Commit Graph
249 Commits
Author SHA1 Message Date
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
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
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
Jaunty 14af9d5f5c 车型页面高级搜索样式更改 2021-07-09 15:39:35 +08:00
Jaunty ac9b608d16 车型页面高级搜索样式更改 2021-07-09 15:23:31 +08:00
Jaunty 537bc1c7fe 车型页面完善 2021-07-09 11:33:17 +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