From 9a33a7b4a4416f8a265be3107d611d0ef91d8f58 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Wed, 5 Jan 2022 17:03:47 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/addEdit.vue | 26 ++++++++++++------- .../domesticStandardsAndRegulations/index.vue | 1 - 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 52a5786b6..c76856b90 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -632,6 +632,7 @@ export default { // 新增、编辑 数据搜索字段 sarAccessInfoSearch: { id: '', + standType: 'INLAND', standNumber: '', askType: '', // 监管类型 dataSource: 'INLAND_STAND', // 数据来源 @@ -645,6 +646,7 @@ export default { id: '', standNumber: '', standName: '', + standType: 'INLAND', askType: '', // 监管类型 dataSource: 'INLAND_STAND', // 数据来源 pageNo: 1, @@ -1009,6 +1011,8 @@ export default { this.sarAccessInfoSearch.advanceSearchVOStr = '' // 国内标准法规可查字段 if (val === 'INLAND_STAND') { + this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' + this.selectLawsStands() this.twoOptions = [ { label: '适用车辆类型', @@ -1050,6 +1054,8 @@ export default { ] // 海外标准法规可查字段 } else if (val === 'FOREIGN_STAND') { + this.sarAccessInfoSearch.dataSource = 'FOREIGN_STAND' + this.selectLawsStands() this.twoOptions = [ { label: '适用车辆类型', @@ -1096,6 +1102,8 @@ export default { ] // 国内外政策可查字段 }else if (val === 'FOREIGN_LAWS'){ + this.sarAccessInfoSearch.dataSource = 'FOREIGN_LAWS' + this.selectLawsStands() this.twoOptions=[ { label: '适用车辆类型', @@ -1142,6 +1150,8 @@ export default { ] // 标准法规清单可查字段 }else { + this.sarAccessInfoSearch.dataSource = 'BUSINESS' + this.selectLawsStands() this.twoOptions=[ { label: '清单名称', @@ -1473,7 +1483,6 @@ export default { this.sarAccessInfoSearch.page = 1 if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'){ StandardsInfoPage(this.sarAccessInfoSearch).then(res => { - console.log('1476',res.data.list) this.sarAccessInfoSearchList = res.data.list this.sarAccessInfoSearchList.forEach(item => { if (item.standYear === null) { @@ -1501,7 +1510,6 @@ export default { this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.sarAccessInfoSearch, { _this: this, }, res => { - console.log('1648',res) this.sarAccessInfoSearchList = res.data.list this.drawerTotal = res.data.count }, e => { @@ -1543,17 +1551,17 @@ export default { }, selectBtn() { if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { - this.sarAccessInfoSearch.standType = 'INLAND' + this.sarAccessInfo.standType = 'INLAND' this.selectPage() } else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') { - this.sarAccessInfoSearch.standType = 'FOREIGN' - this.pageInfo() + this.sarAccessInfo.standType = 'FOREIGN' + this.selectPage() }else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS') { - this.sarAccessInfoSearch.standType = 'LAWS' - this.pageInfo() + this.sarAccessInfo.standType = 'LAWS' + this.selectPage() }else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS') { - this.sarAccessInfoSearch.standType = 'BUSINESS' - this.pageInfo() + this.sarAccessInfo.standType = 'BUSINESS' + this.selectPage() } }, // 数据搜索table判断checked状态 diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 65b7a2020..cc8bf2660 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -3626,7 +3626,6 @@ export default { selectMoreBtn() { this.isAdvancedSearch = true this.sarStandardsSearch = {} - console.log(this.sarStandardsSearch) }, treeCollapse() { this.sideClose = !this.sideClose From 2c4481088c49b120f82349bd4a3390c804c1ecdd Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Wed, 5 Jan 2022 17:32:03 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/details/otherStandardDetails/index.vue | 2 +- .../accessStandardsAndRegulations/pages/addEdit.vue | 2 +- .../accessStandardsAndRegulations/pages/otherAddEit.vue | 2 +- .../accessStandardsAndRegulations/pages/projectAddEit.vue | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 5262fcd56..d854e24e8 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -266,7 +266,7 @@

{{ sarStandardsInfoEO.issueTime || '-' }}

-

{{ +

{{ standMap[sarStandardsInfoEO.standNature] || '-' }}

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue index f1d38f49d..8b9b3e2bb 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue @@ -6,7 +6,7 @@
基础信息
- +
审批历史
@@ -19,44 +19,44 @@ >
+ :key = "formKey" + :formSub = "form" + :FBGBUSSFileListSub = "FBGBUSSFileList" + :LSBBBUSSFileListSub = "LSBBBUSSFileList" + :BZSMBUSSFileListSub = "BZSMBUSSFileList" + :QTWJBUSSFileListSub = "QTWJBUSSFileList" + :GLWJBUSSFileListSub = "GLWJBUSSFileList" + :disabledState = "disabledState" + :verifySarStandard = "verifySarStandard" + :fileMadelSub = "fileMadel" + :fbgDown = "false" + @formCancel="formCancel" + @formSelectLawsCancel = "formSelectLawsCancel" + @formChoiceZRRListCancel = "formChoiceZRRListCancel" + @formChoiceQCDW = "formChoiceQCDW" + />