From 1a11591495f7445b0908828c897f24b50e6d4bf4 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 14 Mar 2024 16:44:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=BF=9B=E5=BA=A6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=8C=E5=88=97=E8=A1=A8=E5=88=86=E9=A1=B5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E9=9C=80=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/smartImport/cpts/completeTask.vue    |   3 +-
 .../base/smartImport/cpts/createdTask.vue     |   4 +-
 .../base/smartImport/cpts/executeTask.vue     |   4 +-
 .../base/smartImport/cpts/smartImportInfo.vue | 106 +++++++++++-------
 4 files changed, 72 insertions(+), 45 deletions(-)

diff --git a/src/views/modules/base/smartImport/cpts/completeTask.vue b/src/views/modules/base/smartImport/cpts/completeTask.vue
index 932952954..39224b978 100644
--- a/src/views/modules/base/smartImport/cpts/completeTask.vue
+++ b/src/views/modules/base/smartImport/cpts/completeTask.vue
@@ -44,7 +44,7 @@
         <!--     -->
         <i class="el-icon-download" style="margin-left: 16px;"></i>
         <a
-        v-if="this.resultDescFile"
+        v-if="resultDescFile"
         :href="this.resultDescFile"
               target="_blank"
               style="color: #ff4d4f; cursor: pointer"
