From 1aedcffb5bca2b2bce6a184d1b0376b67918b65b Mon Sep 17 00:00:00 2001 From: fanlin Date: Mon, 26 Jul 2021 15:21:53 +0800 Subject: [PATCH 1/6] =?UTF-8?q?bug=EF=BC=9A=20=E6=B5=B7=E5=A4=96=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=85=A5=E5=BA=93=E6=96=B0=E5=A2=9E=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E5=86=8D=E6=AC=A1=E7=BC=96=E8=BE=91=E6=8F=90=E4=BA=A4=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=E9=83=BD=E5=8F=98?= =?UTF-8?q?=E6=88=90=E4=BA=861910-01-01=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreignStandardsAndRegulations/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 59181280b..e14017cc7 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -2756,7 +2756,7 @@ export default { const value = nowstandinfo[item.attrField] // 时间格式处理 if (item.attrType === 'DATE_PICKER' && value) { - nowstandinfo[item.attrField] = this.$dateFormat(this.sarStandardsInfoEO[item.attrField], 'yyyy-MM-dd hh:mm:ss') + nowstandinfo[item.attrField] = this.sarStandardsInfoEO[item.attrField] } // 数组处理 if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') { From 6f0f26497a1a07f2177f9ee6337b3097d955d6b9 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Mon, 26 Jul 2021 15:40:02 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=97=E8=A1=A8=E6=B8=85=E7=A9=BA=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E6=9F=A5=E8=AF=A2=EF=BC=8C=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E9=A1=B5=E7=9A=84=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../page/listOfCountries.vue | 6 ------ .../pages/addEdit.vue | 19 ++++++++++++++++++ .../pages/details.vue | 4 ++-- .../pages/otherAddEit.vue | 20 +++++++++++++++++++ .../pages/projectAddEit.vue | 20 +++++++++++++++++++ 5 files changed, 61 insertions(+), 8 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue index cc10b90c5..60757cd0d 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue @@ -86,12 +86,6 @@ prop="countryArea" label="国家/地区" align="center"> - { + this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) + this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) + this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) + this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) + this.$set(item, 'nylx', item.attrInfoMap.NYLX) + this.$set(item, 'zrbm', item.attrInfoMap.ZRBM) + this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM) + this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN) + this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM) + this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) + }) this.drawerTotal = res.data.list.length }, e => { }) @@ -2004,6 +2016,13 @@ export default { _this: this }, res => { this.sarAccessInfoList = res.data + this.sarAccessInfoList.forEach(item => { + if (item.standYear === null) { + item.standNumber = item.standSortShow + ' ' + item.standNumber + } else { + item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear + } + }) }, e => { }) }, diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index 32b738445..2e6ab6b5b 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -151,7 +151,7 @@ size="small" > { + this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) + this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) + this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) + this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) + this.$set(item, 'nylx', item.attrInfoMap.NYLX) + this.$set(item, 'zrbm', item.attrInfoMap.ZRBM) + this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM) + this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN) + this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM) + this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) + }) this.drawerTotal = res.data.list.length }, e => { @@ -1818,6 +1831,13 @@ export default { _this: this }, res => { this.sarAccessInfoList = res.data + this.sarAccessInfoList.forEach(item => { + if (item.standYear === null) { + item.standNumber = item.standSortShow + ' ' + item.standNumber + } else { + item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear + } + }) }, e => { }) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index d636411a5..07272fbed 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -942,6 +942,7 @@ export default { }, // 点击清空查询条件 按钮事件 clearSearchLaws () { + this.sarAccessInfoSearch.standName = '' this.sarAccessInfoSearch.advanceSearchVOStr = '' this.sarAccessInfoSearch.applyArctic = '' // 能源种类 this.sarAccessInfoSearch.keywords = '' // 关键字 @@ -1818,6 +1819,25 @@ export default { _this: this }, res => { this.sarAccessInfoList = res.data + this.sarAccessInfoList.forEach(item => { + if (item.standYear === null) { + item.standNumber = item.standSortShow + ' ' + item.standNumber + } else { + item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear + } + }) + this.sarAccessInfoSearchList.forEach(item => { + this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) + this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) + this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) + this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) + this.$set(item, 'nylx', item.attrInfoMap.NYLX) + this.$set(item, 'zrbm', item.attrInfoMap.ZRBM) + this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM) + this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN) + this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM) + this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) + }) }, e => { }) From f285283e29a1efc464f8e3afc55048c23810bd8f Mon Sep 17 00:00:00 2001 From: fanlin Date: Mon, 26 Jul 2021 16:00:32 +0800 Subject: [PATCH 3/6] =?UTF-8?q?bug=EF=BC=9A=E6=B5=B7=E5=A4=96=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84=EF=BC=8C=E7=BC=96=E8=BE=91=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E6=A0=87=E5=87=86=E5=B9=B4=E4=BB=BD=E9=99=90?= =?UTF-8?q?=E5=88=B6=E9=AA=8C=E8=AF=81=E9=94=99=E8=AF=AF=EF=BC=8C=E6=A0=87?= =?UTF-8?q?=E5=87=86=E8=8B=B1=E6=96=87=E5=90=8D=E7=A7=B0=E9=99=90=E5=88=B6?= =?UTF-8?q?=E5=AD=97=E7=AC=A6500?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreignStandardsAndRegulations/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index e14017cc7..efcff8c9b 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -1573,9 +1573,9 @@ export default { {type: 'string', max: 1000, message: '文本说明不能超过1000个字符', trigger: 'change'} ], standYear: [ - // {required: true, message: '标准年份/系列不能为空', trigger: 'change'}, - {validator: this.verify.testItemCode, trigger: 'change'}, - {type: 'string', max: 20, message: '标准年份/系列不能超过20个字符', trigger: 'change'} + {required: true, message: '标准年份不能为空', trigger: 'change'}, + {validator: this.verify.testNumberCode, trigger: 'change'}, + {type: 'string', max: 100, message: '标准年份不能超过100个字符', trigger: 'change'} ], standName: [ {required: true, message: '中文名称不能为空', trigger: 'change'}, @@ -1583,7 +1583,7 @@ export default { ], standEnName: [ {required: true, message: '英文名称不能为空', trigger: 'change'}, - {type: 'string', max: 1000, message: '英文名称不能超过1000个字符', trigger: 'change'} + {type: 'string', max: 500, message: '英文名称不能超过500个字符', trigger: 'change'} // {validator: this.verify.valiateEnName, trigger: 'blur'} ], // standState: [ From 2dd4b3e8636539e3606bf32e260409153dcb860a Mon Sep 17 00:00:00 2001 From: fanlin Date: Mon, 26 Jul 2021 16:06:45 +0800 Subject: [PATCH 4/6] =?UTF-8?q?bug=EF=BC=9A=20=E6=B5=B7=E5=A4=96=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84=EF=BC=8C=E5=85=A5=E5=BA=93=E6=97=B6?= =?UTF-8?q?=E6=9C=AA=E5=A1=AB=E5=86=99=E4=BF=A1=E6=81=AF=EF=BC=8C=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=EF=BC=8C=E4=BF=A1=E6=81=AF=E5=9B=9E=E6=98=BE=E9=94=99=E8=AF=AF?= =?UTF-8?q?=EF=BC=8C=E5=BA=94=E5=9B=9E=E6=98=BE=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreignStandardsAndRegulations/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index efcff8c9b..c41279e7b 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -2074,7 +2074,7 @@ export default { Object.keys(item.attrInfoMap || {}).forEach((key) => { item.attrInfoMap[key] = item.attrInfoMap[key] === null ? '' : item.attrInfoMap[key] if (item.attrInfoMap[key] || item.attrInfoMap[key] === '') { - this.$set(this.sarStandardsInfoEO, key, item.attrInfoMap[key]) + this.$set(this.sarStandardsInfoEO, key, item.attrInfoMap[key] === '[]' ? '' : item.attrInfoMap[key]) } }) const dynamicFormField = this.sarStandardsInfoEO From 932a286b2a8a85ff6649aa7cd41fc341242c4d29 Mon Sep 17 00:00:00 2001 From: fanlin Date: Mon, 26 Jul 2021 16:56:04 +0800 Subject: [PATCH 5/6] =?UTF-8?q?bug:=20=E5=9B=BD=E5=86=85=E5=A4=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomFormComponents/InputForStandards.vue | 7 +++++-- .../CustomFormComponents/InputForStandardsForForeign.vue | 9 ++++++--- .../foreignStandardsAndRegulations/index.vue | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/components/CustomFormComponents/InputForStandards.vue b/src/components/CustomFormComponents/InputForStandards.vue index 2ce3f679f..0afef8433 100644 --- a/src/components/CustomFormComponents/InputForStandards.vue +++ b/src/components/CustomFormComponents/InputForStandards.vue @@ -59,7 +59,7 @@ type="primary" class="common-button-primary" round - @click="getReplaceLawsNumRowFirst"> + @click="getReplaceLawsNumRowFirst(true)"> @@ -217,7 +217,10 @@ export default { this.getReplaceLawsNumRow() }, // 代替政策号 请求数据 - getReplaceLawsNumRowFirst () { + getReplaceLawsNumRowFirst (val) { + if (val) { + this.replaceLawsNumForm.page = '1' + } if (this.sarBussionessLawsEO.replaceLawsNum !== null && this.sarBussionessLawsEO.replaceLawsNum !== '') { this.replaceLawsNumForm.quoteIdList = this.quoteIdList1.toString() === '' ? '' : this.quoteIdList1 } else { diff --git a/src/components/CustomFormComponents/InputForStandardsForForeign.vue b/src/components/CustomFormComponents/InputForStandardsForForeign.vue index 31d90ad21..08d4408ee 100644 --- a/src/components/CustomFormComponents/InputForStandardsForForeign.vue +++ b/src/components/CustomFormComponents/InputForStandardsForForeign.vue @@ -53,7 +53,7 @@ type="primary" class="common-button-primary" round - @click="getReplaceLawsNumRow"> + @click="getReplaceLawsNumRow(true)"> @@ -126,7 +126,7 @@ @pageChange="pageChangeReplace" @pageSizeChange="pageSizeChangeReplace">
- 取消 + 取消 提交
@@ -227,7 +227,10 @@ export default { this.getReplaceLawsNumRow() }, // 代替政策号 请求数据 - getReplaceLawsNumRow () { + getReplaceLawsNumRow (val) { + if (val) { + this.replaceLawsNumForm.page = '1' + } if (this.sarBussionessLawsEO.replaceLawsNum !== null && this.sarBussionessLawsEO.replaceLawsNum !== '') { this.replaceLawsNumForm.quoteIdList = this.quoteIdList1.toString() === '' ? '' : this.quoteIdList1 } else { diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index c41279e7b..e9d5466b6 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -2005,7 +2005,7 @@ export default { item.collectBtn = !item.collectBtn item.cancelCollectBtn = !item.cancelCollectBtn item.collectId = res.data.id - this.$message.success(res.message) + // this.$message.success(res.message) } else { this.$message.warning(res.message) } From de0f4a2bc3d1417212e599f135be55ad780a8bc1 Mon Sep 17 00:00:00 2001 From: liuhuaizhi Date: Mon, 26 Jul 2021 17:03:54 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=A6=E5=9E=8B?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/details.vue | 15 +++++++++++---- .../nonConfomity/pages/rectificationDatabase.vue | 4 ++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index 9cf6991c4..f73e7aa91 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -585,16 +585,23 @@ export default { ids+=',\''+this.selectList[i].standId+'\'' } const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' + - 'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName - console.log(exportURL + "MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM") + 'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName + '&id=' + this.localProEO.id + console.log(exportURL) window.open(exportURL) this.$message.success('导出信息成功') } } else if (this.saveExportType === 'all') { console.log(this.selectList); + let ids = '' + if (this.selectList.length === 0) { + ids='\''+this.dataList[0].standId+'\'' + for(let i=1;i + label="标准号"> @@ -229,7 +229,7 @@ style="width: 100%;" :model="historySeeForm" > - +
{{historySeeForm.standId}}