FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
317 Commits 3 Branches 0 Tags
d12fed2efa42f11206ab0f4e6199bbb0e6bff75d
Commit Graph
317 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaunty d12fed2efa Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
#	src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
#	src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
#	src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
 2021-07-16 14:26:05 +08:00
Jaunty a795039c87 车型界面完善 2021-07-16 14:12:01 +08:00
宋伟佳 cf6dc19dca Merge branch 'develop' of http://101.36.229.190:90/LAWS/laws-system-front-FOTON into develop 2021-07-16 14:02:09 +08:00
宋伟佳 1f05451a70 修复清单bug 2021-07-16 14:02:04 +08:00
zhutianqi 89b9651646 Merge remote-tracking branch 'origin/develop' into develop 2021-07-16 11:29:15 +08:00
zhutianqi f3549f3a13 commit 2021-07-16 11:29:09 +08:00
yuezhihang df08287d6e 回显字段！！！！ 2021-07-16 09:46:33 +08:00
宋伟佳 f2fe115248 Merge branch 'develop' of http://101.36.229.190:90/LAWS/laws-system-front-FOTON into develop 2021-07-16 09:05:58 +08:00
宋伟佳 30dd40378f 清单流程 2021-07-16 09:05:49 +08:00
zhutianqi 2d933ec9fe commit 2021-07-15 19:52:48 +08:00
zhutianqi f1e0b08597 Merge remote-tracking branch 'origin/develop' into develop 2021-07-15 19:38:54 +08:00
zhutianqi fe64b29164 commit 2021-07-15 19:38:46 +08:00
super_liu 23fe93d991 Merge remote-tracking branch 'origin/develop' into develop 2021-07-15 18:37:03 +08:00
super_liu 04ec966f28 feat: 标准库入库流程 添加未实现功能 2021-07-15 18:36:44 +08:00
shen_yan_pu 49c6a49bef 修改按钮权限id 2021-07-15 17:49:07 +08:00
宋伟佳 e71a959714 Merge branch 'develop' of http://101.36.229.190:90/LAWS/laws-system-front-FOTON into develop 2021-07-15 16:38:01 +08:00
宋伟佳 9190568fc8 评估流程 2021-07-15 16:37:55 +08:00
zhutianqi d936597828 Merge remote-tracking branch 'origin/develop' into develop 2021-07-15 15:19:32 +08:00
zhutianqi 3cbb0111a0 commit 2021-07-15 15:19:22 +08:00
super_liu a09510fb38 Merge remote-tracking branch 'origin/develop' into develop 2021-07-15 09:11:33 +08:00
super_liu adafbb2df9 Merge remote-tracking branch 'origin/develop' into develop 2021-07-15 09:10:36 +08:00
shen_yan_pu 8eedeaa9f5 修改部分的样式bug 2021-07-15 09:10:25 +08:00
super_liu 3f3dd1ea35 feat: 标准库 2021-07-15 09:09:50 +08:00
Jaunty 46d2d87494 bug修改，标准法规的新增界面搜索接口暂无 2021-07-15 09:07:57 +08:00
宋伟佳 5c46f8a86b Merge branch 'develop' of http://101.36.229.190:90/LAWS/laws-system-front-FOTON into develop 2021-07-14 21:02:16 +08:00
宋伟佳 9be9f1664d 评估流程 2021-07-14 21:02:11 +08:00
zhutianqi de627ca1db Merge remote-tracking branch 'origin/develop' into develop 2021-07-14 18:00:41 +08:00
zhutianqi 61f7f1342b commit 2021-07-14 18:00:35 +08:00
宋伟佳 4c338c36f9 Merge branch 'develop' of http://101.36.229.190:90/LAWS/laws-system-front-FOTON into develop 2021-07-14 17:15:55 +08:00
宋伟佳 8b4e61300d 修复bug 2021-07-14 17:15:50 +08:00
shen_yan_pu b2e04ae8ca 未符合项整改流程第二步添加查询 2021-07-14 16:14:57 +08:00
宋伟佳 9b02ed06a5 Merge branch 'develop' of http://101.36.229.190:90/LAWS/laws-system-front-FOTON into develop 2021-07-14 14:31:10 +08:00
宋伟佳 1391041a2c 首页 2021-07-14 14:31:04 +08:00
zhutianqi cff0bbca8d Merge remote-tracking branch 'origin/develop' into develop 2021-07-14 14:20:00 +08:00
zhutianqi 7ec73c26e9 commit 2021-07-14 14:19:48 +08:00
宋伟佳 024a30d8d5 Merge branch 'develop' of http://101.36.229.190:90/LAWS/laws-system-front-FOTON into develop 2021-07-14 13:48:11 +08:00
宋伟佳 c70d436e0f 评估流程 2021-07-14 13:48:06 +08:00
zhutianqi b6c4774489 Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	src/pages/localTool/standAutoSplit/index.vue
#	src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
 2021-07-13 17:55:59 +08:00
zhutianqi 7fbea78a8a commit 2021-07-13 17:54:39 +08:00
super_liu 4b4c7b7da8 Merge remote-tracking branch 'origin/develop' into develop 2021-07-13 16:14:12 +08:00
super_liu f2f643a588 feat: 标准入库 文件信息功能完善 2021-07-13 16:13:55 +08:00
shen_yan_pu 75bccd61eb 未符合项整改流程 2021-07-13 15:36:29 +08:00
super_liu b6c147848c Merge remote-tracking branch 'origin/develop' into develop 2021-07-13 14:23:03 +08:00
super_liu 3164d7dc49 feat: 标准库 添加 企业标准库关联 2021-07-13 14:22:51 +08:00
宋伟佳 493339fd7f Merge branch 'develop' of http://101.36.229.190:90/LAWS/laws-system-front-FOTON into develop 2021-07-13 10:29:06 +08:00
宋伟佳 301a415765 评估流程及权限 2021-07-13 10:29:00 +08:00
super_liu 8c93cab88e feat: 标准库 2021-07-13 09:52:09 +08:00
Jaunty eeb5302a7a Merge branch 'develop' of http://101.36.229.190:90/LAWS/laws-system-front-FOTON into develop 2021-07-13 09:14:37 +08:00
super_liu f5d20984db feat: 迁移代码标准库分页url替换 标准详情对应字段修改 2021-07-12 18:08:23 +08:00
Jaunty b12cb8a491 链接管理页面完善 2021-07-12 17:53:03 +08:00