From 5c6dccb6c2dd33ef7e08beeed50727bd2f097106 Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Tue, 14 Nov 2023 10:31:30 +0800
Subject: [PATCH 1/8] =?UTF-8?q?bug:=20=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/searchCenter/pages/standardSearch.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue
index 94d218194..c882f9b7a 100644
--- a/src/pages/searchCenter/pages/standardSearch.vue
+++ b/src/pages/searchCenter/pages/standardSearch.vue
@@ -129,8 +129,9 @@
                                                 align="center"
                                                 :label="(selectIndex === 'stand'||'bussstand') && selectIndex !== 'laws'  ? $t('m.standName') : (selectIndex === 'laws' ? '中文名称' : $t('m.enterpriseStandardName'))">
                                             <template slot-scope="scope">
-                                                <a class="jumpColor" style="margin-left: 10px" @click="judgeRolePermiOnSar(scope.row, 1)">{{ selectIndex === 'laws' ? scope.row.lawsName : scope.row.nameshow }}</a>
-                                            </template>
+                                              <!--<a class="jumpColor" style="margin-left: 10px" @click="judgeRolePermiOnSar(scope.row, 1)">{{ selectIndex === 'laws' ? scope.row.lawsName : scope.row.nameshow }}</a>-->
+                                              <a v-if="selectIndex === 'laws'" class="jumpColor" style="margin-left: 10px" @click="judgeRolePermiOnSar(scope.row, 1)">{{scope.row.lawsName }}</a>
+                                              <a v-else class="jumpColor" style="margin-left: 10px" @click="judgeRolePermiOnSar(scope.row, 1)">{{ scope.row.standName || scope.row.standEnName }}</a></template>
                                         </el-table-column>
                                         <el-table-column
                                                 min-width="12%"

From 2d6e64fb8716a29b9276125261c65d05e264a49a Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Tue, 14 Nov 2023 15:11:07 +0800
Subject: [PATCH 2/8] =?UTF-8?q?bug:=20=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/phone/domesticStand.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/phone/domesticStand.vue b/src/pages/phone/domesticStand.vue
index 5b3c6fbc8..6234d86e5 100644
--- a/src/pages/phone/domesticStand.vue
+++ b/src/pages/phone/domesticStand.vue
@@ -30,8 +30,9 @@
      <div v-else-if="!loading && standList.length" class="card-content" v-for="item in standList" :key="item.id" @click="jumpDetails(item)">
        <div class="standTitle">
          <div v-if="titleType === 'POLICY'"  class="title">{{item.lawsNumber}}</div>
-         <div v-else-if="titleType !== 'POLICY' && item.standYear" class="title">{{item.standSort + '&nbsp&nbsp' + item.standNumber + '-' + item.standYear }}</div>
-         <div v-else class="title">{{item.standSort + '&nbsp&nbsp' + item.standNumber }}</div>
+         <!--<div v-else-if="titleType !== 'POLICY' && item.standYear" class="title">{{item.standSort + '&nbsp&nbsp' + item.standNumber + '-' + item.standYear }}</div>-->
+         <!--<div v-else class="title">{{item.standSort + '&nbsp&nbsp' + item.standNumber }}</div>-->
+         <div v-else class="title">{{ item.stand_code || item.numbershow }}</div>
        </div>
        <div class="standContent">
          <!--<div class="standState">{{item.standName && item.standName !== '' ? item.standName : item.standEnName !== '' ? item.standEnName : item.nameshow }}</div>-->

From 3179dc7b2c214a14726ab349adf62cb67a010d96 Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Tue, 14 Nov 2023 15:21:34 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF-=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/phone/phoneHome.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pages/phone/phoneHome.vue b/src/pages/phone/phoneHome.vue
index 0d15d352c..559c6c5c3 100644
--- a/src/pages/phone/phoneHome.vue
+++ b/src/pages/phone/phoneHome.vue
@@ -206,6 +206,8 @@ export default {
     bottom: 10px;
     left: 50%;
     transform: translateX(-50%);
+    border: 2px solid red;
+    padding: 5px;
   }
 }
 </style>

From ef4f46298f717aabdb940ab39a291e377c0fec25 Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Tue, 14 Nov 2023 15:40:20 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E7=AE=A1=E6=8E=A7=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?-=E6=A0=87=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processCenter/pages/creatProcess/qbzxdjhgk/step1-1.vue      | 2 +-
 .../processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue      | 2 +-
 src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue  | 2 +-
 src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue  | 2 +-
 src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue  | 2 +-
 src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue  | 2 +-
 src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-1.vue
