ryoeiken
|
49c93f59eb
|
实现首次结算的时候，提示这个病人是首次收费，不显示上次结算日期
|
2020-12-09 10:39:23 +08:00 |
|
RuoYi
|
4d46f4c1b5
|
删除用户和角色解绑关联
|
2020-12-09 10:32:53 +08:00 |
|
czx
|
32f30e6e57
|
Merge remote-tracking branch 'origin/master' into master
|
2020-12-08 18:14:39 +08:00 |
|
ryoeiken
|
26f6e4e264
|
CRUD开票模块
|
2020-12-08 18:12:18 +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
|
c4285c56ec
|
构建生成次日报餐记录的sql脚本
|
2020-12-07 22:24:23 +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
|
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
|
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 |
|
ryoeiken
|
e94a6eeec2
|
查询员工信息列表附带科室信息传入弹出层
|
2020-12-04 16:01:19 +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 |
|
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 |
|
ryoeiken
|
6d342a00ca
|
修改病人配餐设置管理，病人营养配餐管理
|
2020-12-03 14:35: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
|
a5107c5a44
|
Merge remote-tracking branch 'origin/master' into master
|
2020-12-01 17:42:02 +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
|
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 |
|
疯狂的狮子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
|
f248b7d4af
|
预付费管理模块增加结算类型切换
|
2020-11-30 11:24:12 +08:00 |
|
28353131@qq.com
|
63e2052b9a
|
改造实现输入建议内容
|
2020-11-29 16:49:26 +08:00 |
|
RuoYi
|
a69cc94f35
|
三级菜单自动配置组件
|
2020-11-28 20:39:03 +08:00 |
|
28353131@qq.com
|
e3c0bc3c5c
|
1、完善每周菜谱功能，用户不能添加和删除
2、列表中增加合并列显示效果
3、增加菜品列表
|
2020-11-28 12:53:37 +08:00 |
|