Merge branch 'luckysheet' of http://120.46.222.128:10021/elink-star/epmet-work-pc into luckysheet_xiaowang

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

@@ -134,7 +134,7 @@ export default {
                 receiverIds: '',//分发人员
                 moduleUrl: '',//上传模板
                 taskIntroduction: '',//任务要求
-                wordBookId:'1881158766216990722'//工作簿id
+                workBookId:''//工作簿id
             },
             dataRule: {
                 taskTitle: [{ required: true, message: "任务主题不能为空", trigger: "blur" },],
@@ -335,8 +335,7 @@ export default {
             console.log(this.luckysheetJson);
             const { data, code, msg } = await requestPost(`/actual/base/luckySheet/workbook/createByJson?fileName=${this.fileName}`, this.luckysheetJson)
             if (code === 0) {
-                console.log(data.workbookId, '新建成功');
+                this.form.workBookId = data.workbookId
-                this.form.wordBookId = data.wordBookId
             } else {
                 console.log(msg);
             }

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

@@ -67,7 +67,7 @@
       </el-table>
     </div>
     <div v-show="progress == 3">
-      <div v-if="formData1.importCategory === 'resident_base_info'">
+      <div v-if="formData1.importCategory === 'BASEINFO'">
         <resi-search ref="resi_form"></resi-search>
       </div>
       <div v-else>
@@ -98,7 +98,7 @@ export default {
         name: "楼栋房屋信息一张表",
         image: "https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet-saas/dev/internal/20250114/003b8782213a487b8ce7d4267262d0ec.png",
         status: 1,
-        importCategory: "resident_base_info",
+        importCategory: "BASEINFO",
         originalFilePath: "https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet-saas/dev/20250115/c4102136584140aeaf323767361a1e92.xls"
       },
       dataSourceList: [
@@ -107,7 +107,7 @@ export default {
           name: "居民信息一张表",
           image: "https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet-saas/dev/internal/20250114/0c1e1ea17f8842e49bf5f1afeac72e42.png",
           status: 1,
-          importCategory: "community_info",
+          importCategory: "HOUSE_INFO",
           originalFilePath: "https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet-saas/dev/20250115/1acd160dd0fe41409cddd461b4eb0328.xls"
         },
         {
@@ -115,7 +115,7 @@ export default {
           name: "楼栋房屋信息一张表",
           image: "https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet-saas/dev/internal/20250114/003b8782213a487b8ce7d4267262d0ec.png",
           status: 0,
-          importCategory: "resident_base_info",
+          importCategory: "BASEINFO",
           originalFilePath: "https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet-saas/dev/20250115/c4102136584140aeaf323767361a1e92.xls"
         },
         // {
@@ -191,7 +191,7 @@ export default {
         this.formData.columnMateJson = JSON.stringify(obj)
         this.progress = 3;
       } else {
-        if(this.formData1.importCategory === 'resident_base_info'){
+        if(this.formData1.importCategory === 'BASEINFO'){
           this.formData.searchForm= this.$refs['resi_form'].form;
         }else{
           this.formData.searchForm= this.$refs['house_form'].form;

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

@@ -14,7 +14,7 @@
     <div class="flex flex-y flex1 luckysheet-wrap">
       <div class="top_btn flex flex-end">
         <div>
-          <el-button type="warning" v-if="pageType === 'add'"> 自动检测</el-button>
+          <el-button type="warning" v-if="pageType === 'add'"> 自动检查</el-button>
           <el-button type="success" @click="onClickUplond()" v-else> 智能填表</el-button>
         </div>
         <div>