Commit Graph
1585 Commits
Author SHA1 Message Date
zhutianqi 8ba79e400d commit 2021-10-28 17:59:20 +08:00
宋伟佳 9842ce41c0 commit 2021-10-28 17:54:46 +08:00
zhutianqi 5c383bb472 commit 2021-10-28 16:29:56 +08:00
zhutianqi f0d6dd1743 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
2021-10-27 17:58:18 +08:00
zhutianqi 8a0d7e5ebf commit 2021-10-27 17:58:00 +08:00
shenyanpei 17919a03f7 外部标准化协会参会流程 2021-10-27 16:59:33 +08:00
shenyanpei cb0edb5074 外部标准化协会参会流程,外部标准化协会入会流程 2021-10-27 13:54:33 +08:00
zhaokaiyao@91isoft.com 2119620fd4 标准入库整个流程实现多个文件 2021-10-27 09:53:19 +08:00
zhutianqi f8349d8ce1 commit 2021-10-27 09:51:53 +08:00
zhaokaiyao@91isoft.com b5789a9b97 Merge remote-tracking branch 'origin/develop' into develop 2021-10-27 09:51:41 +08:00
zhutianqi ce13aed18c Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
2021-10-26 17:58:28 +08:00
zhutianqi 53eeb5cc56 commit 2021-10-26 17:57:58 +08:00
shenyanpei 8a8832496a 外部标准化协会入会流程 2021-10-26 17:26:57 +08:00
宋伟佳 3f7500be6e commit 2021-10-26 17:23:36 +08:00
zhaokaiyao@91isoft.com a5ef6d3625 带入标准,勘误件无法显示.switch没写break(@_@;) 2021-10-26 17:21:36 +08:00
宋伟佳 1f10184ee4 commit 2021-10-26 16:46:45 +08:00
zhutianqi 311c2b1ebc Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/pages/processCenter/pages/newProcess/index.vue
2021-10-26 16:36:17 +08:00
zhutianqi 7acba6aaaa commit 2021-10-26 16:34:07 +08:00
宋伟佳 28f1da75dc commit 2021-10-26 09:34:54 +08:00
zhutianqi 37702f435f Merge remote-tracking branch 'origin/develop' into develop 2021-10-25 17:56:13 +08:00
zhutianqi 5942ba86b3 commit 2021-10-25 17:56:06 +08:00
宋伟佳 7b8a33e0da 外部署名推荐审批流程 2021-10-25 17:47:28 +08:00
zhutianqi a0f1fdc2f1 commit 2021-10-25 13:15:06 +08:00
yanyizhou 9a0e1a82a2 展开基础信息折叠动画 2021-10-22 18:00:11 +08:00
宋伟佳 ec3b397e65 commit 2021-10-21 14:57:24 +08:00
yanyizhou 9fbe5c0e1c 标准清单发布/更新流程 添加重复的标准后 添加弹窗显示暂无数据 点击清空 数据回来了 应该一直有数据 2021-10-21 10:39:14 +08:00
zhutianqi bed01d4afb commit 2021-10-21 09:33:35 +08:00
zhutianqi 56cf5790eb commit 2021-10-20 15:44:40 +08:00
super_liu 08bbc9a6ad Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
2021-10-14 14:46:33 +08:00
super_liu 9394110a24 feat: There is no way the oa 2021-10-14 14:45:03 +08:00
wangxiahui@91isoft.com 68e3980645 项目清单确认流程 注掉多余按钮 2021-10-14 10:33:03 +08:00
宋伟佳 23837b645e commit 2021-10-13 21:47:58 +08:00
zhaokaiyao@91isoft.com 70dd56ec58 Merge remote-tracking branch 'origin/develop' into develop 2021-10-13 18:42:33 +08:00
zhaokaiyao@91isoft.com a686c7f0d6 入库流程/标准编辑 树形选择 关闭问题 2021-10-13 18:42:24 +08:00
super_liu e5da6e0b27 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
2021-10-13 17:58:37 +08:00
super_liu 8d60c72e84 feat: There is no way the oa add endTime 2021-10-13 17:57:48 +08:00
宋伟佳 8cb45eae57 清单确认流程按钮更改 2021-10-13 16:28:14 +08:00
zhutianqi c35c73701b commit 2021-10-13 16:00:56 +08:00
zhaokaiyao@91isoft.com df2d5ecc93 标准入库,文件第一次提交 2021-10-13 11:20:45 +08:00
zhaokaiyao@91isoft.com d2a2b6ad74 Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 2021-10-11 16:53:25 +08:00
zhaokaiyao@91isoft.com d4c312d982 标准入库流程1->添加文件名出现undefined 2021-10-11 16:53:15 +08:00
zhutianqi dd3bad1a91 Merge remote-tracking branch 'origin/develop' into develop 2021-10-11 16:10:33 +08:00
zhutianqi 718a2b923b commit 2021-10-11 16:10:00 +08:00
zhaokaiyao@91isoft.com a105a3e6fc 入库流程->标准体系弹出框->无法取消 同上一个提交 2021-10-11 11:10:44 +08:00
zhaokaiyao@91isoft.com 353cbbcfd5 Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 2021-10-09 17:23:15 +08:00
zhaokaiyao@91isoft.com ebeed11b5a 入库流程->模块结构选择框问题 2021-10-09 17:23:02 +08:00
yanyizhou d5d514c739 项目清单确认流程只能单选(优化代码) 2021-10-09 16:16:33 +08:00
宋伟佳 d82440e435 项目清单单选 2021-10-09 15:31:09 +08:00
zhutianqi fdef700e1d Merge remote-tracking branch 'origin/develop' into develop 2021-10-09 15:04:03 +08:00
zhutianqi 8bc327553c commit 2021-10-09 15:03:45 +08:00