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

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue

@@ -23,7 +23,7 @@
               ></el-input>
             </el-form-item>
             <el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
-              <el-select :disabled="disabledXX" v-model="qbfsForm.bussSort" filterable placeholder="请选择企标类别" style="width: 100%;">
+              <el-select disabled v-model="qbfsForm.bussSort" filterable placeholder="请选择企标类别" style="width: 100%;">
                 <el-option
                   v-for="(item, index) in standSortOptions"
                   :key="index"

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue

@@ -4,6 +4,7 @@
       <template slot="title">更名企标信息</template>
     </process-title>
     <el-form
+      v-if="showForm"
       ref="qbfsForm"
       :model="qbfsForm"
       :rules="formRules"
@@ -23,7 +24,7 @@
               ></el-input>
             </el-form-item>
             <el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
-              <el-select :disabled="disabledXX" v-model="qbfsForm.bussSort"  filterable placeholder="请选择企标类别" style="width: 100%;">
+              <el-select :disabled="disabledXX" v-model="qbfsForm.bussSort" @change="bussSortChange" filterable placeholder="请选择企标类别" style="width: 100%;">
                 <el-option
                   v-for="(item, index) in standSortOptions"
                   :key="index"
@@ -409,7 +410,7 @@ export default {
         reviewDate: '',
         abolishCause:'',
       },
-
+      showForm: true,
     }
   },
   watch:{
@@ -436,6 +437,12 @@ export default {
     })
   },
   methods: {
+    bussSortChange (val) {
+      this.showForm = false
+      this.$nextTick(() => {
+        this.showForm = true
+      })
+    },
     getMap1(item){
       const map = new Map();
       map.set('0','未开始')

src/pages/regulatoryRepository/systemSearch/components/DialogTable.vue

@@ -467,7 +467,7 @@ export default {
         if (res.ok) {
           this.dict = { ...res.data }
           const WBZTCLASS = this.dict.WBZTCLASS.map(item => ({
-            label: '国内标准-' + item.label,
+            label: '国内/海外标准-' + item.label,
             value: item.value
           }))
           const TEXTSTATUSBUSS = this.dict.TEXTSTATUSBUSS.map(item => ({