abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
925 Commits 5 Branches 22 Tags
Commit Graph

86 Commits

Author SHA1 Message Date
czx
43e075ad7d 修复预付费查询功能 2021-02-09 09:54:11 +08:00
czx
ff8a4be89b 优化打印数值转换中文数字 2021-02-01 18:11:00 +08:00
czx
63485c1f7d 新增病患报餐统计功能 2021-01-28 16:05:24 +08:00
ryoeiken
007d0adfb2 修复开票管理是否已开票不能筛选的 bug 2021-01-25 16:17:35 +08:00
ryoeiken
b5c134c960 开票管理，单条结算单开票 2021-01-22 11:14:40 +08:00
ryoeiken
803102f206 新增发票表，结算表字段 2021-01-22 09:47:52 +08:00
ryoeiken
4a1a09e932 窗口收费-收费 2021-01-21 15:32:06 +08:00
ryoeiken
aa57a01ffa 营养餐统计 2021-01-21 09:54:33 +08:00
czx
5b1eb6d89d 前端对应数据库病患报餐增加是否开通营养配餐标志 2021-01-19 17:52:15 +08:00
ryoeiken
d0f5c425b2 病患默认配餐配置表，报餐表添加营养配餐开通标志字段 2021-01-19 17:06:46 +08:00
ryoeiken
e940708d52 营养配餐暂停，恢复，复制，粘贴 2021-01-19 14:33:04 +08:00
ryoeiken
4415a55369 人脸信息 CRUD 2021-01-11 10:45:30 +08:00
ryoeiken
a631281ba7 员工信息新增人面设备员工 id 字段 2021-01-11 10:32:54 +08:00
ryoeiken
835e6dfcd0 会员客户端 api：获取会员主页 URL，获取会员积分，获取会员余额，获取会员代金券数量，获取会员具体项目首页 URL 2021-01-09 10:00:00 +08:00
ryoeiken
6bd7ea834f 食品管理添加用餐类型字段 2021-01-04 17:27:03 +08:00
ryoeiken
4bec2d207f 病人配餐设置页面改造 2021-01-04 15:29:48 +08:00
ryoeiken
629e81c177 基本完成开票，回款登记 CRUD 2021-01-04 14:50:06 +08:00
ryoeiken
873bf7203a Merge remote-tracking branch 'origin/master' into master 2020-12-31 17:24:43 +08:00
czx
57e016d0f1 Merge remote-tracking branch 'origin/master' into master 
# Conflicts:
#	ruoyi-admin/src/main/resources/application-dev.yml
#	ruoyi-admin/src/main/resources/application-prod.yml
 2020-12-31 17:17:36 +08:00
ryoeiken
416ed16118 病患营养配餐前端页面 2020-12-31 17:12:29 +08:00
ryoeiken
2eff99e3c0 报餐表添加新字段 2020-12-31 13:42:43 +08:00
ryoeiken
baf88a0ea4 完善根据科室获取次日报餐信息 2020-12-31 11:42:11 +08:00
ryoeiken
9604f9495d 修复根据科室获取次日报餐信息 2020-12-31 10:13:57 +08:00
czx
58ea5fb983 发现bug 2020-12-31 09:41:26 +08:00
ryoeiken
595adb7ae3 送餐员报餐 APP 后端接口，todo：批量更新报餐记录，通知营养科更新营养配餐信息 2020-12-30 16:36:44 +08:00
疯狂的狮子li
e9d368ed0c Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
	ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
 2020-12-30 16:20:09 +08:00
ryoeiken
f9a5efd406 护工获取默认部门信息 2020-12-30 10:57:17 +08:00
ryoeiken
48c922a3a9 后端接口：获取指定病患明天的订餐记录,获取指定科室明天的报餐记录 2020-12-30 09:26:41 +08:00
28353131@qq.com
d5195dfe9e 修复一对多bug 2020-12-29 22:08:22 +08:00
czx
1a6837f49e 一对多完善 2020-12-29 18:41:11 +08:00
RuoYi
647af5b485 菜单组件修改允许空字符串 2020-12-29 17:27:48 +08:00
li_oxen
a04bb71777 修复 用户管理 -> 修改用户 手机号码 和 邮箱 不能清空 2020-12-29 13:51:15 +08:00
ryoeiken
af71ca6da4 todo：收费 2020-12-28 16:47:51 +08:00
ryoeiken
f84ce6e13f 病人同步 2020-12-24 17:07:37 +08:00
ryoeiken
14186cc4af 完成 日常收费 - 收费 功能 2020-12-23 11:13:12 +08:00
ryoeiken
21416475a2 收费页面弹出层 2020-12-22 18:00:07 +08:00
ryoeiken
85747dc9a1 修复前端补贴发放标志不能修改错误 并 根据发放标志插入记录，显示在职员工， 2020-12-21 17:41:53 +08:00
ryoeiken
aa4289245f 补贴发放 2020-12-21 16:59:16 +08:00
ryoeiken
bb88724e20 饭堂系统信息 CRUD 2020-12-17 09:21:46 +08:00
ryoeiken
025ae3c117 Merge remote-tracking branch 'origin/master' into master 
# Conflicts:
#	ruoyi-admin/src/main/resources/application.yml
#	ruoyi-ui/package.json
#	ruoyi-ui/src/views/index.vue
 2020-12-14 17:41:13 +08:00
疯狂的狮子li
f56f57a236 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
	ruoyi-ui/package.json
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/assets/styles/sidebar.scss
	ruoyi-ui/src/assets/styles/variables.scss
	ruoyi-ui/src/components/HeaderSearch/index.vue
	ruoyi-ui/src/components/Screenfull/index.vue
	ruoyi-ui/src/layout/components/Settings/index.vue
	ruoyi-ui/src/layout/components/Sidebar/Logo.vue
	ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
	ruoyi-ui/src/layout/components/Sidebar/index.vue
	ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
	ruoyi-ui/src/layout/index.vue
	ruoyi-ui/src/main.js
	ruoyi-ui/src/settings.js
	ruoyi-ui/src/store/modules/settings.js
	ruoyi-ui/src/store/modules/user.js
	ruoyi-ui/src/views/login.vue
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/src/views/system/user/profile/resetPwd.vue
	ruoyi-ui/src/views/system/user/profile/userInfo.vue
	ruoyi-ui/src/views/tool/gen/editTable.vue
	ruoyi-ui/src/views/tool/gen/index.vue
	ruoyi-ui/vue.config.js
 2020-12-11 14:27:54 +08:00
ryoeiken
6d4d7ef8f1 Merge remote-tracking branch 'origin/master' into master 2020-12-09 17:34:36 +08:00
ryoeiken
56aa0ed630 完善 日常收费-收费功能 2020-12-09 17:34:21 +08:00
czx
48497f5d4b 预付费问题修复 2020-12-09 11:37:27 +08:00
RuoYi
4d46f4c1b5 删除用户和角色解绑关联 2020-12-09 10:32:53 +08:00
ryoeiken
26f6e4e264 CRUD开票模块 2020-12-08 18:12:18 +08:00
ryoeiken
e2fa131cf9 配餐功能营养配餐显示 2020-12-08 11:48:31 +08:00
ryoeiken
33fe8c08bb 完善配餐功能修改 2020-12-08 11:31:29 +08:00
ryoeiken
42d10696c3 修复修改病人配餐不能读取病人信息 bug 2020-12-07 23:23:37 +08:00
ryoeiken
10e70120e8 配餐功能列表显示，查询 2020-12-07 17:43:34 +08:00