From 8f3538ee4aad7a62d452a0585a97eabbd4f56b16 Mon Sep 17 00:00:00 2001 From: hanshaozhuang Date: Tue, 19 Jul 2022 10:38:24 +0800 Subject: [PATCH 01/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2056638=20=E8=B0=83?= =?UTF-8?q?=E7=A0=94=E6=B5=81=E7=A8=8B-=E6=89=B9=E5=87=86=E8=8A=82?= =?UTF-8?q?=E7=82=B9=20UI=E9=9C=80=E8=A6=81=E8=BF=9B=E8=A1=8C=E5=AF=B9?= =?UTF-8?q?=E9=BD=90=20=E6=B1=87=E6=80=BB=E8=B0=83=E7=A0=94=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E5=92=8C=E4=B8=8B=E9=9D=A2=E4=BF=A9=E5=AF=B9=E9=BD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/bzdy/step1-9.vue | 8 ++++---- src/pages/processCenter/pages/creatProcess/bzdy/step9.vue | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue index 7d8694f6b..c7875e018 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue @@ -42,10 +42,10 @@ -
+
{{ form.hzfileName }}
-
+
- -
@@ -61,7 +61,7 @@ >
-
+
- -
@@ -77,7 +77,7 @@ >
-
+
- -
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue index 4bf35d46c..e43f9e8ee 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue @@ -59,7 +59,7 @@ style="height: 32px; margin-left: 5px;" >
-
+
- -
@@ -75,7 +75,7 @@ >
-
+
- -
@@ -91,7 +91,7 @@ >
-
+
- -
From b471a4cac4a24cfd685a9088472e64746c564ede Mon Sep 17 00:00:00 2001 From: hanshaozhuang Date: Tue, 19 Jul 2022 13:41:27 +0800 Subject: [PATCH 02/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2055856=20=E9=97=AE?= =?UTF-8?q?=E7=AD=94=20=E9=97=AE=E9=A2=98=E8=BF=87=E5=A4=9A=20=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nonConfomity/pages/rectificationDatabase.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index 34ea19738..3519daa82 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -1233,7 +1233,7 @@ export default { let routeUrl = this.$router.resolve({ name: "OtherStandardDetails", params: { - id: item.standId, + id: item.standId ? item.standId : item.id, pageType: "INLAND_STAND" } }); From 3d5f60a339797ac79f42c493a4f3f40bcf39b14a Mon Sep 17 00:00:00 2001 From: hanshaozhuang Date: Tue, 19 Jul 2022 14:01:52 +0800 Subject: [PATCH 03/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2056622=20=E9=AB=98?= =?UTF-8?q?=E7=BA=A7=E6=9F=A5=E8=AF=A2=E4=B9=8B=E5=90=8E=EF=BC=8C=E7=BB=A7?= =?UTF-8?q?=E7=BB=AD=E7=82=B9=E5=87=BB=E9=AB=98=E7=BA=A7=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=8C=E6=9C=89=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=B8=85=E7=A9=BA=EF=BC=8C=E6=9C=89=E7=9A=84=E4=B8=8D=E6=B8=85?= =?UTF-8?q?=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accessStandardsAndRegulations/pages/addEdit.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 995f4cd54..0a4844f5a 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -1235,7 +1235,7 @@ export default { if (this.sarAccessInfo.dataSource === 'FOREIGN_STAND' || this.sarAccessInfo.dataSource === 'INLAND_STAND') { formData.startIssueTime = formData.issueTime ? formData.issueTime[0] : null formData.endIssueTime = formData.issueTime ? formData.issueTime[1] : null - formData.issueTime = null + // formData.issueTime = null } /*else if(this.sarAccessInfo.dataSource === 'BUSINESS') { // formData.issueTime = formData.issueTime ? formData.issueTime[0] : null // formData.issueTime = formData.issueTime ? formData.issueTime[1] : null @@ -1761,7 +1761,6 @@ export default { delete this.sarAccessInfo.lawsNumber delete this.sarAccessInfo.standCode } - console.log('this.sarAccessInfo===' , this.sarAccessInfo) StandardsInfoPage(type === 1 ? ({...this.sarAccessInfo, standNumber: this.sarAccessInfo.seniorStandNumber, lawsNumber: this.sarAccessInfo.seniorLawsNumber, standCode: this.sarAccessInfo.seniorStandCode}) : (this.sarAccessInfo)).then(res => { // if (type === 1) { // this.sarAccessInfo.standNumber = '' From eb84684fd0c40039d5dfa51a86ba5b22c474ec04 Mon Sep 17 00:00:00 2001 From: hanshaozhuang Date: Tue, 19 Jul 2022 14:07:58 +0800 Subject: [PATCH 04/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2056644=20=E3=80=90?= =?UTF-8?q?=E6=BC=94=E7=A4=BA=E9=97=AE=E9=A2=98=E3=80=91=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0-=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=20=E6=9F=A5=E7=9C=8B=E7=9A=84=E6=8A=BD?= =?UTF-8?q?=E5=B1=89=E5=BA=94=E8=AF=A5=E4=B8=8E=E5=88=86=E8=A7=A3=E5=8D=95?= =?UTF-8?q?=E4=B8=AD=E5=AD=97=E6=AE=B5=E7=9B=B8=E5=90=8C=20=E7=8E=B0?= =?UTF-8?q?=E5=9C=A8=E7=BC=BA=E5=B0=91=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/technologyInvolveProject.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue index 47e71cef2..3e4997e2b 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue @@ -675,10 +675,10 @@ mounted () { this.queryStandAndLaws() this.tableHeight = $('.regulatory-repository').height() - 159 - this.sarProStateTableHeight = $('body').height() - 152 + this.sarProStateTableHeight = $('body').height() - 162 window.onresize = () => { this.tableHeight = $('.regulatory-repository').height() - 159 - this.sarProStateTableHeight = $('body').height() - 152 + this.sarProStateTableHeight = $('body').height() - 162 } } } From 4eae288fec775633e3e8226fc8098740e5f87365 Mon Sep 17 00:00:00 2001 From: hanshaozhuang Date: Tue, 19 Jul 2022 14:42:31 +0800 Subject: [PATCH 05/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2056671=20=E7=BC=96?= =?UTF-8?q?=E8=BE=91=20=E6=96=87=E4=BB=B6=E8=BF=87=E5=A4=9A=20=E6=88=96?= =?UTF-8?q?=E6=96=87=E5=AD=97=E8=BF=87=E5=A4=9A=E6=97=B6=20=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E8=A2=AB=E9=A1=B6=E6=B2=A1=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../regulatoryRepository/dataCenter/index.vue | 47 ++++++++++--------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/src/pages/regulatoryRepository/dataCenter/index.vue b/src/pages/regulatoryRepository/dataCenter/index.vue index a7fd987fc..23c2391d2 100644 --- a/src/pages/regulatoryRepository/dataCenter/index.vue +++ b/src/pages/regulatoryRepository/dataCenter/index.vue @@ -238,7 +238,7 @@ :styles="styles" :close="cancelModel" > -
+
-
- 提交 - - 取消 - -
+
+
+ 提交 + + 取消 +
@@ -1041,7 +1042,7 @@ export default { } .upload-demo{ /deep/.el-upload-list{ - height: 60vh; + height: 42vh; overflow-y: auto; } } From c7921f02df64639cba34b8215ae6328e1cc67af2 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Tue, 19 Jul 2022 14:43:06 +0800 Subject: [PATCH 06/26] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=2056?= =?UTF-8?q?586=20=E9=AB=98=E7=BA=A7=E6=9F=A5=E8=AF=A2=E9=87=8C=E8=BE=B9?= =?UTF-8?q?=E7=9A=84=E4=BB=A5=E4=B8=8B=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E6=90=9C=E7=B4=A2=E4=B9=8B=E5=90=8E=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E6=B8=85=E7=A9=BA=EF=BC=8C=E4=B8=8D=E8=83=BD=E9=87=8D=E7=BD=AE?= =?UTF-8?q?=EF=BC=8C=E5=BF=85=E9=A1=BB=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index ffd993cd8..02d131d22 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -3834,6 +3834,7 @@ export default { this.sarStandardsSearch.standSort = '' this.sarStandardsSearch.standNumber = '' this.sarStandardsSearch.standName = '' + this.sarStandardsSearch.standEnName = '' this.sarStandardsSearch.standState = '' this.sarStandardsSearch.standNature = '' this.sarStandardsSearch.issueTime = '' @@ -3850,11 +3851,18 @@ export default { // } else if (flag === 'standCommonlySearch') { this.sarStandardsSearch.standName = '' this.sarStandardsSearch.standNumber = '' - this.pageChange(1) - this.getDomesticStandardTable(this.sarStandardsSearch) + this.advanceSearchMapping = {} + this.standCommonlySearch = {} + this.sarStandardsSearch = { + page: 1, + pageSize: this.$store.getters.userInfo.configContent, + standType: 'INLAND', + validFlag: '0', + } for (let key in this.advanceSearchMapping) { this.advanceSearchMapping[key] = '' } + this.pageChange(1) } else if (flag === 2) { // 标准条目搜索 this.standItemSearch.responsibleUnit = '' @@ -4598,6 +4606,7 @@ export default { }, // 分页查询国内标准 getDomesticStandardTable(item, type) { + console.log(item) if (item !== '' && item !== null && item !== undefined) { item.pageSize = this.$store.getters.userInfo.configContent } From 4d18a326cd08c4e31219874630425a40297dfe34 Mon Sep 17 00:00:00 2001 From: hanshaozhuang Date: Tue, 19 Jul 2022 14:45:07 +0800 Subject: [PATCH 07/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2056577=20=E3=80=90?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E3=80=91=E6=A0=87=E5=87=86=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=B5=81=E7=A8=8B=20=E5=B0=86=E6=89=80=E6=9C=89?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=89=B9=E5=87=86=E8=8A=82=E7=82=B9=E6=9C=AA?= =?UTF-8?q?=E5=A1=AB=E5=86=99=E7=9A=84=E7=BD=AE=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/phone/bzrk/step2.vue | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/pages/processCenter/pages/phone/bzrk/step2.vue b/src/pages/processCenter/pages/phone/bzrk/step2.vue index 01a5f0c7d..916184967 100644 --- a/src/pages/processCenter/pages/phone/bzrk/step2.vue +++ b/src/pages/processCenter/pages/phone/bzrk/step2.vue @@ -242,7 +242,7 @@ --> - + - + - + - - - - - - - - + + + + + + + + @@ -331,7 +331,7 @@ > --> - + Date: Tue, 19 Jul 2022 15:12:07 +0800 Subject: [PATCH 08/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2056604=20=E5=85=B3?= =?UTF-8?q?=E8=81=94=E6=A8=A1=E5=9D=97=E5=AD=97=E6=AE=B5=E7=9A=84=E4=B8=8B?= =?UTF-8?q?=E6=8B=89=E9=80=89=E9=A1=B9=E7=BC=BA=E5=B0=91=E6=BB=9A=E5=8A=A8?= =?UTF-8?q?=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/treeSelect/treeSelectStand.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/treeSelect/treeSelectStand.vue b/src/components/treeSelect/treeSelectStand.vue index 7e8d9068e..613e08de2 100644 --- a/src/components/treeSelect/treeSelectStand.vue +++ b/src/components/treeSelect/treeSelectStand.vue @@ -310,5 +310,8 @@ export default { ::v-deep .el-drawer{ outline: none!important; } - +.common-tree{ + height: 100%; + overflow-y: auto; +} From 65e0c185180694d87e4f86cc3a072de280b5bbfa Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Tue, 19 Jul 2022 15:16:24 +0800 Subject: [PATCH 09/26] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=2056?= =?UTF-8?q?586=20=E9=AB=98=E7=BA=A7=E6=9F=A5=E8=AF=A2=E9=87=8C=E8=BE=B9?= =?UTF-8?q?=E7=9A=84=E4=BB=A5=E4=B8=8B=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E6=90=9C=E7=B4=A2=E4=B9=8B=E5=90=8E=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E6=B8=85=E7=A9=BA=EF=BC=8C=E4=B8=8D=E8=83=BD=E9=87=8D=E7=BD=AE?= =?UTF-8?q?=EF=BC=8C=E5=BF=85=E9=A1=BB=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 41 +------------------ 1 file changed, 2 insertions(+), 39 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 02d131d22..42aac9d03 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -3777,43 +3777,6 @@ export default { }, // 搜索 getDomesticStandardTableBtn(item) { - // // 自定义属性字段高级搜索处理 - //advanceSearchVOStr - const advanceSearchVOList = []; - for (let key in this.advanceSearchMapping) { - const value = this.advanceSearchMapping[key]; - if (value !== null && value !== '' && (key === 'NYLX' || key === 'SYRZ' || key === 'SYCPX' || (item.CLLX && item.CLLX.length > 0))) { - advanceSearchVOList.push({ - connect: "and", - field: key || '', - type: 'regexp', - value: value.join(',') - }); - } else if (value !== null && value !== '' && (key === 'SSRQ' || key === 'XCXSSRQ' || key === 'ZCCSSRQ')) { - advanceSearchVOList.push({ - connect: "and", - field: key || '', - type: 'between', - value: value.join(',') - }); - } else if (value !== null && value !== '' && (key === 'BARQ')) { - advanceSearchVOList.push({ - connect: "and", - field: key || '', - type: 'between', - value: value.join(',') - }); - } else if (value !== null && value !== '' && (key === 'TXLBName')) { - } else if (value !== null && value !== '') { - advanceSearchVOList.push({ - connect: "and", - field: key || '', - type: 'like', - value: value - }); - } - } - item.advanceSearchVOStr = advanceSearchVOList sessionStorage.setItem('tableFlag', JSON.stringify(item)) this.tableFlag = item item.page = 1 @@ -4651,12 +4614,12 @@ export default { for (let key in this.advanceSearchMapping) { const value = this.advanceSearchMapping[key]; - if (value !== null && value !== '' && (key === 'NYLX' || key === 'SYRZ' || key === 'SYCPX' || (item.CLLX && item.CLLX.length > 0))) { + if (value !== null && value !== '' && (key === 'NYLX' || key === 'SYRZ' || key === 'SYCPX' || (key === 'CLLX' && item.CLLX && item.CLLX.length > 0))) { advanceSearchVOList.push({ connect: "and", field: key || '', type: 'regexp', - value: value.join(',') + value: list.join(',') }); } else if (value !== null && value !== '' && (key === 'SSRQ' || key === 'XCXSSRQ' || key === 'ZCCSSRQ')) { advanceSearchVOList.push({ From 7c4e7281521a9d1242c3bb2668808489942e0163 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Tue, 19 Jul 2022 16:30:39 +0800 Subject: [PATCH 10/26] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=2056?= =?UTF-8?q?581=20=E3=80=90=E7=A7=BB=E5=8A=A8=E7=AB=AF=E3=80=91=E6=B5=B7?= =?UTF-8?q?=E5=A4=96=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93-=20=E6=9C=AA?= =?UTF-8?q?=E5=A1=AB=E5=86=99=E7=9A=84=E5=AD=97=E6=AE=B5=20=E5=B0=B1?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=A9=BA=E5=8D=B3=E5=8F=AF=20=E4=B8=8D?= =?UTF-8?q?=E8=A6=81=E6=98=BE=E7=A4=BA=E8=AF=B7=E8=BE=93=E5=85=A5XXXX?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/phone/bzrk/step2.vue | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/pages/processCenter/pages/phone/bzrk/step2.vue b/src/pages/processCenter/pages/phone/bzrk/step2.vue index 01a5f0c7d..5a023ee99 100644 --- a/src/pages/processCenter/pages/phone/bzrk/step2.vue +++ b/src/pages/processCenter/pages/phone/bzrk/step2.vue @@ -40,7 +40,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -106,7 +106,7 @@ @@ -119,7 +119,7 @@ @@ -242,7 +242,7 @@ --> - + - + - + - - - - - - - - + + + + + + + + @@ -331,7 +331,7 @@ > --> - +
From 7afbc4c08114125c7d3542f2630cf7a2d3736c7f Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Tue, 19 Jul 2022 16:59:17 +0800 Subject: [PATCH 11/26] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=2056?= =?UTF-8?q?601=20=E9=AB=98=E7=BA=A7=E6=9F=A5=E8=AF=A2=E9=87=8C=E8=BE=B9?= =?UTF-8?q?=E7=9A=84=E2=80=9C=E8=B4=A3=E4=BB=BB=E5=B7=A5=E7=A8=8B=E5=B8=88?= =?UTF-8?q?=E2=80=9D=E9=80=89=E6=8B=A9=E4=B9=8B=E5=90=8E=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/roleTree/index.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/components/roleTree/index.vue b/src/components/roleTree/index.vue index e6a1e0880..a90e71c3b 100644 --- a/src/components/roleTree/index.vue +++ b/src/components/roleTree/index.vue @@ -89,9 +89,9 @@ 导入中... @@ -150,6 +150,7 @@ treeData: [], open1: true, treeLoading: false, + subLoading: false, roleRow: {} } }, @@ -307,6 +308,7 @@ ids = item } }) + this.subLoading = true this.$http.get('SarInstitution/institution/getNextById', { ids: ids, topNum: 3, @@ -316,6 +318,7 @@ this.$emit('checkedRole', res) this.nodeList2 = [] this.$emit('update:isVisible', false) + this.subLoading = false }) } else { this.$emit('checkedRole', this.roleList) From 60eca17b85504ec5b945e89b34f65cf189fe2dc9 Mon Sep 17 00:00:00 2001 From: zyd Date: Tue, 19 Jul 2022 20:45:28 +0800 Subject: [PATCH 12/26] =?UTF-8?q?fix:=E5=B0=86=E7=B3=BB=E7=BB=9F=E5=86=85?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2=E4=B8=AD=E6=89=80=E6=9C=89?= =?UTF-8?q?=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86=E4=BF=AE=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=9B=BD=E5=A4=96=E6=A0=87=E5=87=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/process.js | 2 +- src/assets/languages/cn.js | 2 +- .../InputForStandardsForEnterprise.vue | 2 +- .../InputForStandardsForLaws.vue | 2 +- .../pages/attributeCustom/components/buss.vue | 10 +++++----- .../pages/attributeCustom/components/stand.vue | 10 +++++----- .../pages/standInvolveProjectDetailTwo.vue | 2 +- .../pages/technologyInvolveProjectTwo.vue | 2 +- .../pages/standInvolveProjectDetailTwo.vue | 2 +- .../pages/technologyInvolveProjectTwo.vue | 2 +- src/pages/home/index.vue | 2 +- src/pages/home/information.vue | 4 ++-- .../home1/components/searchGroup/index.vue | 2 +- src/pages/home1/index.vue | 4 ++-- .../home2/components/searchGroup/index.vue | 2 +- src/pages/home2/index.vue | 4 ++-- src/pages/localTool/standAutoSplit/index.vue | 6 +++--- .../standAutoSplit/pages/itemSplitInfo.vue | 2 +- .../localTool/standardRecognition/index.vue | 8 ++++---- src/pages/localTool/standardWarning.vue | 2 +- .../CollectionStandardDetail.vue | 2 +- .../components/CollectionStandard.vue | 2 +- src/pages/personal/pages/my-forward/index.vue | 4 ++-- src/pages/personal/pages/my-push/index.vue | 2 +- src/pages/phone/databaseSearch.vue | 2 +- src/pages/phone/domesticStand.vue | 2 +- src/pages/phone/phoneHome.vue | 2 +- .../pages/creatProcess/bzpg/step1.vue | 2 +- .../pages/creatProcess/bzqdfb/step1-1.vue | 2 +- .../pages/creatProcess/bzqdfb/step1-3.vue | 2 +- .../pages/creatProcess/bzqdfb/step1.vue | 2 +- .../pages/creatProcess/bzqdfb/step3.vue | 2 +- .../pages/creatProcess/bzrk/step1.vue | 4 ++-- .../pages/creatProcess/bzrk/step2.vue | 2 +- .../pages/creatProcess/bzrk/step3.vue | 2 +- .../pages/creatProcess/bzrk/step4.vue | 2 +- .../pages/creatProcess/bzrk/step5.vue | 2 +- .../pages/creatProcess/bzzqyj/step1-1.vue | 2 +- .../pages/creatProcess/bzzqyj/step1.vue | 2 +- .../pages/creatProcess/cywbbzzxd/step3.vue | 2 +- .../pages/creatProcess/wbsm/step1.vue | 2 +- .../pages/creatProcess/xmqdqr/step1-4.vue | 2 +- .../pages/creatProcess/xmqdqr/step1.vue | 2 +- .../pages/creatProcess/xmqdqr/step2.vue | 2 +- .../pages/creatProcess/xmqdqr/step3.vue | 2 +- .../pages/creatProcess/xmqdqr/step4.vue | 2 +- .../processCenter/pages/phone/bzrk/step2.vue | 2 +- .../pages/processAcceptDetail/index.vue | 2 +- .../pages/processDetail/index.vue | 2 +- .../page/listOfCountries.vue | 2 +- .../page/listOther.vue | 2 +- .../page/listProject.vue | 2 +- .../page/listTracking.vue | 2 +- .../pages/addEdit.vue | 4 ++-- .../pages/otherAddEit.vue | 4 ++-- .../pages/projectAddEit.vue | 4 ++-- .../pages/components/ImplementWarning.vue | 4 ++-- .../foreignRegulationsDatabase/index.vue | 2 +- .../foreignStandardsAndRegulations/index.vue | 18 +++++++++--------- .../pages/details.vue | 2 +- .../pages/rectificationDatabase.vue | 2 +- .../regulatoryRepository/standQA/index.vue | 4 ++-- .../searchCenter/pages/standardSearch.vue | 10 +++++----- src/router/index.js | 4 ++-- 64 files changed, 100 insertions(+), 100 deletions(-) diff --git a/src/api/process.js b/src/api/process.js index ab709c7b6..75837c078 100644 --- a/src/api/process.js +++ b/src/api/process.js @@ -472,7 +472,7 @@ export function afterConferenceProcess (data) { }) } -// 海外标准清单流程入库 +// 国外标准清单流程入库 export function foreignAccessProcess (data) { return axios({ url: '/api/lawss/actSarItems/foreignAccessProcess', diff --git a/src/assets/languages/cn.js b/src/assets/languages/cn.js index 648cb25fc..b6d3f833c 100644 --- a/src/assets/languages/cn.js +++ b/src/assets/languages/cn.js @@ -28,7 +28,7 @@ export const m = { more: '更多', dataCenter: '资料中心', domesticStandardDatabase: '国内标准法规', - foreignStandardDatabase: '海外标准法规', + foreignStandardDatabase: '国外标准法规', domesticRegulationsDatabase: '国内政策', foreignRegulationsDatabase: '国外政策', enterpriseStandardDatabase: '企业标准法规', diff --git a/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue b/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue index ef68b3685..343a535f9 100644 --- a/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue +++ b/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue @@ -220,7 +220,7 @@ export default { // 数据搜索 数据来源list dataSourceOptions: [ {value: 'INLAND_STAND', label: '国内标准法规'}, - {value: 'FOREIGN_STAND', label: '海外标准法规'}, + {value: 'FOREIGN_STAND', label: '国外标准法规'}, {value: 'BUSINESS', label: '企业标准 '} ], dataSource: 'BUSINESS' diff --git a/src/components/CustomFormComponents/InputForStandardsForLaws.vue b/src/components/CustomFormComponents/InputForStandardsForLaws.vue index e29b58902..989ebce32 100644 --- a/src/components/CustomFormComponents/InputForStandardsForLaws.vue +++ b/src/components/CustomFormComponents/InputForStandardsForLaws.vue @@ -207,7 +207,7 @@ export default { // 数据搜索 数据来源list dataSourceOptions: [ {value: 'INLAND_STAND', label: '国内标准法规'}, - {value: 'FOREIGN_STAND', label: '海外标准法规'}, + {value: 'FOREIGN_STAND', label: '国外标准法规'}, {value: 'BUSINESS', label: '企业标准 '}, {value: 'LAWS_STAND', label: '国内外政策'} ], diff --git a/src/pages/config/pages/attributeCustom/components/buss.vue b/src/pages/config/pages/attributeCustom/components/buss.vue index 209b5128a..04f007d9b 100644 --- a/src/pages/config/pages/attributeCustom/components/buss.vue +++ b/src/pages/config/pages/attributeCustom/components/buss.vue @@ -377,12 +377,12 @@ export default { ], sarTypeOptions: [ { label: '国内标准法规', value: 'INLAND_STAND' }, - { label: '海外标准法规', value: 'FOREIGN_STAND' }, - { label: '国内及海外标准法规', value: 'STAND' } + { label: '国外标准法规', value: 'FOREIGN_STAND' }, + { label: '国内及国外标准法规', value: 'STAND' } ], sarTypeLocationOptions: [ { label: '国内标准法规', value: 'INLAND_STAND' }, - { label: '海外标准法规', value: 'FOREIGN_STAND' } + { label: '国外标准法规', value: 'FOREIGN_STAND' } ], isMustOptions: [ { label: '是', value: '0' }, @@ -727,9 +727,9 @@ export default { if (type === 'INLAND_STAND') { texts = '国内标准法规' } else if (type === 'FOREIGN_STAND') { - texts = '海外标准法规' + texts = '国外标准法规' } else if (type === 'STAND') { - texts = '国内及海外标准法规' + texts = '国内及国外标准法规' } else if (type === 'BUSS') { texts = '企业标准库' } diff --git a/src/pages/config/pages/attributeCustom/components/stand.vue b/src/pages/config/pages/attributeCustom/components/stand.vue index 13104f3fb..ab8a9f10c 100644 --- a/src/pages/config/pages/attributeCustom/components/stand.vue +++ b/src/pages/config/pages/attributeCustom/components/stand.vue @@ -366,12 +366,12 @@ export default { ], sarTypeOptions: [ { label: '国内标准法规', value: 'INLAND_STAND' }, - { label: '海外标准法规', value: 'FOREIGN_STAND' }, - { label: '国内及海外标准法规', value: 'STAND' } + { label: '国外标准法规', value: 'FOREIGN_STAND' }, + { label: '国内及国外标准法规', value: 'STAND' } ], sarTypeLocationOptions: [ { label: '国内标准法规', value: 'INLAND_STAND' }, - { label: '海外标准法规', value: 'FOREIGN_STAND' } + { label: '国外标准法规', value: 'FOREIGN_STAND' } ], isMustOptions: [ { label: '是', value: '0' }, @@ -710,9 +710,9 @@ export default { if (type === 'INLAND_STAND') { texts = '国内标准法规' } else if (type === 'FOREIGN_STAND') { - texts = '海外标准法规' + texts = '国外标准法规' } else if (type === 'STAND') { - texts = '国内及海外标准法规' + texts = '国内及国外标准法规' } return texts }, diff --git a/src/pages/details/otherStandardDetails/pages/standInvolveProjectDetailTwo.vue b/src/pages/details/otherStandardDetails/pages/standInvolveProjectDetailTwo.vue index 7b5ea27ee..7321bbdf1 100644 --- a/src/pages/details/otherStandardDetails/pages/standInvolveProjectDetailTwo.vue +++ b/src/pages/details/otherStandardDetails/pages/standInvolveProjectDetailTwo.vue @@ -82,7 +82,7 @@ >