index 41a3453ba..71ab0c8d5 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-1.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="qbzxd-jhgk">
     <ProcessHeader toggle>
-      <template slot="proName">企标制修订计划管控</template>
+      <template slot="proName">企标制修订计划管控{{ toggleType === '1' ? '-计划合并' : toggleType === '2' ? '-计划延期' : toggleType === '3' ? '-计划取消' : toggleType === '4' ? '-计划更名' : '-计划立项' }}</template>
       <template slot="proNode">起草</template>
     </ProcessHeader>
     <div class="headerTabs">
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue
index 5f1b04b41..93e05d16d 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="qbzxd-jhgk">
     <ProcessHeader toggle>
-      <template slot="proName">企标制修订计划管控</template>
+      <template slot="proName">企标制修订计划管控{{ type === '1' ? '-计划合并' : type === '2' ? '-计划延期' : type === '3' ? '-计划取消' : type === '4' ? '-计划更名' : '-计划立项' }}</template>
       <template slot="proNode">批准</template>
     </ProcessHeader>
     <div class="headerTabs">
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
index 31e35411d..24eb4007d 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="qbzxd-jhgk">
     <ProcessHeader toggle>
-      <template slot="proName">企标制修订计划管控</template>
+      <template slot="proName">企标制修订计划管控{{ toggleType === '1' ? '-计划合并' : toggleType === '2' ? '-计划延期' : toggleType === '3' ? '-计划取消' : toggleType === '4' ? '-计划更名' : '-计划立项' }}</template>
       <template slot="proNode">起草</template>
     </ProcessHeader>
     <div class="headerTabs">
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue
index 92a6c12c3..3742e8ed3 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="qbzxd-jhgk">
     <ProcessHeader toggle>
-      <template slot="proName">企标制修订计划管控</template>
+      <template slot="proName">企标制修订计划管控{{ type === '1' ? '-计划合并' : type === '2' ? '-计划延期' : type === '3' ? '-计划取消' : type === '4' ? '-计划更名' : '-计划立项' }}</template>
       <template slot="proNode">审核</template>
     </ProcessHeader>
     <div class="headerTabs">
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue
index 370ac353d..49ec64d77 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="qbzxd-jhgk">
     <ProcessHeader toggle>
-      <template slot="proName">企标制修订计划管控</template>
+      <template slot="proName">企标制修订计划管控{{ type === '1' ? '-计划合并' : type === '2' ? '-计划延期' : type === '3' ? '-计划取消' : type === '4' ? '-计划更名' : '-计划立项' }}</template>
       <template slot="proNode">会签</template>
     </ProcessHeader>
     <div class="headerTabs">
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue
index 50e3930d8..5145f1c32 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="qbzxd-jhgk">
     <ProcessHeader toggle>
-      <template slot="proName">企标制修订计划管控</template>
+      <template slot="proName">企标制修订计划管控{{ type === '1' ? '-计划合并' : type === '2' ? '-计划延期' : type === '3' ? '-计划取消' : type === '4' ? '-计划更名' : '-计划立项' }}</template>
       <template slot="proNode">审定</template>
     </ProcessHeader>
     <div class="headerTabs">
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
index 3e44506c6..f79326d89 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="qbzxd-jhgk">
     <ProcessHeader toggle>
-      <template slot="proName">企标制修订计划管控</template>
+      <template slot="proName">企标制修订计划管控{{ type === '1' ? '-计划合并' : type === '2' ? '-计划延期' : type === '3' ? '-计划取消' : type === '4' ? '-计划更名' : '-计划立项' }}</template>
       <template slot="proNode">批准</template>
     </ProcessHeader>
     <div class="headerTabs">

From 0338732fecbd27a0cd5c5c885ce5ef90c5ea180d Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Tue, 14 Nov 2023 17:41:30 +0800
Subject: [PATCH 5/8] =?UTF-8?q?bug:=20=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/searchCenter/pages/standardSearch.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue
index c882f9b7a..91af01f23 100644
--- a/src/pages/searchCenter/pages/standardSearch.vue
+++ b/src/pages/searchCenter/pages/standardSearch.vue
@@ -131,7 +131,7 @@
                                             <template slot-scope="scope">
                                               <!--<a class="jumpColor" style="margin-left: 10px" @click="judgeRolePermiOnSar(scope.row, 1)">{{ selectIndex === 'laws' ? scope.row.lawsName : scope.row.nameshow }}</a>-->
                                               <a v-if="selectIndex === 'laws'" class="jumpColor" style="margin-left: 10px" @click="judgeRolePermiOnSar(scope.row, 1)">{{scope.row.lawsName }}</a>
