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 |
|
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 |
|
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 |
|
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 |
|
ryoeiken
|
ffddfb5da5
|
配餐功能前端页面改造
|
2020-12-07 13:49:51 +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
|
6d342a00ca
|
修改病人配餐设置管理，病人营养配餐管理
|
2020-12-03 14:35:43 +08:00 |
|
ryoeiken
|
ff8737de03
|
结算管理后端获取最近一次结算时间以及距当前时间的天数
|
2020-12-01 17:41:06 +08:00 |
|
czx
|
f248b7d4af
|
预付费管理模块增加结算类型切换
|
2020-11-30 11:24:12 +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 |
|
ryoeiken
|
86c1094e34
|
默认报餐表
|
2020-11-25 17:55:06 +08:00 |
|
czx
|
783dc47a84
|
修复护工绑定科室多选问题
|
2020-11-25 15:46:53 +08:00 |
|
ryoeiken
|
a35a2ff6f2
|
人员管理,财务管理-补贴管理
|
2020-11-25 09:40:14 +08:00 |
|
ryoeiken
|
7cdb38b7c9
|
员工管理护工管理数据分离
|
2020-11-24 23:17:51 +08:00 |
|
ryoeiken
|
64bd494733
|
人员管理
|
2020-11-24 17:56:12 +08:00 |
|
ryoeiken
|
78f06ed7e2
|
修改前端页面
|
2020-11-19 15:52:46 +08:00 |
|
ryoeiken
|
3d3188e399
|
自动生成 CRUD
|
2020-11-19 15:15:23 +08:00 |
|
疯狂的狮子li
|
aefa2095f0
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
ruoyi-generator/src/main/resources/vm/sql/sql.vm
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/router/index.js
ruoyi-ui/src/views/system/menu/index.vue
ruoyi-ui/src/views/system/role/index.vue
ruoyi-ui/src/views/system/user/index.vue
sql/ry_20200920.sql
|
2020-09-22 13:22:30 +08:00 |
|
RuoYi
|
69829827fe
|
菜单&数据权限新增（展开/折叠 全选/全不选 父子联动）
|
2020-09-21 14:10:01 +08:00 |
|
wensanpi
|
1aa18c523d
|
update ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml.
|
2020-09-20 17:38:21 +08:00 |
|
RuoYi
|
abeb8d7fd8
|
菜单新增是否缓存keep-alive
|
2020-09-20 10:34:03 +08:00 |
|