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 |
|
czx
|
147dbe0e15
|
修复每周菜谱自动计价功能bug
|
2020-12-01 16:07:35 +08:00 |
|
czx
|
d61517cf46
|
Merge remote-tracking branch 'origin/master' into master
|
2020-12-01 15:30:44 +08:00 |
|
czx
|
0b5b7db96d
|
临时
|
2020-12-01 15:30:17 +08:00 |
|
ryoeiken
|
b94f753ae5
|
Merge remote-tracking branch 'origin/master' into master
|
2020-12-01 15:29:00 +08:00 |
|
ryoeiken
|
03169452d8
|
预付费结算判断
|
2020-12-01 15:28:46 +08:00 |
|
czx
|
af6b5546c9
|
结算管理页面调整
|
2020-12-01 15:26:37 +08:00 |
|
czx
|
d708c734df
|
增加查询结算记录（未完）
|
2020-11-30 18:05:14 +08:00 |
|
czx
|
8657a73b92
|
修复添加预收费记录默认数据不完整
|
2020-11-30 15:06:17 +08:00 |
|
czx
|
b4cfb9cb80
|
完成预付费收费功能
|
2020-11-30 14:27:06 +08:00 |
|
czx
|
147b7d8896
|
预付款输入框控制正整数输入
|
2020-11-30 11:50:00 +08:00 |
|
czx
|
3e1b7163b0
|
收费弹出层关联选择按钮
|
2020-11-30 11:38:54 +08:00 |
|
czx
|
f248b7d4af
|
预付费管理模块增加结算类型切换
|
2020-11-30 11:24:12 +08:00 |
|
28353131@qq.com
|
acf6cf7298
|
修复bug
|
2020-11-29 17:03:42 +08:00 |
|
28353131@qq.com
|
63e2052b9a
|
改造实现输入建议内容
|
2020-11-29 16:49:26 +08:00 |
|
28353131@qq.com
|
0d16f9158a
|
初步改造前端页面
|
2020-11-29 15:16:17 +08:00 |
|
28353131@qq.com
|
5b598909f7
|
删除无用的console
|
2020-11-28 19:03:16 +08:00 |
|
28353131@qq.com
|
ba32570859
|
增加价格自动计算和格式化回显
|
2020-11-28 19:02:18 +08:00 |
|
28353131@qq.com
|
d1a5c75da8
|
优化显示效果，增大菜单栏的长度
|
2020-11-28 18:33:24 +08:00 |
|
28353131@qq.com
|
16a6560ff4
|
优化多选状态下菜品显示，同时显示价格
|
2020-11-28 18:20:43 +08:00 |
|
28353131@qq.com
|
b3a0332835
|
优化交互功能，嵌入多选器显示菜单，并可以直接编辑保存
|
2020-11-28 18:06:38 +08:00 |
|
28353131@qq.com
|
e3c0bc3c5c
|
1、完善每周菜谱功能，用户不能添加和删除
2、列表中增加合并列显示效果
3、增加菜品列表
|
2020-11-28 12:53:37 +08:00 |
|
28353131@qq.com
|
bac94b2f03
|
修改每周菜谱数据类型，对应修改实体类
|
2020-11-28 11:16:34 +08:00 |
|
czx
|
797a9c3cd8
|
Merge remote-tracking branch 'origin/master' into master
|
2020-11-27 17:48:10 +08:00 |
|
czx
|
6864c23124
|
增加填写同步日志功能
|
2020-11-27 17:47:34 +08:00 |
|
ryoeiken
|
737186308d
|
Merge remote-tracking branch 'origin/master' into master
|
2020-11-27 17:28:32 +08:00 |
|
ryoeiken
|
c696a03232
|
添加每周食谱
|
2020-11-27 17:28:17 +08:00 |
|
czx
|
0ef4ec268e
|
增加填充新病患的报餐默认配置数据
|
2020-11-27 17:13:41 +08:00 |
|
ryoeiken
|
7ab0d24e50
|
添加病人报餐
|
2020-11-26 16:32:01 +08:00 |
|
ryoeiken
|
000f94049b
|
添加默认报餐表总价格
|
2020-11-26 15:45:18 +08:00 |
|
ryoeiken
|
02229ed732
|
默认报餐表显示
|
2020-11-26 15:00:44 +08:00 |
|
czx
|
820bb00831
|
完善远程病患同步逻辑
|
2020-11-26 14:29:20 +08:00 |
|
czx
|
63d72d7f51
|
完成同步远程病患数据到本地
|
2020-11-26 11:29:02 +08:00 |
|
czx
|
a2798f7a1f
|
不同数据源切换同步远程病患到本地
|
2020-11-26 09:33:32 +08:00 |
|
ryoeiken
|
c91b0f55e5
|
默认报餐
|
2020-11-26 00:40:17 +08:00 |
|
ryoeiken
|
552abab811
|
Merge remote-tracking branch 'origin/master'
|
2020-11-26 00:34:50 +08:00 |
|
ryoeiken
|
b8428b09fe
|
默认报餐
|
2020-11-26 00:34:39 +08:00 |
|
28353131@qq.com
|
0bb383d7c2
|
多数据源，远程病人信息表
|
2020-11-25 23:09:02 +08:00 |
|
czx
|
a65761757b
|
Merge remote-tracking branch 'origin/master' into master
# Conflicts:
# ruoyi-admin/src/main/resources/application-dev.yml
|
2020-11-25 17:59:06 +08:00 |
|
czx
|
0cd78a6b7c
|
多数据源配置
|
2020-11-25 17:58:14 +08:00 |
|
ryoeiken
|
86c1094e34
|
默认报餐表
|
2020-11-25 17:55:06 +08:00 |
|
ryoeiken
|
0e13b03072
|
Merge remote-tracking branch 'origin/master' into master
|
2020-11-25 16:19:01 +08:00 |
|
czx
|
6dbe2daa24
|
删除护工信息列表多余内容
|
2020-11-25 16:08:32 +08:00 |
|
czx
|
9b3fe8d6ee
|
修复护工绑定科室多选问题
|
2020-11-25 15:54:03 +08:00 |
|
ryoeiken
|
b4e7c3f2a7
|
Merge remote-tracking branch 'origin/master' into master
|
2020-11-25 15:50:11 +08:00 |
|
czx
|
783dc47a84
|
修复护工绑定科室多选问题
|
2020-11-25 15:46:53 +08:00 |
|
ryoeiken
|
ee17361cda
|
Merge remote-tracking branch 'origin/master' into master
|
2020-11-25 15:14:19 +08:00 |
|