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; +} 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 @@ >
-
+
- -
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 = '' 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; } } 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 } } } 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" } });