From e87f612475b710361e77d86d65de3bdc5868ef8b Mon Sep 17 00:00:00 2001 From: liuhuaizhi Date: Fri, 30 Jul 2021 15:54:55 +0800 Subject: [PATCH 1/6] =?UTF-8?q?45883=20=E8=BD=A6=E5=9E=8B=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=BA=93=EF=BC=8C=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E5=87=BA=E9=94=99=E8=AF=AF=EF=BC=8C=E7=AC=AC?= =?UTF-8?q?=E4=B8=80=E6=AC=A1=E7=82=B9=E5=87=BB=E5=AF=BC=E5=87=BA=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E5=AF=BC=E5=87=BA=E5=A4=B1=E8=B4=A5=EF=BC=8C?= =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E6=AC=A1=E7=82=B9=E5=87=BB=E5=90=8E=E6=89=8D?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localProductsOrProjectLibrary/pages/details.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index 2e94c804e..3cca8d9fc 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -611,8 +611,8 @@ export default { } const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' + 'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName + '&id=' + this.localProEO.id - console.log(exportURL) - window.open(exportURL) + console.log(exportURL,'_self') + window.open(exportURL,'_self') this.$message.success('导出信息成功') } } else if (this.saveExportType === 'all') { @@ -629,8 +629,8 @@ export default { } const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' + 'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName + '&id=' + this.localProEO.id - console.log(exportURL) - window.open(exportURL) + console.log(exportURL,'_self') + window.open(exportURL,'_self') this.$message.success('导出信息成功') } } From 30336bab2e23334c4fbebcaf165804bb4187d734 Mon Sep 17 00:00:00 2001 From: liuhuaizhi Date: Fri, 30 Jul 2021 15:58:31 +0800 Subject: [PATCH 2/6] =?UTF-8?q?45887=20=E8=BD=A6=E5=9E=8B=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=BA=93=EF=BC=8C=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=EF=BC=8C=E6=A0=87=E5=87=86=E5=8F=B7=E5=9B=9E=E6=98=BE=E9=94=99?= =?UTF-8?q?=E8=AF=AF=EF=BC=8C=E9=83=A8=E5=88=86=E6=A0=87=E5=87=86=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=9C=AA=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localProductsOrProjectLibrary/pages/details.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index 3cca8d9fc..c6b031fc6 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -60,7 +60,7 @@ @@ -580,7 +580,7 @@ export default { this.active = -1 } } - // 考虑如果没有当前时间， 颜色怎么设置 + // 考虑如果没有当前时间，颜色怎么设置 }) this.selectTableDataList() }, From 1b7b0480a75d315116b965db6b1a4b22aec1e072 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 30 Jul 2021 16:32:44 +0800 Subject: [PATCH 3/6] commit --- .../pages/creatProcess/bzjd/step1.vue | 68 ++++++++++--------- 1 file changed, 36 insertions(+), 32 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index 1d54e3fdc..4ab746639 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -233,20 +233,20 @@ label="标准号/政策号" width="170" align="center"> - + + + + - + + + + @@ -287,20 +287,20 @@ label="标准号/政策号" width="170" align="center"> - + + + + - + + + + @@ -374,7 +374,7 @@ page: 1, pageSize: this.$store.getters.userInfo.configContent, result: '1', - sarType: 'INLAND' + standType: 'INLAND' }, spinShow: false, standInfoList: [], @@ -513,15 +513,17 @@ for (let i = 0; i < this.selectedList.length; i++) { bringData.push(deposit.get(this.selectedList[i])); } - if (bringData[0].splitStatus === '0') { - this.form.itemsNum = bringData[0].standNumSplit - this.form.itemsName = bringData[0].standNameSplit - } else { - this.form.itemsNum = bringData[0].showNumber - this.form.itemsName = bringData[0].standName - } + this.form.itemsNum = bringData[0].showNumber + this.form.itemsName = bringData[0].standName + // if (bringData[0].splitStatus === '0') { + // this.form.itemsNum = bringData[0].standNumSplit + // this.form.itemsName = bringData[0].standNameSplit + // } else { + // this.form.itemsNum = bringData[0].showNumber + // this.form.itemsName = bringData[0].standName + // } this.form.standId = bringData[0].id - this.sarType = bringData[0].sarType + this.sarType = bringData[0].standType this.standId = bringData[0].standId this.listModel = false; this.listModel2 = true @@ -560,13 +562,15 @@ for (let i = 0; i < this.selectedList2.length; i++) { bringData.push(deposit.get(this.selectedList2[i])); } - if (bringData[0].splitStatus === '0') { - this.form.itemsNum1 = bringData[0].standNumSplit - this.form.itemsName1 = bringData[0].standNameSplit - } else { - this.form.itemsNum1 = bringData[0].showNumber - this.form.itemsName1 = bringData[0].standName - } + // if (bringData[0].splitStatus === '0') { + // this.form.itemsNum1 = bringData[0].standNumSplit + // this.form.itemsName1 = bringData[0].standNameSplit + // } else { + // this.form.itemsNum1 = bringData[0].showNumber + // this.form.itemsName1 = bringData[0].standName + // } + this.form.itemsNum1 = bringData[0].showNumber + this.form.itemsName1 = bringData[0].standName this.form.oldNumber = bringData[0].id this.listModel2 = false } else if (this.selectedList2.length > 1) { From 40c43b55a85697d02ea62eda0aec271941125697 Mon Sep 17 00:00:00 2001 From: liuhuaizhi Date: Fri, 30 Jul 2021 17:03:54 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=BA=94=E5=90=8E=E5=8F=B0=E7=8E=8B?= =?UTF-8?q?=E6=B4=AA=E8=A6=81=E6=B1=82=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nonConfomity/pages/rectificationDatabase.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index 0dfe97778..9bab53613 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -119,7 +119,7 @@ align="center"> @@ -128,7 +128,7 @@ Date: Fri, 30 Jul 2021 17:24:46 +0800 Subject: [PATCH 5/6] =?UTF-8?q?bug:=20=E5=9B=BD=E5=86=85=E6=A0=87=E5=87=86?= =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=A0=87=E5=87=86=E7=9A=84=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 2 +- .../foreignStandardsAndRegulations/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index e2efd0482..f14971026 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -4090,7 +4090,7 @@ export default { // 取最外层目录id search.menuId = this.selectSarMenu.id search.idlist = [] - search.sarType = 'INLAND' + search.standType = 'INLAND' if (flag === 1) { this.$confirm('确定移除该条标准?', '提示', { confirmButtonText: '确定', diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index e145d5c08..ee0c6fc78 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -3672,7 +3672,7 @@ export default { // 取最外层目录id search.menuId = this.selectSarMenu.id search.idlist = [] - search.sarType = 'FOREIGN' + search.standType = 'FOREIGN' if (flag === 1) { this.$confirm('确定移除该条标准?', '提示', { confirmButtonText: '确定', From fca46dfa9f6e225c587584f2602f39a1f9b89137 Mon Sep 17 00:00:00 2001 From: fanlin Date: Fri, 30 Jul 2021 17:36:03 +0800 Subject: [PATCH 6/6] bug --- .../pages/creatProcess/bzrk/step1.vue | 16 +++--- .../pages/creatProcess/bzrk/step4.vue | 56 +++++++++---------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 73e8b0114..fd24218c6 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1607,14 +1607,14 @@ const json = Object.assign(bringData, bringData.attrInfoCaseMap); this.form = JSON.parse(JSON.stringify(json)) console.log(json,'AAAAAAA') - this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw ? JSON.parse(JSON.stringify(json)).qcdw.split(',') : [] - this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr ? JSON.parse(JSON.stringify(json)).wssmr.split(',') : [] - this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs ? JSON.parse(JSON.stringify(json)).zrgcs.split(',') : [] - this.form.zrbm = JSON.parse(JSON.stringify(json)).zrbm ? JSON.parse(JSON.stringify(json)).zrbm.split(',') : [] - this.form.syrz = JSON.parse(JSON.stringify(json)).syrz ? JSON.parse(JSON.stringify(json)).syrz.split(',') : [] - this.form.sycpx = JSON.parse(JSON.stringify(json)).sycpx ? JSON.parse(JSON.stringify(json)).sycpx.split(',') : [] - this.form.nylx = JSON.parse(JSON.stringify(json)).nylx ? JSON.parse(JSON.stringify(json)).nylx.split(',') : [] - this.form.cllx = JSON.parse(JSON.stringify(json)).cllx ? JSON.parse(JSON.stringify(json)).cllx.split(',') : [] + this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw && JSON.parse(JSON.stringify(json)).qcdw !== '[]' ? JSON.parse(JSON.stringify(json)).qcdw.split(',') : [] + this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr && JSON.parse(JSON.stringify(json)).wssmr !== '[]' ? JSON.parse(JSON.stringify(json)).wssmr.split(',') : [] + this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs && JSON.parse(JSON.stringify(json)).zrgcs !== '[]' ? JSON.parse(JSON.stringify(json)).zrgcs.split(',') : [] + this.form.zrbm = JSON.parse(JSON.stringify(json)).zrbm && JSON.parse(JSON.stringify(json)).zrbm !== '[]' ? JSON.parse(JSON.stringify(json)).zrbm.split(',') : [] + this.form.syrz = JSON.parse(JSON.stringify(json)).syrz && JSON.parse(JSON.stringify(json)).syrz !== '[]' ? JSON.parse(JSON.stringify(json)).syrz.split(',') : [] + this.form.sycpx = JSON.parse(JSON.stringify(json)).sycpx && JSON.parse(JSON.stringify(json)).sycpx !== '[]' ? JSON.parse(JSON.stringify(json)).sycpx.split(',') : [] + this.form.nylx = JSON.parse(JSON.stringify(json)).nylx && JSON.parse(JSON.stringify(json)).nylx !== '[]' ? JSON.parse(JSON.stringify(json)).nylx.split(',') : [] + this.form.cllx = JSON.parse(JSON.stringify(json)).cllx && JSON.parse(JSON.stringify(json)).cllx !== '[]' ? JSON.parse(JSON.stringify(json)).cllx.split(',') : [] this.defaultCheckedKeys = [this.form.standSystem]; this.defaultCheckedKeys1 = [this.form.cycvppsbm]; this.defaultCheckedKeys2 = [this.form.kccvppsbm]; diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 7c849de38..28fbcddac 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -666,13 +666,13 @@ - - - + + + + + + + {{'手动查找'}} - - - {{'手动查找'}} - - - - + + + + + + + + + + + + + + + + + + + + +