Merge remote-tracking branch 'origin/main'

main
hansha 2 years ago
commit 835f8924fb

File diff suppressed because it is too large Load Diff

@ -412,6 +412,7 @@
<el-dropdown-item command="handleBankInfo">银行卡信息</el-dropdown-item> <el-dropdown-item command="handleBankInfo">银行卡信息</el-dropdown-item>
<el-dropdown-item command="handleHzbg">户主变更</el-dropdown-item> <el-dropdown-item command="handleHzbg">户主变更</el-dropdown-item>
<el-dropdown-item command="handleClxx">车辆信息</el-dropdown-item> <el-dropdown-item command="handleClxx">车辆信息</el-dropdown-item>
<el-dropdown-item command="handleFwxx">房屋信息</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</template> </template>
@ -1069,6 +1070,46 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog title="房屋信息" :visible.sync="fwxx.visible" width="1200px" append-to-body>
<el-table v-loading="fwxx.loading" :data="fwxx.list" border>
<el-table-column label="主键ID" align="center" prop="id" />
<el-table-column label="所属网格" align="center" prop="deptName" />
<el-table-column label="户主姓名" align="center" prop="ownerName" />
<el-table-column label="身份证号" align="center" prop="cardId" />
<el-table-column label="小区名称" align="center" prop="houseName" />
<el-table-column label="楼栋名称" align="center" prop="ldName" />
<el-table-column label="单元" align="center" prop="unit" />
<el-table-column label="门牌号" align="center" prop="doorNo" />
<el-table-column label="房屋类型" align="center" prop="houseType" >
<template slot-scope="scope">
<dict-tag :options="dict.type.szxc_xqfwlx" :value="scope.row.houseType"/>
</template>
</el-table-column>
<el-table-column label="房屋面积" align="center" prop="houseArea" />
<el-table-column label="房屋性质" align="center" prop="houseProp" >
<template slot-scope="scope">
<dict-tag :options="dict.type.szxc_fw_xz" :value="scope.row.houseProp"/>
</template>
</el-table-column>
<el-table-column label="取暖方式" align="center" prop="qnfs" >
<template slot-scope="scope">
<dict-tag :options="dict.type.szxc_qnfs" :value="scope.row.qnfs"/>
</template>
</el-table-column>
<el-table-column label="厕所类型" align="center" prop="toiletType" >
<template slot-scope="scope">
<dict-tag :options="dict.type.szxc_cs_type" :value="scope.row.toiletType"/>
</template>
</el-table-column>
<el-table-column label="房屋简介" align="center" prop="houseIntro" />
<el-table-column label="房屋照片" align="center" prop="housePicture" >
<template slot-scope="scope">
<image-preview :src="scope.row.housePicture" :width="50" :height="50"/>
</template>
</el-table-column>
</el-table>
</el-dialog>
</div> </div>
</template> </template>
@ -1079,6 +1120,7 @@ import { listJmtag, addAllJmtag } from "@/api/szxc/jmtag";
import { listTag } from "@/api/szxc/tag"; import { listTag } from "@/api/szxc/tag";
import { listBankinfo, editDefault, addBankinfo, updateBankinfo, delBankinfo } from "@/api/szxc/bankinfo"; import { listBankinfo, editDefault, addBankinfo, updateBankinfo, delBankinfo } from "@/api/szxc/bankinfo";
import { listCarinfo, delCarinfo, addCarinfo, updateCarinfo } from "@/api/szxc/carinfo"; import { listCarinfo, delCarinfo, addCarinfo, updateCarinfo } from "@/api/szxc/carinfo";
import { listHouseinfo } from "@/api/szxc/houseinfo";
import { addRecard } from "@/api/szxc/recard"; import { addRecard } from "@/api/szxc/recard";
import { addOffrecard } from "@/api/szxc/offrecard"; import { addOffrecard } from "@/api/szxc/offrecard";
import { deptTreeSelect } from "@/api/system/user"; import { deptTreeSelect } from "@/api/system/user";
@ -1089,7 +1131,8 @@ export default {
name: "Jminfo", name: "Jminfo",
components: { Treeselect }, components: { Treeselect },
dicts: ['szxc_hjxz', 'szxc_gj', 'szxc_head', 'szxc_hzgx', 'szxc_yes_no', 'szxc_off', 'szxc_gj', 'sys_user_sex', dicts: ['szxc_hjxz', 'szxc_gj', 'szxc_head', 'szxc_hzgx', 'szxc_yes_no', 'szxc_off', 'szxc_gj', 'sys_user_sex',
'szxc_brqk', 'szxc_hyzk', 'szxc_xueli', 'szxc_zjxy', 'szxc_jkzk', 'szxc_zzmm', 'szxc_hkbg_reason', 'szxc_cartype'], 'szxc_brqk', 'szxc_hyzk', 'szxc_xueli', 'szxc_zjxy', 'szxc_jkzk', 'szxc_zzmm', 'szxc_hkbg_reason',
'szxc_cartype', 'szxc_qnfs', 'szxc_fw_xz', 'szxc_xq_type', 'szxc_wy_type', 'szxc_cs_type', 'szxc_xqfwlx'],
data() { data() {
return { return {
queryMore: false, queryMore: false,
@ -1409,6 +1452,16 @@ export default {
], ],
}, },
}, },
//
fwxx: {
visible: false,
//
loading: false,
//
list: [],
//
jminRow: null,
},
}; };
}, },
created() { created() {
@ -1579,6 +1632,9 @@ export default {
case "handleClxx": case "handleClxx":
this.handleClxx(row); this.handleClxx(row);
break; break;
case "handleFwxx":
this.handleFwxx(row);
break;
default: default:
break; break;
} }
@ -1818,7 +1874,7 @@ export default {
this.clxx.visible = true; this.clxx.visible = true;
this.getlistClxx(); this.getlistClxx();
}, },
/** 查询银行卡信息列表 */ /** 查询车辆信息列表 */
getlistClxx() { getlistClxx() {
listCarinfo({ listCarinfo({
pageNum: 1, pageNum: 1,
@ -1828,7 +1884,7 @@ export default {
this.clxx.list = response.rows this.clxx.list = response.rows
}); });
}, },
// //
clxxAdd(){ clxxAdd(){
this.resetForm("clxxForm"); this.resetForm("clxxForm");
this.clxx.form = { this.clxx.form = {
@ -1868,7 +1924,7 @@ export default {
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
}).catch(() => {}); }).catch(() => {});
}, },
// //
clxxSubmit(){ clxxSubmit(){
this.$refs["clxxForm"].validate(valid => { this.$refs["clxxForm"].validate(valid => {
if (valid) { if (valid) {
@ -1888,6 +1944,22 @@ export default {
} }
}); });
}, },
//
handleFwxx(row){
this.fwxx.jminRow = row;
this.fwxx.visible = true;
this.getlistHouseinfo();
},
/** 查询房屋信息列表 */
getlistHouseinfo() {
listHouseinfo({
pageNum: 1,
pageSize: 100000000,
ownerId: this.fwxx.jminRow.id
}).then(response => {
this.fwxx.list = response.rows
});
},
} }
}; };
</script> </script>

