Merge remote-tracking branch 'origin/develop' into develop

src/pages/processCenter/pages/creatProcess/qbfs/step1.vue

@@ -207,7 +207,7 @@
                   type="primary"
                   class="common-button-primary"
                   size="small"
-                  @click="getStandDataBtn">
+                  @click="getStandDataBtns">
                   查询
                 </el-button>
               </el-form-item>
@@ -225,7 +225,7 @@
             tooltip-effect="dark"
             style="width: 100%"
             border
-            height="100%"
+            class="table-height"
             :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
             @selection-change="selectListChange"
@@ -461,6 +461,20 @@ export default {
       this.getStandDataBtn()
       this.ListModel = true;
     },
+    getStandDataBtns(){
+      this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage',{
+        standCode: this.standardSearch.standCode,
+        standName: this.standardSearch.standName,
+        page: 1,
+        pageSize: this.pageSize,
+      }, {
+        _this: this,
+      }, res => {
+        this.page = 1
+        this.standinfoList = res.data.list
+        this.total = res.data.count
+      })
+    },
     //企业标准查询this.standardSearch,
     getStandDataBtn(){
       this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage',{
@@ -478,6 +492,7 @@ export default {
     },
     //企业标准清空
     clearSearch(){
+      this.page = 1
       this.standardSearch = {
         standCode: '',
         standName: ''
@@ -792,7 +807,16 @@ export default {
       width: 210px;
     }
   }
-
+  .table-height{
+    height: calc(~'100% - 65px');
+    overflow: auto;
+  }
+  .el-table::before {
+    content: '';
+    position: absolute;
+    background-color: #EBEEF5;
+    z-index: 0;
+  }
   .demo-drawer-content {
     margin-top: 10px;
   }

src/pages/processCenter/pages/creatProcess/qbfz/step1.vue

@@ -30,7 +30,8 @@
                 <el-input
                   v-model="standardSearch.standCode"
                   placeholder="请输入企标编号"
-                  clearable
+                  clearabler
+                  readonly
                 ></el-input>
               </el-form-item>
               <el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
@@ -38,6 +39,7 @@
                   v-model="standardSearch.standName"
                   placeholder="请输入中文名称"
                   clearable
+                  readonly
                 ></el-input>
               </el-form-item>
               <el-form-item v-show="standShow" label="英文名称" prop="enName" class="add-form-item form-item-disabled">
@@ -225,7 +227,7 @@
                     type="primary"
                     class="common-button-primary"
                     size="small"
-                    @click="getStandDataBtn">
+                    @click="getStandDataBtns">
                     查询
                   </el-button>
                 </el-form-item>
@@ -243,7 +245,7 @@
               tooltip-effect="dark"
               style="width: 100%"
               border
-              height="100%"
+              class="table-height"
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
               @selection-change="selectListChange"
@@ -498,6 +500,20 @@ export default {
       this.getStandDataBtn()
       this.ListModel = true;
     },
+    getStandDataBtns(){
+      this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage',{
+        standCode: this.standardSearch.standCode,
+        standName: this.standardSearch.standName,
+        page: 1,
+        pageSize: this.pageSize,
+      }, {
+        _this: this,
+      }, res => {
+        this.page = 1
+        this.standinfoList = res.data.list
+        this.total = res.data.count
+      })
+    },
     //企业标准查询
     getStandDataBtn(){
       this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage',{
@@ -515,6 +531,7 @@ export default {
     },
     //企业标准清空
     clearSearch(){
+      this.page = 1
       this.standardSearch = {
         standCode: '',
         standName: ''
@@ -857,7 +874,16 @@ export default {
       width: 210px;
     }
   }
-
+  .table-height{
+    height: calc(~'100% - 65px');
+    overflow: auto;
+  }
+  .el-table::before {
+    content: '';
+    position: absolute;
+    background-color: #EBEEF5;
+    z-index: 0;
+  }
   .demo-drawer-content {
     margin-top: 10px;
   }