589 Commits

Author SHA1 Message Date
czx
38cf0af13a 增加营养配餐合并列显示 2020-12-08 18:13:32 +08:00
czx
2aab3d0f48 前端员工订餐接口定义 2020-12-08 11:56:06 +08:00
ryoeiken
e2fa131cf9 配餐功能营养配餐显示 2020-12-08 11:48:31 +08:00
ryoeiken
33fe8c08bb 完善配餐功能修改 2020-12-08 11:31:29 +08:00
ryoeiken
2cf46f7fc8 修复员工,护工管理查询错误 2020-12-08 08:12:34 +08:00
ryoeiken
914cc24d5b Merge remote-tracking branch 'origin/master' 2020-12-07 23:23:48 +08:00
ryoeiken
42d10696c3 修复修改病人配餐不能读取病人信息 bug 2020-12-07 23:23:37 +08:00
28353131@qq.com
e59cb4ee64 构建生成次日报餐记录的sql脚本 2020-12-07 22:41:49 +08:00
28353131@qq.com
832ab863a2 Merge remote-tracking branch 'origin/master' 2020-12-07 22:24:43 +08:00
28353131@qq.com
c4285c56ec 构建生成次日报餐记录的sql脚本 2020-12-07 22:24:23 +08:00
ryoeiken
92e53c810a 修复修改病人配餐错误 2020-12-07 22:04:11 +08:00
ryoeiken
2651c88c6b 修复修改病人配餐设置弹出层错误 2020-12-07 18:01:37 +08:00
ryoeiken
10e70120e8 配餐功能列表显示,查询 2020-12-07 17:43:34 +08:00
ryoeiken
dea15c69de 员工订餐-获取用餐时间 2020-12-07 17:33:31 +08:00
ryoeiken
a9f0e4aad2 修改病人配餐设置前端页面 2020-12-07 17:32:04 +08:00
ryoeiken
3bb9e8a105 修复病人配餐查询 2020-12-07 16:06:10 +08:00
czx
99abbdb015 Merge remote-tracking branch 'origin/master' into master 2020-12-07 14:55:40 +08:00
czx
ce92663f2c 更新前端病患配置列表显示格式,同时修改对应后端实现 2020-12-07 14:54:10 +08:00
czx
ac43c15b8b 病患默认配餐配置删除price字段,调整sql语句 2020-12-07 13:50:05 +08:00
ryoeiken
ffddfb5da5 配餐功能前端页面改造 2020-12-07 13:49:51 +08:00
ryoeiken
b99ab862ef 病人报餐修改弹出层正餐类型回显 2020-12-07 08:18:48 +08:00
28353131@qq.com
5d15dc37ec 增加报餐前端设计说明 2020-12-06 08:33:59 +08:00
28353131@qq.com
c99bedef5c 增加预开票开发说明 2020-12-05 10:38:02 +08:00
28353131@qq.com
720951dcdb Merge remote-tracking branch 'origin/master' 2020-12-05 09:50:09 +08:00
28353131@qq.com
423dadc5d6 新增功能文档描述 2020-12-05 09:49:40 +08:00
ryoeiken
1638bdd145 Merge remote-tracking branch 'origin/master' into master 2020-12-04 17:43:22 +08:00
ryoeiken
0b289f2abf 补贴弹出层科室筛选 2020-12-04 17:42:59 +08:00
czx
4e447e3e39 完善病患配餐页面 2020-12-04 17:41:42 +08:00
czx
801412ef96 Merge remote-tracking branch 'origin/master' into master 2020-12-04 16:10:09 +08:00
ryoeiken
e94a6eeec2 查询员工信息列表附带科室信息传入弹出层 2020-12-04 16:01:19 +08:00
czx
0b9a5baf7a Merge remote-tracking branch 'origin/master' into master 2020-12-04 15:55:05 +08:00
ryoeiken
5a2a31c552 补贴页面添加补贴发放弹出层,添加查询员工信息列表附带科室信息 2020-12-04 15:43:12 +08:00
czx
355258abbb Merge remote-tracking branch 'origin/master' into master 2020-12-04 08:08:21 +08:00
28353131@qq.com
0e571bde22 病患配餐列表中增加正餐菜品名回显 2020-12-03 23:16:28 +08:00
ryoeiken
e6e6a94784 搭建病患配餐页面 2020-12-03 18:11:09 +08:00
ryoeiken
a8567345c9 完善营养套餐管理 2020-12-03 17:32:17 +08:00
ryoeiken
5da5451cbc 营养配餐设置功能页面 2020-12-03 16:02:32 +08:00
czx
107def44eb Merge remote-tracking branch 'origin/master' into master 2020-12-03 14:36:18 +08:00
ryoeiken
6d342a00ca 修改病人配餐设置管理,病人营养配餐管理 2020-12-03 14:35:43 +08:00
czx
a5b4cc6c18 修复每周菜谱翻页异常bug 2020-12-03 09:39:43 +08:00
czx
54ff1d29ef 结算收款功能 2020-12-02 17:47:12 +08:00
czx
85716eb8d8 结算收款功能(未完) 2020-12-02 14:34:36 +08:00
czx
81a2e5578e 防止预付费重复收款 2020-12-02 09:50:23 +08:00
czx
1f89abf51d 更新系统标题相关内容 2020-12-02 08:52:48 +08:00
czx
970a194347 导入getuser包 2020-12-01 17:45:28 +08:00
czx
a5107c5a44 Merge remote-tracking branch 'origin/master' into master 2020-12-01 17:42:02 +08:00
ryoeiken
26e0c50d96 Merge remote-tracking branch 'origin/master' into master 2020-12-01 17:41:18 +08:00
ryoeiken
ff8737de03 结算管理后端获取最近一次结算时间以及距当前时间的天数 2020-12-01 17:41:06 +08:00
czx
e2ad86e682 增加判断是否已经支付预付伙食费(未完) 2020-12-01 16:55:57 +08:00
czx
43b05b9781 数据库结构调整createby int --> varchar 2020-12-01 16:39:00 +08:00