From b6cdda5d6a5750a4ba6614341a9bc883f597bbd8 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Thu, 12 Aug 2021 17:51:12 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E9=9B=B6=E9=83=A8=E4=BB=B6=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E7=94=B3=E8=AF=B7=E6=A8=A1=E5=9D=97=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E5=AE=8C=E6=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/navMenu/index.vue | 14 +- .../details/otherStandardDetails/index.vue | 8 +- .../partCodeApply/index.vue | 306 +++++++++++++++--- 3 files changed, 267 insertions(+), 61 deletions(-) diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index c26c24ebd..c1a7bfcb4 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -88,11 +88,11 @@ export default { path: '/domesticStandardsAndRegulations', menuId: '3e3657498664beaa0dc1de1ecb3ae0da' }, - // { - // title: '零部件编号申请', - // path: '/partCodeApply', - // menuId: '' - // }, + { + title: '零部件编号申请', + path: '/partCodeApply', + menuId: 'ad9db496772c075f78495382b7581fe9' + }, // { // title: '标准法规工作组数据统计', // path: '/dataStatisComments', @@ -310,11 +310,11 @@ export default { // path: '/convertDocView', // menuId: '3F52K25546' // }, - /*{ + { title: '菜单管理', path: '/menuManage', menuId: '87b8b4f5817a7829696e63185c744d52' - },*/ + }, { title: '链接管理', path: '/linkManage', diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index b472b7646..362c13083 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -539,7 +539,7 @@ prop="termsConditions" label="解读内容" show-overflow-tooltip - :resizable="false" + > - From 2f71741baf672ae58b468adfbb1d0784662ef00c Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Thu, 12 Aug 2021 17:55:41 +0800 Subject: [PATCH 02/14] commit --- src/components/navMenu/index.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index c1a7bfcb4..56cf10aca 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -310,11 +310,11 @@ export default { // path: '/convertDocView', // menuId: '3F52K25546' // }, - { - title: '菜单管理', - path: '/menuManage', - menuId: '87b8b4f5817a7829696e63185c744d52' - }, + // { + // title: '菜单管理', + // path: '/menuManage', + // menuId: '87b8b4f5817a7829696e63185c744d52' + // }, { title: '链接管理', path: '/linkManage', From 363c67012fb885a4820d413994c06a2b8cdc4fdb Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 12 Aug 2021 18:05:12 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E6=A0=87?= =?UTF-8?q?=E5=87=86,=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2,=E5=BD=92?= =?UTF-8?q?=E5=8F=A3=E7=AE=A1=E7=90=86=E9=83=A8=E9=97=A8=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 35 +++++++++++-------- .../foreignStandardsAndRegulations/index.vue | 8 +++-- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index ae3f5ce8c..2ce701c52 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -1356,8 +1356,10 @@ - + + {{ opt.label}} + @@ -1688,18 +1690,21 @@ export default { searching: false, stahndinfoList: [], tableFlag: '', + // sycpxOptions: [], // 适用产品线 + syzrOptions: [], // 适用认证 + // zrgcsOptions: [], // 责任工程师 + countryOptions: [], - cysdOptions: [], // 我司参与深度下拉框 + regionOptions: [], // 区域 + standSortOptions: [], // 标准类别下拉框 + standSystemOptions: [], // 标准体系下拉框 sycpxOptions: [], // 适用产品线下拉框 zrbmOptions: [], // 责任部门下拉框 zrgcsOptions: [], // 责任工程师下拉框 txlbOptions: [], // 体系类别下拉框 - regionOptions: [], // 区域 - standSortOptions: [], // 标准类别下拉框 standSortConfigOptions: [], // 标准类别下拉框 applyArcticOptions: [], // 适用车型下拉框 - standStateOptions: [], // 文本状态下拉框 - standSystemOptions: [], // 标准体系下拉框 + standStateOptions: [], // 标准状态下拉框 standNatureOptions: [], // 标准性质下拉框 adoptExtentOptions: [], // 采标程度下拉框 emergyKindOptions: [], // 能源种类下拉框 @@ -1707,12 +1712,14 @@ export default { categoryOptions: [], // 所属类别下拉框 categoryConfigOptions: [], // 所属类别下拉框 assemClassOptions: [], // 总成分类下拉框 - qcdwOptions: [], // 起草单位 - nylxOptions: [], // 能源类型 - // sycpxOptions: [], // 适用产品线 - syzrOptions: [], // 适用认证 - // zrbmOptions: [], // 责任部门 - // zrgcsOptions: [], // 责任工程师 + qcdwOptions:[],//起草单位下拉框 + cysdOptions:[], //我司参与深度下拉框 + nylxOptions:[],//能源类型下拉框 + syrzOptions:[],//适用认证下拉框 + gkglbmOptions:[],//归口管理部门下拉框 + + + standAttributeList: [], sarStandardsSearch: { page: 1, @@ -4743,7 +4750,6 @@ export default { this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 this.cysdOptions = res.data.WSCYSD // 我司参与深度 this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 - this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.txlbOptions = res.data.TXLBCLASS // 体系类别 this.qcdwOptions = res.data.QCDW // 起草单位 @@ -4752,6 +4758,7 @@ export default { this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.syrzOptions = res.data.SYRZCLASS // 适用认证 + this.gkglbmOptions=res.data.GKGLBM;//归口管理部门 this.getGzzOption() this.setMap(this.standStateOptions) }, e => { diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index dd6c766d3..1aec45cc7 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -423,8 +423,10 @@ - + + {{ opt.label}} + @@ -1523,6 +1525,7 @@ export default { cysdOptions:[], //我司参与深度下拉框 nylxOptions:[],//能源类型下拉框 syrzOptions:[],//适用认证下拉框 + gkglbmOptions:[],//归口管理部门下拉框 // 树形结构 // tree function MoveTest: '', @@ -4325,6 +4328,7 @@ export default { this.cysdOptions=res.data.WSCYSD; this.nylxOptions=res.data.NYLXCLASS;//能源类型 this.syrzOptions=res.data.SYRZCLASS;//适用认证 + this.gkglbmOptions=res.data.GKGLBM;//归口管理部门 this.getGzzOption() this.setMap(this.standStateOptions) From de2f8c1fc3e7d811e72cc735e930137fa5e1910f Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Thu, 12 Aug 2021 18:31:05 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=8B=86=E5=88=86--?= =?UTF-8?q?=E6=8B=86=E5=88=86=E9=A1=B5=E9=9D=A2=E5=92=8C=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=82=B9=E5=87=BB=E6=A0=87=E5=87=86=E5=8F=B7?= =?UTF-8?q?=E3=80=81=E6=A0=87=E5=87=86=E5=90=8D=E7=A7=B0=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E8=87=B3=E8=AF=A5=E6=A0=87=E5=87=86=E7=9A=84?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/standInvolveProjectDetail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue index 5c55a6950..9e53c7ad7 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue @@ -198,7 +198,7 @@ Date: Thu, 12 Aug 2021 19:30:09 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84-=E9=AB=98=E7=BA=A7=E6=A3=80?= =?UTF-8?q?=E7=B4=A2=E7=9A=84=E6=A0=87=E5=87=86=E5=B9=B4=E4=BB=BD=E6=94=B9?= =?UTF-8?q?=E6=88=90=E8=BE=93=E5=85=A5=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 5 ++--- .../foreignStandardsAndRegulations/index.vue | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 2ce701c52..7eace579f 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -1302,11 +1302,10 @@ - - + diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 1aec45cc7..967358f31 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -369,11 +369,10 @@ - - + From b2d54ed06d0fa8238e50880f3035af873b28b8ea Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 12 Aug 2021 19:44:54 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=20=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86?= =?UTF-8?q?=E6=B3=95=E8=A7=84--=E5=88=97=E8=A1=A8=E7=BC=BA=E5=B0=91?= =?UTF-8?q?=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreignStandardsAndRegulations/index.vue | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 967358f31..a270aebb8 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -185,6 +185,17 @@ {{ formatIssueDate(scope.row.issueTime) }} + + + Date: Fri, 13 Aug 2021 09:27:15 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=20=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E7=BC=96=E8=BE=91=E6=B7=BB=E5=8A=A0=E5=9B=BD?= =?UTF-8?q?=E5=AE=B6/=E5=9C=B0=E5=8C=BA=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreignStandardsAndRegulations/index.vue | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index a270aebb8..8a5111bd2 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -620,7 +620,22 @@
{{ displayLocation.label }}
 +