693 Commits

Author SHA1 Message Date
ryoeiken
49c93f59eb 实现首次结算的时候,提示这个病人是首次收费,不显示上次结算日期 2020-12-09 10:39:23 +08:00
RuoYi
4d46f4c1b5 删除用户和角色解绑关联 2020-12-09 10:32:53 +08:00
若依
a941c1b488 !134 修改 代码生成 预览无法左右滑动
Merge pull request !134 from 〝走走停停/master
2020-12-09 10:27:34 +08:00
ryoeiken
206fecd2b0 添加饭堂初始化数据库 2020-12-09 09:50:57 +08:00
ryoeiken
4934bfa730 修改结算管理弹出层 2020-12-09 08:48:09 +08:00
ryoeiken
742b0ae527 修改本地开发测试数据库配置文件 2020-12-09 08:25:00 +08:00
28353131@qq.com
4ba16c1c1b 修复添加营养配餐没有餐号显示的bug 2020-12-08 22:42:35 +08:00
czx
32f30e6e57 Merge remote-tracking branch 'origin/master' into master 2020-12-08 18:14:39 +08:00
czx
38cf0af13a 增加营养配餐合并列显示 2020-12-08 18:13:32 +08:00
ryoeiken
26f6e4e264 CRUD开票模块 2020-12-08 18:12:18 +08:00
〝走走停停
d6b6151aea update ruoyi-ui/src/assets/styles/ruoyi.scss. 2020-12-08 17:49:51 +08:00
RuoYi
fbc071a573 关闭页签清理缓存数据 2020-12-08 16:43:26 +08:00
疯狂的狮子li
5a62019cdd 更新 如何修改为Tomcat相关注释配置与说明 2020-12-08 16:21:30 +08:00
RuoYi
6cfff90b4a 缓存仪表图设置默认大小 2020-12-08 16:13:21 +08:00
RuoYi
474cca921e 回显数据字典防止空值报错 2020-12-08 16:12:00 +08:00
若依
1657e06be6 !132 update ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java.
Merge pull request !132 from abbfun/N/A
2020-12-08 16:03:51 +08:00
ryoeiken
33136439d5 员工性别回显 2020-12-08 15:10:07 +08:00
ryoeiken
ad876c378c 修改生产环境数据库地址 2020-12-08 15:09:36 +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
abbfun
c01eeb8521 update ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java. 2020-12-08 11:11:34 +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
832ab863a2 Merge remote-tracking branch 'origin/master' 2020-12-07 22:24:43 +08:00
28353131@qq.com
c4285c56ec 构建生成次日报餐记录的sql脚本 2020-12-07 22:24:23 +08:00
ryoeiken
92e53c810a 修复修改病人配餐错误 2020-12-07 22:04:11 +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
a9f0e4aad2 修改病人配餐设置前端页面 2020-12-07 17:32:04 +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
RuoYi
f90899d72a 支持主题风格配置 2020-12-07 14:13:02 +08:00
czx
ac43c15b8b 病患默认配餐配置删除price字段,调整sql语句 2020-12-07 13:50:05 +08:00
ryoeiken
ffddfb5da5 配餐功能前端页面改造 2020-12-07 13:49:51 +08:00
疯狂的狮子li
69f30760f8 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/utils/request.js
	ruoyi-ui/src/views/system/user/profile/userAvatar.vue
2020-12-07 12:59:35 +08:00
ryoeiken
b99ab862ef 病人报餐修改弹出层正餐类型回显 2020-12-07 08:18:48 +08:00
RuoYi
7e78a9167f 修改用户头像预览宽高 2020-12-06 16:22:45 +08:00
RuoYi
563e11d9c1 get请求params添加null值判断 2020-12-06 11:05:02 +08:00
28353131@qq.com
5d15dc37ec 增加报餐前端设计说明 2020-12-06 08:33:59 +08:00
28353131@qq.com
c99bedef5c 增加预开票开发说明 2020-12-05 10:38:02 +08:00
28353131@qq.com
720951dcdb Merge remote-tracking branch 'origin/master' 2020-12-05 09:50:09 +08:00
28353131@qq.com
423dadc5d6 新增功能文档描述 2020-12-05 09:49:40 +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