Commit Graph
1500 Commits
Author SHA1 Message Date
宋伟佳 e42ee6b763 删除认证工程师和质量工程师 2022-03-03 15:15:59 +08:00
zhutianqi 63c9142b75 commit 2022-03-03 10:48:19 +08:00
zhutianqi 2250ef8234 Merge remote-tracking branch 'origin/develop' into develop 2022-03-03 10:29:28 +08:00
zhutianqi 4d143302bc commit 2022-03-03 10:29:22 +08:00
宋伟佳 f028455555 去掉标准名称必填 2022-03-03 09:46:36 +08:00
super_liu 88bff9ed10 Merge branch 'develop' into FOTON 2022-03-02 19:48:10 +08:00
宋伟佳 b9f45d2691 标准跳转 字段更改 2022-03-02 16:05:35 +08:00
super_liu f20087bd41 feat: There is no way the, 2022-03-02 14:37:48 +08:00
super_liu 4ec5907eda feat: There is no way the, 海外结构树 菜单查询 2022-03-02 14:36:44 +08:00
super_liu f66ed6a146 feat: There is no way the, 企标计划及立项 体系结构 添加逻辑 只可选择二级及以下 2022-03-02 10:04:08 +08:00
王夏晖 826088c0ab Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!331
2022-03-01 15:25:47 +08:00
宋伟佳 a7bc276469 海外必填bug 2022-03-01 14:58:04 +08:00
宋伟佳 fa19a8b3cb 修改国内标准bug 2022-03-01 14:42:18 +08:00
super_liu 4c4c7932ca feat: There is no way the, 企标高级检索 备案日期 多条件查询 2022-03-01 14:08:00 +08:00
王夏晖 ba7f325f95 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!330
2022-03-01 14:05:43 +08:00
super_liu a3b4d8ee7d feat: There is no way the, 删除123 企标详情 加逻辑 企标 关联属性数据不存在 报错问题 2022-03-01 10:41:28 +08:00
王夏晖 5a91403536 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!329
2022-02-28 09:01:38 +08:00
宋伟佳 1bb5377ef1 清单详情 清单新增页面bug 2022-02-25 11:10:45 +08:00
宋伟佳 ecf9512f58 未符合项整改bug 2022-02-24 17:48:47 +08:00
super_liu 79f74c0316 Merge branch 'develop' into FOTON
# Conflicts:
#	src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
2022-02-24 15:32:57 +08:00
zhutianqi a11bac321d commit 2022-02-24 15:19:58 +08:00
zhutianqi 6ae0c71079 commit 2022-02-24 15:04:49 +08:00
王夏晖 41ca5359b9 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!327
2022-02-23 16:14:19 +08:00
zhutianqi e2dfddf827 commit 2022-02-23 11:30:02 +08:00
zhutianqi 87b506dfc3 commit 2022-02-23 10:50:27 +08:00
super_liu 64691793f6 Merge branch 'develop' into FOTON 2022-02-22 19:24:29 +08:00
super_liu bcae46a62e feat: There is no way the, 企标复审计划数据 标题 添加数据描述 2022-02-22 17:27:26 +08:00
super_liu 1b223f1291 Merge remote-tracking branch 'origin/develop' into develop 2022-02-22 17:17:55 +08:00
super_liu 427384ad77 feat: There is no way the, 企标库 权限树结构 相关模块修改 2022-02-22 17:17:13 +08:00
王夏晖 ee3c00c4a5 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!326
2022-02-22 17:01:35 +08:00
zhutianqi 01f1402049 Merge remote-tracking branch 'origin/develop' into develop 2022-02-22 15:48:57 +08:00
zhutianqi 82d7a3aaef commit 2022-02-22 15:48:52 +08:00
王夏晖 661aa2ca38 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!325
2022-02-22 15:18:57 +08:00
宋伟佳 37a3b237ed 修改表单bug 2022-02-22 15:14:30 +08:00
王夏晖 d728a53f87 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!324
2022-02-22 13:26:00 +08:00
zhutianqi 0ba9950160 commit 2022-02-22 09:50:58 +08:00
王夏晖 247f82b786 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!323
2022-02-21 17:57:07 +08:00
super_liu 32768ff683 Merge remote-tracking branch 'origin/develop' into develop 2022-02-21 17:45:40 +08:00
super_liu 51d2c8c0e0 feat: There is no way the, buss tree auth 2022-02-21 17:45:33 +08:00
zhutianqi b2ea1cc965 Merge remote-tracking branch 'origin/develop' into develop 2022-02-21 17:43:46 +08:00
zhutianqi 62e82228aa commit 2022-02-21 17:43:41 +08:00
宋伟佳 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
王夏晖 b16a7deaf1 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!321
2022-02-21 16:18:23 +08:00
super_liu 202d2264ed feat: There is no way the, 注掉 技术系列 国内逻辑 2022-02-21 12:34:33 +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 ad738073a5 feat: There is no way the, 角色标准数据权限体系优化 国内标准左侧树 加入技术体系 待完成 2022-02-18 17:48:47 +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
宋伟佳 6a88b8111f 国内海外单元变型号 2022-02-17 18:36:02 +08:00