From 850e040cc02fe3004850c3526891e83dc8c78870 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com>
Date: Thu, 29 Sep 2022 17:35:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=B3=E5=8A=A1=E7=AE=A1=E7=90=86(=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E7=AE=A1=E7=90=86):=E9=87=8D=E5=A4=8D=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=AF=BC=E5=85=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../personModule/administration.vue           | 19 +++++++++++++------
 .../personModule/laborComponent.vue           | 12 ++++++------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/views/projectFront/laborManage/personModule/administration.vue b/src/views/projectFront/laborManage/personModule/administration.vue
index abc10c6a..7a75e074 100644
--- a/src/views/projectFront/laborManage/personModule/administration.vue
+++ b/src/views/projectFront/laborManage/personModule/administration.vue
@@ -115,7 +115,7 @@
         >
       </div> -->
     </div>
-    <div class="right2" style="width: 100%; margin-left: 0">
+    <div class="right2" style="width: 100%; margin-left: 0" v-if="refreshPage" >
       <div class="title whiteBlock flex">
         <span>{{ $t('message.laborMange.crewInfo') }}</span>
         <div class="team_number flex2">
@@ -436,7 +436,7 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="address" width="280px">
+            <el-table-column prop="address" width="300px">
               <template slot-scope="scope">
                 <div class="tableBtns">
                   <el-button
@@ -1773,6 +1773,7 @@ export default {
   },
   data() {
     return {
+      refreshPage:true,
       key: false,
       isCheckeedData: true, //判断一键下发是否有数据选中
       COMPANY: COMPANY,
@@ -1919,7 +1920,7 @@ export default {
           if (item2.actionCode == 'akey_issued') {
             this.key = true
           }
-          console.log('this.key', this.key)
+          // console.log('this.key', this.key)
         })
       }
     })
@@ -2055,9 +2056,15 @@ export default {
         }
       }
     },
-    handleSuccessE() {
-      this.$message.success(this.$t('message.laborMange.hint6')) //导入成功！
-      this.refreshBtn()
+    handleSuccessE(file) {
+      this.refreshPage = false
+      if(file.code == 200){
+        this.$message.success(file.message) //导入成功
+        this.refreshBtn()
+      }
+      this.$nextTick(()=>{
+        this.refreshPage = true
+      })
     },
     handleErrorE() {
       this.$message.error(this.$t('message.laborMange.hint7')) //导入失败
diff --git a/src/views/projectFront/laborManage/personModule/laborComponent.vue b/src/views/projectFront/laborManage/personModule/laborComponent.vue
index bd336d4f..f65abe25 100644
--- a/src/views/projectFront/laborManage/personModule/laborComponent.vue
+++ b/src/views/projectFront/laborManage/personModule/laborComponent.vue
@@ -392,7 +392,7 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="address" width="270px">
+            <el-table-column prop="address" width="300px">
               <template slot-scope="scope">
                 <div class="tableBtns">
                   <!-- 退场 -->
@@ -2206,7 +2206,7 @@ export default {
           if (item2.actionCode == 'akey_issued') {
             this.key = true
           }
-          console.log('this.key', this.key)
+          // console.log('this.key', this.key)
         })
       }
     })
@@ -2331,13 +2331,13 @@ export default {
       this.refreshPage = false
       console.log('==========',file)
       if(file.code == 200){
-        this.$message.success(this.$t('message.laborMange.hint6')) //导入成功
+        this.$message.success(file.message) //导入成功
         this.refreshBtn()
         this.getTeamList()
-        setTimeout(()=>{
-          this.refreshPage = true
-        },100)
       }
+      this.$nextTick(()=>{
+        this.refreshPage = true
+      })
     },
     handleErrorE() {
       this.$message.error(this.$t('message.laborMange.hint7'))