@@ -135,6 +135,7 @@ export default {
     async handelClickLook(type) {
       this.showTable = true;
       this.tableType = type;
+      this.pageNo = 1;
       this.getTable()
     },
     async getTable(){
diff --git a/src/views/modules/base/smartImport/cpts/createdTask.vue b/src/views/modules/base/smartImport/cpts/createdTask.vue
index be6182d5b..e9794f2c3 100644
--- a/src/views/modules/base/smartImport/cpts/createdTask.vue
+++ b/src/views/modules/base/smartImport/cpts/createdTask.vue
@@ -343,8 +343,6 @@ export default {
       await this.$http
         .post("/actual/base/intelligentImportData/uploadFile", formData)
         .then((res) => {
-          console.log("res-up", res);
-
           if (res.data.code == 0) {
             const { fileName, url } = res.data.data;
             this.createdFileName = fileName;
@@ -357,7 +355,7 @@ export default {
         .catch((err) => {
           console.log("失败", err);
           file.onError(); //上传失败的文件会从文件列表中删除
-          // this.$message.error("导入失败");
+          this.dataListLoading = false;
         });
       this.$refs.upload.clearFiles();
     },
diff --git a/src/views/modules/base/smartImport/cpts/executeTask.vue b/src/views/modules/base/smartImport/cpts/executeTask.vue
index 60e561b46..1a5fe1402 100644
--- a/src/views/modules/base/smartImport/cpts/executeTask.vue
+++ b/src/views/modules/base/smartImport/cpts/executeTask.vue
@@ -124,8 +124,7 @@ export default {
       pageNo:1,
       pageSize:20,
       total:0,
-      tableType:null
-
+      tableType:null,
     };
   },
   props: {
@@ -201,6 +200,7 @@ export default {
     async handelClickLook(type) {
       this.showTable = true;
       this.tableType = type;
+      this.pageNo = 1;
       this.getTable()
     },
     async getTable(){
diff --git a/src/views/modules/base/smartImport/cpts/smartImportInfo.vue b/src/views/modules/base/smartImport/cpts/smartImportInfo.vue
index 24d0f44de..cfea89b20 100644
--- a/src/views/modules/base/smartImport/cpts/smartImportInfo.vue
+++ b/src/views/modules/base/smartImport/cpts/smartImportInfo.vue
@@ -2,75 +2,103 @@
   <div class="m-detail-main">
     <el-card>
       <div class="steps">
-        <el-steps :active="progress" >
-            <!-- description="这是一段很长很长很长的描述性文字" -->
-          <el-step :class="[this.operatorName == null?'showNum':'']"  title="创建任务" :description="`${this.operatorName}(${this.createdTime})`" ></el-step>
-          <el-step  title="正在导入" :description="`导入进度${this.processStatus == 'processing'?this.progressNum:100 }%`"></el-step>
+        <el-steps :active="progress">
+          <el-step
+            :class="[this.operatorName == null ? 'showNum' : '']"
+            title="创建任务"
+            :description="`${this.operatorName}(${this.createdTime})`"
+          ></el-step>
+          <el-step
+            title="正在导入"
+            :class="[this.progress == 2 || this.progress == 3 ? '' : 'showNum']"
+            :description="`导入进度${
+              this.progressNum ? this.progressNum : 100
+            }%`"
+          ></el-step>
           <el-step title="导入完成"></el-step>
         </el-steps>
       </div>
-      <div style="margin-top: 37px;">
-        <created-task v-if="progress == 1" @handelClickUpload="handelClickUpload" @handelClickBack="handelClickBack"></created-task>
-        <execute-task v-if="progress == 2" @successImport="successImport" @handelClickBack="handelClickBack" @updateProgress="updateProgress" :fileCode="fileCode" :fileCodeP="fileCodeP"  @updateoperatorName="updateoperatorName"></execute-task>
-        <complete-task v-if="progress == 3"@handelClickBack="handelClickBack" :fileCodeP="fileCodeP" @updateoperatorName="updateoperatorName" :fileCode="fileCode"></complete-task>
+      <div style="margin-top: 37px">
+        <created-task
+          v-if="progress == 1"
+          @handelClickUpload="handelClickUpload"
+          @handelClickBack="handelClickBack"
+        ></created-task>
+        <execute-task
+          v-if="progress == 2"
+          @successImport="successImport"
+          @handelClickBack="handelClickBack"
+          @updateProgress="updateProgress"
+          :fileCode="fileCode"
+          :fileCodeP="fileCodeP"
+          @updateoperatorName="updateoperatorName"
+        ></execute-task>
+        <complete-task
+          v-if="progress == 3"
+          @handelClickBack="handelClickBack"
+          :fileCodeP="fileCodeP"
+          @updateoperatorName="updateoperatorName"
+          :fileCode="fileCode"
+        ></complete-task>
       </div>
     </el-card>
   </div>
 </template>
   <script>
-import createdTask from './createdTask.vue'
-import executeTask from './executeTask.vue'
-import completeTask from './completeTask.vue'
+import createdTask from "./createdTask.vue";
+import executeTask from "./executeTask.vue";
+import completeTask from "./completeTask.vue";
 export default {
   data() {
     return {
-      progress:1,
-      fileCode:null,
-      progressNum:null,
-      createdTime:null,
-      operatorName:null
+      progress: 1,
+      fileCode: null,
+      progressNum: null,
+      createdTime: null,
+      operatorName: null,
     };
   },
   props: {
-    fileCodeP:{
-      type:String,
-      default:null
+    fileCodeP: {
+      type: String,
+      default: null,
     },
-    taskId:{
-      type:String,
-      default:null
+    taskId: {
+      type: String,
+      default: null,
+    },
+    processStatus: {
+      type: String,
+      default: null,
     },
-    processStatus:{
-      type:String,
-      default:null
-    }
   },
   created() {
     console.log(this.processStatus);
-    if(this.processStatus){
-      this.progress = this.processStatus == 'processing'?2:3
+    if (this.processStatus) {
+      this.progress = this.processStatus == "processing" ? 2 : 3;
     }
   },
   methods: {
-    handelClickUpload(fileCode){
-        this.progress = 2;
-        this.fileCode = fileCode;
+    handelClickUpload(fileCode) {
+      this.progress = 2;
+      this.fileCode = fileCode;
     },
-    handelClickBack(){
-        this.$emit('handleClose');
+    handelClickBack() {
+      this.$emit("handleClose");
     },
-    successImport(){
+    successImport() {
       this.progress = 3;
+      this.progressNum = 100;
     },
-    updateProgress(num){
+    updateProgress(num) {
       this.progressNum = num;
     },
-    updateoperatorName({operatorName,createdTime}){
+    updateoperatorName({ operatorName, createdTime }) {
       this.operatorName = operatorName;
       this.createdTime = createdTime;
     },
   },
-  components: {createdTask,executeTask,completeTask},
+  components: { createdTask, executeTask, completeTask },
   computed: {},
   watch: {},
 };
@@ -79,8 +107,8 @@ export default {
 @import "@/assets/scss/buttonstyle.scss";
 @import "@/assets/scss/modules/management/detail-main.scss";
 @import "@/assets/scss/pages/smartImport.scss";
-.showNum{
-  /deep/.el-step__description{
+.showNum {
+  /deep/.el-step__description {
     display: none;
   }
 }