Commit Graph
178 Commits
Author SHA1 Message Date
宋伟佳 902e291fb1 Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 2021-07-22 14:35:02 +08:00
宋伟佳 2b1677d62b 评估流程 2021-07-22 14:34:57 +08:00
zhutianqi c7aebd4698 commit 2021-07-22 14:23:23 +08:00
zhutianqi 130e8c9fa5 Merge remote-tracking branch 'origin/develop' into develop 2021-07-22 13:59:31 +08:00
zhutianqi a7ac33f6ed commit 2021-07-22 13:59:21 +08:00
super_liu ba35661aa8 Merge remote-tracking branch 'origin/develop' into develop 2021-07-22 10:26:17 +08:00
yuezhihang 6858f5c5b6 待办界面流程对象对应 2021-07-22 10:13:51 +08:00
super_liu 23917e989a Merge remote-tracking branch 'origin/develop' into develop 2021-07-22 10:11:32 +08:00
super_liu add0f76364 feat: 标准库 入库流程 修改属性字段存储类型 2021-07-22 10:11:08 +08:00
fanlin 27d4e7c151 bug:入库流程--发起页面,把被引用标准这个字段去掉 2021-07-22 09:00:12 +08:00
宋伟佳 b2c2c09b0e Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 2021-07-21 21:01:12 +08:00
宋伟佳 9a0ca53e4a 评估流程2 2021-07-21 21:01:07 +08:00
super_liu c1c23c001c feat: 标准库 统一组织结构树组件 2021-07-21 19:12:54 +08:00
宋伟佳 eab7dc54f6 Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 2021-07-21 16:39:52 +08:00
宋伟佳 2c988a3f76 修复bug 2021-07-21 16:39:46 +08:00
zhutianqi 63ef41fe8d Merge remote-tracking branch 'origin/develop' into develop 2021-07-21 16:27:05 +08:00
zhutianqi bbb2102fb1 commit 2021-07-21 16:26:58 +08:00
yuezhihang cf30193ceb 回显字段!!!! 2021-07-21 16:25:17 +08:00
宋伟佳 4c4541cd63 Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 2021-07-21 15:46:53 +08:00
宋伟佳 e220e9c1f4 评估及未符合bug 2021-07-21 15:46:24 +08:00
zhutianqi 5f91f150a2 Merge remote-tracking branch 'origin/develop' into develop 2021-07-21 11:21:41 +08:00
zhutianqi fc5070ac81 commit 2021-07-21 11:21:22 +08:00
宋伟佳 3673d37a8d Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 2021-07-21 10:36:25 +08:00
宋伟佳 70b4528a94 评估流程 2021-07-21 10:36:14 +08:00
fanlin 47cdcbc1ae Merge remote-tracking branch 'origin/develop' into develop 2021-07-20 18:03:03 +08:00
zhutianqi 128fd88956 Merge remote-tracking branch 'origin/develop' into develop 2021-07-20 18:00:18 +08:00
zhutianqi 1bf09d7ee9 commit 2021-07-20 18:00:11 +08:00
fanlin 28a889fc2f Merge remote-tracking branch 'origin/develop' into develop 2021-07-20 18:00:09 +08:00
fanlin 8df229c9b4 bug: 标准入库流程 责任人会签节点点击保存没反应 2021-07-20 17:57:06 +08:00
宋伟佳 7da4bb7893 评估流程 2021-07-20 17:47:43 +08:00
宋伟佳 317294fdc0 Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 2021-07-20 13:45:02 +08:00
宋伟佳 91b9606885 评估流程 2021-07-20 13:44:48 +08:00
fanlin a3e01f170f Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
2021-07-19 17:39:52 +08:00
宋伟佳 9e315314bc Merge branch 'develop' of http://101.36.229.190:90/LAWS/laws-system-front-FOTON into develop 2021-07-19 17:23:53 +08:00
宋伟佳 fddba323f3 项目评估流程 2021-07-19 17:23:46 +08:00
fanlin a76a1ab869 bug 2021-07-19 17:15:28 +08:00
zhutianqi 62a6db8e98 commit 2021-07-19 15:40:49 +08:00
zhutianqi dc0935ff8e Merge remote-tracking branch 'origin/develop' into develop 2021-07-19 15:27:40 +08:00
zhutianqi 4ae7335a24 commit 2021-07-19 15:27:18 +08:00
super_liu 88ba417c7e Merge remote-tracking branch 'origin/develop' into develop 2021-07-19 14:09:40 +08:00
super_liu 88fbde8b51 fix: 解决bug #45290 2021-07-19 14:09:03 +08:00
宋伟佳 504349cef0 Merge branch 'develop' of http://101.36.229.190:90/LAWS/laws-system-front-FOTON into develop 2021-07-19 10:57:22 +08:00
宋伟佳 959ab65acd 修复bug 2021-07-19 10:57:16 +08:00
shen_yan_pu f8536448e7 首页添加更多按钮,清单可以新增 2021-07-19 10:45:16 +08:00
super_liu 1d6f9d0a59 feat: 标准库 2021-07-18 17:09:54 +08:00
super_liu 750a657f09 feat: 标准库 2021-07-17 18:33:12 +08:00
super_liu 7d435619f2 Merge remote-tracking branch 'origin/develop' into develop 2021-07-17 16:11:47 +08:00
super_liu a02a38a8d6 feat: 标准库 2021-07-17 16:11:32 +08:00
zhutianqi 4dee9e67e3 Merge remote-tracking branch 'origin/develop' into develop 2021-07-16 17:46:52 +08:00
zhutianqi 08ade11bd1 commit 2021-07-16 17:46:46 +08:00