diff --git a/src/views/components/checkBox.vue b/src/views/components/checkBox.vue index 101321c00..7c713e078 100644 --- a/src/views/components/checkBox.vue +++ b/src/views/components/checkBox.vue @@ -28,6 +28,10 @@ export default { list: { type: Array, default: () => [] + }, + leftList:{ + type: Array, + default: () => [] } }, data() { @@ -41,7 +45,9 @@ export default { } }, created() { + console.log(this.leftList,"sfsdfd"); this.boxList = this.list.filter(item => item.itemType != 'inputRange') + console.log(this.boxList,"kdsflkljf"); this.pid = this.list[0].itemGroupId }, methods: { diff --git a/src/views/modules/base/smartExport/exset.vue b/src/views/modules/base/smartExport/exset.vue index e7de751a4..54ced454b 100644 --- a/src/views/modules/base/smartExport/exset.vue +++ b/src/views/modules/base/smartExport/exset.vue @@ -773,6 +773,7 @@ specialCategoryList: [ if (code === 0) { this.form= JSON.parse(data.list[0].filterCriteria).searchForm console.log(JSON.parse(data.list[0].filterCriteria).exportConfig.itemList); + console.log(JSON.parse(data.list[0].filterCriteria).exportConfig,"this.rigist"); this.rightList=JSON.parse(data.list[0].filterCriteria).exportConfig.itemList console.log(this.rightList,"this.rightList"); this.rightList.forEach(item => { @@ -917,19 +918,18 @@ specialCategoryList: [ }, //导出数据 async exportTemplate() { - debugger if(!this.form.name){ return this.$message.error("请输入模板名称") } - debugger let url = "/actual/base/residentBaseInfo/exportExcelCustom" let params = { - templateId: this.originId, + // templateId: this.originId, searchForm: {...this.form}, formCode: 'resident_base_info', exportConfig: { ...this.form, formCode: 'resident_base_info', + originId:this.originId, itemList: this.rightList.map(item => { return { itemId: item.id, @@ -942,11 +942,9 @@ specialCategoryList: [ } } - debugger if(this.virtualResi){ params.searchForm.gridType = 'virtual' } - debugger await this.$http({ method: 'POST', url, @@ -1231,10 +1229,8 @@ specialCategoryList: [ } }, formatData(res) { - debugger const fileReader = new FileReader() console.log(fileReader.result,); - debugger fileReader.onloadend = () => { try { if (fileReader.result) { @@ -1250,7 +1246,6 @@ specialCategoryList: [ this.downloadFile(res) } } - debugger fileReader.readAsText(res.data) }, downloadFile(res) { diff --git a/src/views/modules/base/smartExport/index.vue b/src/views/modules/base/smartExport/index.vue index f22e2ccb0..a9387ac50 100644 --- a/src/views/modules/base/smartExport/index.vue +++ b/src/views/modules/base/smartExport/index.vue @@ -2,7 +2,7 @@