From c507c9e3b756c9f1c00c7baab1016ae454f9cbdd Mon Sep 17 00:00:00 2001
From: "396572590@qq.com" <liuchao>
Date: Thu, 4 Aug 2022 17:14:05 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?=
 =?UTF-8?q?=E2=80=8556789=20=E6=B5=81=E7=A8=8B=E5=8F=91=E8=B5=B7=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E9=80=89=E6=8B=A9=E4=BC=81=E4=B8=9A=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=EF=BC=8C=E5=88=B6=E4=BF=AE=E8=AE=A2=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=9F=A5=E4=B8=8D=E5=87=BA?=
 =?UTF-8?q?=E6=9D=A5=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/qbzxdjhgk/component/merge.vue     | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
index afb14dd3b..763437848 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
@@ -226,8 +226,9 @@
                 </el-form-item>
                 <el-form-item label="制修订类型" class="search-item search-item-last">
                   <el-select :disabled="disabledXX"  v-model="standardSearch.reviseStatus" placeholder="请选择制修订类型">
-                    <el-option label="制定" value="制定"></el-option>
-                    <el-option label="修订" value="修订"></el-option>
+                    <el-option label="请选择" value=""></el-option>
+                    <el-option label="制定" value="1"></el-option>
+                    <el-option label="修订" value="2"></el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item class="search-item btn-box">
@@ -323,6 +324,7 @@
                 label="起草责任单位">
               </el-table-column>
             </el-table>
+            <loading :loading="replaceLoading">{{$t('m.dataAcquisition')}}</loading>
           </div>
           <pagination
             :page="page"
@@ -583,6 +585,7 @@ export default {
   data(){
     return {
       disabledXX:!!this.$route.query.disabledXX,
+      replaceLoading:false,
       formLoading:false,
       workModel: false,
       workSearch: {
@@ -1074,6 +1077,7 @@ export default {
     },
     //企业标准查询
     getStandDataBtn(){
+      this.replaceLoading = true
       this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{
         reviseStatus: this.standardSearch.reviseStatus || '',
         esName: this.standardSearch.standName,
@@ -1091,6 +1095,7 @@ export default {
           }
         })
         this.total = this.standinfoList.length
+        this.replaceLoading = false
       })
 
     },