Browse Source

小区管理

preview
jiangyy 4 years ago
parent
commit
d6f9a3bf4a
  1. 527
      epmet-oper-web/src/views/modules/base/community/buildForm.vue
  2. 74
      epmet-oper-web/src/views/modules/base/community/buildTable.vue
  3. 90
      epmet-oper-web/src/views/modules/base/community/community.vue
  4. 55
      epmet-oper-web/src/views/modules/base/community/communityForm.vue
  5. 49
      epmet-oper-web/src/views/modules/base/community/communityTable.vue
  6. 473
      epmet-oper-web/src/views/modules/base/community/roomForm.vue
  7. 95
      epmet-oper-web/src/views/modules/base/community/roomTable.vue

527
epmet-oper-web/src/views/modules/base/community/buildForm.vue

@ -1,332 +1,294 @@
<template>
<div>
<div>
<div v-show="!propertyFormShow">
<el-form :inline="false"
:model="dataForm"
:rules="dataRule"
:disabled="formType==='detail'"
class="form">
<el-form-item label="小区名称"
prop="neighborHoodName"
label-width="150px"
style="display:block">
<el-input class="item_width_1"
maxlength="50"
show-word-limit
placeholder='请输入小区名称'
v-model="dataForm.neighborHoodName">
</el-input>
</el-form-item>
<el-form-item label="所属组织"
prop="agencyId"
label-width="150px"
style="display:block">
<el-select class="item_width_1"
v-model="dataForm.agencyId"
placeholder="请选择"
@change="handleAgencyChanged"
clearable>
<el-option v-for="item in agencyList"
:key="item.agencyId"
:label="item.agencyName"
:value="item.agencyId">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="所属网格"
prop="gridId"
label-width="150px"
style="display:block">
<el-select class="item_width_1"
v-model="dataForm.gridId"
placeholder="请选择"
clearable>
<el-option v-for="item in gridList"
:key="item.gridId"
:label="item.gridName"
:value="item.gridId">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="关联物业"
prop="propertyId"
label-width="150px"
style="display:block">
<el-select class="item_width_2"
v-model="dataForm.propertyId"
placeholder="请选择"
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="primary"
size="small"
@click="handleAddProperty">添加物业</el-button>
</el-form-item>
<el-form-item label="详细地址"
prop="address"
label-width="150px"
style="display:block">
<el-input class="item_width_1"
<el-form :inline="true"
:model="dataForm"
:rules="dataRule"
:disabled="formType === 'detail'"
class="form">
<el-form-item label="所属小区"
label-width="150px"
style="display: block">
<span>{{ agencyObj.agencyName }}{{ agencyObj.gridName }}{{ agencyObj.label }}</span>
</el-form-item>
<el-form-item label="楼栋名称"
prop="buildingName"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
maxlength="50"
show-word-limit
placeholder="请输入楼栋名称"
v-model="dataForm.buildingName">
</el-input>
</el-form-item>
<el-form-item label="楼栋类型"
prop="type"
label-width="150px"
style="display: block">
<el-radio-group v-model="dataForm.type">
<el-radio :label="'1'">商品房</el-radio>
<el-radio :label="'2'">自建房</el-radio>
<el-radio :label="'3'">别墅</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="排序"
prop="sort"
label-width="150px">
<el-input-number v-model="dataForm.sort"
label="排序"></el-input-number>
</el-form-item>
<el-form-item label="单元数"
prop="totalUnitNum"
label-width="150px">
<el-input-number v-model="dataForm.totalUnitNum"
:min="1"
label="单元数"></el-input-number>
</el-form-item>
<el-form-item label="层数"
prop="totalFloorNum"
label-width="150px">
<el-input-number v-model="dataForm.totalFloorNum"
:min="1"
label="层数"></el-input-number>
</el-form-item>
<el-form-item label="户数"
prop="totalHouseNum"
label-width="150px">
<el-input-number v-model="dataForm.totalHouseNum"
:min="1"
label="户数"></el-input-number>
</el-form-item>
<el-form-item label="位置坐标"
prop="longitude"
label-width="150px"
style="display: block">
<el-input class="item_width_3"
maxlength="50"
placeholder="请输入关键字"
v-model="keyWords">
</el-input>
<el-button style="margin-left: 10px"
type="primary"
size="small"
@click="handleSearchMap">查询</el-button>
<div id="app"
class="div_map"></div>
<div style="margin-top: 10px">
<span>经度</span>
<el-input class="item_width_3"
maxlength="50"
show-word-limit
placeholder='请输入详细地址'
v-model="dataForm.address">
placeholder="请输入经度"
v-model="dataForm.longitude">
</el-input>
</el-form-item>
<el-form-item label="备注"
prop="remark"
label-width="150px"
style="display:block">
<el-input class="item_width_1"
type="textarea"
maxlength="500"
:rows="3"
placeholder='请输入备注,不超过500字'
v-model="dataForm.remark"></el-input>
</el-form-item>
<!-- <el-form-item label="位置坐标"
prop="neighborHoodName"
label-width="150px"
style="display:block">
<el-input class="item_width_1"
maxlength="50"
show-word-limit
placeholder='请输入小区名称'
v-model="dataForm.neighborHoodName">
</el-input>
</el-form-item> -->
</el-form>
</div>
<div v-show="propertyFormShow">
<el-form :inline="false"
:model="propertyForm"
:rules="propertyRule"
class="form">
<el-form-item label="物业名称"
prop="name"
label-width="150px"
style="display:block">
<el-input class="item_width_1"
<span style="margin-left: 20px">纬度</span>
<el-input class="item_width_3"
maxlength="50"
show-word-limit
placeholder='请输入小区名称'
v-model="propertyForm.name">
placeholder="请输入纬度"
v-model="dataForm.latitude">
</el-input>
</div>
</el-form-item>
</el-form>
</el-form-item>
</el-form>
</div>
</div>
<div class="div_btn">
<el-button @click="handleCancle"> </el-button>
<el-button v-if="formType!='detail'"
<el-button v-if="formType != 'detail'"
type="primary"
@click="handleComfirm"> </el-button>
</div>
</div>
</template>
<script>
import { mapGetters } from 'vuex'
import { Loading } from 'element-ui' // Loading
import { requestPost } from "@/js/dai/request";
import { requestPost } from '@/js/dai/request'
var map
var search
var markers
var infoWindowList
let loading //
export default {
data () {
return {
formType: 'add',// addeditdetail
formType: 'add', // addeditdetail
agencyList: [],
gridList: [],
propertyList: [],
neighborHoodId: '',//ID
buildingId: '', //ID
dataForm: {
neighborHoodName: '', // 50
agencyId: '', // ID
gridId: '', //ID
propertyId: '', //
address: '', //
remark: '', //500
location: '', //
agencyId: '', // ID
agencyName: '',
gridId: '', //ID
neighborHoodId: '',//id
buildingName: '',//
sort: 0,//
totalUnitNum: 0,//
totalFloorNum: 0,//
totalHouseNum: 0,//
type: '1',//
location: '', //
longitude: '', //
latitude: '', //
latitude: '' //
},
propertyFormShow: false,
propertyForm: {
name: ''
}
keyWords: '',
agencyObj: {},
}
},
components: {
},
components: {},
mounted () {
this.initMap()
},
methods: {
async initForm (type, row) {
this.formType = type
if (row) {
this.neighborHoodId = row.neighborHoodId
this.dataForm = row
}
async initForm (type, row, agencyObj) {
await this.loadAgency()
await this.loadProperty()
},
async handleAgencyChanged () {
await this.loadGrid()
},
//
async loadAgency () {
// const url = "/gov/org/agency/belongOrg"
const url = "http://yapi.elinkservice.cn/mock/245/gov/org/agency/belongOrg"
let params = {}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.agencyObj = agencyObj
this.dataForm.agencyId = agencyObj.agencyId
this.dataForm.gridId = agencyObj.gridId
this.dataForm.neighborHoodId = agencyObj.id
this.agencyList = data
map.setCenter(new TMap.LatLng(agencyObj.latitude, agencyObj.longitude))
} else {
this.$message.error(msg)
}
},
//
async loadGrid () {
// const url = "/gov/org/grid/allgrids"
const url = "https://epmet-dev.elinkservice.cn:7082/api/apimock-v2/95518686fa128a53f64c678906848062/gov/org/grid/allgrids"
let params = {
agencyId: this.dataForm.agencyId
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.gridList = data
} else {
this.$message.error(msg)
}
},
//
async loadProperty () {
// const url = "/gov/org/propertymanagement/list"
const url = "http://yapi.elinkservice.cn/mock/245/gov/org/propertymanagement/list"
let params = {}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.propertyList = data
} else {
this.$message.error(msg)
this.formType = type
if (row) {
this.buildingId = row.buildingId
this.dataForm = row
}
},
handleAddProperty () {
this.propertyForm.name = ''
this.propertyFormShow = true
},
async handleComfirm () {
if (this.propertyFormShow) {
this.addProperty()
} else {
this.addCommunity()
}
},
async addCommunity () {
// let url = "/gov/org/neighborhood/neighborhoodadd"
let url = "http://yapi.elinkservice.cn/mock/245/gov/org/neighborhood/neighborhoodadd"
let url = ''
if (this.formType === 'add') {
// url = "/gov/org/neighborhood/neighborhoodadd"
url = "http://yapi.elinkservice.cn/mock/245/gov/org/neighborhood/neighborhoodadd"
url = '/gov/org/building/buildingadd'
} else {
// url = "/gov/org/neighborhood/neighborhoodadd"
url = "http://yapi.elinkservice.cn/mock/245/gov/org/neighborhood/neighborhoodadd"
this.dataForm.neighborHoodId = this.neighborHoodId
url = '/gov/org/building/buildingupdate'
this.dataForm.buildingId = this.buildingId
}
const { data, code, msg } = await requestPost(url, this.dataForm)
if (code === 0) {
this.$message({
type: "success",
message: "添加小区成功"
});
this.propertyFormShow = false
type: 'success',
message: '添加楼栋成功'
})
this.resetData()
this.$emit('dialogOk')
} else {
this.$message.error(msg)
}
},
async addProperty () {
// const url = "/gov/org/propertymanagement/add"
const url = "http://yapi.elinkservice.cn/mock/245/gov/org/propertymanagement/add"
let params = {
name: this.propertyForm.name
}
const { data, code, msg } = await requestPost(url, params)
handleCancle () {
this.resetData()
this.$emit('dialogCancle')
if (code === 0) {
},
// init
initMap () {
//
var center = new window.TMap.LatLng(36.0722275, 120.38945519)
// map TMap.Map()
map = new window.TMap.Map(document.getElementById('app'), {
center: center, //
zoom: 17.2, //
pitch: 43.5, //
rotation: 45 //
})
this.$message({
type: "success",
message: "添加物业成功"
});
this.propertyForm.name = ''
this.propertyFormShow = false
this.loadProperty()
} else {
this.$message.error(msg)
}
search = new window.TMap.service.Search({ pageSize: 10 })
//
markers = new TMap.MultiMarker({
map: map,
geometries: []
})
infoWindowList = Array(10)
//
map.on('panend', () => {
this.handleMoveCenter()
})
this.handleMoveCenter()
},
handleCancle () {
if (this.propertyFormShow) {
this.propertyForm.name = ''
this.propertyFormShow = false
} else {
this.$emit('dialogCancle')
}
setMarker (lat, lng) {
markers.setGeometries([])
markers.add([
{
id: '4',
styleId: 'marker',
position: new TMap.LatLng(lat, lng),
properties: {
title: 'marker4'
}
}
])
},
resetData () {
handleSearchMap () {
infoWindowList.forEach((infoWindow) => {
infoWindow.close()
})
infoWindowList.length = 0
markers.setGeometries([])
//
search
.searchRectangle({
keyword: this.keyWords,
bounds: map.getBounds()
})
.then((result) => {
let { data } = result
if (Array.isArray(data) && data.length > 0) {
const {
location: { lat, lng }
} = data[0]
map.setCenter(new TMap.LatLng(lat, lng))
this.setMarker(lat, lng)
this.dataForm.latitude = lat
this.dataForm.longitude = lng
} else {
this.$message.error('未检索到相关位置坐标')
}
})
},
handleMoveCenter () {
//
const center = map.getCenter()
const lat = center.getLat()
const lng = center.getLng()
this.dataForm.latitude = lat
this.dataForm.longitude = lng
this.setMarker(lat, lng)
},
resetData () {
this.buildingId = '' //ID
this.dataForm = {
agencyId: '', // ID
agencyName: '',
gridId: '', //ID
neighborHoodId: '',//id
buildingName: '',//
sort: 0,//
totalUnitNum: 0,//
totalFloorNum: 0,//
totalHouseNum: 0,//
type: '1',//
location: '', //
longitude: '', //
latitude: '' //
}
},
//
startLoading () {
@ -347,9 +309,14 @@ export default {
computed: {
dataRule () {
return {
neighborHoodName: [
{ required: true, message: '小区名称不能为空', trigger: 'blur' },
{ min: 1, max: 50, message: '小区名称长度在 1 到 50个字符', trigger: 'blur' }
buildingName: [
{ required: true, message: '楼栋名称不能为空', trigger: 'blur' },
{
min: 1,
max: 50,
message: '小区名称长度在 1 到 50个字符',
trigger: 'blur'
}
],
agencyId: [
{ required: true, message: '所属组织不能为空', trigger: 'blur' }
@ -357,34 +324,32 @@ export default {
gridId: [
{ required: true, message: '所属网格不能为空', trigger: 'blur' }
],
address: [
{ required: true, message: '详细地址不能为空', trigger: 'blur' }
],
location: [
{ required: true, message: '上架状态不能为空', trigger: 'blur' }
]
longitude: [
{ required: true, message: '坐标不能为空', trigger: 'blur' }
]
}
},
propertyRule () {
name: [
{ required: true, message: '物业名称不能为空', trigger: 'blur' },
// { min: 1, max: 50, message: ' 1 50', trigger: 'blur' }
]
}
},
props: {
}
},
props: {}
}
</script>
<style scoped >
<style scoped>
.item_width_1 {
width: 500px;
}
.item_width_2 {
width: 400px;
}
.item_width_3 {
margin-left: 10px;
width: 200px;
}
.div_map {
margin-top: 10px;
}
.div_btn {
display: flex;

74
epmet-oper-web/src/views/modules/base/community/buildTable.vue

@ -50,11 +50,11 @@
border
style="width: 100%">
<el-table-column prop="buildingName"
label="楼名称"
label="楼名称"
width="180">
</el-table-column>
<el-table-column prop="neighbourHoodName"
label="所属楼宇"
<el-table-column prop="neighborHoodName"
label="所属小区"
width="160">
</el-table-column>
<el-table-column prop="buildingType"
@ -100,9 +100,9 @@
<div>
<el-pagination @size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page.sync="params.pageNo"
:current-page.sync="pageNo"
:page-sizes="[20, 30, 50]"
:page-size="params.pageSize"
:page-size="pageSize"
layout="sizes, prev, pager, next"
:total="total">
</el-pagination>
@ -114,11 +114,12 @@
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="formTitle"
width="800px"
top="5vh"
width="900px"
@closed="diaClose">
<community-form ref="ref_form"
@dialogCancle="addFormCancle"
@dialogOk="addFormOk"></community-form>
<build-form ref="ref_form"
@dialogCancle="addFormCancle"
@dialogOk="addFormOk"></build-form>
</el-dialog>
</div>
@ -126,7 +127,7 @@
<script>
import CommunityForm from './communityForm'
import BuildForm from './buildForm'
import { requestPost } from "@/js/dai/request";
import { mapGetters } from 'vuex'
@ -138,28 +139,25 @@ export default {
return {
loading: false,
total: 0,
params: {
pageSize: 20,
pageNo: 0,
ownerName: '',
ownerPhone: ''
},
pageSize: 20,
pageNo: 0,
agencyObj: {},//
ownerName: '',
ownerPhone: '',
tableData: [],
//form
formShow: false,
formTitle: '新增楼宇'
formTitle: '新增楼宇',
}
},
components: {
CommunityForm
BuildForm
},
async mounted () {
console.log('building11111111111111111111111111')
},
computed: {
rowHeight () {
@ -168,17 +166,23 @@ export default {
...mapGetters(['clientHeight'])
},
methods: {
handleSearch () {
this.loadTable()
},
async loadTable () {
// const url = "/gov/org/neighborhood/neighborhoodlist"
const url = "http://yapi.elinkservice.cn/mock/245/gov/org/neighborhood/neighborhoodlist"
async loadTable (fromTree, treeObj) {
if (fromTree) {
this.agencyObj = treeObj
}
const url = "/gov/org/building/buildinglist"
let params = {
pageSize: this.pageSize,
pageNo: this.pageNo,
ownerName: this.ownerName,
ownerPhone: this.ownerPhone
ownerPhone: this.ownerPhone,
neighborHoodId: this.agencyObj.id
}
const { data, code, msg } = await requestPost(url, params)
@ -196,25 +200,25 @@ export default {
},
handleDetail (row) {
this.formTitle = '楼详情'
this.formTitle = '楼详情'
this.formShow = true
this.$nextTick(() => {
this.$refs.ref_form.initForm('detail', row)
this.$refs.ref_form.initForm('detail', row, this.agencyObj)
})
},
handleAdd () {
this.formTitle = '新增楼'
this.formTitle = '新增楼'
this.formShow = true
this.$nextTick(() => {
this.$refs.ref_form.initForm('add')
this.$refs.ref_form.initForm('add', null, this.agencyObj)
})
},
handleEdit (row) {
this.formTitle = '修改楼'
this.formTitle = '修改楼'
this.formShow = true
this.$refs.ref_form.initForm('edit', row)
this.$refs.ref_form.initForm('edit', row, this.agencyObj)
},
addFormCancle () {
@ -233,7 +237,7 @@ export default {
type: "warning"
})
.then(() => {
this.deleteCommunity(row)
this.deleteBuild(row)
})
.catch(err => {
if (err == "cancel") {
@ -248,11 +252,11 @@ export default {
},
async deleteCommunity (row) {
// const url = "/gov/org/neighborhood/neighborhooddel"
const url = "http://yapi.elinkservice.cn/mock/245/gov/org/neighborhood/neighborhooddel"
async deleteBuild (row) {
const url = "/gov/org/building/buildingdel"
let params = {
neighborHoodId: row.neighborHoodId
buildingId: row.buildingId
}
const { data, code, msg } = await requestPost(url, params)
@ -262,6 +266,8 @@ export default {
type: "success",
message: "删除成功"
});
this.$emit('refreshTree')
this.loadTable()
} else {
this.$message.error(msg)
}

90
epmet-oper-web/src/views/modules/base/community/community.vue

@ -16,6 +16,7 @@
class="filter-tree"
:data="treeData"
:props="defaultProps"
:highlight-current="true"
node-key="id"
:expand-on-click-node="false"
default-expand-all
@ -32,12 +33,15 @@
<el-card>
<div :style="{height:rowHeight}">
<build-table v-if="selTreeLevel==='neighbourHood'"
ref="ref_neighTable"></build-table>
<room-table v-else-if="selTreeLevel==='building'"
ref="ref_buildingTable"></room-table>
<build-table v-if="selTreeObj.level==='neighbourHood'"
ref="ref_neighTable"
@refreshTree="refreshTree"></build-table>
<room-table v-else-if="selTreeObj.level==='building'"
ref="ref_buildingTable"
@refreshTree="refreshTree"></room-table>
<community-table v-else
ref="ref_communityTable"></community-table>
ref="ref_communityTable"
@refreshTree="refreshTree"></community-table>
</div>
</el-card>
@ -68,8 +72,7 @@ export default {
label: 'label'
},
selTreeId: '',
selTreeLevel: '',
selTreeObj: {},
centerPoint: []
@ -80,10 +83,8 @@ export default {
},
async mounted () {
await this.loadOrgData()
await this.$refs['ref_communityTable'].initData(this.centerPoint)
await this.loadTree()
await this.$refs['ref_communityTable'].loadTable(this.selTreeId, this.selTreeLevel)
await this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj)
},
computed: {
rowHeight () {
@ -94,7 +95,6 @@ export default {
methods: {
async loadTree () {
const url = "/gov/org/building/treelist"
// const url = "http://yapi.elinkservice.cn/mock/245/gov/org/building/treelist"
let params = {}
const { data, code, msg } = await requestPost(url, params)
@ -103,8 +103,14 @@ export default {
this.treeData = data
if (data.length > 0) {
this.selTreeId = data[0].id
this.selTreeLevel = data[0].level
this.selTreeObj = data[0]
if (!this.selTreeObj.latitude) {
this.selTreeObj.latitude = this.centerPoint[0]
}
if (!this.selTreeObj.longitude) {
this.selTreeObj.longitude = this.centerPoint[1]
}
}
} else {
@ -133,13 +139,61 @@ export default {
},
handleNodeClick (obj) {
if (obj.level === 'building') {
this.$refs['ref_buildingTable'].loadTable(obj.id, obj.level)
} else if (obj.level === 'neighbourHood') {
this.$refs['ref_neighTable'].loadTable(obj.id, obj.level)
this.getTreeObj(obj)
this.$nextTick(() => {
if (obj.level === 'building') {//
this.$refs['ref_buildingTable'].loadTable(true, this.selTreeObj)
} else if (obj.level === 'neighbourHood') {//
this.$refs['ref_neighTable'].loadTable(true, this.selTreeObj)
} else {
this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj)
}
})
},
//
refreshTree () {
},
//
getTreeObj (obj) {
// debugger
//
// idtype
// idtypeidid
// idtypeid
if (obj.level === 'building') {//
let communityNode = this.$refs.ref_tree.getNode(obj.pid)
obj.communityId = communityNode.data.id
obj.communityName = communityNode.data.label
} else if (obj.level === 'neighbourHood') {//
let gridNode = this.$refs.ref_tree.getNode(obj.pid)
let agencyNode = this.$refs.ref_tree.getNode(gridNode.data.pid)
obj.gridId = gridNode.data.id
obj.gridName = gridNode.data.label
obj.agencyId = agencyNode.data.id
obj.agencyName = agencyNode.data.label
} else {
this.$refs['ref_communityTable'].loadTable(obj.id, obj.level)
}
if (!obj.latitude) {
obj.latitude = this.centerPoint[0]
}
if (!obj.longitude) {
obj.longitude = this.centerPoint[1]
}
this.selTreeObj = obj
console.log(this.selTreeObj)
},

55
epmet-oper-web/src/views/modules/base/community/communityForm.vue

@ -7,17 +7,7 @@
:rules="dataRule"
:disabled="formType === 'detail'"
class="form">
<el-form-item label="小区名称"
prop="neighborHoodName"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
maxlength="50"
show-word-limit
placeholder="请输入小区名称"
v-model="dataForm.neighborHoodName">
</el-input>
</el-form-item>
<el-form-item label="所属组织"
label-width="150px"
style="display: block">
@ -38,6 +28,18 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="小区名称"
prop="neighborHoodName"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
maxlength="50"
show-word-limit
placeholder="请输入小区名称"
v-model="dataForm.neighborHoodName">
</el-input>
</el-form-item>
<el-form-item label="关联物业"
prop="propertyId"
label-width="150px"
@ -179,7 +181,7 @@ export default {
},
keyWords: '',
centerPoint: []
agencyObj: {}
}
},
components: {},
@ -267,11 +269,11 @@ export default {
this.setMarker(lat, lng)
},
async initForm (centerPoint, type, row) {
async initForm (type, row, agencyObj) {
this.centerPoint = centerPoint
this.agencyObj = agencyObj
// debugger
map.setCenter(new TMap.LatLng(this.centerPoint[0], this.centerPoint[1]))
map.setCenter(new TMap.LatLng(agencyObj.latitude, agencyObj.longitude))
this.formType = type
if (row) {
@ -281,7 +283,7 @@ export default {
await this.loadAgency()
await this.loadGrid()
// await this.loadProperty()
await this.loadProperty()
},
//
@ -360,8 +362,8 @@ export default {
type: 'success',
message: '添加小区成功'
})
this.propertyFormShow = false
this.resetData()
this.$emit('dialogOk')
} else {
this.$message.error(msg)
}
@ -392,10 +394,25 @@ export default {
this.propertyForm.name = ''
this.propertyFormShow = false
} else {
this.resetData()
this.$emit('dialogCancle')
}
},
resetData () { },
resetData () {
this.neighborHoodId = '' //ID
this.dataForm = {
neighborHoodName: '', // 50
agencyId: '', // ID
agencyName: '',
gridId: '', //ID
propertyId: '', //
address: '', //
remark: '', //500
location: '', //
longitude: '', //
latitude: '' //
}
},
//
startLoading () {
loading = Loading.service({

49
epmet-oper-web/src/views/modules/base/community/communityTable.vue

@ -53,7 +53,7 @@
label="小区名称"
width="180">
</el-table-column>
<el-table-column prop="orgName"
<el-table-column prop="agencyName"
label="所属组织"
width="160">
</el-table-column>
@ -94,9 +94,9 @@
<div>
<el-pagination @size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page.sync="params.pageNo"
:current-page.sync="pageNo"
:page-sizes="[20, 30, 50]"
:page-size="params.pageSize"
:page-size="pageSize"
layout="sizes, prev, pager, next"
:total="total">
</el-pagination>
@ -109,7 +109,7 @@
:close-on-press-escape="false"
:title="formTitle"
width="800px"
top='15'
top="5vh"
@closed="diaClose">
<community-form ref="ref_form"
@dialogCancle="addFormCancle"
@ -133,15 +133,10 @@ export default {
return {
loading: false,
total: 0,
params: {
pageSize: 20,
pageNo: 0,
ownerName: '',
ownerPhone: ''
},
selTreeId: '',
selTreeLevel: '',
pageSize: 20,
pageNo: 0,
agencyObj: {},//
ownerName: '',
ownerPhone: '',
tableData: [],
@ -166,17 +161,16 @@ export default {
...mapGetters(['clientHeight'])
},
methods: {
initData (centerPoint) {
this.centerPoint = centerPoint
},
handleSearch () {
this.loadTable()
},
async loadTable (selTreeId, selTreeLevel) {
if (selTreeId && selTreeLevel) {
this.selTreeId = selTreeId
this.selTreeLevel = selTreeLevel
async loadTable (fromTree, treeObj, centerPoint) {
if (fromTree) {
this.agencyObj = treeObj
this.centerPoint = centerPoint
}
const url = "/gov/org/neighborhood/neighborhoodlist"
// const url = "http://yapi.elinkservice.cn/mock/245/gov/org/neighborhood/neighborhoodlist"
let params = {
@ -184,8 +178,8 @@ export default {
pageNo: this.pageNo,
ownerName: this.ownerName,
ownerPhone: this.ownerPhone,
level: this.selTreeId,
id: this.selTreeLevel
level: this.agencyObj.level,
id: this.agencyObj.id
}
const { data, code, msg } = await requestPost(url, params)
@ -206,7 +200,7 @@ export default {
this.formTitle = '小区详情'
this.formShow = true
this.$nextTick(() => {
this.$refs.ref_form.initForm(this.centerPoint, 'detail', row)
this.$refs.ref_form.initForm('detail', row, this.agencyObj)
})
},
@ -214,14 +208,14 @@ export default {
this.formTitle = '新增小区'
this.formShow = true
this.$nextTick(() => {
this.$refs.ref_form.initForm(this.centerPoint, 'add')
this.$refs.ref_form.initForm('add', null, this.agencyObj)
})
},
handleEdit (row) {
this.formTitle = '修改小区'
this.formShow = true
this.$refs.ref_form.initForm(this.centerPoint, 'edit', row)
this.$refs.ref_form.initForm('edit', row, this.agencyObj)
},
addFormCancle () {
@ -229,6 +223,7 @@ export default {
},
addFormOk () {
this.formShow = false
this.$emit('addCommunityOk')
this.loadTable()
},
@ -257,7 +252,7 @@ export default {
async deleteCommunity (row) {
const url = "/gov/org/neighborhood/neighborhooddel"
// const url = "http://yapi.elinkservice.cn/mock/245/gov/org/neighborhood/neighborhooddel"
let params = {
neighborHoodId: row.neighborHoodId
}
@ -269,6 +264,8 @@ export default {
type: "success",
message: "删除成功"
});
this.$emit('refreshTree')
this.loadTable()
} else {
this.$message.error(msg)
}

473
epmet-oper-web/src/views/modules/base/community/roomForm.vue

@ -1,332 +1,241 @@
<template>
<div>
<div>
<div v-show="!propertyFormShow">
<el-form :inline="false"
:model="dataForm"
:rules="dataRule"
:disabled="formType==='detail'"
class="form">
<el-form-item label="小区名称"
prop="neighborHoodName"
label-width="150px"
style="display:block">
<el-input class="item_width_1"
maxlength="50"
show-word-limit
placeholder='请输入小区名称'
v-model="dataForm.neighborHoodName">
</el-input>
</el-form-item>
<el-form-item label="所属组织"
prop="agencyId"
label-width="150px"
style="display:block">
<el-select class="item_width_1"
v-model="dataForm.agencyId"
placeholder="请选择"
@change="handleAgencyChanged"
clearable>
<el-option v-for="item in agencyList"
:key="item.agencyId"
:label="item.agencyName"
:value="item.agencyId">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="所属网格"
prop="gridId"
label-width="150px"
style="display:block">
<el-select class="item_width_1"
v-model="dataForm.gridId"
placeholder="请选择"
clearable>
<el-option v-for="item in gridList"
:key="item.gridId"
:label="item.gridName"
:value="item.gridId">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="关联物业"
prop="propertyId"
label-width="150px"
style="display:block">
<el-select class="item_width_2"
v-model="dataForm.propertyId"
placeholder="请选择"
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="primary"
size="small"
@click="handleAddProperty">添加物业</el-button>
</el-form-item>
<el-form-item label="详细地址"
prop="address"
label-width="150px"
style="display:block">
<el-input class="item_width_1"
maxlength="50"
show-word-limit
placeholder='请输入详细地址'
v-model="dataForm.address">
</el-input>
</el-form-item>
<el-form-item label="备注"
prop="remark"
label-width="150px"
style="display:block">
<el-input class="item_width_1"
type="textarea"
maxlength="500"
:rows="3"
placeholder='请输入备注,不超过500字'
v-model="dataForm.remark"></el-input>
</el-form-item>
<!-- <el-form-item label="位置坐标"
prop="neighborHoodName"
label-width="150px"
style="display:block">
<el-input class="item_width_1"
maxlength="50"
show-word-limit
placeholder='请输入小区名称'
v-model="dataForm.neighborHoodName">
</el-input>
</el-form-item> -->
</el-form>
</div>
<div v-show="propertyFormShow">
<el-form :inline="false"
:model="propertyForm"
:rules="propertyRule"
class="form">
<el-form-item label="物业名称"
prop="name"
label-width="150px"
style="display:block">
<el-input class="item_width_1"
maxlength="50"
show-word-limit
placeholder='请输入小区名称'
v-model="propertyForm.name">
</el-input>
</el-form-item>
</el-form>
</div>
<el-form :inline="false"
:model="dataForm"
:rules="dataRule"
:disabled="formType === 'detail'"
class="form">
<el-form-item label="所属楼栋"
label-width="150px"
style="display: block">
<span>{{ agencyObj.communityName }}{{agencyObj.label}}</span>
</el-form-item>
<el-form-item label="单元号"
prop="buildingUnitId"
label-width="150px"
style="display: block">
<el-select class="item_width_1"
v-model="dataForm.buildingUnitId"
placeholder="请选择"
clearable>
<el-option v-for="item in unitList"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="门牌号"
prop="doorName"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
placeholder="请输入门牌号"
v-model="dataForm.doorName">
</el-input>
</el-form-item>
<el-form-item label="房屋类型"
prop="houseType"
label-width="150px"
style="display: block">
<el-radio-group v-model="dataForm.houseType">
<el-radio :label="'1'">楼房</el-radio>
<el-radio :label="'2'">平房</el-radio>
<el-radio :label="'3'">别墅</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="房屋用途"
prop="purpose"
label-width="150px"
style="display: block">
<el-radio-group v-model="dataForm.purpose">
<el-radio :label="'1'">商品房</el-radio>
<el-radio :label="'2'">自建房</el-radio>
<el-radio :label="'3'">别墅</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="出租"
prop="rentFlag"
label-width="150px"
style="display: block">
<el-radio-group v-model="dataForm.rentFlag">
<el-radio :label="1"></el-radio>
<el-radio :label="2"></el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="房主姓名"
prop="ownerName"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
maxlength="50"
show-word-limit
placeholder="请输入房主姓名"
v-model="dataForm.ownerName">
</el-input>
</el-form-item>
<el-form-item label="房主电话"
prop="ownerPhone"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
type='number'
placeholder="请输入房主电话"
v-model="dataForm.ownerPhone">
</el-input>
</el-form-item>
<el-form-item label="房主身份证"
prop="ownerIdCard"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
type='number'
placeholder="请输入房主身份证"
v-model="dataForm.ownerIdCard">
</el-input>
</el-form-item>
</el-form>
</div>
<div class="div_btn">
<el-button @click="handleCancle"> </el-button>
<el-button v-if="formType!='detail'"
<el-button v-if="formType != 'detail'"
type="primary"
@click="handleComfirm"> </el-button>
</div>
</div>
</template>
<script>
import { mapGetters } from 'vuex'
import { Loading } from 'element-ui' // Loading
import { requestPost } from "@/js/dai/request";
import { requestPost } from '@/js/dai/request'
let loading //
export default {
data () {
return {
formType: 'add',// addeditdetail
formType: 'add', // addeditdetail
agencyList: [],
gridList: [],
propertyList: [],
unitList: [],
neighborHoodId: '',//ID
houseId: '', //ID
dataForm: {
neighborHoodName: '', // 50
agencyId: '', // ID
gridId: '', //ID
propertyId: '', //
address: '', //
remark: '', //500
location: '', //
longitude: '', //
latitude: '', //
neighborHoodId: '', // ID
buildingId: '',//ID
buildingUnitId: '',//ID
doorName: '',//
houseType: '1',//
purpose: '1',//
rentFlag: 0,//10
ownerPhone: '', //
ownerName: '', //
ownerIdCard: '' //
},
propertyFormShow: false,
propertyForm: {
name: ''
}
keyWords: '',
agencyObj: {},
}
},
components: {
},
components: {},
mounted () {
},
methods: {
async initForm (type, row) {
async initForm (type, row, agencyObj) {
this.agencyObj = agencyObj
this.dataForm.neighborHoodId = agencyObj.communityId
this.dataForm.buildingId = agencyObj.id
this.formType = type
if (row) {
this.neighborHoodId = row.neighborHoodId
this.houseId = row.houseId
this.dataForm = row
}
await this.loadAgency()
await this.loadProperty()
},
// await this.loadUnitList()
async handleAgencyChanged () {
await this.loadGrid()
},
//
async loadAgency () {
// const url = "/gov/org/agency/belongOrg"
const url = "http://yapi.elinkservice.cn/mock/245/gov/org/agency/belongOrg"
let params = {}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.agencyList = data
//
async loadUnitList () {
const url = '/gov/org/building/buildingunitlist'
} else {
this.$message.error(msg)
}
},
//
async loadGrid () {
// const url = "/gov/org/grid/allgrids"
const url = "https://epmet-dev.elinkservice.cn:7082/api/apimock-v2/95518686fa128a53f64c678906848062/gov/org/grid/allgrids"
let params = {
agencyId: this.dataForm.agencyId
buildingid: this.agencyObj.id
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.gridList = data
this.unitList = data
} else {
this.$message.error(msg)
}
},
//
async loadProperty () {
// const url = "/gov/org/propertymanagement/list"
const url = "http://yapi.elinkservice.cn/mock/245/gov/org/propertymanagement/list"
let params = {}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.propertyList = data
} else {
this.$message.error(msg)
}
},
handleAddProperty () {
this.propertyForm.name = ''
this.propertyFormShow = true
},
async handleComfirm () {
if (this.propertyFormShow) {
this.addProperty()
} else {
this.addCommunity()
}
},
async addCommunity () {
// let url = "/gov/org/neighborhood/neighborhoodadd"
let url = "http://yapi.elinkservice.cn/mock/245/gov/org/neighborhood/neighborhoodadd"
let url = ''
this.dataForm.buildingUnitId = '14a8df50bc43fda1753088fb458d2942'
if (this.formType === 'add') {
// url = "/gov/org/neighborhood/neighborhoodadd"
url = "http://yapi.elinkservice.cn/mock/245/gov/org/neighborhood/neighborhoodadd"
url = '/gov/org/house/houseadd'
} else {
// url = "/gov/org/neighborhood/neighborhoodadd"
url = "http://yapi.elinkservice.cn/mock/245/gov/org/neighborhood/neighborhoodadd"
this.dataForm.neighborHoodId = this.neighborHoodId
url = '/gov/org/house/houseupdate'
this.dataForm.houseId = this.houseId
}
const { data, code, msg } = await requestPost(url, this.dataForm)
if (code === 0) {
this.$message({
type: "success",
message: "添加小区成功"
});
this.propertyFormShow = false
type: 'success',
message: '添加楼栋成功'
})
this.resetData()
this.$emit('dialogOk')
} else {
this.$message.error(msg)
}
},
async addProperty () {
// const url = "/gov/org/propertymanagement/add"
const url = "http://yapi.elinkservice.cn/mock/245/gov/org/propertymanagement/add"
let params = {
name: this.propertyForm.name
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.$message({
type: "success",
message: "添加物业成功"
});
this.propertyForm.name = ''
this.propertyFormShow = false
this.loadProperty()
} else {
this.$message.error(msg)
}
},
handleCancle () {
if (this.propertyFormShow) {
this.propertyForm.name = ''
this.propertyFormShow = false
} else {
this.$emit('dialogCancle')
}
this.resetData()
this.$emit('dialogCancle')
},
resetData () {
resetData () {
this.houseId = '' //ID
this.dataForm = {
neighborHoodId: '', // ID
buildingId: '',//ID
buildingUnitId: 0,//ID
doorName: 0,//
houseType: '1',//
purpose: '1',//
rentFlag: '1',//10
ownerPhone: '', //
ownerName: '', //
ownerIdCard: '' //
}
},
//
startLoading () {
@ -347,44 +256,50 @@ export default {
computed: {
dataRule () {
return {
neighborHoodName: [
{ required: true, message: '小区名称不能为空', trigger: 'blur' },
{ min: 1, max: 50, message: '小区名称长度在 1 到 50个字符', trigger: 'blur' }
],
agencyId: [
{ required: true, message: '所属组织不能为空', trigger: 'blur' }
buildingUnitId: [
{ required: true, message: '所属单元不能为空', trigger: 'blur' },
],
gridId: [
{ required: true, message: '所属网格不能为空', trigger: 'blur' }
doorName: [
{ required: true, message: '门牌号不能为空', trigger: 'blur' }
],
address: [
{ required: true, message: '详细地址不能为空', trigger: 'blur' }
houseType: [
{ required: true, message: '房屋类型不能为空', trigger: 'blur' }
],
location: [
{ required: true, message: '上架状态不能为空', trigger: 'blur' }
]
purpose: [
{ required: true, message: '房屋用途不能为空', trigger: 'blur' }
],
rentFlag: [
{ required: true, message: '是否出租不能为空', trigger: 'blur' }
],
ownerPhone: [
{ required: true, message: '房主电话不能为空', trigger: 'blur' }
],
ownerName: [
{ required: true, message: '房主姓名不能为空', trigger: 'blur' }
],
ownerIdCard: [
{ required: true, message: '房主身份证号不能为空', trigger: 'blur' }
],
}
},
propertyRule () {
name: [
{ required: true, message: '物业名称不能为空', trigger: 'blur' },
// { min: 1, max: 50, message: ' 1 50', trigger: 'blur' }
]
}
},
props: {
}
},
props: {}
}
</script>
<style scoped >
<style scoped>
.item_width_1 {
width: 500px;
}
.item_width_2 {
width: 400px;
}
.item_width_3 {
margin-left: 10px;
width: 200px;
}
.div_btn {
display: flex;

95
epmet-oper-web/src/views/modules/base/community/roomTable.vue

@ -49,41 +49,40 @@
<el-table :data="tableData"
border
style="width: 100%">
<el-table-column prop="neighborHoodName"
<el-table-column prop="houseName"
label="房屋名称"
width="180">
width="120">
</el-table-column>
<el-table-column prop="orgName"
<el-table-column prop="neighborHoodName"
label="所属小区"
width="160">
</el-table-column>
<el-table-column prop="gridName"
label="所属楼栋"
width="140">
<el-table-column prop="buildingName"
label="所属楼栋">
</el-table-column>
<el-table-column prop="address"
<el-table-column prop="unitNum"
label="单元号">
</el-table-column>
<el-table-column prop="remark"
<el-table-column prop="doorName"
label="门牌号">
</el-table-column>
<el-table-column prop="remark"
<el-table-column prop="houseType"
label="房屋类型">
</el-table-column>
<el-table-column prop="remark"
<el-table-column prop="purpose"
label="房屋用途">
</el-table-column>
<el-table-column prop="remark"
<el-table-column prop="rentFlag"
label="是否出租">
</el-table-column>
<el-table-column prop="remark"
<el-table-column prop="ownerName"
label="房主姓名">
</el-table-column>
<el-table-column prop="remark"
<el-table-column prop="ownerPhone"
label="房主电话">
</el-table-column>
<el-table-column prop="remark"
label="身份证号码">
<el-table-column prop="ownerIdCard"
label="身份证">
</el-table-column>
<el-table-column label="操作"
fixed="right"
@ -112,9 +111,9 @@
<div>
<el-pagination @size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page.sync="params.pageNo"
:current-page.sync="pageNo"
:page-sizes="[20, 30, 50]"
:page-size="params.pageSize"
:page-size="pageSize"
layout="sizes, prev, pager, next"
:total="total">
</el-pagination>
@ -128,9 +127,9 @@
:title="formTitle"
width="800px"
@closed="diaClose">
<community-form ref="ref_form"
@dialogCancle="addFormCancle"
@dialogOk="addFormOk"></community-form>
<room-form ref="ref_form"
@dialogCancle="addFormCancle"
@dialogOk="addFormOk"></room-form>
</el-dialog>
</div>
@ -138,7 +137,7 @@
<script>
import CommunityForm from './communityForm'
import roomForm from './roomForm'
import { requestPost } from "@/js/dai/request";
import { mapGetters } from 'vuex'
@ -150,25 +149,24 @@ export default {
return {
loading: false,
total: 0,
params: {
pageSize: 20,
pageNo: 0,
ownerName: '',
ownerPhone: ''
},
pageSize: 20,
pageNo: 0,
agencyObj: {},//
ownerName: '',
ownerPhone: '',
tableData: [],
//form
formShow: false,
formTitle: '新增小区'
formTitle: '新增房屋',
}
},
components: {
CommunityForm
roomForm
},
async mounted () {
@ -180,17 +178,24 @@ export default {
...mapGetters(['clientHeight'])
},
methods: {
handleSearch () {
this.loadTable()
},
async loadTable () {
// const url = "/gov/org/neighborhood/neighborhoodlist"
const url = "http://yapi.elinkservice.cn/mock/245/gov/org/neighborhood/neighborhoodlist"
async loadTable (fromTree, treeObj) {
if (fromTree) {
this.agencyObj = treeObj
}
const url = "/gov/org/house/houselist"
let params = {
pageSize: this.pageSize,
pageNo: this.pageNo,
ownerName: this.ownerName,
ownerPhone: this.ownerPhone
ownerPhone: this.ownerPhone,
buildingId: this.agencyObj.id
}
const { data, code, msg } = await requestPost(url, params)
@ -208,25 +213,25 @@ export default {
},
handleDetail (row) {
this.formTitle = '小区详情'
this.formTitle = '房屋详情'
this.formShow = true
this.$nextTick(() => {
this.$refs.ref_form.initForm('detail', row)
this.$refs.ref_form.initForm('detail', row, this.agencyObj)
})
},
handleAdd () {
this.formTitle = '新增小区'
this.formTitle = '新增房屋'
this.formShow = true
this.$nextTick(() => {
this.$refs.ref_form.initForm('add')
this.$refs.ref_form.initForm('add', null, this.agencyObj)
})
},
handleEdit (row) {
this.formTitle = '修改小区'
this.formTitle = '修改房屋'
this.formShow = true
this.$refs.ref_form.initForm('edit', row)
this.$refs.ref_form.initForm('edit', row, this.agencyObj)
},
addFormCancle () {
@ -245,7 +250,7 @@ export default {
type: "warning"
})
.then(() => {
this.deleteCommunity(row)
this.deleteRoom(row)
})
.catch(err => {
if (err == "cancel") {
@ -260,11 +265,11 @@ export default {
},
async deleteCommunity (row) {
// const url = "/gov/org/neighborhood/neighborhooddel"
const url = "http://yapi.elinkservice.cn/mock/245/gov/org/neighborhood/neighborhooddel"
async deleteRoom (row) {
const url = "/gov/org/house/housedel"
let params = {
neighborHoodId: row.neighborHoodId
houseId: row.houseId
}
const { data, code, msg } = await requestPost(url, params)
@ -274,6 +279,8 @@ export default {
type: "success",
message: "删除成功"
});
this.$emit('refreshTree')
this.loadTable()
} else {
this.$message.error(msg)
}

Loading…
Cancel
Save