@ -1,18 +1,14 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="所属小区id" prop="xqId"> <el-form-item label="所属网格" prop="deptId">
<el-input <treeselect v-model="queryParams.deptId" :options="deptOptions" :disable-branch-nodes="true" style="width:215px;"
v-model="queryParams.xqId" placeholder="请选择所属网格"/>
placeholder="请输入所属小区id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="小区名称" prop="xqName"> <el-form-item label="所属小区" prop="xqName">
<el-input <el-input
v-model="queryParams.xqName" v-model="queryParams.xqName"
placeholder="请输入小区名称" placeholder="请输入所属小区"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
@ -25,29 +21,65 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="类别字典" prop="ldSort"> <el-form-item label="楼栋类型" prop="ldType">
<el-input <el-select
v-model="queryParams.ldType"
placeholder="楼栋类型"
clearable
style="width:100%"
>
<el-option
v-for="dict in dict.type.szxc_ld_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="楼栋类别" prop="ldSort">
<el-select
v-model="queryParams.ldSort" v-model="queryParams.ldSort"
placeholder="请输入类别字典" placeholder="楼栋类别"
clearable clearable
@keyup.enter.native="handleQuery" style="width:100%"
/> >
<el-option
v-for="dict in dict.type.szxc_ldlb"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="楼栋结构字典" prop="ldjg"> <el-form-item label="楼栋结构" prop="ldjg">
<el-input <el-select
v-model="queryParams.ldjg" v-model="queryParams.ldjg"
placeholder="请输入楼栋结构字典" placeholder="楼栋结构"
clearable clearable
@keyup.enter.native="handleQuery" style="width:100%"
/> >
<el-option
v-for="dict in dict.type.szxc_ldjg"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="取暖方式" prop="qnfs"> <el-form-item label="取暖方式" prop="qnfs">
<el-input <el-select
v-model="queryParams.qnfs" v-model="queryParams.qnfs"
placeholder="请输入取暖方式" placeholder="取暖方式"
clearable clearable
@keyup.enter.native="handleQuery" style="width:100%"
/> >
<el-option
v-for="dict in dict.type.szxc_qnfs"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="楼层数" prop="lcNum"> <el-form-item label="楼层数" prop="lcNum">
<el-input <el-input
@ -73,38 +105,6 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="楼栋描述" prop="ldDescribe">
<el-input
v-model="queryParams.ldDescribe"
placeholder="请输入楼栋描述"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="部门id" prop="deptId">
<el-input
v-model="queryParams.deptId"
placeholder="请输入部门id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="所属网格" prop="deptName">
<el-input
v-model="queryParams.deptName"
placeholder="请输入所属网格"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建者ID" prop="userId">
<el-input
v-model="queryParams.userId"
placeholder="请输入创建者ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
@ -157,23 +157,36 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="ldinfoList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="ldinfoList" @selection-change="handleSelectionChange" border>
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="45" align="center" />
<el-table-column label="id" align="center" prop="id" /> <el-table-column label="ID" align="center" prop="id" />
<el-table-column label="所属小区id" align="center" prop="xqId" /> <el-table-column label="所属小区" align="center" prop="xqName" />
<el-table-column label="小区名称" align="center" prop="xqName" />
<el-table-column label="楼栋名称" align="center" prop="ldName" /> <el-table-column label="楼栋名称" align="center" prop="ldName" />
<el-table-column label="类型(0小区楼栋1独立房2其它)" align="center" prop="xqType" /> <el-table-column label="楼栋类型" align="center" prop="ldType" >
<el-table-column label="类别字典" align="center" prop="ldSort" /> <template slot-scope="scope">
<el-table-column label="楼栋结构字典" align="center" prop="ldjg" /> <dict-tag :options="dict.type.szxc_ld_type" :value="scope.row.ldType"/>
<el-table-column label="取暖方式" align="center" prop="qnfs" /> </template>
</el-table-column>
<el-table-column label="楼栋类别" align="center" prop="ldSort" >
<template slot-scope="scope">
<dict-tag :options="dict.type.szxc_ldlb" :value="scope.row.ldSort"/>
</template>
</el-table-column>
<el-table-column label="楼栋结构" align="center" prop="ldjg" >
<template slot-scope="scope">
<dict-tag :options="dict.type.szxc_ldjg" :value="scope.row.ldjg"/>
</template>
</el-table-column>
<el-table-column label="取暖方式" align="center" prop="qnfs" >
<template slot-scope="scope">
<dict-tag :options="dict.type.szxc_qnfs" :value="scope.row.qnfs"/>
</template>
</el-table-column>
<el-table-column label="楼层数" align="center" prop="lcNum" /> <el-table-column label="楼层数" align="center" prop="lcNum" />
<el-table-column label="单元数" align="center" prop="unitNum" /> <el-table-column label="单元数" align="center" prop="unitNum" />
<el-table-column label="户数" align="center" prop="huNum" /> <el-table-column label="户数" align="center" prop="huNum" />
<el-table-column label="楼栋描述" align="center" prop="ldDescribe" /> <el-table-column label="楼栋描述" align="center" prop="ldDescribe" />
<el-table-column label="部门id" align="center" prop="deptId" />
<el-table-column label="所属网格" align="center" prop="deptName" /> <el-table-column label="所属网格" align="center" prop="deptName" />
<el-table-column label="创建者ID" align="center" prop="userId" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -203,25 +216,80 @@
/> />
<!-- 添加或修改楼栋信息对话框 --> <!-- 添加或修改楼栋信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="所属小区id" prop="xqId"> <el-form-item label="所属小区" prop="xqName">
<el-input v-model="form.xqId" placeholder="请输入所属小区id" /> <el-input readonly
placeholder="请选择所属小区"
v-model="form.xqName">
<el-button slot="append" icon="el-icon-search" @click="xqQuery()"></el-button>
</el-input>
</el-form-item> </el-form-item>
<el-form-item label="小区名称" prop="xqName"> <el-form-item label="所属网格" prop="deptName">
<el-input v-model="form.xqName" placeholder="请输入小区名称" /> <el-input v-model="form.deptName" placeholder="请输入所属网格" disabled/>
</el-form-item> </el-form-item>
<el-form-item label="楼栋名称" prop="ldName"> <el-form-item label="楼栋名称" prop="ldName">
<el-input v-model="form.ldName" placeholder="请输入楼栋名称" /> <el-input v-model="form.ldName" placeholder="请输入楼栋名称" />
</el-form-item> </el-form-item>
<el-form-item label="类别字典" prop="ldSort"> <el-form-item label="楼栋类型" prop="ldType">
<el-input v-model="form.ldSort" placeholder="请输入类别字典" /> <el-select
v-model="form.ldType"
placeholder="楼栋类型"
clearable
style="width:100%"
>
<el-option
v-for="dict in dict.type.szxc_ld_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="楼栋类别" prop="ldSort">
<el-select
v-model="form.ldSort"
placeholder="楼栋类别"
clearable
style="width:100%"
>
<el-option
v-for="dict in dict.type.szxc_ldlb"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="楼栋结构字典" prop="ldjg"> <el-form-item label="楼栋结构" prop="ldjg">
<el-input v-model="form.ldjg" placeholder="请输入楼栋结构字典" /> <el-select
v-model="form.ldjg"
placeholder="楼栋结构"
clearable
style="width:100%"
>
<el-option
v-for="dict in dict.type.szxc_ldjg"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="取暖方式" prop="qnfs"> <el-form-item label="取暖方式" prop="qnfs">
<el-input v-model="form.qnfs" placeholder="请输入取暖方式" /> <el-select
v-model="form.qnfs"
placeholder="取暖方式"
clearable
style="width:100%"
>
<el-option
v-for="dict in dict.type.szxc_qnfs"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="楼层数" prop="lcNum"> <el-form-item label="楼层数" prop="lcNum">
<el-input v-model="form.lcNum" placeholder="请输入楼层数" /> <el-input v-model="form.lcNum" placeholder="请输入楼层数" />
@ -233,16 +301,7 @@
<el-input v-model="form.huNum" placeholder="请输入户数" /> <el-input v-model="form.huNum" placeholder="请输入户数" />
</el-form-item> </el-form-item>
<el-form-item label="楼栋描述" prop="ldDescribe"> <el-form-item label="楼栋描述" prop="ldDescribe">
<el-input v-model="form.ldDescribe" placeholder="请输入楼栋描述" /> <el-input v-model="form.ldDescribe" type="textarea" placeholder="请输入楼栋描述" />
</el-form-item>
<el-form-item label="部门id" prop="deptId">
<el-input v-model="form.deptId" placeholder="请输入部门id" />
</el-form-item>
<el-form-item label="所属网格" prop="deptName">
<el-input v-model="form.deptName" placeholder="请输入所属网格" />
</el-form-item>
<el-form-item label="创建者ID" prop="userId">
<el-input v-model="form.userId" placeholder="请输入创建者ID" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -250,177 +309,311 @@
<el-button @click="cancel"> </el-button> <el-button @click="cancel"> </el-button>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog title="选择小区" :visible.sync="xqInfo.visible" width="1000px" append-to-body>
<el-form :model="xqInfo.queryParams" ref="queryForm" size="small" :inline="true" label-width="70px">
<el-form-item label="小区名称" prop="name">
<el-input
v-model="xqInfo.queryParams.name"
placeholder="请输入小区名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="xqInfoQuery"></el-button>
</el-form-item>
</el-form>
<el-alert title="双击选择户主" type="warning" :closable="false"></el-alert>
<el-table v-loading="xqInfo.loading" :data="xqInfo.list" border @cell-dblclick="xqInfoDblclick">
<el-table-column label="所属网格" align="center" prop="deptName" />
<el-table-column label="小区类型" align="center" prop="xqType" >
<template slot-scope="scope">
<dict-tag :options="dict.type.szxc_xq_type" :value="scope.row.xqType"/>
</template>
</el-table-column>
<el-table-column label="小区名称" align="center" prop="name" />
<el-table-column label="楼栋数" align="center" prop="ldNum" />
<el-table-column label="建筑面积" align="center" prop="jzArea" />
<el-table-column label="占地面积" align="center" prop="zdArea" />
<el-table-column label="物业管理方式" align="center" prop="wyType" >
<template slot-scope="scope">
<dict-tag :options="dict.type.szxc_wy_type" :value="scope.row.wyType"/>
</template>
</el-table-column>
<el-table-column label="物业负责人" align="center" prop="wyResponse" />
<el-table-column label="联系电话" align="center" prop="wyPhone" />
<el-table-column label="小区地址" align="center" prop="xqAddress" />
<el-table-column label="建成日期" align="center" prop="buildDate" >
<template slot-scope="scope">
<span>{{ parseTime(scope.row.buildDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
</el-table>
<pagination
v-show="xqInfo.total>0"
:total="xqInfo.total"
:page.sync="xqInfo.queryParams.pageNum"
:limit.sync="xqInfo.queryParams.pageSize"
@pagination="getlistXqinfo"
/>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { listLdinfo, getLdinfo, delLdinfo, addLdinfo, updateLdinfo } from "@/api/szxc/ldinfo"; import { listLdinfo, getLdinfo, delLdinfo, addLdinfo, updateLdinfo } from "@/api/szxc/ldinfo";
import { listXqinfo } from "@/api/szxc/xqinfo";
import { deptTreeSelect } from "@/api/system/user";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default { export default {
name: "Ldinfo", name: "Ldinfo",
data() { components: { Treeselect },
return { dicts: ['szxc_xq_type', 'szxc_ld_type', 'szxc_ldlb', 'szxc_ldjg', 'szxc_qnfs' ],
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
ldinfoList: [],
//
deptOptions: undefined,
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
xqId: null,
ldName: null,
ldType: null,
ldSort: null,
ldjg: null,
qnfs: null,
lcNum: null,
unitNum: null,
huNum: null,
ldDescribe: null,
deptId: null,
deptName: null,
userId: null
},
//
form: {
id: null,
xqId: null,
xqName: null,
ldName: null,
ldType: null,
ldSort: null,
ldjg: null,
qnfs: null,
lcNum: null,
unitNum: null,
huNum: null,
ldDescribe: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
deptId: null,
deptName: null,
userId: null,
},
//
rules: {
xqId: [
{ required: true, message: "所属小区不能为空", trigger: "blur" }
],
deptId: [
{ required: true, message: "部门id不能为空", trigger: "blur" }
],
},
//
xqInfo: {
visible: false,
// //
loading: true, loading: false,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
// //
total: 0, total: 0,
//
ldinfoList: [],
//
title: "",
//
open: false,
// //
queryParams: { queryParams:{
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
xqId: null, name: null
xqName: null,
ldName: null,
xqType: null,
ldSort: null,
ldjg: null,
qnfs: null,
lcNum: null,
unitNum: null,
huNum: null,
ldDescribe: null,
deptId: null,
deptName: null,
userId: null
}, },
// //
form: {}, list: [],
// //
rules: { selectRow: null
xqId: [ },
{ required: true, message: "所属小区id不能为空", trigger: "blur" } };
], },
deptId: [ created() {
{ required: true, message: "部门id不能为空", trigger: "blur" } this.getList();
], this.getDeptTree();
} },
methods: {
/** 查询组织下拉树结构 */
getDeptTree() {
deptTreeSelect().then(response => {
this.deptOptions = response.data;
});
},
selectedTree(node){
this.form.deptId = node.id;
this.form.deptName = node.label;
},
/** 查询楼栋信息列表 */
getList() {
this.loading = true;
listLdinfo(this.queryParams).then(response => {
this.ldinfoList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
id: null,
xqId: null,
xqName: null,
ldName: null,
ldType: null,
ldSort: null,
ldjg: null,
qnfs: null,
lcNum: null,
unitNum: null,
huNum: null,
ldDescribe: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
deptId: null,
deptName: null,
userId: null,
}; };
this.resetForm("form");
}, },
created() { /** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList(); this.getList();
}, },
methods: { /** 重置按钮操作 */
/** 查询楼栋信息列表 */ resetQuery() {
getList() { this.resetForm("queryForm");
this.loading = true; this.handleQuery();
listLdinfo(this.queryParams).then(response => { },
this.ldinfoList = response.rows; //
this.total = response.total; handleSelectionChange(selection) {
this.loading = false; this.ids = selection.map(item => item.id)
}); this.single = selection.length!==1
}, this.multiple = !selection.length
// },
cancel() { /** 新增按钮操作 */
this.open = false; handleAdd() {
this.reset(); this.reset();
}, this.open = true;
// this.title = "添加楼栋信息";
reset() { },
this.form = { /** 修改按钮操作 */
id: null, handleUpdate(row) {
xqId: null, this.reset();
xqName: null, const id = row.id || this.ids
ldName: null, getLdinfo(id).then(response => {
xqType: null, this.form = response.data;
ldSort: null,
ldjg: null,
qnfs: null,
lcNum: null,
unitNum: null,
huNum: null,
ldDescribe: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
deptId: null,
deptName: null,
userId: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true; this.open = true;
this.title = "添加楼栋信息"; this.title = "修改楼栋信息";
}, });
/** 修改按钮操作 */ },
handleUpdate(row) { /** 提交按钮 */
this.reset(); submitForm() {
const id = row.id || this.ids this.$refs["form"].validate(valid => {
getLdinfo(id).then(response => { if (valid) {
this.form = response.data; if (this.form.id != null) {
this.open = true; updateLdinfo(this.form).then(response => {
this.title = "修改楼栋信息"; this.$modal.msgSuccess("修改成功");
}); this.open = false;
}, this.getList();
/** 提交按钮 */ });
submitForm() { } else {
this.$refs["form"].validate(valid => { addLdinfo(this.form).then(response => {
if (valid) { this.$modal.msgSuccess("新增成功");
if (this.form.id != null) { this.open = false;
updateLdinfo(this.form).then(response => { this.getList();
this.$modal.msgSuccess("修改成功"); });
this.open = false;
this.getList();
});
} else {
addLdinfo(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
} }
}); }
}, });
/** 删除按钮操作 */ },
handleDelete(row) { /** 删除按钮操作 */
const ids = row.id || this.ids; handleDelete(row) {
this.$modal.confirm('是否确认删除楼栋信息编号为"' + ids + '"的数据项?').then(function() { const ids = row.id || this.ids;
return delLdinfo(ids); this.$modal.confirm('是否确认删除楼栋信息编号为"' + ids + '"的数据项?').then(function() {
}).then(() => { return delLdinfo(ids);
this.getList(); }).then(() => {
this.$modal.msgSuccess("删除成功"); this.getList();
}).catch(() => {}); this.$modal.msgSuccess("删除成功");
}, }).catch(() => {});
/** 导出按钮操作 */ },
handleExport() { /** 导出按钮操作 */
this.download('szxc/ldinfo/export', { handleExport() {
...this.queryParams this.download('szxc/ldinfo/export', {
}, `ldinfo_${new Date().getTime()}.xlsx`) ...this.queryParams
} }, `ldinfo_${new Date().getTime()}.xlsx`)
} },
}; //
xqQuery(){
this.xqInfo.visible = true;
this.getlistXqinfo()
},
/** 查询户主信息列表 */
getlistXqinfo() {
this.xqInfo.loading = true;
listXqinfo(this.xqInfo.queryParams).then(response => {
this.xqInfo.list = response.rows;
this.xqInfo.total = response.total;
this.xqInfo.loading = false;
});
},
//
xqInfoQuery(){
this.xqInfo.queryParams.pageNum = 1;
this.getlistXqinfo();
},
//
xqInfoDblclick(row) {
this.xqInfo.selectRow = row;
this.form.xqId = row.id;
this.form.xqName = row.name;
this.form.deptId = row.deptId;
this.form.deptName = row.deptName;
this.xqInfo.visible = false
},
}
};
</script> </script>

@ -1,6 +1,33 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="所属网格" prop="deptId">
<treeselect v-model="queryParams.deptId" :options="deptOptions" :disable-branch-nodes="true" style="width:215px;"
placeholder="请选择所属网格"/>
</el-form-item>
<el-form-item label="小区类型" prop="xqType">
<el-select
v-model="queryParams.xqType"
placeholder="小区类型"
clearable
style="width:100%"
>
<el-option
v-for="dict in dict.type.szxc_xq_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="小区名称" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入小区名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="楼栋数" prop="ldNum"> <el-form-item label="楼栋数" prop="ldNum">
<el-input <el-input
v-model="queryParams.ldNum" v-model="queryParams.ldNum"
@ -25,6 +52,21 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="物业管理方式" prop="wyType">
<el-select
v-model="queryParams.wyType"
placeholder="物业管理方式"
clearable
style="width:100%"
>
<el-option
v-for="dict in dict.type.szxc_wy_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="物业负责人" prop="wyResponse"> <el-form-item label="物业负责人" prop="wyResponse">
<el-input <el-input
v-model="queryParams.wyResponse" v-model="queryParams.wyResponse"
@ -41,14 +83,14 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="小区地址" prop="xqAddress"> <!-- <el-form-item label="小区地址" prop="xqAddress">
<el-input <el-input
v-model="queryParams.xqAddress" v-model="queryParams.xqAddress"
placeholder="请输入小区地址" placeholder="请输入小区地址"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>-->
<el-form-item label="建成日期" prop="buildDate"> <el-form-item label="建成日期" prop="buildDate">
<el-date-picker clearable <el-date-picker clearable
v-model="queryParams.buildDate" v-model="queryParams.buildDate"
@ -57,38 +99,6 @@
placeholder="请选择建成日期"> placeholder="请选择建成日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="小区描述" prop="xqDescribe">
<el-input
v-model="queryParams.xqDescribe"
placeholder="请输入小区描述"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="部门id" prop="deptId">
<el-input
v-model="queryParams.deptId"
placeholder="请输入部门id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="所属网格" prop="deptName">
<el-input
v-model="queryParams.deptName"
placeholder="请输入所属网格"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建者ID" prop="userId">
<el-input
v-model="queryParams.userId"
placeholder="请输入创建者ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
@ -141,14 +151,24 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="xqinfoList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="xqinfoList" @selection-change="handleSelectionChange" border>
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="45" align="center" />
<el-table-column label="id" align="center" prop="id" /> <el-table-column label="ID" align="center" prop="id" min-width="60"/>
<el-table-column label="类型(0老旧1新2片区散户)" align="center" prop="xqType" /> <el-table-column label="所属网格" align="center" prop="deptName" />
<el-table-column label="小区类型" align="center" prop="xqType" >
<template slot-scope="scope">
<dict-tag :options="dict.type.szxc_xq_type" :value="scope.row.xqType"/>
</template>
</el-table-column>
<el-table-column label="小区名称" align="center" prop="name" />
<el-table-column label="楼栋数" align="center" prop="ldNum" /> <el-table-column label="楼栋数" align="center" prop="ldNum" />
<el-table-column label="建筑面积" align="center" prop="jzArea" /> <el-table-column label="建筑面积" align="center" prop="jzArea" />
<el-table-column label="占地面积" align="center" prop="zdArea" /> <el-table-column label="占地面积" align="center" prop="zdArea" />
<el-table-column label="物业管理方式(0物业公司1业主自治2其他)" align="center" prop="wyType" /> <el-table-column label="物业管理方式" align="center" prop="wyType" >
<template slot-scope="scope">
<dict-tag :options="dict.type.szxc_wy_type" :value="scope.row.wyType"/>
</template>
</el-table-column>
<el-table-column label="物业负责人" align="center" prop="wyResponse" /> <el-table-column label="物业负责人" align="center" prop="wyResponse" />
<el-table-column label="联系电话" align="center" prop="wyPhone" /> <el-table-column label="联系电话" align="center" prop="wyPhone" />
<el-table-column label="小区地址" align="center" prop="xqAddress" /> <el-table-column label="小区地址" align="center" prop="xqAddress" />
@ -158,9 +178,6 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="小区描述" align="center" prop="xqDescribe" /> <el-table-column label="小区描述" align="center" prop="xqDescribe" />
<el-table-column label="部门id" align="center" prop="deptId" />
<el-table-column label="所属网格" align="center" prop="deptName" />
<el-table-column label="创建者ID" align="center" prop="userId" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -190,45 +207,107 @@
/> />
<!-- 添加或修改小区信息对话框 --> <!-- 添加或修改小区信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body top="15px">
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="楼栋数" prop="ldNum"> <el-row :gutter="10">
<el-input v-model="form.ldNum" placeholder="请输入楼栋数" /> <el-col :span="12">
</el-form-item> <el-form-item label="所属网格" prop="deptId">
<el-form-item label="建筑面积" prop="jzArea"> <treeselect v-model="form.deptId" :options="deptOptions" :disable-branch-nodes="true"
<el-input v-model="form.jzArea" placeholder="请输入建筑面积" /> placeholder="请选择所属网格" style="width:100%;" @select="selectedTree"/>
</el-form-item> </el-form-item>
<el-form-item label="占地面积" prop="zdArea"> </el-col>
<el-input v-model="form.zdArea" placeholder="请输入占地面积" /> <el-col :span="12">
</el-form-item> <el-form-item label="小区名称" prop="name">
<el-form-item label="物业负责人" prop="wyResponse"> <el-input v-model="form.name" placeholder="请输入小区名称" />
<el-input v-model="form.wyResponse" placeholder="请输入物业负责人" /> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="联系电话" prop="wyPhone"> </el-row>
<el-input v-model="form.wyPhone" placeholder="请输入联系电话" />
</el-form-item> <el-row :gutter="10">
<el-col :span="12">
<el-form-item label="小区类型" prop="xqType">
<el-select
v-model="form.xqType"
placeholder="小区类型"
clearable
style="width:100%"
>
<el-option
v-for="dict in dict.type.szxc_xq_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="楼栋数" prop="ldNum">
<el-input v-model="form.ldNum" placeholder="请输入楼栋数" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="12">
<el-form-item label="建筑面积" prop="jzArea">
<el-input v-model="form.jzArea" placeholder="请输入建筑面积" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="占地面积" prop="zdArea">
<el-input v-model="form.zdArea" placeholder="请输入占地面积" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="12">
<el-form-item label="物业管理方式" prop="wyType">
<el-select
v-model="form.wyType"
placeholder="物业管理方式"
clearable
style="width:100%"
>
<el-option
v-for="dict in dict.type.szxc_wy_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="物业负责人" prop="wyResponse">
<el-input v-model="form.wyResponse" placeholder="请输入物业负责人" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="12">
<el-form-item label="联系电话" prop="wyPhone">
<el-input v-model="form.wyPhone" placeholder="请输入联系电话" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="建成日期" prop="buildDate">
<el-date-picker clearable style="width: 100%"
v-model="form.buildDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择建成日期">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="小区地址" prop="xqAddress"> <el-form-item label="小区地址" prop="xqAddress">
<el-input v-model="form.xqAddress" placeholder="请输入小区地址" /> <el-input v-model="form.xqAddress" placeholder="请输入小区地址" />
</el-form-item> </el-form-item>
<el-form-item label="建成日期" prop="buildDate">
<el-date-picker clearable
v-model="form.buildDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择建成日期">
</el-date-picker>
</el-form-item>
<el-form-item label="小区描述" prop="xqDescribe"> <el-form-item label="小区描述" prop="xqDescribe">
<el-input v-model="form.xqDescribe" placeholder="请输入小区描述" /> <el-input v-model="form.xqDescribe" type="textarea" placeholder="请输入小区描述" />
</el-form-item>
<el-form-item label="部门id" prop="deptId">
<el-input v-model="form.deptId" placeholder="请输入部门id" />
</el-form-item>
<el-form-item label="所属网格" prop="deptName">
<el-input v-model="form.deptName" placeholder="请输入所属网格" />
</el-form-item>
<el-form-item label="创建者ID" prop="userId">
<el-input v-model="form.userId" placeholder="请输入创建者ID" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -241,9 +320,14 @@
<script> <script>
import { listXqinfo, getXqinfo, delXqinfo, addXqinfo, updateXqinfo } from "@/api/szxc/xqinfo"; import { listXqinfo, getXqinfo, delXqinfo, addXqinfo, updateXqinfo } from "@/api/szxc/xqinfo";
import { deptTreeSelect } from "@/api/system/user";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default { export default {
name: "Xqinfo", name: "Xqinfo",
components: { Treeselect },
dicts: ['szxc_xq_type', 'szxc_wy_type'],
data() { data() {
return { return {
// //
@ -260,6 +344,8 @@ export default {
total: 0, total: 0,
// //
xqinfoList: [], xqinfoList: [],
//
deptOptions: undefined,
// //
title: "", title: "",
// //
@ -268,6 +354,7 @@ export default {
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
name: null,
xqType: null, xqType: null,
ldNum: null, ldNum: null,
jzArea: null, jzArea: null,
@ -287,15 +374,35 @@ export default {
// //
rules: { rules: {
deptId: [ deptId: [
{ required: true, message: "部门id不能为空", trigger: "blur" } { required: true, message: "所属网格不能为空", trigger: "blur" }
],
name: [
{ required: true, message: "小区名称不能为空", trigger: "blur" }
],
xqType: [
{ required: true, message: "小区类型不能为空", trigger: "blur" }
],
xqAddress: [
{ required: true, message: "小区地址不能为空", trigger: "blur" }
], ],
} }
}; };
}, },
created() { created() {
this.getList(); this.getList();
this.getDeptTree();
}, },
methods: { methods: {
/** 查询组织下拉树结构 */
getDeptTree() {
deptTreeSelect().then(response => {
this.deptOptions = response.data;
});
},
selectedTree(node){
this.form.deptId = node.id;
this.form.deptName = node.label;
},
/** 查询小区信息列表 */ /** 查询小区信息列表 */
getList() { getList() {
this.loading = true; this.loading = true;
@ -314,6 +421,7 @@ export default {
reset() { reset() {
this.form = { this.form = {
id: null, id: null,
name: null,
xqType: null, xqType: null,
ldNum: null, ldNum: null,
jzArea: null, jzArea: null,

Loading…
Cancel
Save