Browse Source

修改添加小区不能回显物业的问题,修改点击分页无法加载数据的问题;

feature
luyan 2 years ago
parent
commit
687d957eba
  1. 200
      src/views/modules/base/community/communityForm.vue
  2. 247
      src/views/modules/base/community/communityTable.vue

200
src/views/modules/base/community/communityForm.vue

@ -2,44 +2,24 @@
<div>
<div class="dialog-h-content scroll-h">
<div v-show="!propertyFormShow">
<el-form ref="ref_form"
:inline="true"
:model="dataForm"
:rules="dataRule"
label-width="150px"
<el-form ref="ref_form" :inline="true" :model="dataForm" :rules="dataRule" label-width="150px"
class="g-edit-form">
<el-form-item v-if="formType==='edit'"
label="所属网格"
style="display: block">
<el-form-item v-if="formType === 'edit'" label="所属网格" style="display: block">
<span>{{ dataForm.agencyName + '-' + dataForm.gridName }}</span>
</el-form-item>
<el-form-item v-if="formType==='add'"
label="所属组织"
prop="gridId"
style="display: block">
<el-cascader ref="ref_cascader_agency"
class="u-edit-width-normal"
v-model="dataForm.gridId"
@change="handleChangeAngency"
:props="props"
clearable />
<el-form-item v-if="formType === 'add'" label="所属组织" prop="gridId" style="display: block">
<el-cascader ref="ref_cascader_agency" class="u-edit-width-normal" v-model="dataForm.gridId"
@change="handleChangeAngency" :props="props" clearable />
</el-form-item>
<el-form-item label="小区名称"
prop="neighborHoodName"
style="display: block">
<el-input class="u-edit-width-normal"
maxlength="50"
show-word-limit
placeholder="请输入小区名称"
<el-form-item label="小区名称" prop="neighborHoodName" style="display: block">
<el-input class="u-edit-width-normal" maxlength="50" show-word-limit placeholder="请输入小区名称"
v-model="dataForm.neighborHoodName">
</el-input>
</el-form-item>
<el-form-item label="居民区类型"
prop="quartersType"
style="display: block">
<el-form-item label="居民区类型" prop="quartersType" style="display: block">
<el-radio-group v-model="quartersType">
<el-radio :label="'0'">小区</el-radio>
@ -47,35 +27,21 @@
</el-radio-group>
</el-form-item>
<el-form-item label="小区编码"
prop="coding"
style="display: block">
<el-input class="u-edit-width-normal"
maxlength="50"
placeholder="请输入小区编码"
<el-form-item label="小区编码" prop="coding" style="display: block">
<el-input class="u-edit-width-normal" maxlength="50" placeholder="请输入小区编码"
v-model="dataForm.coding">
</el-input>
<el-button style="margin-left: 10px"
type="text"
class="div-table-button--blue"
icon="el-icon-upload2"
size="small"
@click="handleCode">生成</el-button>
<el-button style="margin-left: 10px" type="text" class="div-table-button--blue"
icon="el-icon-upload2" size="small" @click="handleCode">生成</el-button>
</el-form-item>
<el-form-item v-if="dataForm.qrcodeUrl"
label="二维码"
prop="coding"
style="display: block">
<el-form-item v-if="dataForm.qrcodeUrl" label="二维码" prop="coding" style="display: block">
<div style="display: flex; align-items:center">
<div class="u-edit-width-normal">
<img style="margin-left: 30px;width: 200px;"
:src="dataForm.qrcodeUrl">
<img style="margin-left: 30px;width: 200px;" :src="dataForm.qrcodeUrl">
</div>
<a style="margin-left: 10px;"
class="div-table-button--blue"
:href="dataForm.qrcodeUrl"
<a style="margin-left: 10px;" class="div-table-button--blue" :href="dataForm.qrcodeUrl"
target="_blank"><i class="el-icon-download"></i>下载</a>
</div>
</el-form-item>
@ -87,99 +53,52 @@
:href="dataForm.qrcodeUrl"
target="_blank">下载</a>
</div> -->
<el-form-item label="关联物业"
prop="propertyId"
style="display: block">
<el-select class="u-edit-width-normal"
v-model="propertyId"
placeholder="请选择"
filterable
clearable>
<el-option v-for="item in propertyList"
:key="item.propertyId"
:label="item.propertyName"
<el-form-item label="关联物业" prop="propertyId" style="display: block">
<el-select class="u-edit-width-normal" v-model="propertyId" placeholder="请选择" filterable clearable>
<el-option v-for="item in propertyList" :key="item.propertyId" :label="item.propertyName"
:value="item.propertyId">
</el-option>
</el-select>
<el-button style="margin-left: 10px"
type="text"
class="div-table-button--blue"
icon="el-icon-plus"
size="small"
@click="handleAddProperty">添加物业</el-button>
<el-button style="margin-left: 10px" type="text" class="div-table-button--blue" icon="el-icon-plus"
size="small" @click="handleAddProperty">添加物业</el-button>
</el-form-item>
<el-form-item label="实有楼栋"
style="display: block"
prop="realBuilding">
<el-input-number class="u-edit-width-normal"
v-model="dataForm.realBuilding"
:min="0"
:max="9999"
<el-form-item label="实有楼栋" style="display: block" prop="realBuilding">
<el-input-number class="u-edit-width-normal" v-model="dataForm.realBuilding" :min="0" :max="9999"
label="总户数"></el-input-number>
</el-form-item>
<el-form-item label="地图位置"
prop="longitude"
style="display: block">
<el-form-item label="地图位置" prop="longitude" style="display: block">
<div class="u-edit-width-normal m-edit-map">
<el-select v-model="searchValue"
filterable
class="u-edit-width-normal m-edit-map-search"
remote
:reserve-keyword="true"
placeholder="请输入关键词"
:remote-method="remoteMethod"
<el-select v-model="searchValue" filterable class="u-edit-width-normal m-edit-map-search" remote
:reserve-keyword="true" placeholder="请输入关键词" :remote-method="remoteMethod"
:loading="loading">
<el-option v-for="(item,index) in searchOptions"
@click.native="handleClickKey(index)"
:key="item.value"
:label="item.label"
:value="item.value">
<el-option v-for="(item, index) in searchOptions" @click.native="handleClickKey(index)"
:key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
<div id="app_community"
class="m-map-item"></div>
<div id="app_community" class="m-map-item"></div>
</div>
</el-form-item>
<el-form-item label="详细地址"
prop="address"
style="display: block">
<el-input class="u-edit-width-normal"
maxlength="50"
show-word-limit
placeholder="请输入详细地址"
<el-form-item label="详细地址" prop="address" style="display: block">
<el-input class="u-edit-width-normal" maxlength="50" show-word-limit placeholder="请输入详细地址"
v-model="dataForm.address">
</el-input>
</el-form-item>
<el-form-item label="备注"
prop="remark"
style="display: block">
<el-input class="u-edit-width-normal"
type="textarea"
maxlength="500"
show-word-limit
:rows="3"
placeholder="请输入备注,不超过500字"
v-model="dataForm.remark"></el-input>
<el-form-item label="备注" prop="remark" style="display: block">
<el-input class="u-edit-width-normal" type="textarea" maxlength="500" show-word-limit :rows="3"
placeholder="请输入备注,不超过500字" v-model="dataForm.remark"></el-input>
</el-form-item>
</el-form>
</div>
<div v-show="propertyFormShow">
<el-form :inline="false"
:model="propertyForm"
:rules="propertyRule"
label-width="150px"
<el-form :inline="false" :model="propertyForm" :rules="propertyRule" label-width="150px"
class="g-edit-form">
<el-form-item label="物业名称"
prop="name"
style="display: block">
<el-input class="u-edit-width-normal"
maxlength="10"
placeholder="请输入小区名称"
<el-form-item label="物业名称" prop="name" style="display: block">
<el-input class="u-edit-width-normal" maxlength="10" placeholder="请输入小区名称"
v-model="propertyForm.name">
</el-input>
</el-form-item>
@ -187,25 +106,17 @@
</div>
</div>
<div class="m-edit-btn">
<el-button size="small"
@click="handleCancle"> </el-button>
<el-button size="small"
type="primary"
:disabled="btnDisable"
@click="handleComfirm"> </el-button>
<el-button size="small" @click="handleCancle"> </el-button>
<el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm"> </el-button>
</div>
</div>
</template>
<script>
import { mapGetters } from 'vuex'
import { Loading } from 'element-ui' // Loading
import { requestPost, requestGet } from '@/js/dai/request'
import daiMap from "@/utils/dai-map";
var map
var search
var markers
var infoWindowList
let loading //
export default {
data() {
@ -267,36 +178,28 @@ export default {
this.user = this.$store.state.user;
this.userAgencyId = this.user.agencyId;
await this.loadAgency()
await this.loadProperty()
},
methods: {
lazyLoadAgency(node, resolve) {
setTimeout(() => {
this.getAgency(node, resolve)
}, 200)
},
async getAgency(node, resolve) {
const url = "/gov/org/agency/dynamicOrgTreeWithDepth"
console.log('级联', node.value)
let params = {
rootOrgId: node.value ? node.value : '',
leafDepth: 1
}
const { data, code, msg } = await requestGet(url, params)
let array = []
if (node.value) {//
array = data.children.length > 0 ? data.children : []
} else {
array = [data]
}
if (code === 0) {
const nodes = array.map(item => ({
value: item.id, //
@ -306,18 +209,13 @@ export default {
leaf: node.level >= 4 // 5
}))
resolve(nodes)
} else {
this.$message.error(msg)
}
},
handleChangeAngency(val) {
let selAgency = this.$refs.ref_cascader_agency.getCheckedNodes()[0]
console.log('选择的组织', selAgency)
if (selAgency.data) {
if (selAgency.data.orgType !== 'grid') {
this.dataForm.gridId = ''
@ -332,12 +230,10 @@ export default {
this.dataForm.gridId = ''
this.dataForm.agencyId = ''
}
},
async initForm(type, row, agencyObj) {
this.$refs.ref_form.resetFields();
// this.$refs.ref_form.resetFields();
this.agencyObj = agencyObj
let { latitude, longitude } = this.$store.state.user;
this.formType = type
@ -347,8 +243,7 @@ export default {
this.dataForm.neighborHoodId = this.dataForm.id
this.neighborHoodId = this.dataForm.neighborHoodId
this.quartersType = this.dataForm.quartersType
// this.propertyId = this.propertyList[0].id
this.propertyId = this.dataForm.propertyId
} else {
this.dataForm.latitude = latitude
this.dataForm.longitude = longitude
@ -477,9 +372,7 @@ export default {
async loadProperty() {
const url = '/actual/base/communityPropertyManagement/listPropertyManagements'
let params = {}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.propertyList = data
} else {
@ -493,11 +386,8 @@ export default {
},
async handleComfirm() {
if (this.propertyFormShow) {
this.addProperty()
} else {
this.btnDisable = true
setTimeout(() => {
@ -518,20 +408,14 @@ export default {
}
},
async addCommunity() {
console.log('dataForm', this.dataForm)
let url = ''
if (this.formType === 'add') {
url = '/actual/base/communityQuarters/saveCommunityQuarters'
} else {
url = '/actual/base/communityQuarters/updateCommunityQuarters'
this.dataForm.neighborHoodId = this.neighborHoodId
}
const { data, code, msg } = await requestPost(url, this.dataForm)
if (code === 0) {
this.$message({
type: 'success',
@ -544,7 +428,6 @@ export default {
this.btnDisable = false
this.$message.error(msg)
}
},
async addProperty() {
if (!this.propertyForm.name || this.propertyForm.name === '') {
@ -555,13 +438,10 @@ export default {
return false
}
const url = '/actual/base/communityPropertyManagement/savePropertyManagement'
let params = {
name: this.propertyForm.name
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.$message({
type: 'success',

247
src/views/modules/base/community/communityTable.vue

@ -2,98 +2,57 @@
<div class="m-table">
<div class="u-table-btn2">
<div class="u-table-btn2-left">
<el-button style=""
size="small"
type="primary "
icon="el-icon-plus"
@click="handleAdd">新增小区</el-button>
<div v-if="showImportBtn"
class="u-btn-upload">
<el-popover v-if="showImportBtn"
popper-class="btn-popper"
placement="bottom"
width="20"
<el-button style="" size="small" type="primary " icon="el-icon-plus" @click="handleAdd">新增小区</el-button>
<div v-if="showImportBtn" class="u-btn-upload">
<el-popover v-if="showImportBtn" popper-class="btn-popper" placement="bottom" width="20"
trigger="click">
<div class="table-more-btn">
<el-upload :headers="$getElUploadHeaders()"
ref="upload_community"
style="text-align: center"
:multiple="false"
:show-file-list="false"
:before-upload="(file) => {
<el-upload :headers="$getElUploadHeaders()" ref="upload_community" style="text-align: center"
:multiple="false" :show-file-list="false" :before-upload="(file) => {
beforeUpload(file, 'community');
}
"
action=""
accept=".xls,.xlsx"
:http-request="() => {
" action="" accept=".xls,.xlsx" :http-request="() => {
uploadFile('community');
}
">
<el-button size="small"
type="text"
class="diy-button--other">导入小区数据</el-button>
<el-button size="small" type="text" class="diy-button--other">导入小区数据</el-button>
</el-upload>
</div>
<div class="table-more-btn">
<el-upload :headers="$getElUploadHeaders()"
style="text-align: center"
ref="upload_building"
:multiple="false"
:show-file-list="false"
:before-upload="(file) => {
<el-upload :headers="$getElUploadHeaders()" style="text-align: center" ref="upload_building"
:multiple="false" :show-file-list="false" :before-upload="(file) => {
beforeUpload(file, 'building');
}
"
action=""
accept=".xls,.xlsx"
:http-request="() => {
" action="" accept=".xls,.xlsx" :http-request="() => {
uploadFile('building');
}
">
<el-button size="small"
type="text"
class="diy-button--other">导入楼栋数据</el-button>
<el-button size="small" type="text" class="diy-button--other">导入楼栋数据</el-button>
</el-upload>
</div>
<div class="table-more-btn">
<el-upload :headers="$getElUploadHeaders()"
style="text-align: center"
ref="upload_room"
:multiple="false"
:show-file-list="false"
:before-upload="(file) => {
<el-upload :headers="$getElUploadHeaders()" style="text-align: center" ref="upload_room"
:multiple="false" :show-file-list="false" :before-upload="(file) => {
beforeUpload(file, 'room');
}
"
action=""
accept=".xls,.xlsx"
:http-request="() => {
" action="" accept=".xls,.xlsx" :http-request="() => {
uploadFile('room');
}
">
<el-button size="small"
type="text"
class="diy-button--other">导入房屋数据</el-button>
<el-button size="small" type="text" class="diy-button--other">导入房屋数据</el-button>
</el-upload>
</div>
<el-button size="small"
style="float: right"
class="diy-button--white"
slot="reference">导入<i class="el-icon-arrow-down el-icon--right"></i></el-button>
<el-button size="small" style="float: right" class="diy-button--white" slot="reference">导入<i
class="el-icon-arrow-down el-icon--right"></i></el-button>
</el-popover>
</div>
<el-button style="margin-left: 10px"
class="diy-button--white"
size="small"
<el-button style="margin-left: 10px" class="diy-button--white" size="small"
@click="handleExportOpen">导出</el-button>
<el-button style="margin-left: 10px"
class="diy-button--white"
size="small"
<el-button style="margin-left: 10px" class="diy-button--white" size="small"
@click="deleteBatch">批量删除</el-button>
<!-- <el-button style=";margin-left:10px"
@ -103,33 +62,19 @@
@click="handleExportYihuyidang()">导出一户一档</el-button> -->
</div>
<div>
<el-popover popper-class="btn-popper"
placement="bottom"
style="margin-left: 10px"
width="20"
<el-popover popper-class="btn-popper" placement="bottom" style="margin-left: 10px" width="20"
trigger="click">
<div v-if="showImportBtn"
class="table-more-btn">
<el-button class="diy-button--other"
size="small"
type="text"
<div v-if="showImportBtn" class="table-more-btn">
<el-button class="diy-button--other" size="small" type="text"
@click="handleExportModule('community')">下载小区模板</el-button>
</div>
<div v-if="showImportBtn"
class="table-more-btn">
<el-button :headers="$getElUploadHeaders()"
class="diy-button--other"
size="small"
type="text"
<div v-if="showImportBtn" class="table-more-btn">
<el-button :headers="$getElUploadHeaders()" class="diy-button--other" size="small" type="text"
@click="handleExportModule('building')">下载楼栋模板</el-button>
</div>
<div v-if="showImportBtn"
class="table-more-btn">
<el-button :headers="$getElUploadHeaders()"
class="diy-button--other"
size="small"
type="text"
<div v-if="showImportBtn" class="table-more-btn">
<el-button :headers="$getElUploadHeaders()" class="diy-button--other" size="small" type="text"
@click="handleExportModule('room')">下载房屋模板</el-button>
</div>
<!-- <div
@ -163,12 +108,8 @@
>补全小程序小区码</el-button
>
</div> -->
<div v-if="displayedBaobiaoBtn"
class="table-more-btn">
<el-button size="small"
type="text"
class="diy-button--other"
@click="reportForm">智能填报</el-button>
<div v-if="displayedBaobiaoBtn" class="table-more-btn">
<el-button size="small" type="text" class="diy-button--other" @click="reportForm">智能填报</el-button>
</div>
<!-- <div
v-if="agencyObj.level == 'community'"
@ -182,51 +123,28 @@
>社区二维码</el-button
>
</div> -->
<el-button size="small"
style="float: right"
class="diy-button--white"
slot="reference">更多<i class="el-icon-arrow-down el-icon--right"></i></el-button>
<el-button size="small" style="float: right" class="diy-button--white" slot="reference">更多<i
class="el-icon-arrow-down el-icon--right"></i></el-button>
</el-popover>
</div>
</div>
<div class="m-table-item">
<el-table ref="ref_table"
:data="tableData"
border
:height="tableHeight"
v-loading="tableLoading"
style="width: 100%"
:show-overflow-tooltip="true"
@select-all="selectAll"
<el-table ref="ref_table" :data="tableData" border :height="tableHeight" v-loading="tableLoading"
style="width: 100%" :show-overflow-tooltip="true" @select-all="selectAll"
@selection-change="selectionChange">
<el-table-column type="selection"
:selectable="checkSelect"
width="55">
<el-table-column type="selection" :selectable="checkSelect" width="55">
</el-table-column>
<el-table-column prop="neighborHoodName"
label="小区名称"
header-align="left"
align="left"
min-width="100">
<el-table-column prop="neighborHoodName" label="小区名称" header-align="left" align="left" min-width="100">
<template slot-scope="scope">
<a class="name-a"
@click="handleToNextLevel(scope.row)">
<a class="name-a" @click="handleToNextLevel(scope.row)">
{{ scope.row.neighborHoodName }}
</a>
</template>
</el-table-column>
<el-table-column prop="agencyName"
label="所属组织"
header-align="left"
align="left"
min-width="100">
<el-table-column prop="agencyName" label="所属组织" header-align="left" align="left" min-width="100">
</el-table-column>
<el-table-column prop="gridName"
label="所属网格"
header-align="left"
align="left"
min-width="120">
<el-table-column prop="gridName" label="所属网格" header-align="left" align="left" min-width="120">
</el-table-column>
<!-- <el-table-column prop="总单元数"
label="所属网格"
@ -236,23 +154,12 @@
label="所属网格"
min-width="80">
</el-table-column> -->
<el-table-column prop="address"
label="详细地址"
header-align="left"
align="left"
min-width="180">
<el-table-column prop="address" label="详细地址" header-align="left" align="left" min-width="180">
</el-table-column>
<el-table-column label="操作"
fixed="right"
width="220"
header-align="center"
align="center"
class="operate">
<el-table-column label="操作" fixed="right" width="220" header-align="center" align="center" class="operate">
<template slot-scope="scope">
<el-button type="text"
class="div-table-button--blue"
size="small"
<el-button type="text" class="div-table-button--blue" size="small"
@click="handleDetail(scope.row)">查看</el-button>
<!-- <el-button v-if="scope.row.showBtn"
type="text"
@ -265,55 +172,31 @@
class="div-table-button--blue"
size="small"
@click="handleDelete(scope.row)">删除</el-button> -->
<el-button type="text"
class="div-table-button--blue"
size="small"
<el-button type="text" class="div-table-button--blue" size="small"
@click="handleEdit(scope.row)">编辑</el-button>
<el-button type="text"
class="div-table-button--blue"
size="small"
<el-button type="text" class="div-table-button--blue" size="small"
@click="handleDelete(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<div>
<el-pagination @size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page.sync="pageNo"
:page-sizes="[20, 50, 100, 200]"
:page-size="pageSize"
layout="sizes, prev, pager, next, total"
:total="total">
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
:current-page.sync="pageNo" :page-sizes="[20, 50, 100, 200]" :page-size="pageSize"
layout="sizes, prev, pager, next, total" :total="total">
</el-pagination>
</div>
</div>
<!-- 详情弹出框 -->
<el-dialog :visible.sync="detailShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="'小区详情'"
width="920px"
top="5vh"
class="dialog-h"
@closed="detailFormCancle">
<community-detail ref="ref_form_detail"
@diaDetailClose="detailFormCancle"></community-detail>
<el-dialog :visible.sync="detailShow" :close-on-click-modal="false" :close-on-press-escape="false" :title="'小区详情'"
width="920px" top="5vh" class="dialog-h" @closed="detailFormCancle">
<community-detail ref="ref_form_detail" @diaDetailClose="detailFormCancle"></community-detail>
</el-dialog>
<!-- 修改弹出框 -->
<el-dialog :visible.sync="formShow"
v-if="formShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="formTitle"
width="670px"
top="5vh"
class="dialog-h"
@closed="diaClose">
<community-form ref="ref_form"
@dialogCancle="addFormCancle"
@dialogOk="addFormOk"></community-form>
<el-dialog :visible.sync="formShow" v-if="formShow" :close-on-click-modal="false" :close-on-press-escape="false"
:title="formTitle" width="670px" top="5vh" class="dialog-h" @closed="diaClose">
<community-form ref="ref_form" @dialogCancle="addFormCancle" @dialogOk="addFormOk"></community-form>
</el-dialog>
<!-- <el-dialog title="导出"
@ -337,24 +220,14 @@
</el-dialog> -->
<el-dialog :visible.sync="diyDialog"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="1150px"
title="导出模板"
top="5vh"
class="dialog-h">
<community-export-info v-if="diyDialog"
ref="ref_diy"
:list="exportList"
:search="{
<el-dialog :visible.sync="diyDialog" :close-on-click-modal="false" :close-on-press-escape="false" width="1150px"
title="导出模板" top="5vh" class="dialog-h">
<community-export-info v-if="diyDialog" ref="ref_diy" :list="exportList" :search="{
formCode: 'community_info',
pageNo: pageNo,
pageSize: pageSize,
conditions: queryConditions
}"
:orgId="treeObj.id"
@close="handleDiyClose"></community-export-info>
}" :orgId="treeObj.id" @close="handleDiyClose"></community-export-info>
</el-dialog>
<baobiao ref="baobiao" />
@ -562,13 +435,9 @@ export default {
});
},
async loadTable(fromTree, treeObj) {
this.treeObj = { ...treeObj }
//
this.roleList = localStorage.getItem("roleList");
if (
this.roleList.indexOf("root_manager") > -1 ||
this.roleList.indexOf("manager") > -1
@ -1183,11 +1052,11 @@ export default {
handleSizeChange(val) {
this.pageSize = val;
this.pageNo = 1;
this.loadTable(this.treeObj);
this.loadTable(true, this.treeObj);
},
handleCurrentChange(val) {
this.pageNo = val;
this.loadTable(this.treeObj);
this.loadTable(true, this.treeObj);
},
//

Loading…
Cancel
Save