FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,819 Commits 3 Branches 0 Tags
8a2a6cfc8d87f80e9414ccb1c5164cdd7d8132a3
Commit Graph
3819 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
zhutianqi f30beb07c5 commit 2022-02-17 16:38:33 +08:00
super_liu cad426b0b8 Merge remote-tracking branch 'origin/develop' into develop 2022-02-17 16:24:06 +08:00
super_liu 61328f48b8 feat: There is no way the, 新复审 2022-02-17 16:23:34 +08:00
宋伟佳 c3054507bf 企业标准详情跳转及多发布稿展示 2022-02-17 15:00:09 +08:00
王夏晖 b13d1b220e Merge branch 'develop' into 'FOTON' 
Develop

See merge request LAWS/laws-system-front-FOTON!318
 2022-02-17 09:50:39 +08:00
zhutianqi b8e0a9e567 commit 2022-02-17 09:38:58 +08:00
super_liu b8f5de3721 Merge remote-tracking branch 'origin/develop' into develop 2022-02-16 18:01:50 +08:00
super_liu 954e7748ef feat: There is no way the, 复审2 2022-02-16 18:00:35 +08:00
宋伟佳 d232b78a78 标准评估流程查询 2022-02-16 17:59:16 +08:00
zhutianqi 2d89e9b707 commit 2022-02-16 17:53:55 +08:00
王夏晖 5ad11cceca Merge branch 'develop' into 'FOTON' 
Develop

See merge request LAWS/laws-system-front-FOTON!317
 2022-02-16 10:03:11 +08:00
zhutianqi b7cbe25fff Merge remote-tracking branch 'origin/develop' into develop 2022-02-16 09:22:53 +08:00
zhutianqi acebd39871 commit 2022-02-16 09:20:38 +08:00
王夏晖 119744a167 Merge branch 'develop' into 'FOTON' 
Develop

See merge request LAWS/laws-system-front-FOTON!316
 2022-02-16 09:00:26 +08:00
super_liu 01c5f13d37 feat: There is no way the, 复审新 2022-02-15 15:55:21 +08:00
super_liu a2e50a629d feat: There is no way the, 2022-02-15 14:43:19 +08:00
super_liu bd376981e3 Merge remote-tracking branch 'origin/develop' into develop 2022-02-15 11:29:22 +08:00
super_liu 324ae1bdd5 feat: There is no way the, 修改立项单在线编辑 接口 传参 2022-02-15 11:29:15 +08:00
宋伟佳 d1af3737d3 标准评估流程落实人必填 2022-02-15 11:09:19 +08:00
super_liu 9c4cff5fc7 Merge remote-tracking branch 'origin/develop' into develop 2022-02-15 10:19:42 +08:00
super_liu 8139087fde feat: There is no way the, 发起 对接人 多人 2022-02-15 10:19:34 +08:00
zhutianqi 6aba052fac Merge remote-tracking branch 'origin/develop' into develop 2022-02-15 09:53:08 +08:00
zhutianqi 486369c149 commit 2022-02-15 09:53:03 +08:00
宋伟佳 289727b659 标准评估流程落实人删除驳回 2022-02-15 09:28:59 +08:00
zhutianqi 744d9971db commit 2022-02-14 11:00:53 +08:00
王夏晖 3e8a9b16cf Merge branch 'develop' into 'FOTON' 
Develop

See merge request LAWS/laws-system-front-FOTON!315
 2022-02-14 10:22:38 +08:00
zhutianqi a081367873 Merge remote-tracking branch 'origin/develop' into develop 2022-02-14 10:20:33 +08:00
zhutianqi 54fa8a8434 commit 2022-02-14 10:20:26 +08:00
shenyanpei d753830f20 流程节点名称修改 2022-02-14 10:19:08 +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 5d073b024f feat: There is no way the, 2022-02-14 08:31:26 +08:00
super_liu d14c4efede Merge remote-tracking branch 'origin/develop' into develop 2022-02-11 17:15:10 +08:00
super_liu 5845addb96 feat: There is no way the, 2022-02-11 17:14:27 +08:00
zhutianqi 3a0f457111 Merge remote-tracking branch 'origin/develop' into develop 2022-02-11 11:04:31 +08:00
zhutianqi 65a80b1c85 commit 2022-02-11 11:04:13 +08:00
宋伟佳 ab68aaa839 节点名称修改 2022-02-11 11:03:34 +08:00
宋伟佳 a1cec57d56 流程节点修改 2022-02-11 10:52:46 +08:00
super_liu 296c62f5a9 Merge remote-tracking branch 'origin/develop' into develop 2022-02-10 20:41:41 +08:00