Commit Graph
1380 Commits
Author SHA1 Message Date
fanlin fca46dfa9f bug 2021-07-30 17:36:03 +08:00
zhutianqi e040599ad5 Merge remote-tracking branch 'origin/develop' into develop 2021-07-30 16:32:53 +08:00
zhutianqi 1b7b0480a7 commit 2021-07-30 16:32:44 +08:00
宋伟佳 74b7a09269 Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 2021-07-30 13:52:11 +08:00
宋伟佳 e19628dca1 修改bug 2021-07-30 13:52:06 +08:00
zhutianqi bb0069f373 Merge remote-tracking branch 'origin/develop' into develop 2021-07-30 11:30:21 +08:00
zhutianqi 21e4742aa7 commit 2021-07-30 11:30:07 +08:00
宋伟佳 e7e80b9a06 Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 2021-07-29 17:01:29 +08:00
宋伟佳 2bbf4875ff 修复bug 2021-07-29 17:01:25 +08:00
fanlin 94954879fc Merge remote-tracking branch 'origin/develop' into develop 2021-07-29 15:35:33 +08:00
fanlin 760f7bbfbc bug:标准入库流程--我司署名人与配置管理配置的不一致 2021-07-29 15:35:12 +08:00
fanlin 77825748b4 bug: 标准入库流程--申请人修订页面去掉圈住的字段,发起页面和修订页面缺少部分代替标准号字段 2021-07-29 15:29:59 +08:00
zhutianqi f92621427a Merge remote-tracking branch 'origin/develop' into develop 2021-07-29 15:22:42 +08:00
zhutianqi d62f69ed7e commit 2021-07-29 15:22:24 +08:00
宋伟佳 abe054b2c0 Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 2021-07-29 15:03:36 +08:00
宋伟佳 6e334ed07d 标准法规清单bug 2021-07-29 15:03:30 +08:00
yuezhihang 4b42e510db Merge remote-tracking branch 'origin/develop' into develop 2021-07-29 10:15:59 +08:00
yuezhihang 75594d8959 项目维度流程 2021-07-29 10:15:53 +08:00
fanlin c872b0edb1 bug: 上传上去文件以后清空以便于下次重新上传 2021-07-29 09:44:27 +08:00
宋伟佳 5123e51408 Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 2021-07-28 18:18:56 +08:00
宋伟佳 e960aa5cdf 修复bug 2021-07-28 18:18:51 +08:00
fanlin 021f77f0ed Merge remote-tracking branch 'origin/develop' into develop 2021-07-28 17:44:43 +08:00
fanlin 209e772c09 bug入库新增上传了附件,在编辑时,再次上传了一个附件,提交后,查看详情页面,附件为空 2021-07-28 17:44:35 +08:00
zhutianqi 4a9814337b Merge remote-tracking branch 'origin/develop' into develop 2021-07-28 17:25:46 +08:00
zhutianqi 9e20156e5b commit 2021-07-28 17:25:36 +08:00
fanlin 4b80c2768b bug:圈住的地方缺少一个上传附件进度条 2021-07-28 16:12:17 +08:00
fanlin 7dd33233d2 bug: 标准入库流程--圈住的字段应该是支持多选的且父子之间不联动 2021-07-28 15:22:14 +08:00
fanlin 8e6b027c10 bug: 标准入库流程--带入一条标准,采标程度、采标编号没回显 2021-07-28 14:58:51 +08:00
shen_yan_pu 68f79d8883 标准清单数据列表,未符合项接口调用顺序 2021-07-28 10:54:07 +08:00
yuezhihang 61f227c037 Merge remote-tracking branch 'origin/develop' into develop 2021-07-27 21:16:15 +08:00
yuezhihang d1b37660ff 合规评估流程-项目维度 2021-07-27 21:16:09 +08:00
宋伟佳 7d0d552b5d Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 2021-07-27 21:14:37 +08:00
宋伟佳 50ee88f7c2 修复bug 2021-07-27 21:14:32 +08:00
shen_yan_pu 6e707c4660 未符合项流程 2021-07-27 19:51:15 +08:00
shen_yan_pu 9534774e19 未符合项流程节点 2021-07-27 19:38:03 +08:00
宋伟佳 51e37b012a Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 2021-07-27 19:35:00 +08:00
宋伟佳 156a0e5899 未符合项整改bug 2021-07-27 19:34:55 +08:00
fanlin 4a1fa5d0ff bug 2021-07-27 17:52:57 +08:00
fanlin f305f29261 bug 2021-07-27 17:06:01 +08:00
fanlin eb907967f0 Merge remote-tracking branch 'origin/develop' into develop 2021-07-27 16:56:30 +08:00
fanlin 9a67cf3613 bug: 标准入库流程--选择人员的组织架构,需加检索,参考期望 2021-07-27 16:56:22 +08:00
zhutianqi 8b960b384e Merge remote-tracking branch 'origin/develop' into develop 2021-07-27 15:49:51 +08:00
zhutianqi 2eca268fd0 commit 2021-07-27 15:49:45 +08:00
fanlin a8bb78c23a Merge remote-tracking branch 'origin/develop' into develop 2021-07-27 15:38:42 +08:00
fanlin 9baf7dc117 bug:标准入库流程--流程中心---已发流程查看入库流程的流程数据,文件显示乱码,去掉相关流程、被引用标准、参会记录字段,圈住的字段没回显 2021-07-27 15:38:37 +08:00
宋伟佳 8bf58763b9 Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 2021-07-27 14:53:09 +08:00
宋伟佳 7657b7ed6a 修复bug 2021-07-27 14:53:01 +08:00
fanlin 4e921d67e5 bug 2021-07-27 14:38:23 +08:00
fanlin 4d00117149 Merge remote-tracking branch 'origin/develop' into develop 2021-07-27 14:04:24 +08:00
fanlin be01e64b4a bug:
1、标准入库流程--圈住的字段,先手动输入,然后再手动查找,点提交就会把手动输入的标准号覆盖
2、标准入库流程--采标编号也应该支持手动查找和手动输入
2021-07-27 14:04:18 +08:00