Commit Graph
364 Commits
Author SHA1 Message Date
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 02b2f9fe24 Merge remote-tracking branch 'origin/develop' into develop-1 2021-07-19 17:41:02 +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
宋伟佳 9e315314bc Merge branch 'develop' of http://101.36.229.190:90/LAWS/laws-system-front-FOTON into develop 2021-07-19 17:23:53 +08:00
宋伟佳 fddba323f3 项目评估流程 2021-07-19 17:23:46 +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
zqx0221 b4581b9733 fix:机构管理数据数量回显 2021-07-19 16:34:05 +08:00
super_liu b9cb1d30b3 Merge remote-tracking branch 'origin/develop' into develop 2021-07-19 16:28:27 +08:00
super_liu 41cd49ee03 feat: 首页标准发布 2021-07-19 16:28:09 +08:00
zhutianqi 59c3c162f2 Merge remote-tracking branch 'origin/develop' into develop 2021-07-19 16:27:05 +08:00
zhutianqi c63b364c94 commit 2021-07-19 16:26:56 +08:00
zqx0221 d7c5b74a8a Merge remote-tracking branch 'origin/develop' into develop 2021-07-19 16:21:32 +08:00
shen_yan_pu ebed457034 标准拆分 2021-07-19 16:14:02 +08:00
zqx0221 a4049c3e38 fix:技术评估结果的清空按钮无作用 2021-07-19 15:58:58 +08:00
zhutianqi 62a6db8e98 commit 2021-07-19 15:40:49 +08:00
zhutianqi dc0935ff8e Merge remote-tracking branch 'origin/develop' into develop 2021-07-19 15:27:40 +08:00
zhutianqi 4ae7335a24 commit 2021-07-19 15:27:18 +08:00
super_liu b925bc6f3e Merge remote-tracking branch 'origin/develop' into develop 2021-07-19 14:35:53 +08:00
super_liu 5cf729ce46 fix: 标准发布 bug 79825 2021-07-19 14:35:38 +08:00
shen_yan_pu 44e0d3c585 去除按钮权限 2021-07-19 14:12:48 +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
宋伟佳 504349cef0 Merge branch 'develop' of http://101.36.229.190:90/LAWS/laws-system-front-FOTON into develop 2021-07-19 10:57:22 +08:00
宋伟佳 959ab65acd 修复bug 2021-07-19 10:57:16 +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 750a657f09 feat: 标准库 2021-07-17 18:33:12 +08:00
super_liu 7d435619f2 Merge remote-tracking branch 'origin/develop' into develop 2021-07-17 16:11:47 +08:00
super_liu a02a38a8d6 feat: 标准库 2021-07-17 16:11:32 +08:00
zhutianqi 4dee9e67e3 Merge remote-tracking branch 'origin/develop' into develop 2021-07-16 17:46:52 +08:00
zhutianqi 08ade11bd1 commit 2021-07-16 17:46:46 +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
zhutianqi 898b7abe6b Merge remote-tracking branch 'origin/develop' into develop 2021-07-16 16:47:06 +08:00
zhutianqi b39249ff94 commit 2021-07-16 16:47:00 +08:00
Jaunty 514fb25252 标准法规国家地区清单 新增、编辑页 删除无用代码 2021-07-16 15:53:44 +08:00
Jaunty b55a060ebf Merge remote-tracking branch 'origin/develop' into develop 2021-07-16 15:07:18 +08:00
Jaunty 9baf9fb1cf 首页代办跳转 2021-07-16 15:07:07 +08:00
宋伟佳 3787fa0f75 Merge branch 'develop' of http://101.36.229.190:90/LAWS/laws-system-front-FOTON into develop 2021-07-16 14:34:55 +08:00
宋伟佳 41d3b5527e 清单流程bug 2021-07-16 14:34:49 +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
宋伟佳 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