Merge branch 'Luckysheet-mk' into luckysheet

src/views/modules/base/smartExcel/cpts/excel-upload-data.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="m-detail-main">
+  <div class="m-detail-main" v-loading="dataListLoading">
     <div class="steps1">
       <el-steps :active="progress">
         <el-step :class="[this.operatorName == null ? 'showNum' : '']" title="填写基本信息"
@@ -76,7 +76,7 @@
     </div>
     <span slot="footer" style="margin-top: 100px;">
       <el-button v-if="progress != 1" @click="progress = progress - 1">上一步</el-button>
-      <el-button type="primary" @click="onClickNext()">下一步</el-button>
+      <el-button type="primary" @click="onClickNext()" >下一步</el-button>
     </span>
   </div>
 </template>
@@ -84,6 +84,7 @@
 import { requestPost } from "@/js/dai/request";
 import resiSearch from "../../../../components/resiSearch.vue";
 import HoseSearch from "./hose-search.vue";
+import { Loading } from "element-ui";
 export default {
   data() {
     return {
@@ -140,6 +141,7 @@ export default {
       groupList: [],
       fileCode: null,
       dataList: [],
+      dataListLoading:false
     };
   },
   props: {
@@ -158,6 +160,10 @@ export default {
     currentTable: {
       type: Array,
       default: () => []
+    },
+    sheetRow:{
+      type:Number,
+      default:0
     }
   },
   created() {
@@ -179,6 +185,7 @@ export default {
     },
     onClickNext() {
       if (this.progress === 1) {
+        this.dataListLoading = true;
         this.progress = 2;
         this.checkExtractExcelHead()
       } else if (this.progress === 2) {
@@ -191,13 +198,33 @@ export default {
         this.formData.columnMateJson = JSON.stringify(obj)
         this.progress = 3;
       } else {
+        this.dataListLoading = true;
         if(this.formData1.importCategory === 'BASEINFO'){
           this.formData.searchForm= this.$refs['resi_form'].form;
         }else{
           this.formData.searchForm= this.$refs['house_form'].form;
         }
-        this.$emit('saveUploadForm',this.formData)
+        this.saveUploadForm()
+      }
+    },
+    async saveUploadForm() {
+      const url = '/actual/base/residentBaseInfo/exportOneSheet'
+      const { data, code, msg } = await requestPost(url, this.formData)
+      if (code === 0) {
+        this.updataSheet(data)
+      } else {
+        console.log(msg);
+      }
+    },
+    updataSheet(list) {
+      list.forEach((item, index) => {
+        luckysheet.insertRow(this.currentTable[0].data.length, 1)
+        for (let k in item) {
+          luckysheet.setCellValue(index + this.sheetRow + 1, k - 1, item[k])
         }
+      })
+      this.dataListLoading = false;
+      this.$emit('handelUploadDataHide')
     },
     async loadPersonGroup() {
       const url = "/oper/customize/fileModeColumns/listModule";
@@ -259,9 +286,7 @@ export default {
       this.progress = 2;
       this.fileCode = fileCode;
     },
-    handelClickBack() {
-      this.$emit("handleClose");
-    },
+
     successImport() {
       this.progress = 3;
       this.progressNum = 100;

src/views/modules/base/smartExcel/cpts/excel-view.vue

@@ -34,8 +34,8 @@
     </div>
     <el-dialog title="上传共享数据" v-if="showUploadData" :visible.sync="showUploadData" width="60%"
       :close-on-click-modal="false">
-      <excelUploadData @handelUploadData="handelUploadData" :currentTable="currentTable"
-        @saveUploadForm="saveUploadForm">
+      <excelUploadData @handelUploadDataHide="handelUploadDataHide" :currentTable="currentTable" 
+        :btnLoading="btnLoading" :sheetRow="sheetR">
       </excelUploadData>
     </el-dialog>
   </div>
@@ -56,7 +56,8 @@ export default {
       menuActive: 0,
       socket: null,
       currentTable: null,
-      currentId: ''
+      currentId: '',
+      btnLoading:false,
     };
   },
   props: {
@@ -113,17 +114,7 @@ export default {
         this.loadWorkBook()
       }
     },
-    async saveUploadForm(val) {
-      const url = '/actual/base/residentBaseInfo/exportOneSheet'
-      const { data, code, msg } = await requestPost(url, val)
-      if (code === 0) {
-        this.showUploadData = false
-        this.updataSheet(data)
-      } else {
-        console.log(msg);
  
-      }
-    },
     //自动检查
    async handleClickInspect() {
       //流程：发送当前cellData到后台，后台处理返回有问题的行跟列后遍历更改其背景色
@@ -155,11 +146,10 @@ export default {
       };
       this.sheetR = findLastNonNullIndex(this.currentTable[0].data)
       if (this.sheetR != -1) {
-        luckysheet.insertRow(this.currentTable[0].data.length, 5)
-        // this.updataSheet()
+        luckysheet.insertRow(this.currentTable[0].data.length, 5)//固定插入5行
       }
     },
-    handelUploadData() {
+    handelUploadDataHide() {
       this.showUploadData = false
     },
     loadWorkBook() {
@@ -192,14 +182,6 @@ export default {
       this.$emit('close')
     },
 
-    updataSheet(list) {
-      list.forEach((item, index) => {
-        luckysheet.insertRow(this.currentTable[0].data.length, 1)
-        for (let k in item) {
-          luckysheet.setCellValue(index + this.sheetR + 1, k - 1, item[k])
-        }
-      })
-    },
     // 驳回重提，审核存档，保存统一用这一个事件来处理
    async handleClickCurrencyEvent(val){
      const url = '/actual/base/communityOneTablePeriodPublish/update'