Commit Graph
1427 Commits
Author SHA1 Message Date
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
宋伟佳 c3054507bf 企业标准详情跳转及多发布稿展示 2022-02-17 15:00:09 +08:00
王夏晖 e3a3002080 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!314
2022-02-14 09:30:12 +08:00
super_liu b691a0cb29 feat: There is no way the, 2022-02-09 19:51:23 +08:00
super_liu af1eca7ebd feat: There is no way the, 2022-02-08 16:16:18 +08:00
super_liu 4b3440c18e Merge branch 'develop' into FOTON 2022-01-28 21:53:52 +08:00
zhutianqi 4ad3e00865 commit 2022-01-28 17:22:56 +08:00
王夏晖 ad7680d526 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!308
2022-01-28 13:09:02 +08:00
zhutianqi 5f5b7dda99 commit 2022-01-28 11:59:43 +08:00
zyd 9d7f80d0f3 update: 国内、海外标准新增模块单元新字段 2022-01-27 22:58:09 +08:00
zhutianqi c91d25d7bb commit 2022-01-27 21:51:36 +08:00
宋伟佳 1bb31bdd7d 技术评估结果字段展示 2022-01-26 19:24:02 +08:00
zhutianqi bebc201341 commit 2022-01-26 17:20:02 +08:00
chenxiaoxi 7f66222a6c 1.修复征求意见详情页刷新回到登录页的BUG
2.修复征求意见详情添加窗口通信刷新BUG
2022-01-26 17:09:36 +08:00
zhutianqi c835a0719e commit 2022-01-26 15:23:38 +08:00
zhutianqi 8a542b9435 commit 2022-01-26 11:03:43 +08:00
super_liu e89707f729 Merge remote-tracking branch 'origin/develop' into develop 2022-01-25 18:44:45 +08:00
super_liu dd2afabb67 feat: There is no way the, buss state 2022-01-25 18:44:20 +08:00
shenyanpei d6c9db9d51 车型类别清单车型选择 2022-01-25 15:36:12 +08:00
shenyanpei c9c662a8d3 车型类别清单上下移动 2022-01-25 15:03:56 +08:00
shenyanpei 38b22f2142 项目清单字段调整 2022-01-25 14:57:52 +08:00
zhutianqi b127c22f04 commit 2022-01-25 13:01:53 +08:00
super_liu 123bfaaa4b feat: There is no way the, 2022-01-24 20:04:31 +08:00
super_liu 04c9595a33 Merge remote-tracking branch 'origin/develop' into develop 2022-01-24 20:03:34 +08:00