Superman_Main
|
ebd6d3bc38
|
Merge branch 'develop' into FOTON
|
2021-11-28 17:11:24 +08:00 |
|
Superman_Main
|
2774d24da6
|
Merge remote-tracking branch 'origin/develop' into develop
|
2021-11-28 17:07:05 +08:00 |
|
zhaokaiyao@91isoft.com
|
89d704b7ee
|
入库日期多选
|
2021-11-28 17:03:44 +08:00 |
|
Superman_Main
|
a9488b7835
|
Merge remote-tracking branch 'origin/develop' into develop
|
2021-11-28 17:00:50 +08:00 |
|
zhaokaiyao@91isoft.com
|
d4cb099d23
|
模块单元结构只能叶子节点多选, 关联模块vpps不用限制只能叶子节点,所以另起一个组件实现只能叶子节点多选功能
|
2021-11-28 13:22:56 +08:00 |
|
yanyizhou
|
2d1963adb1
|
日期组件还是不能乱改,恢复回去
|
2021-11-28 11:26:34 +08:00 |
|
yanyizhou
|
dc0461e45b
|
责任部门,选中父节点不能连带着子节点选中
|
2021-11-28 11:11:59 +08:00 |
|
Superman_Main
|
90c6afa461
|
feat:FOTON release
|
2021-11-28 10:16:21 +08:00 |
|
zhaokaiyao@91isoft.com
|
0a512fef2d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2021-11-27 23:39:34 +08:00 |
|
zhaokaiyao@91isoft.com
|
1b3bcf47b5
|
模块单元选择最后一个节点
|
2021-11-27 23:39:28 +08:00 |
|
Superman_Main
|
117d7c5fa8
|
Merge branch 'develop' into FOTON
|
2021-11-27 22:51:58 +08:00 |
|
Superman_Main
|
fa3ef91ae4
|
feat:FOTON release
|
2021-11-27 22:51:45 +08:00 |
|
Superman_Main
|
d463767fcc
|
Merge branch 'develop' into FOTON
|
2021-11-27 20:36:00 +08:00 |
|
Superman_Main
|
0f8ceb62de
|
Merge remote-tracking branch 'origin/develop' into develop
|
2021-11-27 20:35:25 +08:00 |
|
Superman_Main
|
7aeefe5ccd
|
Merge remote-tracking branch 'origin/develop' into develop
|
2021-11-27 20:34:15 +08:00 |
|
Superman_Main
|
fa4f1a37ba
|
feat: There is no way the, online preview
|
2021-11-27 20:33:55 +08:00 |
|
yanyizhou
|
1fd3a6e558
|
现在所有的日期都能选多个时间,想选几个选几个,满意了吧(象鸣)
|
2021-11-27 13:50:52 +08:00 |
|
zhaokaiyao@91isoft.com
|
da94221d15
|
模块单元结构
|
2021-11-26 20:10:56 +08:00 |
|
zhaokaiyao@91isoft.com
|
83685a3fd0
|
模块单元结构
|
2021-11-26 16:32:38 +08:00 |
|
Superman_Main
|
2b87adf1ee
|
feat:FOTON release
|
2021-11-26 10:48:18 +08:00 |
|
Superman_Main
|
3557110552
|
feat:FOTON release
|
2021-11-26 09:12:56 +08:00 |
|
Superman_Main
|
048b94056d
|
Merge branch 'develop' into FOTON
# Conflicts:
# package-lock.json
# src/components/navMenu/index.vue
|
2021-11-26 09:02:37 +08:00 |
|
zhaokaiyao@91isoft.com
|
b87502f4b6
|
Merge remote-tracking branch 'origin/develop' into develop
|
2021-11-25 18:05:57 +08:00 |
|
zhaokaiyao@91isoft.com
|
5c9154ee1c
|
vpps查找select组件
|
2021-11-25 18:05:51 +08:00 |
|
shenyanpei
|
8c39dbaea1
|
去除console.log
|
2021-11-25 17:20:16 +08:00 |
|
Superman_Main
|
eee8a2e8e5
|
Merge branch 'develop' into FOTON
|
2021-11-24 12:06:40 +08:00 |
|
宋伟佳
|
5c057b6e86
|
commit
|
2021-11-24 09:34:04 +08:00 |
|
Superman_Main
|
ae4a1d9e3c
|
Merge branch 'develop' into FOTON
|
2021-11-22 22:27:56 +08:00 |
|
zhutianqi
|
7178058e6c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2021-11-22 18:01:03 +08:00 |
|
zhutianqi
|
12ed48f629
|
commit
|
2021-11-22 18:00:52 +08:00 |
|
宋伟佳
|
33b439b60b
|
commit
|
2021-11-22 17:15:16 +08:00 |
|
Superman_Main
|
366d1769f8
|
Merge branch 'develop' into FOTON
# Conflicts:
# src/components/navMenu/index.vue
|
2021-11-22 16:30:33 +08:00 |
|
zhaokaiyao@91isoft.com
|
fc64506d52
|
代替标准手动查找
|
2021-11-22 15:57:27 +08:00 |
|
zhaokaiyao@91isoft.com
|
e834074f26
|
Merge remote-tracking branch 'origin/develop' into develop
|
2021-11-22 15:04:25 +08:00 |
|
zhaokaiyao@91isoft.com
|
244ca20a4f
|
查询,清空按钮
|
2021-11-22 15:04:17 +08:00 |
|
宋伟佳
|
39a76c67f2
|
commit
|
2021-11-22 14:51:24 +08:00 |
|
zhutianqi
|
e6d32a70d4
|
Merge remote-tracking branch 'origin/develop' into develop
|
2021-11-22 11:02:24 +08:00 |
|
zhutianqi
|
d617908297
|
commit
|
2021-11-22 11:02:18 +08:00 |
|
shenyanpei
|
9f86ad6f5b
|
菜单栏高度
|
2021-11-22 10:39:13 +08:00 |
|
Superman_Main
|
3b2499c3f3
|
Merge branch 'develop' into FOTON
|
2021-11-22 10:01:43 +08:00 |
|
zhutianqi
|
057bd0aafc
|
commit
|
2021-11-22 09:58:18 +08:00 |
|
Superman_Main
|
09ab35e1b2
|
Merge branch 'develop' into FOTON
|
2021-11-22 09:52:17 +08:00 |
|
zhutianqi
|
a71989e27c
|
commit
|
2021-11-22 09:43:24 +08:00 |
|
Superman_Main
|
4e0f398ad7
|
feat:FOTON release
|
2021-11-22 09:41:51 +08:00 |
|
shenyanpei
|
c21b849657
|
页面样式修改,工作组统计
|
2021-11-21 16:56:47 +08:00 |
|
yanyizhou
|
65499086da
|
Merge remote-tracking branch 'origin/develop' into develop
|
2021-11-21 16:05:31 +08:00 |
|
yanyizhou
|
99e7c9774d
|
且增加模糊筛选(输入首字段,跳出相关选项,供选择)
|
2021-11-21 16:05:24 +08:00 |
|
zhutianqi
|
f4e39d5ac2
|
commit
|
2021-11-21 15:33:04 +08:00 |
|
zhutianqi
|
16741310cf
|
commit
|
2021-11-19 15:18:10 +08:00 |
|
zhutianqi
|
3d2d0e7112
|
commit
|
2021-11-18 17:18:19 +08:00 |
|