-                                              <a v-else class="jumpColor" style="margin-left: 10px" @click="judgeRolePermiOnSar(scope.row, 1)">{{ scope.row.standName || scope.row.standEnName }}</a></template>
+                                              <a v-else class="jumpColor" style="margin-left: 10px" @click="judgeRolePermiOnSar(scope.row, 1)">{{ scope.row.standName || scope.row.stand_name || scope.row.nameshow || scope.row.standEnName || scope.row.stand_en_name }}</a></template>
                                         </el-table-column>
                                         <el-table-column
                                                 min-width="12%"

From 454738a7d2a67eef616fd5fa8ae61eb2da36223a Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Thu, 16 Nov 2023 10:05:22 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E7=AE=A1=E6=8E=A7=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?-=E6=A0=87=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/qbzxdjhgk/step1-1.vue          |  5 ++++-
 .../pages/creatProcess/qbzxdjhgk/step1-5.vue          | 10 +++++++++-
 .../pages/creatProcess/qbzxdjhgk/step2.vue            | 11 +++++++++--
 .../pages/creatProcess/qbzxdjhgk/step3.vue            | 10 +++++++++-
 .../pages/creatProcess/qbzxdjhgk/step4.vue            | 10 +++++++++-
 .../pages/creatProcess/qbzxdjhgk/step5.vue            | 10 +++++++++-
 6 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-1.vue
index 71ab0c8d5..66feb61c9 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-1.vue
@@ -1,7 +1,10 @@
 <template>
   <div class="qbzxd-jhgk">
     <ProcessHeader toggle>
-      <template slot="proName">企标制修订计划管控{{ toggleType === '1' ? '-计划合并' : toggleType === '2' ? '-计划延期' : toggleType === '3' ? '-计划取消' : toggleType === '4' ? '-计划更名' : '-计划立项' }}</template>
+      <template slot="proName">
+        企标制修订计划管控
+        <span v-if="toggleType">{{ toggleType === '1' ? '-计划合并' : toggleType === '2' ? '-计划延期' : toggleType === '3' ? '-计划取消' : toggleType === '4' ? '-计划更名' : '-计划立项' }}</span>
+      </template>
       <template slot="proNode">起草</template>
     </ProcessHeader>
     <div class="headerTabs">
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue
index 93e05d16d..973fdf35b 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue
@@ -1,7 +1,10 @@
 <template>
   <div class="qbzxd-jhgk">
     <ProcessHeader toggle>
-      <template slot="proName">企标制修订计划管控{{ type === '1' ? '-计划合并' : type === '2' ? '-计划延期' : type === '3' ? '-计划取消' : type === '4' ? '-计划更名' : '-计划立项' }}</template>
+      <template slot="proName">
+        企标制修订计划管控
+        <span>{{ type === '1' ? '-计划合并' : type === '2' ? '-计划延期' : type === '3' ? '-计划取消' : type === '4' ? '-计划更名' : '-计划立项' }}</span>>
+      </template>
       <template slot="proNode">批准</template>
     </ProcessHeader>
     <div class="headerTabs">
@@ -321,6 +324,7 @@
       @checkedRole="checkedRole"
       :nodeList="nodeList"
     ></Role-tree>
+    <loading :loading="isLoading">加载中...</loading>
   </div>
 </template>
 
@@ -357,6 +361,7 @@ export default {
       detailData: [],
       standSortOptions: [],
       cbcdOptions: [],
+      isLoading: false,
     }
   },
   mounted() {
@@ -412,6 +417,7 @@ export default {
       })
     },
     getData() {
+      this.isLoading = true
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({
           taskIds: this.$route.query.taskIds,
@@ -422,6 +428,7 @@ export default {
             this.getFormFieldList(processForm)
           }
         }).catch(e => {
+          this.isLoading = false
         })
       })
     },
