Commit Graph
585 Commits
Author SHA1 Message Date
zhutianqi f3f4620cfd commit 2021-07-27 16:15:58 +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
zqx0221 23c6e90950 Merge remote-tracking branch 'origin/develop' into develop 2021-07-27 15:39:18 +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
zqx0221 9c27738b08 fix:链接管理 删除链接二次弹框 2021-07-27 15:37:40 +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
super_liu 7d284ac758 Merge remote-tracking branch 'origin/develop' into develop 2021-07-27 14:39:29 +08:00
super_liu 4f37dc341f feat: 国内外标准库 左侧树 我的收藏 2021-07-27 14:39:01 +08:00
fanlin 0a64aa2f6b Merge remote-tracking branch 'origin/develop' into develop 2021-07-27 14:38:29 +08:00
fanlin 4e921d67e5 bug 2021-07-27 14:38:23 +08:00
shen_yan_pu c5ab1264c3 标准清单数据列表高级查询 2021-07-27 14:23:59 +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
yuezhihang 9070472a43 Merge remote-tracking branch 'origin/develop' into develop 2021-07-27 13:44:14 +08:00
yuezhihang 6cb41bdb35 项目合规评估-标准维度 第五步bug修复 2021-07-27 13:44:09 +08:00
fanlin 65a380bbe1 bug: 标准入库流程--在发起页面上传的附件,流转到责任人会签节点,附件没法下载,应该是可以下载 2021-07-27 13:43:50 +08:00
zqx0221 818b620c20 fix:链接管理 点击链接实现跳转 2021-07-27 13:34:43 +08:00
shen_yan_pu fd7342e865 标准清单数据新增编辑列表 2021-07-27 11:29:23 +08:00
fanlin 986bb091e7 bug: 标准入库流程 责任人会签节点点击保存没反应 2021-07-27 10:48:19 +08:00
fanlin 6dfc189304 Merge remote-tracking branch 'origin/develop' into develop 2021-07-27 10:41:42 +08:00
fanlin 00a374ff9d bug: 标准入库流程--圈住的字段应该是支持多选的 2021-07-27 10:41:37 +08:00
yangzijiao 926adf8a8a Merge remote-tracking branch 'origin/develop' into develop 2021-07-27 10:34:11 +08:00
yangzijiao c2d0570a5e 标准法规清单 2021-07-27 10:33:12 +08:00
fanlin c796c9f67c bug:海外删除传参修改 2021-07-27 10:22:28 +08:00
fanlin 2ca76bf2ec Merge remote-tracking branch 'origin/develop' into develop 2021-07-27 10:07:33 +08:00
fanlin 677dc31b81 bug: 国内外标准法规,编辑页面手动查找,点击重置按钮后,列表数据数量变少了 2021-07-27 10:07:28 +08:00
zhutianqi 3fc632c351 Merge remote-tracking branch 'origin/develop' into develop 2021-07-27 10:05:37 +08:00
zhutianqi 04eca92d73 commit 2021-07-27 10:05:28 +08:00
宋伟佳 d5596f764d Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 2021-07-27 09:39:56 +08:00
宋伟佳 a69a3fe6ab commit 2021-07-27 09:39:51 +08:00
fanlin 7c9f6a5035 bug: 下载水印传参加userId 2021-07-27 09:17:11 +08:00
fanlin ae402beeb7 bug 2021-07-27 09:08:13 +08:00
fanlin 9d30eb2c2a Merge remote-tracking branch 'origin/develop' into develop 2021-07-26 18:28:55 +08:00
fanlin 58aedc4ebb bug 2021-07-26 18:28:33 +08:00
宋伟佳 62c667e2cb Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 2021-07-26 18:05:19 +08:00
宋伟佳 ed3ccd21f1 修复bug 2021-07-26 18:05:14 +08:00
liuhuaizhi de0f9aaa9f Merge remote-tracking branch 'origin/develop' into develop 2021-07-26 17:44:38 +08:00
liuhuaizhi 815fca2f3e 45886 车型项目库,查看页面,导出后,查看文件,文件信息错误,导出出现了重复数据,标准信息回显错误 2021-07-26 17:44:23 +08:00
shen_yan_pu f233860daf 标准清单数据列表进入详情页返回 2021-07-26 17:42:04 +08:00
yangzijiao ed3b8ab196 标准号格式 2021-07-26 17:22:34 +08:00
yangzijiao c096a445be Merge remote-tracking branch 'origin/develop' into develop 2021-07-26 17:16:56 +08:00
yangzijiao b240b20476 标准号 2021-07-26 17:16:31 +08:00
zhutianqi 8fbcbfbd2c Merge remote-tracking branch 'origin/develop' into develop 2021-07-26 17:13:06 +08:00
zhutianqi cc49ef4152 commit 2021-07-26 17:12:50 +08:00
yangzijiao fb2c61e93a 验证信息 2021-07-26 17:10:33 +08:00
yangzijiao a620c827f1 Merge remote-tracking branch 'origin/develop' into develop 2021-07-26 17:04:28 +08:00
yangzijiao a4c3a759db 标准法规清单 2021-07-26 17:04:14 +08:00