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

969 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
RuoYi
7d0eb3b8c7 用户显隐列添加不同key防止被复用 2021-01-07 13:28:16 +08:00
RuoYi
654aa6b30c 表格右侧工具栏组件支持显隐列 2021-01-06 17:30:39 +08:00
X.B-H
b7cdd10f9f 修复导入数据为负浮点数时丢失精度问题 2021-01-06 11:11:11 +08:00
RuoYi
9bd35cb7be 升级druid到最新版本v1.2.4 2021-01-06 11:00:20 +08:00
RuoYi
7a86c714fc 代码生成支持文件上传组件 2021-01-06 11:00:09 +08:00
疯狂的狮子li
b368745380 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-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-ui/package.json
	ruoyi-ui/src/components/HeaderSearch/index.vue
	ruoyi-ui/src/main.js
	ruoyi-ui/src/views/tool/gen/editTable.vue
	ruoyi-ui/src/views/tool/gen/index.vue
 2021-01-06 09:35:00 +08:00
RuoYi
edd090a098 代码生成支持文件上传组件 2021-01-05 20:59:14 +08:00
RuoYi
3cd886785b 图片组件添加预览功能 2021-01-05 20:33:41 +08:00
RuoYi
ae5a0f9774 新增文件上传组件 2021-01-05 20:11:09 +08:00
RuoYi
074b3c735d 设置单图上传控件 2021-01-05 16:17:41 +08:00
RuoYi
a118738d0f 单图上传组件添加移除 2021-01-05 16:13:22 +08:00
ryoeiken
d1b4bfc77c 员工报餐：修改查看补贴余额，添加补贴订单收款，补贴订单退款 2021-01-05 14:10:21 +08:00
ryoeiken
9c5fc1ba2c 员工报餐：用餐流水（订单）查看,获取截止订餐参数,获取菜品清单,获取订餐优惠比例 2021-01-05 10:50:58 +08:00
RuoYi
56fa3912ae 修复IE11浏览器报错问题 2021-01-05 09:44:08 +08:00
疯狂的狮子li
d73994f05d Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-ui/src/layout/components/TagsView/index.vue
	ruoyi-ui/src/views/login.vue
	ruoyi-ui/src/views/monitor/job/index.vue
	ruoyi-ui/src/views/monitor/logininfor/index.vue
	ruoyi-ui/src/views/monitor/online/index.vue
	ruoyi-ui/src/views/monitor/operlog/index.vue
	ruoyi-ui/src/views/system/config/index.vue
	ruoyi-ui/src/views/system/dept/index.vue
	ruoyi-ui/src/views/system/dict/data.vue
	ruoyi-ui/src/views/system/dict/index.vue
	ruoyi-ui/src/views/system/menu/index.vue
	ruoyi-ui/src/views/system/notice/index.vue
	ruoyi-ui/src/views/system/post/index.vue
	ruoyi-ui/src/views/system/role/index.vue
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/src/views/tool/gen/index.vue
 2021-01-05 09:22:36 +08:00
ryoeiken
0de0210910 员工报餐：查看商品清单 2021-01-05 09:11:59 +08:00
ryoeiken
7514563e6c 员工报餐：查看补贴余额，查看补贴记录 2021-01-05 08:44:59 +08:00
RuoYi
2116ee1822 Update copyright 2021-01-04 17:49:52 +08:00
RuoYi
57a2eb4217 操作按钮组调整为朴素按钮样式 2021-01-04 17:48:46 +08:00
ryoeiken
64e943b681 todo:开票，回款 2021-01-04 17:32:07 +08:00
ryoeiken
150676a9ad 食品管理添加用餐类型字段 2021-01-04 17:27:27 +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
2b23508f40 狮子同步最新版本 2020-12-31 17:22:12 +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
czx
f006cb9fba 修复更新用餐时间配置页面bug 2020-12-31 14:55:13 +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
d3ac78138a 饭堂参数前端页面 2020-12-30 17:52:10 +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