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 05e798bf4..a852d109c 100644 --- a/src/views/modules/base/smartExcel/cpts/excel-upload-data.vue +++ b/src/views/modules/base/smartExcel/cpts/excel-upload-data.vue @@ -9,6 +9,14 @@
+ + + + + + +
{ + if (!valid) { + return false + }else{ + this.progress = 2; + } + }) + }else{ + this.progress = 2; this.dataListLoading = true; this.checkExtractExcelHead() } @@ -210,7 +229,7 @@ export default { this.formData.searchForm= this.$refs['house_form'].form; } if(this.pageType === 'report'){ - this.reportForm = this.$refs['report_form'].rightList.map(item => { + this.formData.columnsJson = this.$refs['report_form'].rightList.map(item => { return { itemId: item.id, label: item.label, @@ -219,12 +238,18 @@ export default { supportAdd: item.supportAdd } }) + this.formData.reportType = 0; + this.formData.formCode = this.formData1.importCategory === 'BASEINFO'?'resident_base_info':'community_info' + delete this.formData.columnMateJson + }else{ + this.formData.formCode = this.formData1.importCategory + delete this.formData.reportName } this.saveUploadForm() } }, async saveUploadForm() { - const url = '/actual/base/residentBaseInfo/exportOneSheet' + const url = this.pageType === 'report'?'/actual/base/intellgentizeReport/create':'/actual/base/residentBaseInfo/exportOneSheet' const { data, code, msg } = await requestPost(url, this.formData) if (code === 0) { this.dataListLoading = false;