From 7c16a15a3638b54f315a0c971798080922948d7b Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Fri, 8 Dec 2023 10:09:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(=E8=AE=A1=E5=88=92=E7=AE=A1=E6=8E=A7):?=
 =?UTF-8?q?=20=E6=9B=B4=E5=90=8D=E6=B5=81=E7=A8=8B-=E4=BC=81=E6=A0=87?=
 =?UTF-8?q?=E7=B1=BB=E5=88=AB=E6=9B=B4=E6=94=B9=E5=90=8E=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/qbzxdjhgk/component/cancel.vue |  2 +-
 .../pages/creatProcess/qbzxdjhgk/component/rename.vue | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
index 4d5934fb7..40c5d9325 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
+++ b/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"
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
index c7268aaa0..03f184945 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
+++ b/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','未开始')

From 99f41a24684b3a1dd3300d4eb780f88b03649038 Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Fri, 8 Dec 2023 10:34:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feature(=E4=BD=93=E7=B3=BB=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2):=20=E6=A0=87=E5=87=86=E7=8A=B6=E6=80=81=E5=9B=BD?=
 =?UTF-8?q?=E5=86=85=E6=A0=87=E5=87=86-...=E6=94=B9=E4=B8=BA=E5=9B=BD?=
 =?UTF-8?q?=E5=86=85/=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86-...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../systemSearch/components/DialogTable.vue                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/systemSearch/components/DialogTable.vue b/src/pages/regulatoryRepository/systemSearch/components/DialogTable.vue
index 3f9b26407..cde532487 100644
--- a/src/pages/regulatoryRepository/systemSearch/components/DialogTable.vue
+++ b/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 => ({