Commit Graph
282 Commits
Author SHA1 Message Date
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
super_liu f5d20984db feat: 迁移代码标准库分页url替换 标准详情对应字段修改 2021-07-12 18:08:23 +08:00
super_liu d478c6bc53 feat: 去debug 2021-07-12 14:10:51 +08:00
super_liu 2994fbc601 feat: 海外标准库 按钮权限 导出 2021-07-12 14:09:48 +08:00
super_liu 1df8599441 feat: 海外标准库 回执按钮权限 2021-07-12 11:13:38 +08:00
super_liu 37e9bb111d Merge remote-tracking branch 'origin/develop' into develop 2021-07-12 10:58:41 +08:00
super_liu b07edb7e4b feat: 去除 debugger 体系树结构 2021-07-12 10:58:19 +08:00
Jaunty f1182b224e 车型页面切换面板功能 2021-07-12 10:39:57 +08:00
super_liu 1ab0345cce feat: 标准库 编辑对应属性字段 体系树结构 流程 2021-07-11 15:47:50 +08:00
super_liu 2ae9d80a16 Merge remote-tracking branch 'origin/develop' into develop 2021-07-09 18:16:10 +08:00
super_liu 74e83d6111 feat: 标准库 编辑对应属性字段 体系树结构 2021-07-09 18:14:50 +08:00
zhutianqi 15c1867e83 Merge remote-tracking branch 'origin/develop' into develop 2021-07-09 17:27:11 +08:00
zhutianqi a5f2bff546 commit 2021-07-09 17:27:05 +08:00
宋伟佳 f207a2f76d Merge branch 'develop' of http://101.36.229.190:90/LAWS/laws-system-front-FOTON into develop 2021-07-09 16:21:51 +08:00
宋伟佳 47da77630b 评估流程 2021-07-09 16:21:45 +08:00
Jaunty 14af9d5f5c 车型页面高级搜索样式更改 2021-07-09 15:39:35 +08:00
Jaunty ac9b608d16 车型页面高级搜索样式更改 2021-07-09 15:23:31 +08:00
Jaunty c8d3b349c9 Merge remote-tracking branch 'origin/develop' into develop 2021-07-09 11:33:26 +08:00
Jaunty 537bc1c7fe 车型页面完善 2021-07-09 11:33:17 +08:00
宋伟佳 db8cd5ec3c Merge branch 'develop' of http://101.36.229.190:90/LAWS/laws-system-front-FOTON into develop 2021-07-09 10:07:23 +08:00
宋伟佳 9317c2f287 评估流程 2021-07-09 10:07:15 +08:00
zhutianqi 57a02d5333 commit 2021-07-09 10:06:14 +08:00
super_liu 9db377e50f feat: 标准库 更新记录 2021-07-08 22:57:22 +08:00
super_liu 19e3294fb1 Merge remote-tracking branch 'origin/develop' into develop 2021-07-08 22:35:18 +08:00
super_liu 280f526c79 feat: 标准库 2021-07-08 22:34:56 +08:00
宋伟佳 6aba9c3cd5 合并冲突 2021-07-08 21:10:45 +08:00
宋伟佳 7c7ef0c56c 评估流程 2021-07-08 21:08:08 +08:00
Way Downtown 9caac69769 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/components/navMenu/index.vue
2021-07-08 21:06:17 +08:00
Way Downtown 75e0704cbc 链接管理 2021-07-08 21:05:17 +08:00
Jaunty fa3e499722 车型页面完善(高级搜索未完成) 2021-07-08 21:05:05 +08:00
Jaunty aec2f4b734 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/sysConfig/index.js
2021-07-08 21:03:49 +08:00
Jaunty 7f1124d0b6 车型页面完善(高级搜索未完成) 2021-07-08 21:03:23 +08:00
shen_yan_pu 8701bb53f9 项目清单 2021-07-08 20:03:50 +08:00
zhutianqi 7b9e8bc02b commit 2021-07-08 19:09:20 +08:00
zhutianqi eaab0d5016 Merge remote-tracking branch 'origin/develop' into develop 2021-07-08 17:31:27 +08:00
zhutianqi edf0a1ad03 commit 2021-07-08 17:31:21 +08:00
宋伟佳 ea9a271c1a Merge branch 'develop' of http://101.36.229.190:90/LAWS/laws-system-front-FOTON into develop 2021-07-08 17:04:24 +08:00