diff --git a/src/views/modules/base/community/communityExportInfo.vue b/src/views/modules/base/community/communityExportInfo.vue index 26dc60c7a..46244d31e 100644 --- a/src/views/modules/base/community/communityExportInfo.vue +++ b/src/views/modules/base/community/communityExportInfo.vue @@ -104,6 +104,8 @@ +
自定义表头:
+ 保存为常用模板 @@ -371,7 +373,7 @@ export default { }, async getTemplateList () { let params = { - formCode: 'resi_base_info' + formCode: 'community_info' } await this.$http .post('/oper/customize/icExportTemplate/templateList', params) @@ -427,277 +429,291 @@ export default { let params = {} const { data, code, msg } = await requestPost(url, params) - if (code === 0) { - let dataTemp = [] - - if (groupId === '45687aa479955f9d06204d415238f7cc_0') { - dataTemp = [ - { - columnName: "GRID_ID", - customerId: "45687aa479955f9d06204d415238f7cc", - itemGroupId: "45687aa479955f9d06204d415238f7cc_0", - itemId: "20220422102809_1001", - itemType: null, - label: "所属组织", - optionSourceType: "remote", - optionSourceValue: "/gov/org/customergrid/gridoption", - options: null, - sort: 0, - supportAdd: false, - tableName: "ic_resi_user", - }, - { - columnName: "VILLAGE_ID", - customerId: "45687aa479955f9d06204d415238f7cc", - itemGroupId: "45687aa479955f9d06204d415238f7cc_0", - itemId: "20220422102809_1002", - itemType: null, - label: "所属网格", - optionSourceType: "remote", - optionSourceValue: "/actual/base/communityQuarters/listQuartersOptions?20220422102809_1001", - options: null, - sort: 1, - supportAdd: false, - tableName: "ic_resi_user", - }, - { - columnName: "BUILD_ID", - customerId: "45687aa479955f9d06204d415238f7cc", - itemGroupId: "45687aa479955f9d06204d415238f7cc_0", - itemId: "20220422102809_1003", - itemType: null, - label: "小区名称", - optionSourceType: "remote", - optionSourceValue: "/actual/base/communityBuilding/buildingoption?20220422102809_1002", - options: null, - sort: 2, - supportAdd: false, - tableName: "ic_resi_user", - }, - { - columnName: "UNIT_ID", - customerId: "45687aa479955f9d06204d415238f7cc", - itemGroupId: "45687aa479955f9d06204d415238f7cc_0", - itemId: "20220422102809_10031", - itemType: null, - label: "关联物业", - optionSourceType: "remote", - optionSourceValue: "/actual/base/communityBuildingUnit/unitoption?20220422102809_1003", - options: null, - sort: 3, - supportAdd: false, - tableName: "ic_resi_user", - }, - { - columnName: "HOME_ID", - customerId: "45687aa479955f9d06204d415238f7cc", - itemGroupId: "45687aa479955f9d06204d415238f7cc_0", - itemId: "20220422102809_1004", - itemType: null, - label: "详细地址", - optionSourceType: "remote", - optionSourceValue: "/actual/base/communityHouse/houseoption?20220422102809_10031", - options: null, - sort: 4, - supportAdd: false, - tableName: "ic_resi_user", - }, - { - columnName: "IS_BDHJ", - customerId: "45687aa479955f9d06204d415238f7cc", - itemGroupId: "45687aa479955f9d06204d415238f7cc_0", - itemId: "20220422102809_1005", - itemType: null, - label: "备注", - optionSourceType: "local", - optionSourceValue: "options表取", - options: null, - sort: 5, - supportAdd: false, - tableName: "ic_resi_user", - }, - - ] - } - - if (groupId === '20220422102809_101') { - dataTemp = [ - { - columnName: "GRID_ID", - customerId: "45687aa479955f9d06204d415238f7cc", - itemGroupId: "20220422102809_101", - itemId: "20220422102809_1001", - itemType: null, - label: "所属小区", - optionSourceType: "remote", - optionSourceValue: "/gov/org/customergrid/gridoption", - options: null, - sort: 0, - supportAdd: false, - tableName: "ic_resi_user", - }, - - { - columnName: "VILLAGE_ID", - customerId: "45687aa479955f9d06204d415238f7cc", - itemGroupId: "20220422102809_101", - itemId: "20220422102809_1002", - itemType: null, - label: "楼栋名称", - optionSourceType: "remote", - optionSourceValue: "/actual/base/communityQuarters/listQuartersOptions?20220422102809_1001", - options: null, - sort: 1, - supportAdd: false, - tableName: "ic_resi_user", - }, - - { - columnName: "BUILD_ID", - customerId: "45687aa479955f9d06204d415238f7cc", - itemGroupId: "20220422102809_101", - itemId: "20220422102809_1003", - itemType: null, - label: "楼栋类型", - optionSourceType: "remote", - optionSourceValue: "/actual/base/communityBuilding/buildingoption?20220422102809_1002", - options: null, - sort: 2, - supportAdd: false, - tableName: "ic_resi_user", - }, - - { - columnName: "UNIT_ID", - customerId: "45687aa479955f9d06204d415238f7cc", - itemGroupId: "20220422102809_101", - itemId: "20220422102809_10031", - itemType: null, - label: "单元数", - optionSourceType: "remote", - optionSourceValue: "/actual/base/communityBuildingUnit/unitoption?20220422102809_1003", - options: null, - sort: 3, - supportAdd: false, - tableName: "ic_resi_user", - }, - - { - columnName: "HOME_ID", - customerId: "45687aa479955f9d06204d415238f7cc", - itemGroupId: "20220422102809_101", - itemId: "20220422102809_1004", - itemType: null, - label: "楼栋地址", - optionSourceType: "remote", - optionSourceValue: "/actual/base/communityHouse/houseoption?20220422102809_10031", - options: null, - sort: 4, - supportAdd: false, - tableName: "ic_resi_user", - }, - ] - } - - if (groupId === '20220422102809_102') { - dataTemp = [ - { - columnName: "GRID_ID", - customerId: "45687aa479955f9d06204d415238f7cc", - itemGroupId: "20220422102809_102", - itemId: "20220422102809_1001", - itemType: null, - label: "所属楼栋", - optionSourceType: "remote", - optionSourceValue: "/gov/org/customergrid/gridoption", - options: null, - sort: 0, - supportAdd: false, - tableName: "ic_resi_user", - }, - - { - columnName: "VILLAGE_ID", - customerId: "45687aa479955f9d06204d415238f7cc", - itemGroupId: "20220422102809_102", - itemId: "20220422102809_1002", - itemType: null, - label: "单元号", - optionSourceType: "remote", - optionSourceValue: "/actual/base/communityQuarters/listQuartersOptions?20220422102809_1001", - options: null, - sort: 1, - supportAdd: false, - tableName: "ic_resi_user", - }, - - { - columnName: "BUILD_ID", - customerId: "45687aa479955f9d06204d415238f7cc", - itemGroupId: "20220422102809_102", - itemId: "20220422102809_1003", - itemType: null, - label: "门牌号", - optionSourceType: "remote", - optionSourceValue: "/actual/base/communityBuilding/buildingoption?20220422102809_1002", - options: null, - sort: 2, - supportAdd: false, - tableName: "ic_resi_user", - }, - - { - columnName: "UNIT_ID", - customerId: "45687aa479955f9d06204d415238f7cc", - itemGroupId: "20220422102809_102", - itemId: "20220422102809_10031", - itemType: null, - label: "房屋类型", - optionSourceType: "remote", - optionSourceValue: "/actual/base/communityBuildingUnit/unitoption?20220422102809_1003", - options: null, - sort: 3, - supportAdd: false, - tableName: "ic_resi_user", - }, - - { - columnName: "HOME_ID", - customerId: "45687aa479955f9d06204d415238f7cc", - itemGroupId: "20220422102809_102", - itemId: "20220422102809_1004", - itemType: null, - label: "房屋用途", - optionSourceType: "remote", - optionSourceValue: "/actual/base/communityHouse/houseoption?20220422102809_10031", - options: null, - sort: 4, - supportAdd: false, - tableName: "ic_resi_user", - }, - { - columnName: "IS_BDHJ", - customerId: "45687aa479955f9d06204d415238f7cc", - itemGroupId: "20220422102809_102", - itemId: "20220422102809_1005", - itemType: null, - label: "房屋状态", - optionSourceType: "local", - optionSourceValue: "options表取", - options: null, - sort: 5, - supportAdd: false, - tableName: "ic_resi_user", - }, - ] - } - - return dataTemp - + data.forEach((item) => { + (async (id) => { + // item.queryItemList = await this.getExportChildList(id) + item.queryItemList = []; + })(item.id); + }); + this.exportList = [...data]; + this.$nextTick(() => { + this.diyDialog = true; + }); + console.log("获取详情成功getExportList----", this.exportList); } else { - this.$message.error(msg) + this.$message.error(msg); } + // if (code === 0) { + // let dataTemp = [] + // + // if (groupId === '45687aa479955f9d06204d415238f7cc_0') { + // dataTemp = [ + // { + // columnName: "GRID_ID", + // customerId: "45687aa479955f9d06204d415238f7cc", + // itemGroupId: "45687aa479955f9d06204d415238f7cc_0", + // itemId: "20220422102809_1001", + // itemType: null, + // label: "所属组织", + // optionSourceType: "remote", + // optionSourceValue: "/gov/org/customergrid/gridoption", + // options: null, + // sort: 0, + // supportAdd: false, + // tableName: "ic_resi_user", + // }, + // { + // columnName: "VILLAGE_ID", + // customerId: "45687aa479955f9d06204d415238f7cc", + // itemGroupId: "45687aa479955f9d06204d415238f7cc_0", + // itemId: "20220422102809_1002", + // itemType: null, + // label: "所属网格", + // optionSourceType: "remote", + // optionSourceValue: "/actual/base/communityQuarters/listQuartersOptions?20220422102809_1001", + // options: null, + // sort: 1, + // supportAdd: false, + // tableName: "ic_resi_user", + // }, + // { + // columnName: "BUILD_ID", + // customerId: "45687aa479955f9d06204d415238f7cc", + // itemGroupId: "45687aa479955f9d06204d415238f7cc_0", + // itemId: "20220422102809_1003", + // itemType: null, + // label: "小区名称", + // optionSourceType: "remote", + // optionSourceValue: "/actual/base/communityBuilding/buildingoption?20220422102809_1002", + // options: null, + // sort: 2, + // supportAdd: false, + // tableName: "ic_resi_user", + // }, + // { + // columnName: "UNIT_ID", + // customerId: "45687aa479955f9d06204d415238f7cc", + // itemGroupId: "45687aa479955f9d06204d415238f7cc_0", + // itemId: "20220422102809_10031", + // itemType: null, + // label: "关联物业", + // optionSourceType: "remote", + // optionSourceValue: "/actual/base/communityBuildingUnit/unitoption?20220422102809_1003", + // options: null, + // sort: 3, + // supportAdd: false, + // tableName: "ic_resi_user", + // }, + // { + // columnName: "HOME_ID", + // customerId: "45687aa479955f9d06204d415238f7cc", + // itemGroupId: "45687aa479955f9d06204d415238f7cc_0", + // itemId: "20220422102809_1004", + // itemType: null, + // label: "详细地址", + // optionSourceType: "remote", + // optionSourceValue: "/actual/base/communityHouse/houseoption?20220422102809_10031", + // options: null, + // sort: 4, + // supportAdd: false, + // tableName: "ic_resi_user", + // }, + // { + // columnName: "IS_BDHJ", + // customerId: "45687aa479955f9d06204d415238f7cc", + // itemGroupId: "45687aa479955f9d06204d415238f7cc_0", + // itemId: "20220422102809_1005", + // itemType: null, + // label: "备注", + // optionSourceType: "local", + // optionSourceValue: "options表取", + // options: null, + // sort: 5, + // supportAdd: false, + // tableName: "ic_resi_user", + // }, + // + // ] + // } + // + // if (groupId === '20220422102809_101') { + // dataTemp = [ + // { + // columnName: "GRID_ID", + // customerId: "45687aa479955f9d06204d415238f7cc", + // itemGroupId: "20220422102809_101", + // itemId: "20220422102809_1001", + // itemType: null, + // label: "所属小区", + // optionSourceType: "remote", + // optionSourceValue: "/gov/org/customergrid/gridoption", + // options: null, + // sort: 0, + // supportAdd: false, + // tableName: "ic_resi_user", + // }, + // + // { + // columnName: "VILLAGE_ID", + // customerId: "45687aa479955f9d06204d415238f7cc", + // itemGroupId: "20220422102809_101", + // itemId: "20220422102809_1002", + // itemType: null, + // label: "楼栋名称", + // optionSourceType: "remote", + // optionSourceValue: "/actual/base/communityQuarters/listQuartersOptions?20220422102809_1001", + // options: null, + // sort: 1, + // supportAdd: false, + // tableName: "ic_resi_user", + // }, + // + // { + // columnName: "BUILD_ID", + // customerId: "45687aa479955f9d06204d415238f7cc", + // itemGroupId: "20220422102809_101", + // itemId: "20220422102809_1003", + // itemType: null, + // label: "楼栋类型", + // optionSourceType: "remote", + // optionSourceValue: "/actual/base/communityBuilding/buildingoption?20220422102809_1002", + // options: null, + // sort: 2, + // supportAdd: false, + // tableName: "ic_resi_user", + // }, + // + // { + // columnName: "UNIT_ID", + // customerId: "45687aa479955f9d06204d415238f7cc", + // itemGroupId: "20220422102809_101", + // itemId: "20220422102809_10031", + // itemType: null, + // label: "单元数", + // optionSourceType: "remote", + // optionSourceValue: "/actual/base/communityBuildingUnit/unitoption?20220422102809_1003", + // options: null, + // sort: 3, + // supportAdd: false, + // tableName: "ic_resi_user", + // }, + // + // { + // columnName: "HOME_ID", + // customerId: "45687aa479955f9d06204d415238f7cc", + // itemGroupId: "20220422102809_101", + // itemId: "20220422102809_1004", + // itemType: null, + // label: "楼栋地址", + // optionSourceType: "remote", + // optionSourceValue: "/actual/base/communityHouse/houseoption?20220422102809_10031", + // options: null, + // sort: 4, + // supportAdd: false, + // tableName: "ic_resi_user", + // }, + // ] + // } + // + // if (groupId === '20220422102809_102') { + // dataTemp = [ + // { + // columnName: "GRID_ID", + // customerId: "45687aa479955f9d06204d415238f7cc", + // itemGroupId: "20220422102809_102", + // itemId: "20220422102809_1001", + // itemType: null, + // label: "所属楼栋", + // optionSourceType: "remote", + // optionSourceValue: "/gov/org/customergrid/gridoption", + // options: null, + // sort: 0, + // supportAdd: false, + // tableName: "ic_resi_user", + // }, + // + // { + // columnName: "VILLAGE_ID", + // customerId: "45687aa479955f9d06204d415238f7cc", + // itemGroupId: "20220422102809_102", + // itemId: "20220422102809_1002", + // itemType: null, + // label: "单元号", + // optionSourceType: "remote", + // optionSourceValue: "/actual/base/communityQuarters/listQuartersOptions?20220422102809_1001", + // options: null, + // sort: 1, + // supportAdd: false, + // tableName: "ic_resi_user", + // }, + // + // { + // columnName: "BUILD_ID", + // customerId: "45687aa479955f9d06204d415238f7cc", + // itemGroupId: "20220422102809_102", + // itemId: "20220422102809_1003", + // itemType: null, + // label: "门牌号", + // optionSourceType: "remote", + // optionSourceValue: "/actual/base/communityBuilding/buildingoption?20220422102809_1002", + // options: null, + // sort: 2, + // supportAdd: false, + // tableName: "ic_resi_user", + // }, + // + // { + // columnName: "UNIT_ID", + // customerId: "45687aa479955f9d06204d415238f7cc", + // itemGroupId: "20220422102809_102", + // itemId: "20220422102809_10031", + // itemType: null, + // label: "房屋类型", + // optionSourceType: "remote", + // optionSourceValue: "/actual/base/communityBuildingUnit/unitoption?20220422102809_1003", + // options: null, + // sort: 3, + // supportAdd: false, + // tableName: "ic_resi_user", + // }, + // + // { + // columnName: "HOME_ID", + // customerId: "45687aa479955f9d06204d415238f7cc", + // itemGroupId: "20220422102809_102", + // itemId: "20220422102809_1004", + // itemType: null, + // label: "房屋用途", + // optionSourceType: "remote", + // optionSourceValue: "/actual/base/communityHouse/houseoption?20220422102809_10031", + // options: null, + // sort: 4, + // supportAdd: false, + // tableName: "ic_resi_user", + // }, + // { + // columnName: "IS_BDHJ", + // customerId: "45687aa479955f9d06204d415238f7cc", + // itemGroupId: "20220422102809_102", + // itemId: "20220422102809_1005", + // itemType: null, + // label: "房屋状态", + // optionSourceType: "local", + // optionSourceValue: "options表取", + // options: null, + // sort: 5, + // supportAdd: false, + // tableName: "ic_resi_user", + // }, + // ] + // } + // + // return dataTemp + // + // } else { + // this.$message.error(msg) + // } }, formatData (res) { const fileReader = new FileReader() @@ -815,4 +831,4 @@ export default { .wd200 { width: 200px; } - \ No newline at end of file + diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue index c7da40a76..f39d86c2e 100644 --- a/src/views/modules/base/community/communityTable.vue +++ b/src/views/modules/base/community/communityTable.vue @@ -756,66 +756,21 @@ export default { }, async getExportList (type) { - const url = "/oper/customize//icformitemgroup/list"; + const url = "/oper/customize/icformitemgroup/list"; let params = { - formCode: "resi_base_info", + formCode: "community_info", }; const { data, code, msg } = await requestPost(url, params); if (code === 0) { - //暂无接口 - let dataTemp = [ - { - childShowFlag: "0", - customerId: "45687aa479955f9d06204d415238f7cc", - display: false, - formCode: "resi_base_info", - formId: "20220422102809_1", - groupCode: "jcxx", - id: "45687aa479955f9d06204d415238f7cc_0", - label: "小区信息", - policyFlag: "1", - sort: 0, - supportAdd: false, - tableName: "ic_resi_user" - }, - { - childShowFlag: "0", - customerId: "45687aa479955f9d06204d415238f7cc", - display: true, - formCode: "resi_base_info", - formId: "20220422102809_1", - groupCode: "jyxx", - id: "20220422102809_101", - label: "楼栋信息", - policyFlag: "1", - sort: 1, - supportAdd: false, - tableName: "ic_resi_user", - }, - { - childShowFlag: "0", - customerId: "45687aa479955f9d06204d415238f7cc", - display: true, - formCode: "resi_base_info", - formId: "20220422102809_1", - groupCode: "xqah", - id: "20220422102809_102", - label: "房屋信息", - policyFlag: "1", - sort: 2, - supportAdd: false, - tableName: "ic_resi_user", - } - ] - dataTemp.forEach((item) => { + data.forEach((item) => { (async (id) => { // item.queryItemList = await this.getExportChildList(id) item.queryItemList = []; })(item.id); }); - this.exportList = [...dataTemp]; + this.exportList = [...data]; this.$nextTick(() => { this.diyDialog = true; }); @@ -823,6 +778,67 @@ export default { } else { this.$message.error(msg); } + + // if (code === 0) { + // //暂无接口 + // let dataTemp = [ + // { + // childShowFlag: "0", + // customerId: "45687aa479955f9d06204d415238f7cc", + // display: false, + // formCode: "resi_base_info", + // formId: "20220422102809_1", + // groupCode: "jcxx", + // id: "45687aa479955f9d06204d415238f7cc_0", + // label: "小区信息", + // policyFlag: "1", + // sort: 0, + // supportAdd: false, + // tableName: "ic_resi_user" + // }, + // { + // childShowFlag: "0", + // customerId: "45687aa479955f9d06204d415238f7cc", + // display: true, + // formCode: "resi_base_info", + // formId: "20220422102809_1", + // groupCode: "jyxx", + // id: "20220422102809_101", + // label: "楼栋信息", + // policyFlag: "1", + // sort: 1, + // supportAdd: false, + // tableName: "ic_resi_user", + // }, + // { + // childShowFlag: "0", + // customerId: "45687aa479955f9d06204d415238f7cc", + // display: true, + // formCode: "resi_base_info", + // formId: "20220422102809_1", + // groupCode: "xqah", + // id: "20220422102809_102", + // label: "房屋信息", + // policyFlag: "1", + // sort: 2, + // supportAdd: false, + // tableName: "ic_resi_user", + // } + // ] + // dataTemp.forEach((item) => { + // (async (id) => { + // // item.queryItemList = await this.getExportChildList(id) + // item.queryItemList = []; + // })(item.id); + // }); + // this.exportList = [...dataTemp]; + // this.$nextTick(() => { + // this.diyDialog = true; + // }); + // console.log("获取详情成功getExportList----", this.exportList); + // } else { + // this.$message.error(msg); + // } }, //导出表格 以前是导出 现在改成导出房屋数据 async handleExport () { diff --git a/src/views/modules/base/diyInfo.vue b/src/views/modules/base/diyInfo.vue index aafdaa0f7..62cbe0574 100644 --- a/src/views/modules/base/diyInfo.vue +++ b/src/views/modules/base/diyInfo.vue @@ -7,11 +7,11 @@
-
- +
@@ -21,7 +21,7 @@
- 删除 - 预览 - 导出 @@ -84,6 +84,8 @@
模板名称:
+
自定义表头:
+ 保存为常用模板
@@ -115,10 +117,10 @@ :key="i" align="center" min-width="120"> - + - + @@ -178,7 +180,7 @@ export default { rightList: { handler(val) { if (val.length > 0) this.dragSort() - + }, deep: true }, @@ -211,7 +213,7 @@ export default { }) } else { this.rightList.push(obj) - + this.$nextTick(() => { console.log('itemttt------', this.$refs[`drag${pid}`]) this.$refs[`drag${pid}`][0].dragSort() @@ -235,7 +237,7 @@ export default { if (n == item.itemId) { checkList.splice(i, 1) this.$refs[`checkbox${item.itemGroupId}`][0].handleChange(checkList) - } + } }) this.rightList.forEach((n, i) => { if (n.id === item.itemGroupId) { @@ -281,7 +283,7 @@ export default { this.$message({ type: 'info', message: '已取消删除' - }); + }); }) }, handlePreview(id) { @@ -337,13 +339,13 @@ export default { console.log('res----dddd', res) // this.download(res.data, title + '.xls') // this.getTemplateList() - + this.exportLoading = false // if (res.data.code && res.data.code == 9999) { // return this.$message.error(res.data.msg) // } this.formatData(res) - + }) .catch(err => { console.log('err', err) @@ -519,7 +521,7 @@ export default { // max-height: calc(80vh - 220px); // // overflow: auto; // } - + // } // } .mb10 { @@ -534,4 +536,4 @@ export default { .wd200 { width: 200px; } - \ No newline at end of file + diff --git a/src/views/modules/base/resi copy.vue b/src/views/modules/base/resi copy.vue index 63d9fb32e..85c67e52a 100644 --- a/src/views/modules/base/resi copy.vue +++ b/src/views/modules/base/resi copy.vue @@ -142,7 +142,7 @@ type="text" size="small" class="btn-color-look">查看 --> - @@ -1335,7 +1335,7 @@ export default { }); }, async getExportList (type) { - const url = "/oper/customize//icformitemgroup/list"; + const url = "/oper/customize/icformitemgroup/list"; let params = { formCode: "resi_base_info", }; diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index cb805615a..ee147198a 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -822,7 +822,7 @@ export default { obj.agencyId = obj.agencyId.join(',') } else { obj.agencyId = ""; - } + } this.currentPage = val; this.getTableData(obj); }, @@ -1492,7 +1492,7 @@ export default { }); }, async getExportList(type) { - const url = "/oper/customize//icformitemgroup/list"; + const url = "/oper/customize/icformitemgroup/list"; let params = { formCode: "resi_base_info", };