opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-19 01:48:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
859 Commits 2 Branches 11 Tags 149 MiB
fd6a2425c5
Commit Graph

248 Commits

Author SHA1 Message Date
ryoeiken
9c5fc1ba2c 员工报餐：用餐流水（订单）查看,获取截止订餐参数,获取菜品清单,获取订餐优惠比例 2021-01-05 10:50:58 +08:00
ryoeiken
0de0210910 员工报餐：查看商品清单 2021-01-05 09:11:59 +08:00
ryoeiken
7514563e6c 员工报餐：查看补贴余额，查看补贴记录 2021-01-05 08:44:59 +08:00
ryoeiken
64e943b681 todo:开票，回款 2021-01-04 17:32:07 +08:00
ryoeiken
6bd7ea834f 食品管理添加用餐类型字段 2021-01-04 17:27:03 +08:00
ryoeiken
4bec2d207f 病人配餐设置页面改造 2021-01-04 15:29:48 +08:00
ryoeiken
d04a9c5cbb 病人配餐默认不开启营养餐 2021-01-04 15:05:49 +08:00
ryoeiken
629e81c177 基本完成开票，回款登记 CRUD 2021-01-04 14:50:06 +08:00
ryoeiken
b96b7bbf41 新增，修改营养配餐时一同新增，修改病人配餐设置 2021-01-04 10:10:20 +08:00
ryoeiken
873bf7203a Merge remote-tracking branch 'origin/master' into master 2020-12-31 17:24:43 +08:00
czx
57e016d0f1 Merge remote-tracking branch 'origin/master' into master 
# Conflicts:
#	ruoyi-admin/src/main/resources/application-dev.yml
#	ruoyi-admin/src/main/resources/application-prod.yml
 2020-12-31 17:17:36 +08:00
ryoeiken
416ed16118 病患营养配餐前端页面 2020-12-31 17:12:29 +08:00
ryoeiken
6cb636ca40 修改参数 2020-12-31 14:14:30 +08:00
ryoeiken
2eff99e3c0 报餐表添加新字段 2020-12-31 13:42:43 +08:00
ryoeiken
baf88a0ea4 完善根据科室获取次日报餐信息 2020-12-31 11:42:11 +08:00
ryoeiken
9604f9495d 修复根据科室获取次日报餐信息 2020-12-31 10:13:57 +08:00
ryoeiken
81546a3b56 获取菜品清单 2020-12-31 10:04:54 +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
疯狂的狮子li
e9d368ed0c Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
	ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
 2020-12-30 16:20:09 +08:00
ryoeiken
f27e2de7c1 更改默认报餐部门 2020-12-30 11:24:16 +08:00
ryoeiken
21f019264e 获取部门列表 2020-12-30 11:08:58 +08:00
ryoeiken
969b6aef37 添加注释 2020-12-30 11:05:00 +08:00
ryoeiken
f9a5efd406 护工获取默认部门信息 2020-12-30 10:57:17 +08:00
ryoeiken
339ea49928 护工添加手机号码及密码 2020-12-30 10:26:25 +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
e73d581adf 一对多初步 2020-12-29 17:49:43 +08:00
ryoeiken
5d4451ec27 一对多初步 2020-12-29 17:49:33 +08:00
ryoeiken
6c80b39059 一对多初步 2020-12-29 17:48:43 +08:00
RuoYi
647af5b485 菜单组件修改允许空字符串 2020-12-29 17:27:48 +08:00
ryoeiken
418c8b6657 窗口收费 2020-12-29 16:18:20 +08:00
li_oxen
a04bb71777 修复 用户管理 -> 修改用户 手机号码 和 邮箱 不能清空 2020-12-29 13:51:15 +08:00
28353131@qq.com
a5bdb5072a 员工订餐统计接口，增加部门统计 2020-12-28 23:24:26 +08:00
ryoeiken
046aba1a2f Merge remote-tracking branch 'origin/master' into master 
# Conflicts:
#	ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtPatientDaoMapper.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SyncPatientServiceImpl.java
 2020-12-28 16:49:18 +08:00
ryoeiken
af71ca6da4 todo：收费 2020-12-28 16:47:51 +08:00
czx
43350ad40b bug：订餐配置信息 2020-12-28 14:17:04 +08:00
czx
08864e17b9 优化员工报餐，过来周六日 2020-12-28 10:32:24 +08:00
czx
f257ee2f6c 临时修改 2020-12-25 17:59:09 +08:00
ryoeiken
0704a2a51c 修复 日常收费 bug 2020-12-25 14:34:09 +08:00
28353131@qq.com
bb0adb833a 完善订餐逻辑，先删除停餐记录 2020-12-24 22:38:55 +08:00
ryoeiken
ff2e63e3b7 Merge remote-tracking branch 'origin/master' into master 2020-12-24 17:07:44 +08:00
ryoeiken
f84ce6e13f 病人同步 2020-12-24 17:07:37 +08:00
czx
e01edd535b 增加统计单日接口 2020-12-24 14:10:16 +08:00
czx
69785a0388 返回有效记录接口bug 2020-12-24 12:29:19 +08:00
czx
32cbe06ec6 优化返回有效记录接口，只返回今天以后的记录 2020-12-24 11:17:28 +08:00
czx
357eb123c9 返回菜单接口bug 2020-12-24 10:06:03 +08:00
czx
5f825db580 增加初始化员工配置记录接口 2020-12-24 09:17:17 +08:00
28353131@qq.com
ff11bbb16f 优化获取有效停餐记录接口，只返回今天以后的记录 2020-12-23 23:39:34 +08:00
28353131@qq.com
4064be7c50 优化菜谱接口，获取某一天的菜谱 2020-12-23 23:29:53 +08:00
28353131@qq.com
d903c4ebe5 增加今日菜单功能 2020-12-23 23:27:13 +08:00
ryoeiken
14186cc4af 完成 日常收费 - 收费 功能 2020-12-23 11:13:12 +08:00
ryoeiken
21416475a2 收费页面弹出层 2020-12-22 18:00:07 +08:00
ryoeiken
f0ac254e43 修复 日常收费 - 收费 弹出层错误 2020-12-22 11:22:02 +08:00
ryoeiken
f29a047f54 修复员工，护工管理页面错误 2020-12-22 08:44:18 +08:00
czx
bb45ccb720 Merge remote-tracking branch 'origin/master' into master 2020-12-21 17:54:46 +08:00
czx
16afb20621 修改员工登出功能 2020-12-21 17:54:11 +08:00
ryoeiken
85747dc9a1 修复前端补贴发放标志不能修改错误 并 根据发放标志插入记录，显示在职员工， 2020-12-21 17:41:53 +08:00
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