From bdd799333dab8117b639a836672d93f4e5c108b1 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Wed, 5 Feb 2025 17:57:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=A1=AB=E5=85=85=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=B8=AD=E8=A1=A8=E5=A4=B4=E5=AF=B9=E5=BA=94=E5=85=B3?= =?UTF-8?q?=E7=B3=BB=E6=8E=A5=E5=8F=A3=E5=85=A5=E5=8F=82=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=8C=E5=8F=91=E5=B8=83=E4=BB=BB=E5=8A=A1=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=85=A5=E5=8F=82=E5=AD=97=E6=AF=8D=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/smartExcel/cpts/excel-add.vue | 5 ++--- .../modules/base/smartExcel/cpts/excel-upload-data.vue | 10 +++++----- src/views/modules/base/smartExcel/cpts/excel-view.vue | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/views/modules/base/smartExcel/cpts/excel-add.vue b/src/views/modules/base/smartExcel/cpts/excel-add.vue index ea101a6ac..6f754d8da 100644 --- a/src/views/modules/base/smartExcel/cpts/excel-add.vue +++ b/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.wordBookId = data.wordBookId + this.form.workBookId = data.workbookId } else { console.log(msg); } 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 c9e5d8067..d33d32132 100644 --- a/src/views/modules/base/smartExcel/cpts/excel-upload-data.vue +++ b/src/views/modules/base/smartExcel/cpts/excel-upload-data.vue @@ -67,7 +67,7 @@
-
+
@@ -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; diff --git a/src/views/modules/base/smartExcel/cpts/excel-view.vue b/src/views/modules/base/smartExcel/cpts/excel-view.vue index 81e2890d8..5393ea7ba 100644 --- a/src/views/modules/base/smartExcel/cpts/excel-view.vue +++ b/src/views/modules/base/smartExcel/cpts/excel-view.vue @@ -14,7 +14,7 @@
- 自动检测 + 自动检查 智能填表