Commit Graph
80 Commits
Author SHA1 Message Date
396572590@qq.com b3d7a8f44e feat: conf dev 2022-06-21 09:36:49 +08:00
396572590@qq.com 8896aa290c Merge remote-tracking branch 'origin/develop' into develop 2022-06-21 09:11:39 +08:00
yuezhihang 371b2d553b 111 2022-06-20 17:02:16 +08:00
super_liu faf7fea3b2 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/sysConfig/index.js
2022-03-31 15:39:02 +08:00
宋伟佳 513c799f7f 52246 替换系统内的上传下载接口 2022-03-30 10:36:02 +08:00
宋伟佳 55d8b08364 附件展示 2022-03-25 14:28:33 +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
王夏晖 34da378fdb Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!306
2022-01-26 18:32:46 +08:00
chenxiaoxi 7f66222a6c 1.修复征求意见详情页刷新回到登录页的BUG
2.修复征求意见详情添加窗口通信刷新BUG
2022-01-26 17:09:36 +08:00
王夏晖 61a5390585 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!280
2022-01-06 15:33:41 +08:00
zhutianqi adddd3eb0b commit 2022-01-06 14:41:08 +08:00
super_liu 233b0ae32c Merge branch 'develop' into FOTON 2021-12-31 09:45:41 +08:00
super_liu 7e27310dd5 feat:new 2021-12-31 09:45:15 +08:00
super_liu 0444c693c8 feat:new 剁手 2021-12-27 15:05:40 +08:00
宋伟佳 95badff27b 修改清单相关的bug 2021-12-27 10:52:42 +08:00
super_liu 9438f0cf74 feat:new 2021-12-23 21:54:52 +08:00
super_liu b5b9d29410 feat: There is no way the,only 2021-12-23 21:47:36 +08:00
super_liu bbe7d2c930 Merge branch 'develop' into FOTON
# Conflicts:
#	src/sysConfig/index.js
2021-12-23 21:46:48 +08:00
super_liu a9b912f69b feat: There is no way the,only 2021-12-23 21:44:15 +08:00
super_liu b6ba0f06b1 feat:new 2021-12-16 21:51:16 +08:00
super_liu 5b4f870e24 Merge branch 'develop' into FOTON
# Conflicts:
#	src/sysConfig/index.js
2021-12-16 21:50:31 +08:00
super_liu bc8b1dc289 feat:new 2021-12-16 10:59:39 +08:00
Superman_Main f839350192 feat:FOTON rest 2021-12-09 08:52:06 +08:00
wangxiahui@91isoft.com 89179b71f7 Default Changelist 2021-12-08 10:15:47 +08:00
Superman_Main 4e0f398ad7 feat:FOTON release 2021-11-22 09:41:51 +08:00
zhutianqi 4b181eafe4 commit 2021-11-07 16:37:20 +08:00
zhutianqi 8a0d7e5ebf commit 2021-10-27 17:58:00 +08:00
super_liu 341e78ea8d feat: There is no way the test conf 2021-10-22 15:16:56 +08:00
super_liu b91e57419b Merge branch 'test' into 'develop'
# Conflicts:
#   src/sysConfig/index.js
2021-10-22 14:29:41 +08:00
宋伟佳 b493818454 commit 2021-10-16 10:41:21 +08:00
王夏晖 5ad327884a Update index.js 2021-10-14 09:07:16 +08:00
王夏晖 ca66921d3e Update index.js 2021-10-13 19:33:16 +08:00
super_liu 19089f562f feat: There is no way the idm and oa 2021-10-11 17:48:17 +08:00
宋伟佳 ced7e8f0e2 commit 2021-09-24 14:42:36 +08:00
zhutianqi 6804acd7c0 commit 2021-09-17 17:55:59 +08:00
zhutianqi b2f7e17576 commit 2021-09-15 17:50:42 +08:00
宋伟佳 f19f93d521 标准征求意见流程历史数据页面展示 2021-08-27 18:21:04 +08:00
zhutianqi 83a0fd7c96 commit 2021-08-27 08:55:52 +08:00
宋伟佳 bb4fc26161 修改bug 2021-08-19 18:04:34 +08:00
宋伟佳 f6be00c653 合并代码 2021-08-09 09:29:44 +08:00
yanyizhou 6770fad07b 添加零部件编号申请模块 2021-08-08 16:29:59 +08:00
宋伟佳 5ffa81c986 流程页面添加标准号和标准名称跳转 2021-08-06 09:39:14 +08:00
song2048 18aed9b692 no message 2021-08-05 16:27:21 +08:00
宋伟佳 b2498c485d 合并代码 2021-08-05 09:15:16 +08:00
Mr.Z ef48f5cddf 修改未符合项整改--由项目合规评估流程-标准归档到未符合项整改库的数据问题 2021-08-04 14:32:18 +08:00
zhutianqi 95a56debc2 commit 2021-08-04 11:28:35 +08:00
zhutianqi 38ee07db17 commit 2021-08-04 11:22:59 +08:00
zhutianqi 0719b0f796 commit 2021-08-04 11:11:01 +08:00
宋伟佳 23e9389958 commit 2021-08-03 14:04:58 +08:00