From 594ccd8e3f62f1b2b684ef759504d5e401da7829 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 24 Mar 2022 11:32:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/qbfz/step1-7.vue           |  3 ---
 .../qbzxdjhgk/component/establish.vue             | 12 ++++++++++--
 .../creatProcess/qbzxdjhgk/component/merge.vue    | 15 ++++++++++++---
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue
index ffbe8a46c..1f23010b6 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue
@@ -277,9 +277,6 @@ export default {
         nextStatus: ""
       },
       formRules: {
-        nextStatus: [
-          { required: true, message: "", trigger: "change" }
-        ]
       },
       associationOptions: [{
         value: "修订",
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
index 33ebc9065..22bd02fd2 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
@@ -206,7 +206,7 @@
                   type="primary"
                   size="mini"
                   class="common-button-primary"
-                  @click="QYBZget">查询
+                  @click="QYBZgetBtn">查询
                 </el-button>
                 <el-button
                   class="common-button-default"
@@ -223,7 +223,7 @@
                 :data="QYBZList"
                 tooltip-effect="dark"
                 style="width: 100%;padding:0 0 20px 0;"
-                height="100%"
+                class="table-height"
                 border
                 @selection-change="handleSelectionQYBZ"
                 :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
@@ -753,6 +753,10 @@ export default {
       this.QYBZform.pageSize = pageSize
       this.QYBZget()
     },
+    QYBZgetBtn(){
+      this.QYBZform.page = 1
+      this.QYBZget()
+    },
     QYBZget () {
       this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.QYBZform, {
         _this: this, loading: 'QYBZShow'
@@ -958,5 +962,9 @@ export default {
       }
     }
   }
+  .table-height{
+    height: calc(~'100% - 65px');
+    overflow: auto;
+  }
 }
 </style>
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
index 186d5cb50..8e5d7073e 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
@@ -372,7 +372,7 @@
                   type="primary"
                   size="mini"
                   class="common-button-primary"
-                  @click="QYBZget">查询
+                  @click="QYBZgetBtn">查询
                 </el-button>
                 <el-button
                   class="common-button-default"
@@ -389,7 +389,7 @@
                 :data="QYBZList"
                 tooltip-effect="dark"
                 style="width: 100%;padding:0 0 20px 0;"
-                height="100%"
+                class="table-height"
                 border
                 @selection-change="handleSelectionQYBZ"
                 :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
@@ -858,7 +858,7 @@ export default {
     },
     QYBZenterDrawer () {
       if (this.QYBZformSelect.length > 1) {
-        this.$message.warning('请选择一条标准')
+        this.$message.warning('您只能选择一条标准进行带入')
       } else if (this.QYBZformSelect.length < 1){
         this.$message.warning('请选择要带入的标准')
       } else {
@@ -879,6 +879,11 @@ export default {
       this.QYBZform.pageSize = pageSize
       this.QYBZget()
     },
+    //企业标准查询
+    QYBZgetBtn(){
+      this.QYBZform.page = 1
+      this.QYBZget()
+    },
     QYBZget () {
       this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.QYBZform, {
         _this: this, loading: 'QYBZShow'
@@ -1170,5 +1175,9 @@ export default {
       }
     }
   }
+  .table-height{
+    height: calc(~'100% - 65px');
+    overflow: auto;
+  }
 }
 </style>