From 8f3538ee4aad7a62d452a0585a97eabbd4f56b16 Mon Sep 17 00:00:00 2001 From: hanshaozhuang Date: Tue, 19 Jul 2022 10:38:24 +0800 Subject: [PATCH 1/7] =?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 2/7] =?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 3/7] =?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 4/7] =?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 5/7] =?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 4d18a326cd08c4e31219874630425a40297dfe34 Mon Sep 17 00:00:00 2001 From: hanshaozhuang Date: Tue, 19 Jul 2022 14:45:07 +0800 Subject: [PATCH 6/7] =?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 7/7] =?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; +}