139 Commits

Author SHA1 Message Date
ryoeiken
e54f23dd05 Merge remote-tracking branch 'origin/master' into master 2020-12-21 16:59:26 +08:00
ryoeiken
aa4289245f 补贴发放 2020-12-21 16:59:16 +08:00
czx
fd7108f412 优化获取用餐信息的接口 2020-12-21 15:54:44 +08:00
czx
96b6b349dc 新增员工停餐接口 2020-12-21 14:48:57 +08:00
czx
6675d80a92 Merge remote-tracking branch 'origin/master' into master 2020-12-21 14:08:31 +08:00
czx
638ad47e35 新增员工订单生成和取消接口 2020-12-21 14:08:13 +08:00
ryoeiken
68778311e8 修复订单管理页面 2020-12-21 13:51:52 +08:00
czx
9e62938b1f 修改获取员工订餐配置信息记录方式 2020-12-21 11:54:05 +08:00
czx
690b4e56e8 新增返回员工某一日的订单接口 2020-12-18 17:53:51 +08:00
czx
979a450afd 新增返回员工某一日的订单接口 2020-12-18 14:51:58 +08:00
czx
81d88da5d1 新增返回全部订单接口 2020-12-17 18:00:01 +08:00
czx
9dc5505422 完成同步更新三个逻辑 2020-12-17 16:13:51 +08:00
ryoeiken
bb88724e20 饭堂系统信息 CRUD 2020-12-17 09:21:46 +08:00
czx
7c0331b7b6 修复员工订单bug 2020-12-16 17:30:15 +08:00
czx
16e2baae11 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:26:45 +08:00
疯狂的狮子li
7e476b941e Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
	ruoyi-ui/package.json
	ruoyi-ui/src/main.js
	ruoyi-ui/src/views/index.vue
	ruoyi-ui/src/views/tool/gen/index.vue
2020-12-14 09:27:27 +08:00
RuoYi
8988d0b4ab 若依 3.3.0 2020-12-14 09:02:10 +08:00
czx
11a7baeb03 新增获取当天员工订单接口 2020-12-11 18:11:38 +08:00
czx
1540db84df 新增获取当天员工订单接口 2020-12-11 14:42:05 +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
czx
fe51f511a4 1、修复员工登录更新状态bug
2、返回配置信息bug
2020-12-11 11:10:28 +08:00
28353131@qq.com
a01ff2cbc4 员工订餐前端获取配置信息接口 2020-12-10 22:45:45 +08:00
28353131@qq.com
9e1f48d9d8 优化登录接口,记录登录状态,返回uuid 2020-12-10 21:43:33 +08:00
czx
89d06362a7 优化员工自动报餐sql,增加计算最新价格 2020-12-10 17:57:56 +08:00
czx
cb8614201d 添加定时器,定时生成员工订餐记录 2020-12-10 13:33:17 +08:00
czx
84125a0f72 调整员工信息表结构 2020-12-10 09:57:29 +08:00
czx
31c9f6a7aa Merge remote-tracking branch 'origin/master' into master 2020-12-09 17:48:54 +08:00
czx
4cb7ae256e 员工端登录返回 2020-12-09 17:48:05 +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
55f5939808 Merge remote-tracking branch 'origin/master' into master 2020-12-09 11:38:12 +08:00
czx
48497f5d4b 预付费问题修复 2020-12-09 11:37:27 +08:00
ryoeiken
f96f3264f0 添加日常收费-收费功能 2020-12-09 11:31:10 +08:00
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