abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
742 Commits 4 Branches 22 Tags
Commit Graph

341 Commits

Author SHA1 Message Date
RuoYi
1147ea5f8a 设置用户头像悬停高度 2020-11-30 11:10:27 +08:00
RuoYi
a1bf5aaf8e 升级element-ui版本到2.14.1 2020-11-30 10:37:48 +08:00
28353131@qq.com
acf6cf7298 修复bug 2020-11-29 17:03:42 +08:00
28353131@qq.com
63e2052b9a 改造实现输入建议内容 2020-11-29 16:49:26 +08:00
28353131@qq.com
0d16f9158a 初步改造前端页面 2020-11-29 15:16:17 +08:00
RuoYi
a69cc94f35 三级菜单自动配置组件 2020-11-28 20:39:03 +08:00
RuoYi
c666faed66 修复三级菜单之间切换页面无法缓存的问题 2020-11-28 20:31:45 +08:00
28353131@qq.com
5b598909f7 删除无用的console 2020-11-28 19:03:16 +08:00
28353131@qq.com
ba32570859 增加价格自动计算和格式化回显 2020-11-28 19:02:18 +08:00
28353131@qq.com
d1a5c75da8 优化显示效果，增大菜单栏的长度 2020-11-28 18:33:24 +08:00
28353131@qq.com
16a6560ff4 优化多选状态下菜品显示，同时显示价格 2020-11-28 18:20:43 +08:00
28353131@qq.com
b3a0332835 优化交互功能，嵌入多选器显示菜单，并可以直接编辑保存 2020-11-28 18:06:38 +08:00
RuoYi
6072239a40 修改缓存监控内存单位 2020-11-28 13:57:19 +08:00
28353131@qq.com
e3c0bc3c5c 1、完善每周菜谱功能，用户不能添加和删除 
2、列表中增加合并列显示效果
3、增加菜品列表
 2020-11-28 12:53:37 +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
02229ed732 默认报餐表显示 2020-11-26 15:00:44 +08:00
ryoeiken
b8428b09fe 默认报餐 2020-11-26 00:34:39 +08:00
ryoeiken
86c1094e34 默认报餐表 2020-11-25 17:55:06 +08:00
czx
6dbe2daa24 删除护工信息列表多余内容 2020-11-25 16:08:32 +08:00
czx
9b3fe8d6ee 修复护工绑定科室多选问题 2020-11-25 15:54:03 +08:00
czx
783dc47a84 修复护工绑定科室多选问题 2020-11-25 15:46:53 +08:00
czx
913ced8791 修复启用状态回显bug 2020-11-25 11:19:59 +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
疯狂的狮子li
20d7c90515 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java
	ruoyi-ui/src/views/system/user/profile/userAvatar.vue
	sql/ry_20201123.sql
 2020-11-24 10:03:59 +08:00
RuoYi
90ac416e02 新增缓存监控功能 2020-11-23 10:02:50 +08:00
ryoeiken
78f06ed7e2 修改前端页面 2020-11-19 15:52:46 +08:00
ryoeiken
3d3188e399 自动生成 CRUD 2020-11-19 15:15:23 +08:00
RuoYi
5b63f0cab9 优化头像样式，鼠标移入悬停遮罩 2020-11-19 09:33:10 +08:00
疯狂的狮子li
ff563c44e2 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.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/views/index.vue
	ruoyi-ui/src/views/tool/gen/editTable.vue
 2020-11-18 10:41:13 +08:00
RuoYi
8f145bba3a 若依 v3.2.1 2020-11-18 09:32:15 +08:00
RuoYi
823e95667e 代码生成支持上传控件 2020-11-16 16:20:17 +08:00
RuoYi
566053da0c 新增图片上传组件 2020-11-16 15:52:58 +08:00
疯狂的狮子li
60dda6c7eb Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/src/views/index.vue
 2020-11-12 09:24:40 +08:00
RuoYi
0ef007240d 调整默认首页 2020-11-07 10:38:35 +08:00
疯狂的狮子li
efb938c370 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java
	ruoyi-ui/src/views/system/notice/index.vue
	ruoyi-ui/src/views/system/user/index.vue
 2020-11-03 09:56:18 +08:00
FlyFive
212012dc62 未选择时，点击“确认”，出现必填验证提示。使用blur的话，选择之后验证消息不会自动消失，使用change会自动消失。 2020-11-02 11:49:25 +08:00
疯狂的狮子li
cf44d1f213 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
	ruoyi-ui/src/views/system/dept/index.vue
 2020-10-28 11:54:52 +08:00
FlyFive
2b9d46439f update ruoyi-ui/src/views/system/dept/index.vue. 
验证的提示信息错了
 2020-10-26 16:31:51 +08:00
疯狂的狮子li
30d15afd33 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
	ruoyi-generator/src/main/resources/vm/sql/sql.vm
	ruoyi-ui/src/views/login.vue
	sql/ry_20201021.sql
 2020-10-23 17:41:02 +08:00
RuoYi
c9f25cb34e 调整sql默认时间 2020-10-21 11:30:37 +08:00
疯狂的狮子li
f4876422a9 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/src/views/system/dict/index.vue
	ruoyi-ui/src/views/system/role/index.vue
 2020-10-14 09:22:01 +08:00
RuoYi
08df2c93a9 删除不必要的代码 2020-10-13 14:41:26 +08:00
FlyFive
0cae7d0058 update ruoyi-ui/src/views/system/role/index.vue. 
getMenuAllCheckedKeys()方法中选中节点和半选节点获取的方法反了。
 2020-10-12 13:50:25 +08:00
疯狂的狮子li
8ca53c7666 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	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/system/user/profile/resetPwd.vue
	ruoyi-ui/src/views/system/user/profile/userAvatar.vue
	ruoyi-ui/src/views/system/user/profile/userInfo.vue
	ruoyi-ui/src/views/tool/gen/index.vue
 2020-10-12 09:54:59 +08:00
RuoYi
b0965653bf 删除不必要的代码 2020-10-10 17:54:30 +08:00
RuoYi
69256940df 若依 3.2 2020-10-10 09:38:21 +08:00