From 2f48964d03edeee5029b7718c8e26d230168754e Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 18 Mar 2025 09:45:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=99=BA=E8=83=BD=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E5=AF=BC=E5=85=A5=E5=90=8E=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=EF=BC=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=90=8E=E7=BC=96=E8=BE=91=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=BC=B9=E6=A1=86=E4=B8=8D=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/smartExcel/cpts/excel-upload-data.vue |  2 +-
 .../base/smartExcel/cpts/export-view.vue       | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/views/modules/base/smartExcel/cpts/excel-upload-data.vue b/src/views/modules/base/smartExcel/cpts/excel-upload-data.vue
index fb8434235..18565e228 100644
--- a/src/views/modules/base/smartExcel/cpts/excel-upload-data.vue
+++ b/src/views/modules/base/smartExcel/cpts/excel-upload-data.vue
@@ -240,7 +240,6 @@ export default {
 
         this.progress = 3;
       } else {
-        this.dataListLoading = true;
         if (this.formData1.importCategory === 'BASEINFO') {
           this.formData.searchForm = this.$refs['resi_form'].form;
         } else {
@@ -253,6 +252,7 @@ export default {
           this.formData.formCode = this.formData1.importCategory === 'BASEINFO' ? 'resident_base_info' : 'community_info'
           delete this.formData.columnMateJson
         } else {
+          this.dataListLoading = true;
           this.formData.formCode = this.formData1.importCategory
           delete this.formData.reportName
         }
diff --git a/src/views/modules/base/smartExcel/cpts/export-view.vue b/src/views/modules/base/smartExcel/cpts/export-view.vue
index cda55ea5d..94639e284 100644
--- a/src/views/modules/base/smartExcel/cpts/export-view.vue
+++ b/src/views/modules/base/smartExcel/cpts/export-view.vue
@@ -6,8 +6,8 @@
           <el-button type="text" round @click="handelClickBack" icon="el-icon-back">返回</el-button>
           <el-button type="warning" @click="handleClickInspect" v-if="pageType !== 'info'">上传统计模板
           </el-button>
-          <el-button type="success" @click="onClickUplond()" v-if="pageType !== 'info'"> 数据列表导出</el-button>
-          <el-button type="success" @click="onClickShowCondition()"
+          <el-button type="success" @click="onClickUplond" v-if="pageType !== 'info'"> 数据列表导出</el-button>
+          <el-button type="success" @click="onClickShowCondition"
             v-if="pageType === 'info' && this.infoObj.reportType === 0"> 数据统计条件</el-button>
         </div>
         <div>
@@ -916,9 +916,9 @@ export default {
     handleExcelSuccess(e) {
       if (e.code === 0) {
         this.moduleUrl = e.data.url;
-        this.urlToFile(e.data.url)
+        // this.urlToFile(e.data.url)
         this.showTemplate = false;
-        // this.urlToFile('http://localhost:9001/epmet-work-pc/test1.xlsx')
+        this.urlToFile('http://localhost:9001/epmet-work-pc/test1.xlsx')
         this.fullscreenLoading = false;
       }
     },
@@ -960,20 +960,20 @@ export default {
         });
 
       });
-      await nextTick(1000)
+      await nextTick(500)
       await this.saveLuckysheetHead()
     },
     async handleSelect(item) {
       await this.initForm("edit", item);
     },
     handleCellEditBefore(e) {
-      if (this.pageType === 'info' && this.infoObj.reportType === 1) {
+      if ((this.pageType === 'info' && this.infoObj.reportType === 1)|| (this.pageType === 'add'&& this.reportId && this.importType === 'template')) {
         this.drawer = true;
         let column = parseInt(e[0].column[0]) + 1, row = parseInt(e[0].row[0]) + 1;
         this.selectedCellNumberType = [parseInt(e[0].row[0]), parseInt(e[0].column[0])]
         this.selectedCell = this.numberToLetter(column) + row;
         this.getFrequentlyTags();
-        if(this.$store.state.user.id === this.infoObj.creatorId){
+        if((this.$store.state.user.id === this.infoObj.creatorId) || this.importType === 'template'){
          this.showConditionDetailsDialog = false;
           let statisticalValue =  luckysheet.getCellValue(row-1,column-1)
         if(statisticalValue&&(statisticalValue !== 0 && statisticalValue !== null)){
@@ -1002,7 +1002,6 @@ export default {
     },
 
     handleCellUpdateBefore(r, c, value, isRefresh) {
-      this.drawer = false;
       this.selectedCell = "";
     },
 
@@ -1068,10 +1067,10 @@ export default {
       luckysheet.setRangeValue(newArray, {
         range: `A2:${bottomRightCorner}${listData.length}`,
       })
+      this.reportId = val.id;
       this.luckysheetLoading = false;
     },
     async saveLuckysheetHead(head) {
-      // this.currentTable[0].data[0].every(item => !item) &&
       if (head && this.importType === 'list') {
         let temp = head.map(item => item.children).flat();
         for (let i in temp) {
@@ -1129,6 +1128,7 @@ export default {
       });
     },
     handelClickBack() {
+      this.reportId = '';
       this.$emit('close')
     },
   },