Merge branch 'v1.1_smartImport' into dev

src/views/modules/base/smartImport/cpts/completeTask.vue

@@ -114,7 +114,7 @@ export default {
       type: String,
       default: "",
     },
-    fileCodeP: {
+    fileCodeRow: {
       type: String,
       default: "",
     },
@@ -174,7 +174,7 @@ export default {
     async getTaskInfo() {
       let url = "/actual/base/intelligentImportData/getTaskInfo";
       let parm = {
-        fileCode: this.fileCodeP || this.fileCode,
+        fileCode: this.fileCodeRow || this.fileCode,
       };
       let { data, code, msg } = await requestPost(url, parm);
       if (code == 0) {

src/views/modules/base/smartImport/cpts/createdTask.vue

@@ -332,8 +332,10 @@ export default {
         this.$message.error("上传文件大小不能超过 10MB!");
       }
 
-      if (!this.form.importCategory) {
+      if (!this.form.importCategory || !this.form.taskName) {
-        this.$message.error("请选择导入的类别");
+        this.$message.error("请完善基本信息!");
+        this.dataListLoading = false;
+        return false
       }
       return fileType && isLt1M;
     },
@@ -350,6 +352,7 @@ export default {
             this.checkExtractExcelHead();
           } else {
             this.$message.error(res.data.msg);
+            this.dataListLoading = false;
           }
         })
         .catch((err) => {

src/views/modules/base/smartImport/cpts/executeTask.vue

@@ -128,14 +128,14 @@ export default {
     };
   },
   props: {
-    fileCode: {
+    fileCodeRow: {
-      type: String,
-      default: "",
-    },
-    fileCodeP: {
       type: String,
       default: "",
     },
+    fileCode:{
+      type:String,
+      default:""
+    }
   },
   async created() {
     await this.getTaskInfo();
@@ -164,7 +164,7 @@ export default {
     async getProcessRate() {
       let url = "/actual/base/intelligentImportData/processRate";
       let parm = {
-        fileCode: this.fileCode,
+        fileCode: this.fileCodeRow|| this.fileCode,
       };
       let res = await requestPost(url, parm);
       if (res.code == 0) {
@@ -181,7 +181,7 @@ export default {
     async getTaskInfo() {
       let url = "/actual/base/intelligentImportData/getTaskInfo";
       let parm = {
-        fileCode: this.fileCodeP || this.fileCode,
+        fileCode: this.fileCodeRow || this.fileCode,
       };
       let { data, code, msg } = await requestPost(url, parm);
       if (code == 0) {

src/views/modules/base/smartImport/cpts/smartImportInfo.vue

@@ -30,13 +30,13 @@
           @handelClickBack="handelClickBack"
           @updateProgress="updateProgress"
           :fileCode="fileCode"
-          :fileCodeP="fileCodeP"
+          :fileCodeRow="fileCodeRow"
           @updateoperatorName="updateoperatorName"
         ></execute-task>
         <complete-task
           v-if="progress == 3"
           @handelClickBack="handelClickBack"
-          :fileCodeP="fileCodeP"
+          :fileCodeRow="fileCodeRow"
           @updateoperatorName="updateoperatorName"
           :fileCode="fileCode"
         ></complete-task>
@@ -59,7 +59,7 @@ export default {
     };
   },
   props: {
-    fileCodeP: {
+    fileCodeRow: {
       type: String,
       default: null,
     },

src/views/modules/base/smartImport/index.vue

@@ -90,7 +90,7 @@
     <div v-if="pageType == 'add'">
       <!-- :eventDetailData="eventDetailData" -->
             <smart-import-info ref="eleEditForm" :pageType="pageType"  
-                @handleClose="handleClose" @handleOk="handleOk" :fileCodeP="fileCode" :taskId="taskId" :processStatus="processStatus"/>
+                @handleClose="handleClose" @handleOk="handleOk" :fileCodeRow="fileCode" :taskId="taskId" :processStatus="processStatus"/>
         </div>
   </div>
 </template>
@@ -184,6 +184,7 @@ export default {
     //   调出新增组件
     async handleAdd() {
       this.pageType = "add";
+      this.fileCode = null;
     },
     //   查看详情触发事件
     async handleDetail(row) {