@@ -434,6 +441,7 @@ export default {
         this.qbfsForm = JSON.parse(JSON.stringify(item))
         this.type = item.type
         this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
+        this.isLoading = false
       })
     },
     assemble(ids,names){
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue
index 3742e8ed3..b0f833451 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue
@@ -1,7 +1,10 @@
 <template>
   <div class="qbzxd-jhgk">
     <ProcessHeader toggle>
-      <template slot="proName">企标制修订计划管控{{ type === '1' ? '-计划合并' : type === '2' ? '-计划延期' : type === '3' ? '-计划取消' : type === '4' ? '-计划更名' : '-计划立项' }}</template>
+      <template slot="proName">
+        企标制修订计划管控
+        <span v-if="type">{{ type === '1' ? '-计划合并' : type === '2' ? '-计划延期' : type === '3' ? '-计划取消' : type === '4' ? '-计划更名' : '-计划立项' }}</span>
+      </template>
       <template slot="proNode">审核</template>
     </ProcessHeader>
     <div class="headerTabs">
@@ -343,6 +346,7 @@
       @checkedRole="checkedRole"
       :nodeList="nodeList"
     ></Role-tree>
+    <loading :loading="isLoading">加载中...</loading>
   </div>
 </template>
 
@@ -379,7 +383,7 @@ export default {
       drawerTitle: '',
       detailData: [],
       cbcdOptions: [],
-
+      isLoading: false,
     }
   },
   mounted() {
@@ -435,6 +439,7 @@ export default {
       })
     },
     getData() {
+      this.isLoading = true
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({
           taskIds: this.$route.query.taskIds,
@@ -445,6 +450,7 @@ export default {
             this.getFormFieldList(processForm)
           }
         }).catch(e => {
+          this.isLoading = false
         })
       })
     },
@@ -458,6 +464,7 @@ export default {
         console.log(item.area.join(','));
         this.type = item.type
         this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
+        this.isLoading = false
       })
     },
     assemble(ids,names){
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue
index 49ec64d77..b81d20bad 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue
@@ -1,7 +1,10 @@
 <template>
   <div class="qbzxd-jhgk">
     <ProcessHeader toggle>
-      <template slot="proName">企标制修订计划管控{{ type === '1' ? '-计划合并' : type === '2' ? '-计划延期' : type === '3' ? '-计划取消' : type === '4' ? '-计划更名' : '-计划立项' }}</template>
+      <template slot="proName">
+        企标制修订计划管控
+        <span v-if="type">{{ type === '1' ? '-计划合并' : type === '2' ? '-计划延期' : type === '3' ? '-计划取消' : type === '4' ? '-计划更名' : '-计划立项' }}</span>
+      </template>
       <template slot="proNode">会签</template>
     </ProcessHeader>
     <div class="headerTabs">
@@ -339,6 +342,7 @@
       @checkedRole="checkedRole"
       :nodeList="nodeList"
     ></Role-tree>
+    <loading :loading="isLoading">加载中...</loading>
   </div>
 </template>
 
@@ -375,6 +379,7 @@ export default {
       detailData: [],
       standSortOptions: [],
       cbcdOptions: [],
+      isLoading: false,
     }
   },
   mounted() {
@@ -430,6 +435,7 @@ export default {
       })
     },
     getData() {
+      this.isLoading = true
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({
           taskIds: this.$route.query.taskIds,
@@ -440,6 +446,7 @@ export default {
             this.getFormFieldList(processForm)
           }
         }).catch(e => {
+          this.isLoading = false
         })
       })
     },
@@ -452,6 +459,7 @@ export default {
         this.qbfsForm = JSON.parse(JSON.stringify(item))
         this.type = item.type
         this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
+        this.isLoading = false
       })
     },
     assemble(ids,names){
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue
index 5145f1c32..fada915ce 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue
@@ -1,7 +1,10 @@
 <template>
   <div class="qbzxd-jhgk">
     <ProcessHeader toggle>
-      <template slot="proName">企标制修订计划管控{{ type === '1' ? '-计划合并' : type === '2' ? '-计划延期' : type === '3' ? '-计划取消' : type === '4' ? '-计划更名' : '-计划立项' }}</template>
+      <template slot="proName">
+        企标制修订计划管控
+        <span v-if="type">{{ type === '1' ? '-计划合并' : type === '2' ? '-计划延期' : type === '3' ? '-计划取消' : type === '4' ? '-计划更名' : '-计划立项' }}</span>
+      </template>
       <template slot="proNode">审定</template>
     </ProcessHeader>
     <div class="headerTabs">
@@ -341,6 +344,7 @@
       @checkedRole="checkedRole"
       :nodeList="nodeList"
     ></Role-tree>
+    <loading :loading="isLoading">加载中...</loading>
   </div>
 </template>
 
@@ -377,6 +381,7 @@ export default {
       detailData: [],
       standSortOptions: [],
       cbcdOptions: [],
+      isLoading: false,
     }
   },
   mounted() {
@@ -432,6 +437,7 @@ export default {
       })
     },
     getData() {
+      this.isLoading = true
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({
           taskIds: this.$route.query.taskIds,
@@ -442,6 +448,7 @@ export default {
             this.getFormFieldList(processForm)
           }
         }).catch(e => {
+          this.isLoading = false
         })
       })
     },
