diff --git a/src/assets/scss/modules/management/list-main.scss b/src/assets/scss/modules/management/list-main.scss index a2af675a..132b39be 100644 --- a/src/assets/scss/modules/management/list-main.scss +++ b/src/assets/scss/modules/management/list-main.scss @@ -2,6 +2,9 @@ .div_main { width: 100%; + .marginl-20{ + margin-left: 16px; + } .div_search { background: #ffffff; diff --git a/src/assets/scss/modules/visual/communityManage.scss b/src/assets/scss/modules/visual/communityManage.scss index a1323dab..a7a7499a 100644 --- a/src/assets/scss/modules/visual/communityManage.scss +++ b/src/assets/scss/modules/visual/communityManage.scss @@ -49,7 +49,7 @@ .div_btn { display: flex; - margin-top: 20px; + margin-top: 10px; .btn_upload { margin-left: 10px; diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue index 3fe03ac3..68466e23 100644 --- a/src/views/modules/base/community/buildTable.vue +++ b/src/views/modules/base/community/buildTable.vue @@ -241,7 +241,7 @@ export default { computed: { tableHeight () { - return this.$store.state.inIframe ? this.clientHeight - 310 + this.iframeHeight : this.clientHeight - 310 + return this.$store.state.inIframe ? this.clientHeight - 425 + this.iframeHeight : this.clientHeight - 425 }, @@ -603,6 +603,10 @@ export default { ownerName: this.ownerName, ownerPhone: this.ownerPhone, rentFlag: this.rentFlag, + purpose: this.purpose, + remark: this.remark, + updateStartDate: this.updateStartDate, + updateEndDate: this.updateEndDate, neighborHoodId: this.agencyObj.id } @@ -778,6 +782,22 @@ export default { type: String, default: '', }, + purpose: { + type: String, + default: '', + }, + remark: { + type: String, + default: '', + }, + updateStartDate: { + type: String, + default: '', + }, + updateEndDate: { + type: String, + default: '', + }, } } diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue index c1c0e0c5..43a4c7bb 100644 --- a/src/views/modules/base/community/community.vue +++ b/src/views/modules/base/community/community.vue @@ -30,514 +30,575 @@
-
-
-
房主姓名
-
- - - + class=div_left> + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 至 + + + + + 查询 + 重置
-
-
-
房主手机
-
- - + +
+
+ + + + + +
+
-
-
+
+ -
-
房屋状态
-
+ - +} + + + + + + diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue index 5eb4596f..bbdb0db2 100644 --- a/src/views/modules/base/community/communityTable.vue +++ b/src/views/modules/base/community/communityTable.vue @@ -236,7 +236,7 @@ export default { }, computed: { tableHeight () { - return this.$store.state.inIframe ? this.clientHeight - 310 + this.iframeHeight : this.clientHeight - 310 + return this.$store.state.inIframe ? this.clientHeight - 425 + this.iframeHeight : this.clientHeight - 425 }, @@ -583,6 +583,10 @@ export default { ownerName: this.ownerName, ownerPhone: this.ownerPhone, rentFlag: this.rentFlag, + purpose: this.purpose, + remark: this.remark, + updateStartDate: this.updateStartDate, + updateEndDate: this.updateEndDate, } if (this.agencyObj.level === 'grid') { @@ -777,6 +781,22 @@ export default { type: String, default: '', }, + purpose: { + type: String, + default: '', + }, + remark: { + type: String, + default: '', + }, + updateStartDate: { + type: String, + default: '', + }, + updateEndDate: { + type: String, + default: '', + }, } } diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue index daea171b..4f87e3f3 100644 --- a/src/views/modules/base/community/roomTable.vue +++ b/src/views/modules/base/community/roomTable.vue @@ -109,6 +109,10 @@ label="身份证" width="170"> + + - import roomForm from './roomForm' - - import { requestPost } from "@/js/dai/request"; - import { mapGetters } from 'vuex' - import { Loading } from 'element-ui' // 引入Loading服务 - - let loading // 加载动画 - export default { - data () { - return { - source: 'tree',//来源 - importRoomLoading: false, - total: 0, - pageSize: 20, - pageNo: 0, - sortType: 'asc',//asc：正，desc：倒 - tableLoading: true, +import roomForm from './roomForm' - // showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断 +import { requestPost } from "@/js/dai/request"; +import { mapGetters } from 'vuex' +import { Loading } from 'element-ui' // 引入Loading服务 - agencyObj: {},//树所选的小区对象 +let loading // 加载动画 +export default { + data () { + return { + source: 'tree',//来源 + importRoomLoading: false, + total: 0, + pageSize: 20, + pageNo: 0, + sortType: 'asc',//asc：正，desc：倒 + tableLoading: true, + // showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断 - validTableDataNum: 0,//有效的数据数量，即有权限操作的数据数量 - selection: [], - showDeletBtn: false, + agencyObj: {},//树所选的小区对象 - tableData: [], - //form相关 - formShow: false, - formTitle: '新增房屋', + validTableDataNum: 0,//有效的数据数量，即有权限操作的数据数量 + selection: [], + showDeletBtn: false, - rentList: [ - { - value: '1', - label: '出租' - }, - { - value: '2', - label: '闲置' - }, - { - value: '0', - label: '自住' - }, - ], + tableData: [], - yihuyidangDisabled: false, + //form相关 + formShow: false, + formTitle: '新增房屋', - - } + rentList: [ + { + value: '1', + label: '出租' }, - components: { - roomForm + { + value: '2', + label: '闲置' }, - async mounted () { - + { + value: '0', + label: '自住' }, - computed: { - tableHeight () { - return this.$store.state.inIframe ? this.clientHeight - 310 + this.iframeHeight : this.clientHeight - 310 + ], - }, + yihuyidangDisabled: false, - ...mapGetters(['clientHeight', 'iframeHeight']) - }, - methods: { - indexMethod (index) { - return index + 1; - }, - handleSortOrderChange (value) { - this.sortType = value.order === 'ascending' ? 'asc' : 'desc' - this.loadTable() - - }, - handleSortChange (value) { - - this.sortType = value.order === 'ascending' ? 'asc' : 'desc' - this.loadTable() - - }, + } + }, + components: { + roomForm + }, + async mounted () { - handleEditSort (row) { - if (!row.isChange) { - row.isChange = true - } + }, + computed: { + tableHeight () { + return this.$store.state.inIframe ? this.clientHeight - 425 + this.iframeHeight : this.clientHeight - 425 - }, + }, - async handleChangeSort (row, index) { - // row.isChange = false + ...mapGetters(['clientHeight', 'iframeHeight']) + }, + methods: { + indexMethod (index) { + return index + 1; + }, + handleSortOrderChange (value) { - let params = { - id: row.houseId, - sort: row.sort, - type: 'house', - } + this.sortType = value.order === 'ascending' ? 'asc' : 'desc' + this.loadTable() - let url = '/gov/org/house/update-sort' + }, + handleSortChange (value) { - const { data, code, msg } = await requestPost(url, params) + this.sortType = value.order === 'ascending' ? 'asc' : 'desc' + this.loadTable() - if (code === 0) { - // this.$message({ - // type: 'success', - // message: '修改成功' - // }) + }, + handleEditSort (row) { + if (!row.isChange) { + row.isChange = true + } - } else { + }, - this.$message.error(msg) - } + async handleChangeSort (row, index) { + // row.isChange = false + let params = { + id: row.houseId, + sort: row.sort, + type: 'house', + } + + let url = '/gov/org/house/update-sort' + + const { data, code, msg } = await requestPost(url, params) + + if (code === 0) { + // this.$message({ + // type: 'success', + // message: '修改成功' + // }) - }, - checkSelect (row, index) { - let isChecked = false; - if (row.showBtn) { // 判断里面是否存在某个参数 - isChecked = true - } else { - isChecked = false - } - return isChecked - }, - - loadTreeFromSearch () { - - }, + } else { + + this.$message.error(msg) + } + + + }, - async loadTable (source, treeObj) { - - this.source = source - this.tableLoading = true - - if (source === 'tree') {//来源于tree，查询数据清空 - this.sortType = 'asc' - this.agencyObj = treeObj - - } else if (source === 'search') {//来源于查询 - this.agencyObj = treeObj - - } - - // if (fromTree) { - // this.agencyObj = treeObj - - // } - let params = { - pageSize: this.pageSize, - pageNo: this.pageNo, - level: this.agencyObj.level, - id: this.agencyObj.id, - ownerName: this.ownerName, - ownerPhone: this.ownerPhone, - rentFlag: this.rentFlag, - purpose: this.purpose, - remark: this.remark, - sortType: this.sortType, - } - - const url = "/gov/org/house/houselist" - - const { data, code, msg } = await requestPost(url, params) - - if (code === 0) { - this.total = data.total - this.validTableDataNum = 0 - data.list.forEach(item => { - item.sort = parseInt(item.sort) || 0; - item.sort = item.sort.toFixed(2) - item.isChange = false - item.houseNameShow = item.neighborHoodName + item.buildingName + item.unitNum + item.doorName - - if (item.agencyId === this.staffAgencyId) { - item.showBtn = true - this.validTableDataNum++ - } else { - item.showBtn = false - } - - }); - this.tableData = data.list - } else { - this.$message.error(msg) - } - this.tableLoading = false - }, - - diaClose () { - this.$refs.ref_form.resetData() - this.formShow = false - }, - - handleDetail (row) { - this.formTitle = '房屋详情' - this.formShow = true - this.$nextTick(() => { - - this.$refs.ref_form.initForm('detail', row, this.agencyObj) - }) - }, - - handleAdd () { - - this.formTitle = '新增房屋' - this.formShow = true - this.$nextTick(() => { - - this.$refs.ref_form.initForm('add', null, this.agencyObj) - }) - }, - - handleEdit (row) { - this.formTitle = '修改房屋' - this.formShow = true - this.$nextTick(() => { - this.$refs.ref_form.initForm('edit', row, this.agencyObj) - }) - }, - - addFormCancle () { - this.formShow = false - }, - addFormOk () { - this.formShow = false - this.loadTable() - }, - - - deleteBatch () { - if (this.selection.length > 0) { - this.$confirm("确认删除选择的房屋?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning" - }) - .then(() => { - this.deleteCommunityBatch() - }) - .catch(err => { - if (err == "cancel") { - // this.$message({ - // type: "info", - // message: "已取消删除" - // }); - } - - }); - } else { - this.$message.warning('请先选择要删除的房屋') - } - }, - selectAll (selection) { - this.selection = selection - - }, - selectionChange (selection) { - this.selection = selection - - }, - - async handleDelete (row) { - - this.$confirm("确认删除?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning" - }) - .then(() => { - this.deleteRoom(row) - }) - .catch(err => { - if (err == "cancel") { - // this.$message({ - // type: "info", - // message: "已取消删除" - // }); - } - - }); - - - }, - - async deleteCommunityBatch () { - let ids = [] - this.selection.forEach(element => { - - ids.push(element.houseId) - }); - - const url = "/gov/org/house/delete" - - let params = { - type: 'house', - ids: ids - } - - const { data, code, msg } = await requestPost(url, params) - - if (code === 0) { - this.$message({ - type: "success", - message: "删除成功" - }); - this.$emit('refreshTree') - this.loadTable() - } else if (code > 8000) { - this.$message({ - showClose: true, - message: msg, - duration: 0 - }) - this.$emit('refreshTree') - this.loadTable() - } else { - this.$message.error(msg) - } - }, - - async deleteRoom (row) { - const url = "/gov/org/house/housedel" - - let params = { - houseId: row.houseId - } - - const { data, code, msg } = await requestPost(url, params) - - if (code === 0) { - this.$message({ - type: "success", - message: "删除成功" - }); - this.$emit('refreshTree') - this.loadTable() - } else { - this.$message.error(msg) - } - }, - - //导出表格 - async handleExport () { - let title = this.agencyObj.label - title = title + '—房屋列表' - - const url = "/gov/org/house/exporthouseinfo" - let params = { - ownerName: this.ownerName, - ownerPhone: this.ownerPhone, - rentFlag: this.rentFlag, - purpose: this.purpose, - remark: this.remark, - buildingId: this.agencyObj.id - } - - app.ajax.exportFilePost( - url, - params, - (data, rspMsg) => { - - this.download(data, title + '.xls') - }, - (rspMsg, data) => { - this.$message.error(rspMsg); - } - ); - - }, - - // 下载文件 - download (data, fileName) { - if (!data) { - return - } - - var csvData = new Blob([data]) - - if (window.navigator && window.navigator.msSaveOrOpenBlob) { - window.navigator.msSaveOrOpenBlob(csvData, fileName); - } - // for Non-IE (chrome, firefox etc.) - else { - var a = document.createElement('a'); - document.body.appendChild(a); - a.style = 'display: none'; - var url = window.URL.createObjectURL(csvData); - a.href = url; - a.download = fileName; - a.click(); - a.remove(); - window.URL.revokeObjectURL(url); - } - - }, - - handleExportModule () { - let title = '' - title = '房屋模板' - - const url = "/gov/org/house/exporttemplate" - let params = {} - - app.ajax.exportFilePost( - url, - params, - (data, rspMsg) => { - - this.download(data, title + '.xls') - }, - (rspMsg, data) => { - this.$message.error(rspMsg); - } - ); - }, - - //导出一户一档 - handleExportYihuyidang () { - this.yihuyidangDisabled = true - let title = this.agencyObj.label - title = title + '-一户一档' - let url = "/gov/org/house/exportHouseUser" - - - - let params = { - agencyId: '', - gridId: '', - ownerName: this.ownerName, - ownerPhone: this.ownerPhone, - rentFlag: this.rentFlag, - purpose: this.purpose, - remark: this.remark, - buildingId: '', - neighborHoodId: '' - } - - if (this.agencyObj.level === 'grid') { - params.gridId = this.agencyObj.id - params.agencyId = '' - params.buildingId = '' - params.neighborHoodId = '' - } else if (this.agencyObj.level === 'neighborHood') { - params.neighborHoodId = this.agencyObj.id - params.agencyId = '' - params.buildingId = '' - params.gridId = '' - } else if (this.agencyObj.level === 'building') { - params.buildingId = this.agencyObj.id - params.agencyId = '' - params.neighborHoodId = '' - params.gridId = '' - } else { - - params.agencyId = this.agencyObj.id - params.buildingId = '' - params.neighborHoodId = '' - params.gridId = '' - } - - app.ajax.exportFilePost( - url, - params, - (data, rspMsg) => { - - this.download(data, title + '.xls') - this.yihuyidangDisabled = false - }, - (rspMsg, data) => { - this.$message.error(rspMsg); - this.yihuyidangDisabled = false - } - ); - }, - // 上传文件之前的钩子 - beforeUpload (file) { - this.files = file; - - const isText = file.type === 'application/vnd.ms-excel' - const isTextComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' - - if (!isText && !isTextComputer) { - this.$message.error('请选择正确格式的文件') - return false - } else { - this.fileName = file.name; - return true - } - - }, - // 上传文件个数超过定义的数量 - handleExceed (files, fileList) { - this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`) - }, - - async uploadFile () { - - - if (this.fileName == "") { - this.$message.warning('请选择要上传的文件！') - return false - } - - this.$message({ - showClose: true, - message: '导入中，请到系统管理-导入记录中查看进度', - duration: 0 - }) - - //清空上传列表 - this.$refs['upload'].clearFiles() - - var url = '/gov/org/house/houseimport' - - let fileFormData = new FormData(); - fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名 - fileFormData.append('orgId', this.agencyObj.id);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名 - fileFormData.append('orgType', this.agencyObj.level);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名 - - this.importRoomLoading = true - window.app.ajax.post2(url, fileFormData, - (data, rspMsg) => { - - if (data.code === 0 && data.msg == 'success') { - // this.$message.success('导入成功') - } else { - // this.$message({ - // showClose: true, - // message: rspMsg, - // duration: 0, - // type: "error" - // }) - // this.$message.error(rspMsg) - } - this.$emit('refreshTree') - this.loadTable() - this.importRoomLoading = false - }, - (rspMsg, data) => { - this.importRoomLoading = false - }, { headers: { 'Content-Type': 'multipart/form-data' } }) - - - }, - - showMessage (msg) { - this.$alert(msg, '操作结果', { - confirmButtonText: '关闭', - callback: action => { - this.$emit('refreshTree') - this.loadTable() - - } - }); - }, - - handleSizeChange (val) { - this.pageSize = val - this.pageNo = 1 - this.loadTable() - }, - handleCurrentChange (val) { - this.pageNo = val - this.loadTable() - }, - - // 开启加载动画 - startLoading () { - loading = Loading.service({ - lock: true, // 是否锁定 - text: '正在加载……', // 加载中需要显示的文字 - background: 'rgba(0,0,0,.7)' // 背景颜色 - }) - }, - // 结束加载动画 - endLoading () { - // clearTimeout(timer); - if (loading) { - loading.close() - } + checkSelect (row, index) { + let isChecked = false; + if (row.showBtn) { // 判断里面是否存在某个参数 + isChecked = true + } else { + isChecked = false + } + return isChecked + }, + + loadTreeFromSearch () { + + }, + + async loadTable (source, treeObj) { + + this.source = source + this.tableLoading = true + + if (source === 'tree') {//来源于tree，查询数据清空 + this.sortType = 'asc' + this.agencyObj = treeObj + + } else if (source === 'search') {//来源于查询 + this.agencyObj = treeObj + + } + + // if (fromTree) { + // this.agencyObj = treeObj + + // } + let params = { + pageSize: this.pageSize, + pageNo: this.pageNo, + level: this.agencyObj.level, + id: this.agencyObj.id, + ownerName: this.ownerName, + ownerPhone: this.ownerPhone, + rentFlag: this.rentFlag, + purpose: this.purpose, + remark: this.remark, + sortType: this.sortType, + updateStartDate: this.updateStartDate, + updateEndDate: this.updateEndDate, + } + + const url = "/gov/org/house/houselist" + + const { data, code, msg } = await requestPost(url, params) + + if (code === 0) { + this.total = data.total + this.validTableDataNum = 0 + data.list.forEach(item => { + item.sort = parseInt(item.sort) || 0; + item.sort = item.sort.toFixed(2) + item.isChange = false + item.houseNameShow = item.neighborHoodName + item.buildingName + item.unitNum + item.doorName + + if (item.agencyId === this.staffAgencyId) { + item.showBtn = true + this.validTableDataNum++ + } else { + item.showBtn = false + } + + }); + this.tableData = data.list + } else { + this.$message.error(msg) + } + this.tableLoading = false + }, + + diaClose () { + this.$refs.ref_form.resetData() + this.formShow = false + }, + + handleDetail (row) { + this.formTitle = '房屋详情' + this.formShow = true + this.$nextTick(() => { + + this.$refs.ref_form.initForm('detail', row, this.agencyObj) + }) + }, + + handleAdd () { + + this.formTitle = '新增房屋' + this.formShow = true + this.$nextTick(() => { + + this.$refs.ref_form.initForm('add', null, this.agencyObj) + }) + }, + + handleEdit (row) { + this.formTitle = '修改房屋' + this.formShow = true + this.$nextTick(() => { + this.$refs.ref_form.initForm('edit', row, this.agencyObj) + }) + }, + + addFormCancle () { + this.formShow = false + }, + addFormOk () { + this.formShow = false + this.loadTable() + }, + + + deleteBatch () { + if (this.selection.length > 0) { + this.$confirm("确认删除选择的房屋?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning" + }) + .then(() => { + this.deleteCommunityBatch() + }) + .catch(err => { + if (err == "cancel") { + // this.$message({ + // type: "info", + // message: "已取消删除" + // }); } + + }); + } else { + this.$message.warning('请先选择要删除的房屋') + } + }, + selectAll (selection) { + this.selection = selection + + }, + selectionChange (selection) { + this.selection = selection + + }, + + async handleDelete (row) { + + this.$confirm("确认删除?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning" + }) + .then(() => { + this.deleteRoom(row) + }) + .catch(err => { + if (err == "cancel") { + // this.$message({ + // type: "info", + // message: "已取消删除" + // }); + } + + }); + + + }, + + async deleteCommunityBatch () { + let ids = [] + this.selection.forEach(element => { + + ids.push(element.houseId) + }); + + const url = "/gov/org/house/delete" + + let params = { + type: 'house', + ids: ids + } + + const { data, code, msg } = await requestPost(url, params) + + if (code === 0) { + this.$message({ + type: "success", + message: "删除成功" + }); + this.$emit('refreshTree') + this.loadTable() + } else if (code > 8000) { + this.$message({ + showClose: true, + message: msg, + duration: 0 + }) + this.$emit('refreshTree') + this.loadTable() + } else { + this.$message.error(msg) + } + }, + + async deleteRoom (row) { + const url = "/gov/org/house/housedel" + + let params = { + houseId: row.houseId + } + + const { data, code, msg } = await requestPost(url, params) + + if (code === 0) { + this.$message({ + type: "success", + message: "删除成功" + }); + this.$emit('refreshTree') + this.loadTable() + } else { + this.$message.error(msg) + } + }, + + //导出表格 + async handleExport () { + let title = this.agencyObj.label + title = title + '—房屋列表' + + const url = "/gov/org/house/exporthouseinfo" + let params = { + ownerName: this.ownerName, + ownerPhone: this.ownerPhone, + rentFlag: this.rentFlag, + purpose: this.purpose, + remark: this.remark, + updateStartDate: this.updateStartDate, + updateEndDate: this.updateEndDate, + buildingId: this.agencyObj.id + } + + app.ajax.exportFilePost( + url, + params, + (data, rspMsg) => { + + this.download(data, title + '.xls') }, - watch: { - selection (val) { - - if (val.length > 0) { - this.showDeletBtn = true - } else { - this.showDeletBtn = false - } - } + (rspMsg, data) => { + this.$message.error(rspMsg); + } + ); + + }, + + // 下载文件 + download (data, fileName) { + if (!data) { + return + } + + var csvData = new Blob([data]) + + if (window.navigator && window.navigator.msSaveOrOpenBlob) { + window.navigator.msSaveOrOpenBlob(csvData, fileName); + } + // for Non-IE (chrome, firefox etc.) + else { + var a = document.createElement('a'); + document.body.appendChild(a); + a.style = 'display: none'; + var url = window.URL.createObjectURL(csvData); + a.href = url; + a.download = fileName; + a.click(); + a.remove(); + window.URL.revokeObjectURL(url); + } + + }, + + handleExportModule () { + let title = '' + title = '房屋模板' + + const url = "/gov/org/house/exporttemplate" + let params = {} + + app.ajax.exportFilePost( + url, + params, + (data, rspMsg) => { + + this.download(data, title + '.xls') }, - props: { - staffAgencyId: { - type: String, - default: '', - }, - showImportBtn: { - type: Boolean, - default: false, - }, - ownerName: { - type: String, - default: '', - }, - ownerPhone: { - type: String, - default: '', - }, - rentFlag: { - type: String, - default: '', - }, - purpose: { - type: String, - default: '', - }, - remark: { - type: String, - default: '', - }, + (rspMsg, data) => { + this.$message.error(rspMsg); } - } - -