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 |
|
疯狂的狮子li
|
e80349c343
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
ruoyi-ui/src/utils/request.js
|
2020-12-04 11:46:29 +08:00 |
|
RuoYi
|
ef92ad4d8c
|
支持get请求映射params参数
|
2020-12-04 10:52:20 +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 |
|
疯狂的狮子li
|
5ebd0a971f
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
|
2020-12-03 11:20:50 +08:00 |
|
RuoYi
|
23868c4fad
|
防止安全扫描YUI出现的风险提示
|
2020-12-03 10:26:22 +08:00 |
|
czx
|
a5b4cc6c18
|
修复每周菜谱翻页异常bug
|
2020-12-03 09:39:43 +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
|
147dbe0e15
|
修复每周菜谱自动计价功能bug
|
2020-12-01 16:07:35 +08:00 |
|
czx
|
af6b5546c9
|
结算管理页面调整
|
2020-12-01 15:26:37 +08:00 |
|
疯狂的狮子li
|
b36b413a69
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
|
2020-12-01 09:23:55 +08:00 |
|
RuoYi
|
3b2669d148
|
修改缓存监控内存单位
|
2020-11-30 19:27:03 +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 |
|
疯狂的狮子li
|
ce438f182a
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
ruoyi-ui/package.json
ruoyi-ui/src/layout/components/AppMain.vue
ruoyi-ui/src/layout/components/TagsView/index.vue
ruoyi-ui/src/router/index.js
ruoyi-ui/src/store/modules/permission.js
ruoyi-ui/src/views/system/user/profile/userAvatar.vue
sql/ry_20201128.sql
|
2020-11-30 12:41:39 +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 |
|
RuoYi
|
1147ea5f8a
|
设置用户头像悬停高度
|
2020-11-30 11:10:27 +08:00 |
|
RuoYi
|
a1bf5aaf8e
|
升级element-ui版本到2.14.1
|
2020-11-30 10:37:48 +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 |
|
RuoYi
|
a69cc94f35
|
三级菜单自动配置组件
|
2020-11-28 20:39:03 +08:00 |
|
RuoYi
|
c666faed66
|
修复三级菜单之间切换页面无法缓存的问题
|
2020-11-28 20:31:45 +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 |
|
RuoYi
|
6072239a40
|
修改缓存监控内存单位
|
2020-11-28 13:57:19 +08:00 |
|
28353131@qq.com
|
e3c0bc3c5c
|
1、完善每周菜谱功能，用户不能添加和删除
2、列表中增加合并列显示效果
3、增加菜品列表
|
2020-11-28 12:53:37 +08:00 |
|
ryoeiken
|
c696a03232
|
添加每周食谱
|
2020-11-27 17:28:17 +08:00 |
|
ryoeiken
|
7ab0d24e50
|
添加病人报餐
|
2020-11-26 16:32:01 +08:00 |
|
ryoeiken
|
000f94049b
|
添加默认报餐表总价格
|
2020-11-26 15:45:18 +08:00 |
|