From faa7914004361faca5ac3b6752df55363c8f1148 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 18 May 2022 18:18:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=9C=AA=E6=88=90=E5=8A=9F?=
 =?UTF-8?q?=E6=97=B6=E5=8A=A0=E9=81=AE=E7=BD=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  1 +
 jero-web/src/common/lang/zh-cn.js             |  1 +
 jero-web/src/components/ImportFile/index.vue  | 41 +++++++++++++++++++
 .../components/taskCirculationHistory.vue     |  9 +++-
 4 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 91b9ecd39..0a3c95358 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -840,4 +840,5 @@ module.exports = {
   descriptionDeliverables:'Description of deliverables',
   startMonth:'Start Month',
   endMonth:'End Month',
+  Importing:'Importing',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index c17fe81ea..17d47a37b 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -845,4 +845,5 @@ module.exports = {
   descriptionDeliverables:'交付物说明',
   startMonth:'开始日期',
   endMonth:'结束日期',
+  Importing:'导入中',
 }
\ No newline at end of file
diff --git a/jero-web/src/components/ImportFile/index.vue b/jero-web/src/components/ImportFile/index.vue
index 009755729..be20c78e7 100644
--- a/jero-web/src/components/ImportFile/index.vue
+++ b/jero-web/src/components/ImportFile/index.vue
@@ -9,6 +9,14 @@
       <a-icon type="import" :rotate="270"/>
       {{$t('import')}}
     </a-upload>
+    <div class="loading-box" v-if="spinning">
+      <div class="loading-content">
+        <a-icon class="loading" type="loading" />
+        <div class="loading-tips">
+          {{this.$t('Importing')}}...
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -53,6 +61,7 @@
     data() {
       return {
         tokenHeader: { 'X-Access-Token': Vue.ls.get(ACCESS_TOKEN) },
+        spinning: false,
         cut: ''
       }
     },
@@ -174,4 +183,36 @@
     font-weight: 400 !important;
     color: #040B29 !important;
   }
+</style>
+<style scoped lang="less">
+  .loading-box{
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 9999900;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(255, 255, 255, 0.9);
+    border-radius: 8px;
+    user-select: none;
+    .loading-content{
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      color: #21c9cc;
+      transform: translate(-50%, -50%);
+      text-align: center;
+      .loading{
+        font-size:28px ;
+      }
+      .spin-loading{
+        animation: rotating 2s linear infinite;
+      }
+      .loading-tips{
+        margin-top: 5px;
+        font-size: 16px;
+        color: #21c9cc;
+      }
+    }
+  }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue
index 04b7d45b1..7aedb1c56 100644
--- a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue
+++ b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue
@@ -83,8 +83,15 @@
         let query = {
           actiProcInstId: this.$route.query.actiProcInstId
         }
+        this.loading = true
         getAction('/wkflow/processHistoryEO/list', query).then((res) => {
-          this.dataSource = res
+          if (res.success) {
+            this.dataSource = res.result || []
+            this.loading = false
+          } else {
+            this.dataSource = []
+            this.loading = false
+          }
         })
       }
     }