@@ -454,6 +461,7 @@ export default {
         this.qbfsForm = JSON.parse(JSON.stringify(item))
         this.type = item.type
         this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
+        this.isLoading = false
       })
     },
     assemble(ids,names){
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
index f79326d89..a8a9073e4 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
@@ -1,7 +1,10 @@
 <template>
   <div class="qbzxd-jhgk">
     <ProcessHeader toggle>
-      <template slot="proName">企标制修订计划管控{{ type === '1' ? '-计划合并' : type === '2' ? '-计划延期' : type === '3' ? '-计划取消' : type === '4' ? '-计划更名' : '-计划立项' }}</template>
+      <template slot="proName">
+        企标制修订计划管控
+        <span v-if="type">{{ type === '1' ? '-计划合并' : type === '2' ? '-计划延期' : type === '3' ? '-计划取消' : type === '4' ? '-计划更名' : '-计划立项' }}</span>
+      </template>
       <template slot="proNode">批准</template>
     </ProcessHeader>
     <div class="headerTabs">
@@ -341,6 +344,7 @@
       @checkedRole="checkedRole"
       :nodeList="nodeList"
     ></Role-tree>
+    <loading :loading="isLoading">加载中...</loading>
   </div>
 </template>
 
@@ -377,6 +381,7 @@ export default {
       detailData: [],
       standSortOptions: [],
       cbcdOptions: [],
+      isLoading: false,
     }
   },
   mounted() {
@@ -432,6 +437,7 @@ export default {
       })
     },
     getData() {
+      this.isLoading = true
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({
           taskIds: this.$route.query.taskIds,
@@ -442,6 +448,7 @@ export default {
             this.getFormFieldList(processForm)
           }
         }).catch(e => {
+          this.isLoading = false
         })
       })
     },
@@ -454,6 +461,7 @@ export default {
         this.qbfsForm = JSON.parse(JSON.stringify(item))
         this.type = item.type
         this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
+        this.isLoading = false
       })
     },
     assemble(ids,names){

From 91f03db948e6d853a4592f5d73cbb78fc078303e Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Thu, 16 Nov 2023 10:10:43 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=20=E9=80=89=E6=8B=A9=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E4=BD=93=E7=B3=BB=20=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/searchCenter/pages/standardSearch.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue
index 91af01f23..9daa68f04 100644
--- a/src/pages/searchCenter/pages/standardSearch.vue
+++ b/src/pages/searchCenter/pages/standardSearch.vue
@@ -89,13 +89,13 @@
                                         <!--                  <el-button type="primary" size="small" @click="exportSearchResult" class="common-button-default export-button"-->
                                         <!--                             round><i class="iconfont">&#xe6e9;</i>导出</el-button>-->
                                     </div>
-                                  <div class="operate-area" style="padding: 0 10px 10px 10px">
-                                    <el-button
-                                        size="mini"
-                                        type="primary"
-                                        @click="openStandSystemModel">选择标准体系
-                                    </el-button>
-                                  </div>
+<!--                                  <div class="operate-area" style="padding: 0 10px 10px 10px">-->
+<!--                                    <el-button-->
+<!--                                        size="mini"-->
+<!--                                        type="primary"-->
+<!--                                        @click="openStandSystemModel">选择标准体系-->
+<!--                                    </el-button>-->
+<!--                                  </div>-->
                                     <el-table
                                             ref="selection"
                                             :data="resultData"

From 77cf0841c64576c0b698bd05f723125275bfad17 Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Thu, 16 Nov 2023 10:12:38 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/searchCenter/pages/standardSearch.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue
index 9daa68f04..9d64f6809 100644
--- a/src/pages/searchCenter/pages/standardSearch.vue
+++ b/src/pages/searchCenter/pages/standardSearch.vue
@@ -59,7 +59,7 @@
                                     <ul :class="[key, {'is-close': condition.isClose}]">
                                         <li v-for="(conditionOpt, optIndex) in optionsFun(condition.options)" :key="optIndex + condition.title">
                                           <span :class="{ 'selected': searchCondition[key].indexOf(conditionOpt.value) !== -1 }" @click="optChecked(key, conditionOpt.value)">{{ conditionOpt.label }}
-                                            <span v-if="conditionOpt.number !== null && conditionOpt.number !== undefined && selectIndex !== 'All'">(<font style="color: red">{{ conditionOpt.number}}</font>)</span>
+<!--                                            <span v-if="conditionOpt.number !== null && conditionOpt.number !== undefined && selectIndex !== 'All'">(<font style="color: red">{{ conditionOpt.number}}</font>)</span>-->
                                           </span>
                                         </li>
                                     </ul>