Commit Graph
4107 Commits
Author SHA1 Message Date
宋伟佳 7fbbd3b16a 项目清单修改bug 其他清单查询bug 2022-02-21 17:34:11 +08:00
宋伟佳 c0dfdb7b5f 修改清单bug 2022-02-21 17:21:16 +08:00
宋伟佳 d8b12037d3 未符合项整改详情跳转 2022-02-21 17:11:24 +08:00
王夏晖 5739cd3974 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!322
2022-02-21 17:10:29 +08:00
宋伟佳 faa510e0c8 项目评估流程修改传值 2022-02-21 17:01:07 +08:00
宋伟佳 ca7d96eb95 修改bug 2022-02-21 16:40:24 +08:00
王夏晖 b16a7deaf1 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!321
2022-02-21 16:18:23 +08:00
宋伟佳 9db5bc0a18 项目评估流程修改分页和责任人bug 2022-02-21 14:24:57 +08:00
super_liu 1c63566ad0 Merge remote-tracking branch 'origin/develop' into develop 2022-02-21 12:34:49 +08:00
super_liu 202d2264ed feat: There is no way the, 注掉 技术系列 国内逻辑 2022-02-21 12:34:33 +08:00
zhutianqi e4115cdf7c Merge remote-tracking branch 'origin/develop' into develop 2022-02-21 10:00:46 +08:00
zhutianqi c70e400c7e commit 2022-02-21 10:00:15 +08:00
王夏晖 dc41342c12 Merge branch 'develop' into 'FOTON'
项目评估流程开发

See merge request LAWS/laws-system-front-FOTON!320
2022-02-21 09:58:22 +08:00
宋伟佳 7a8ceabc73 项目评估流程开发 2022-02-21 09:50:42 +08:00
王夏晖 cd881ab58b Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!319
2022-02-21 09:01:23 +08:00
super_liu 25bb05b4b5 Merge remote-tracking branch 'origin/develop' into develop 2022-02-18 17:49:49 +08:00
super_liu ad738073a5 feat: There is no way the, 角色标准数据权限体系优化 国内标准左侧树 加入技术体系 待完成 2022-02-18 17:48:47 +08:00
zhutianqi c1b2824f5a commit 2022-02-18 17:25:17 +08:00
zhutianqi 218cca6077 Merge remote-tracking branch 'origin/develop' into develop 2022-02-18 17:19:21 +08:00
zhutianqi 2154d48b25 commit 2022-02-18 17:19:16 +08:00
宋伟佳 abfec705a5 项目评估流程开发 2022-02-18 17:07:50 +08:00
宋伟佳 baab78b0ec 项目评估流程开发 2022-02-18 16:50:31 +08:00
super_liu 6db9e1c2f9 Merge branch 'develop' into FOTON 2022-02-18 13:19:53 +08:00
super_liu 640538afdc feat: There is no way the, 2022-02-18 13:16:51 +08:00
super_liu cd7bf72b46 Merge branch 'develop' into FOTON 2022-02-18 13:14:15 +08:00
super_liu 404ed23040 feat: There is no way the, 2022-02-18 13:13:32 +08:00
super_liu e66a5b0e37 Merge branch 'develop' into FOTON 2022-02-18 12:58:49 +08:00
super_liu 2c70e570d0 feat: There is no way the, 2022-02-18 12:57:37 +08:00
super_liu e3f7d9d2ec Merge branch 'develop' into FOTON 2022-02-18 12:39:56 +08:00
super_liu bb39766947 feat: There is no way the, 2022-02-18 12:39:01 +08:00
super_liu 21ebf68bcc Merge remote-tracking branch 'origin/develop' into develop 2022-02-18 12:24:18 +08:00
super_liu 4132c7b845 feat: There is no way the, 2022-02-18 12:23:23 +08:00
zhutianqi d83b476746 Merge remote-tracking branch 'origin/develop' into develop 2022-02-18 11:23:35 +08:00
zhutianqi f01305c0c8 commit 2022-02-18 11:23:29 +08:00
super_liu bc5a1f37d9 Merge branch 'develop' into FOTON 2022-02-18 10:23:19 +08:00
super_liu 03a26c05cd Merge remote-tracking branch 'origin/develop' into develop 2022-02-18 10:00:54 +08:00
super_liu 053c9d0064 feat: There is no way the, 修改通用流程名称逻辑 独立判断 添加新复审流程名称+节点信息 2022-02-18 10:00:27 +08:00
super_liu 093a5c37ba feat:new 2022-02-18 02:26:41 +08:00
super_liu 8a2a6cfc8d Merge branch 'develop' into FOTON
# Conflicts:
#	src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
#	src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
2022-02-17 20:39:23 +08:00
宋伟佳 157e35192f 标准入库归档位置赋值 2022-02-17 19:10:54 +08:00
宋伟佳 6a88b8111f 国内海外单元变型号 2022-02-17 18:36:02 +08:00
宋伟佳 22d2d0a62e 标准入库增加字段 2022-02-17 18:35:12 +08:00
宋伟佳 49ba90d928 Merge branch 'FOTON' into develop
# Conflicts:
#	src/sysConfig/index.js
2022-02-17 17:39:32 +08:00
super_liu 51abb761f5 Merge remote-tracking branch 'origin/develop' into develop 2022-02-17 17:24:40 +08:00
super_liu 9cac2db68f feat: There is no way the, 2022-02-17 17:24:13 +08:00
宋伟佳 ac08da7f37 海外国内企标预览及下载日志 2022-02-17 17:13:45 +08:00
super_liu 5d3771daf4 feat: There is no way the, 2022-02-17 16:53:08 +08:00
super_liu 7682a19ecc Merge remote-tracking branch 'origin/develop' into develop 2022-02-17 16:39:18 +08:00
super_liu 0536d94fa8 feat: There is no way the, 产品标准流程 添加截止日期 2022-02-17 16:38:58 +08:00
zhutianqi feb534dad3 Merge remote-tracking branch 'origin/develop' into develop 2022-02-17 16:38:40 +08:00