From 37a3b237edd558c75d0c76eadb8fbdb6e7c2048c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 22 Feb 2022 15:14:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=8D=95bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InputForAllStandards2.vue | 20 +++++++------- src/pages/home2/components/todoList/index.vue | 2 +- .../pages/creatProcess/bzqdfb/step2.vue | 1 + .../qbzxdjhgk/component/establish.vue | 7 ++++- .../pages/details.vue | 26 +++++++++---------- 5 files changed, 31 insertions(+), 25 deletions(-) diff --git a/src/components/CustomFormComponents/InputForAllStandards2.vue b/src/components/CustomFormComponents/InputForAllStandards2.vue index 4cf465f31..d21d8e051 100644 --- a/src/components/CustomFormComponents/InputForAllStandards2.vue +++ b/src/components/CustomFormComponents/InputForAllStandards2.vue @@ -36,22 +36,22 @@
+ + + + + + + - - - - - - - {{ getPrcNameFilter(item) }} {{ getPrcNameFilter(item).substring(0, 24) + '...' }} + style="line-height: 30px; font-size: 13px;">{{ getPrcNameFilter(item).substring(0, 32) + '...' }}
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue index efa751b11..4b32a2bf2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -368,6 +368,7 @@ export default { }, e => { }); }, + //预览 clickButtonToUpload2(file) { const attId = file this.$preview(attId) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index 47d288c5e..61ad3c71c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -559,9 +559,14 @@ export default { }, res => { this.cbcdOptions = res.data.DEGREESTANDARD //采标程度 this.BZList = res.data.ENERGYTYPES //适用车型 - this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 + // this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 this.standSystemOptions = res.data.TXLBBUSS // 体系结构 this.qcdwOptions = res.data.QCDW // 起草单位 + res.data.BUSSSTANDCLASS.forEach(item => { + if(item.label){ + this.standSortOptions.push(item) //企标类别 + } + }) }) if(this.$route.query.bpnId === undefined && this.$route.query.taskIds === undefined){ this.$http.get('/lawss/activiti/saveEditFile', { diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index d5a8ab8c0..9965a63e3 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -740,7 +740,7 @@ export default { this.standInfoTableLoading = true if(this.sarAccessEO.sortKey === '1'){ this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", { - ...this.standardFormList, + ...this.sarAccessInfo, ...this.standardForm, id: this.pageId, types: '1', @@ -762,13 +762,13 @@ export default { item.zrbm = null } if (item.zccssrqgj === "undefined") { - item.zccssrqgj = '-' + item.zccssrqgj = '' } if (item.xcxssrqgj === "undefined") { - item.xcxssrqgj = '-' + item.xcxssrqgj = '' } - if (item.ssrq === "undefined") { - item.ssrq = '-' + if (item.ssrq === "undefined" || item.ssrq === 'null' || item.ssrq) { + item.ssrq = '' } }); this.standinfoList = res.data.records; @@ -791,7 +791,7 @@ export default { }); }else{ this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", { - ...this.standardFormList, + ...this.sarAccessInfo, ...this.standardForm, id: this.pageId }, { @@ -833,7 +833,7 @@ export default { }, selectInfoMore() { this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", { - ...this.standardFormList, + ...this.sarAccessInfo, id: this.pageId }, { _this: this @@ -1077,7 +1077,7 @@ export default { this.showQueryMore = true; this.page = 1; this.standardForm.page = 1; - this.selectInfoMore(); + // this.selectInfoMore(); }, queryInfo() { this.page = 1; @@ -1086,11 +1086,11 @@ export default { this.isAdvancedSearch = false; }, backInfo() { - this.standardFormList.standName = ""; - this.standardFormList.typeApplicable = ""; - this.standardFormList.nylx = ""; - this.standardFormList.zrbm = ""; - this.standardFormList.sycpx = ""; + this.sarAccessInfo.standName = ""; + this.sarAccessInfo.typeApplicable = ""; + this.sarAccessInfo.nylx = ""; + this.sarAccessInfo.zrbm = ""; + this.sarAccessInfo.sycpx = ""; this.isAdvancedSearch = false; }, // 获取工作组信息下拉框信息