Commit Graph
1993 Commits
Author SHA1 Message Date
宋伟佳 55e7ccce85 commit 2021-11-30 09:38:13 +08:00
Superman_Main 566360dc8a Merge branch 'develop' into FOTON 2021-11-29 22:24:41 +08:00
宋伟佳 6a891b851e commit 2021-11-29 20:45:54 +08:00
宋伟佳 f00ad24180 commit 2021-11-29 15:03:43 +08:00
Superman_Main cf3dc997d9 Merge branch 'develop' into FOTON 2021-11-29 08:59:18 +08:00
zhaokaiyao@91isoft.com 2bb2c98152 我司署名人 和 责任人选择污染
我司署名人 不可修改的节点显示问题
我司署名人带入下一流程消失问题
2021-11-28 18:28:37 +08:00
Superman_Main ebd6d3bc38 Merge branch 'develop' into FOTON 2021-11-28 17:11:24 +08:00
zhaokaiyao@91isoft.com 354ed85de4 去掉debugger 2021-11-28 17:09:46 +08:00
zhaokaiyao@91isoft.com 00a61eec5d 流程提交 2021-11-28 17:04:49 +08:00
zhaokaiyao@91isoft.com 89d704b7ee 入库日期多选 2021-11-28 17:03:44 +08:00
zhaokaiyao@91isoft.com 14e5e0af80 流程模块结构单元 只能选址叶子节点 2021-11-28 13:41:47 +08:00
Superman_Main c3d3c99949 Merge branch 'develop' into FOTON 2021-11-27 22:58:06 +08:00
yanyizhou 131fb1382e 署名人多选完善 2021-11-27 22:53:15 +08:00
Superman_Main 7ca91b9b9a Merge branch 'develop' into FOTON 2021-11-27 22:35:06 +08:00
yanyizhou 367a60295b Merge remote-tracking branch 'origin/develop' into develop 2021-11-27 22:20:40 +08:00
yanyizhou 8dcadd415e 流程多选日期和署名人多选 2021-11-27 22:20:33 +08:00
Superman_Main d463767fcc Merge branch 'develop' into FOTON 2021-11-27 20:36:00 +08:00
宋伟佳 9ed1437bf5 commit 2021-11-27 19:03:10 +08:00
宋伟佳 3236a0b8fc commit 2021-11-26 15:58:21 +08:00
宋伟佳 1e69ab4faf 标准合规评估带入标准 2021-11-26 15:15:57 +08:00
zhutianqi 9c05c6fd5d Merge remote-tracking branch 'origin/develop' into develop 2021-11-26 14:54:12 +08:00
zhutianqi c3414f0687 commit 2021-11-26 14:54:06 +08:00
zhaokaiyao@91isoft.com 2176ef673a Merge remote-tracking branch 'origin/develop' into develop 2021-11-26 14:53:46 +08:00
zhaokaiyao@91isoft.com 5463166666 流程vpps查找添加 :type="'truck'" 2021-11-26 14:53:39 +08:00
shenyanpei 5ddab141a3 修改新增编辑样式 2021-11-26 10:23:04 +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
zhutianqi 9f4ef0f318 commit 2021-11-25 16:01:53 +08:00
Superman_Main eee8a2e8e5 Merge branch 'develop' into FOTON 2021-11-24 12:06:40 +08:00
shenyanpei edff9d4198 标准入库保存 2021-11-24 10:06:18 +08:00
Superman_Main faf1438540 Merge branch 'develop' into FOTON 2021-11-23 21:16:05 +08:00
zhutianqi 6f89978a4f Merge remote-tracking branch 'origin/develop' into develop 2021-11-23 16:58:42 +08:00
zhutianqi 029e6d71ca commit 2021-11-23 16:58:36 +08:00
shenyanpei ab2ab9c968 标准入库选择海外,标准类别、性质注销 2021-11-23 16:48:36 +08:00
Superman_Main ae4a1d9e3c Merge branch 'develop' into FOTON 2021-11-22 22:27:56 +08:00
yanyizhou a017489a21 折叠动画 2021-11-22 18:20:17 +08:00
yanyizhou 559c891c5a 折叠动画 2021-11-22 18:18:35 +08:00
yanyizhou 422f31280e 折叠动画 2021-11-22 18:15:38 +08:00
yanyizhou 7720d5deaa Merge remote-tracking branch 'origin/develop' into develop 2021-11-22 18:10:16 +08:00
yanyizhou bdf0cb25e6 折叠动画 2021-11-22 18:10:11 +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
yanyizhou a6ac3c76cf Merge remote-tracking branch 'origin/develop' into develop 2021-11-22 18:00:39 +08:00
yanyizhou 945563477c 折叠动画 2021-11-22 18:00:33 +08:00
Superman_Main 366d1769f8 Merge branch 'develop' into FOTON
# Conflicts:
#	src/components/navMenu/index.vue
2021-11-22 16:30:33 +08:00
Superman_Main 2b4b1f75c0 Merge remote-tracking branch 'origin/develop' into develop 2021-11-22 16:26:46 +08:00
yanyizhou 1748fe5d6c 查询清空按钮统一 2021-11-22 15:18:51 +08:00
yanyizhou 97a5f45788 查询清空按钮统一 2021-11-22 15:09:24 +08:00
yanyizhou 1bd8be8d04 查询清空按钮统一 2021-11-22 14:58:02 +08:00
yanyizhou b475ea03dc bzrk Step4 20xxx 2021-11-22 11:03:47 +08:00
Superman_Main ef13fe555b Merge remote-tracking branch 'origin/develop' into develop 2021-11-22 10:43:19 +08:00