Commit Graph
1022 Commits
Author SHA1 Message Date
yangzijiao c274b139e9 Merge remote-tracking branch 'origin/develop' into develop-1 2021-07-21 13:56:40 +08:00
yangzijiao 59fee2f224 标准法规清单字段更改 2021-07-21 13:56:18 +08:00
liuhuaizhi 1d7c837dcd fix:
5677 车型项目库--查看页面 添加按钮改成调取按钮,
点击【调取】进入,该页面需要加检索条件(参考期望),选择一个标准点击添加,查看页面没有数据
2021-07-21 13:40:00 +08:00
liuhuaizhi 927d34b146 Merge remote-tracking branch 'origin/develop' into develop 2021-07-21 13:23:54 +08:00
liuhuaizhi 1d296d876a fix:
5677 车型项目库--查看页面 添加按钮改成调取按钮,
点击【调取】进入,该页面需要加检索条件(参考期望),选择一个标准点击添加,查看页面没有数据
2021-07-21 13:23:45 +08:00
shen_yan_pu 58c00b6c72 调整新增字段,上传可以下载 2021-07-21 11:13:30 +08:00
yangzijiao db975d3ea2 项目清单回显、按钮对齐 2021-07-21 10:25:06 +08:00
fanlin 28a889fc2f Merge remote-tracking branch 'origin/develop' into develop 2021-07-20 18:00:09 +08:00
fanlin e69f39f4f0 bug: 把文本状态右侧的叹号去掉 2021-07-20 17:59:28 +08:00
宋伟佳 b879288e24 Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 2021-07-20 17:47:49 +08:00
宋伟佳 7da4bb7893 评估流程 2021-07-20 17:47:43 +08:00
fanlin ab8db62e76 Merge remote-tracking branch 'origin/develop' into develop 2021-07-20 16:48:27 +08:00
fanlin 48db1ea810 Merge remote-tracking branch 'origin/develop' into develop 2021-07-20 16:45:33 +08:00
super_liu 6fd217e047 Merge remote-tracking branch 'origin/develop' into develop 2021-07-20 16:45:10 +08:00
super_liu 7040dbe706 feat: 标准库 2021-07-20 16:41:42 +08:00
fanlin 55ed51632e bug: 修改国内/外标准法规bug 2021-07-20 16:40:25 +08:00
shen_yan_pu 6b2edd514e 页面列表的字段回显 2021-07-20 16:37:28 +08:00
yangzijiao baffa64eac Merge remote-tracking branch 'origin/develop' into develop-1 2021-07-20 13:24:57 +08:00
yangzijiao d680b991b0 角色管理、标准内容自动识别、标准清单 2021-07-20 13:24:20 +08:00
shen_yan_pu c3eb458337 标准清单的下载回显,上传,导出 2021-07-20 11:17:33 +08:00
shen_yan_pu cabe3cf6c1 去除断点 2021-07-20 10:20:44 +08:00
zqx0221 35c002df6e Merge remote-tracking branch 'origin/develop' into develop 2021-07-20 09:51:45 +08:00
shen_yan_pu 6f391017fe 去除更新时间排序 2021-07-20 09:19:08 +08:00
fanlin 62e0264386 Merge remote-tracking branch 'origin/develop' into develop 2021-07-19 17:53:40 +08:00
yangzijiao 7a7dbc1149 标准法规清单编辑字数限制 2021-07-19 17:47:06 +08:00
fanlin ac42ca0d4a Merge remote-tracking branch 'origin/develop' into develop 2021-07-19 17:47:05 +08:00
yangzijiao 945f73bbe2 标准法规清单新增编辑字数限制 2021-07-19 17:40:52 +08:00
fanlin a3e01f170f Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
2021-07-19 17:39:52 +08:00
fanlin a76a1ab869 bug 2021-07-19 17:15:28 +08:00
shen_yan_pu 0898e5c590 标准法规清单页面 2021-07-19 16:49:17 +08:00
zhutianqi c63b364c94 commit 2021-07-19 16:26:56 +08:00
zqx0221 a4049c3e38 fix:技术评估结果的清空按钮无作用 2021-07-19 15:58:58 +08:00
super_liu 88ba417c7e Merge remote-tracking branch 'origin/develop' into develop 2021-07-19 14:09:40 +08:00
super_liu 88fbde8b51 fix: 解决bug #45290 2021-07-19 14:09:03 +08:00
shen_yan_pu f8536448e7 首页添加更多按钮,清单可以新增 2021-07-19 10:45:16 +08:00
super_liu 1d6f9d0a59 feat: 标准库 2021-07-18 17:09:54 +08:00
super_liu a02a38a8d6 feat: 标准库 2021-07-17 16:11:32 +08:00
super_liu 2059b1685f Merge remote-tracking branch 'origin/develop' into develop 2021-07-16 17:38:59 +08:00
super_liu a379b47c4c feat: 标准库相关 未实现功能 2021-07-16 17:31:27 +08:00
Jaunty 514fb25252 标准法规国家地区清单 新增、编辑页 删除无用代码 2021-07-16 15:53:44 +08:00
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
宋伟佳 1f05451a70 修复清单bug 2021-07-16 14:02:04 +08:00
宋伟佳 30dd40378f 清单流程 2021-07-16 09:05:49 +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
super_liu adafbb2df9 Merge remote-tracking branch 'origin/develop' into develop 2021-07-15 09:10:36 +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
宋伟佳 8b4e61300d 修复bug 2021-07-14 17:15:50 +08:00