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

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

@@ -1080,6 +1080,7 @@ export default {
         this.listForm.commentText = this.commentText
         this.listForm.fileName = this.fileInfoList
         this.listForm.dataList = this.dataList
+        this.listForm.listType = this.listType
         let json = Object.assign(this.listForm, this.roleForm);
         this.$refs["qdfbForm"].validate((valid) => {
           if (valid) {
@@ -1517,6 +1518,7 @@ export default {
         this.dataList = this.listForm.dataList
         this.roleForm = mes.roleForm
         this.commentText = mes.commentText
+        this.listType = mes.form.listType
         console.log(this.listForm)
       })
     },

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

@@ -24,7 +24,8 @@
           <el-row :gutter="24">
             <el-col :span="24">
               <el-form-item label="选择标准" prop="orgName" class="add-form-item form-item-disabled">
-                <el-button :disabled="disabledXX"  size="mini" type="primary" style="margin-left: 10px;" @click="choiceShow">根据企标编号、名称、类别查询</el-button>
+<!--                <el-button :disabled="disabledXX"  size="mini" type="primary" style="margin-left: 10px;" @click="choiceShow">根据企标编号、名称、类别查询</el-button>-->
+                <el-button :disabled="disabledXX"  size="mini" type="primary" style="margin-left: 10px;" @click="choiceShow">根据企标编号、名称查询</el-button>
               </el-form-item>
               <el-form-item label="企标编号" prop="standCode" class="add-form-item form-item-disabled">
                 <el-input :disabled="disabledXX"

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -1,4 +1,4 @@
-<!--企业标准库-->
+ <!--企业标准库-->
 <template>
   <div id="EnterpriseStandardDatabase" :class="{ 'tree-close': sideClose }" class="v-class">
     <!--左侧树-->
@@ -5827,4 +5827,7 @@ export default {
     }
   }
 }
+/deep/.el-table__fixed-body-wrapper .el-table__body {
+  padding-bottom: 20px;
+}
 </style>