From c7cc4a321419b2f8c9f94f55846fd32b5a258fb2 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 11:16:23 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=95=B4=E6=94=B9=E6=B5=81=E7=A8=8B=E6=9F=A5=E8=AF=A2bug=20=20?= =?UTF-8?q?=20=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BF=9D=E5=AD=98bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step1.vue | 1 + .../pages/creatProcess/wfhxzg/step1.vue | 15 +++++---------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 17785de35..83e34a0ce 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -1031,6 +1031,7 @@ export default { //保存事件 handleSave() { this.saveLoading = true; + this.listForm.dataList = this.dataList this.listForm.fileName = this.fileInfoList let _formData = new FormData(); _formData.append("id", this.bpnId || ""); diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index 9396af382..315f128cc 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -404,12 +404,6 @@ export default { addList() { this.loading = true dicTypeData().then(res => { - if (this.pageNo !== undefined) { - this.queryUnqualidiedData.current = this.pageNo - } - if (this.size !== undefined) { - this.queryUnqualidiedData.size = this.size - } this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 standUnqualified(this.queryUnqualidiedData).then(res => { this.unqualidiedData = res.data.records @@ -631,6 +625,7 @@ export default { }, //未整改项抽屉中的查询按钮 getTableByPage() { + this.queryUnqualidiedData.current = 1 this.addList() }, // 清空 查询条件 @@ -642,12 +637,12 @@ export default { }, // 分页事件 pageChange(page) { - this.pageNo = page - this.getTableByPage() + this.queryUnqualidiedData.current = page + this.addList() }, pageSizeChange(pageSize) { - this.size = pageSize - this.getTableByPage(pageSize) + this.queryUnqualidiedData.size = pageSize + this.addList() }, } } From a1b174662edde9d5f704d2e2853ca0c2fa5561b9 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 13:51:18 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=96=87=E4=BB=B6=E9=A2=84=E8=A7=88bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/preview/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/preview/index.js b/src/common/preview/index.js index f0982ca45..ba2aaf535 100644 --- a/src/common/preview/index.js +++ b/src/common/preview/index.js @@ -13,7 +13,7 @@ export default attId => { if(editFileInfo.fileSuffix.toLowerCase() === 'pdg'){ window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl) }else if(editFileInfo.fileSuffix.toLowerCase() === 'pdf'){ - window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id)) + window.open('./static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id)) }else { const nowTime = new Date().getTime() // window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName) 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 3/5] =?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; }, // 获取工作组信息下拉框信息 From 82d7a3aaefe37e4226a2ffa15621c427e9a9191c Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 22 Feb 2022 15:48:52 +0800 Subject: [PATCH 4/5] commit --- .../InputForStandardsForEnterprise.vue | 4 +- .../otherBussStandardDetails/index.vue | 11 +++++- .../details/otherStandardDetails/index.vue | 37 +++---------------- .../pages/creatProcess/bzrk/step1.vue | 1 - .../pages/creatProcess/bzzqyj/step3.vue | 1 - .../pages/creatProcess/bzzqyj/step4-1.vue | 1 - .../pages/creatProcess/bzzqyj/step4-2.vue | 1 - .../pages/creatProcess/bzzqyj/step4.vue | 1 - .../pages/creatProcess/bzzqyj/step5.vue | 1 - .../pages/creatProcess/bzzqyj/step6.vue | 1 - .../pages/creatProcess/bzzqyj/step7.vue | 1 - .../pages/creatProcess/bzzqyj/step8.vue | 1 - .../pages/creatProcess/bzzqyj/step9.vue | 1 - .../components/EnterpriseStandardDatabase.vue | 1 + 14 files changed, 18 insertions(+), 45 deletions(-) diff --git a/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue b/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue index 35f498e6d..ef68b3685 100644 --- a/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue +++ b/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue @@ -314,7 +314,6 @@ export default { // 代替政策编号确定 replaceLawsNumModelBt() { let textArr = [] - if (typeof this.value === 'string') { if (this.value) { textArr = this.value.split(',') @@ -337,7 +336,8 @@ export default { // 判断数据是国内外法规标准还是企业标准 if (this.dataSource === 'BUSINESS') { if (item.standYear != null && item.standYear !== '') { - texts = item.standCode + '-' + item.standYear + // texts = item.standCode + '-' + item.standYear + texts = item.standCode } else { texts = item.standCode } diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index 3216c77e1..86cfcdc9d 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -502,6 +502,15 @@ :title="child.tips || '-'" > {{ !child.value || child.value === 'null' ? '-' : child.value }} + + + {{ child.value }} + - {{ item }} - +