elink-star
/
epmet-oper-lingshan
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

小区管理

master
jiangyy 4 years ago
parent
4cd6978bcd
commit
d6f9a3bf4a
7 changed files with 662 additions and 701 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 521
      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

521
epmet-oper-web/src/views/modules/base/community/buildForm.vue
View File

@ -1,332 +1,294 @@
<template> <template>
<div> <div>
<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 :inline="true"
<el-form-item label="详细地址" :model="dataForm"
prop="address" :rules="dataRule"
label-width="150px" :disabled="formType === 'detail'"
style="display:block"> class="form">
<el-input class="item_width_1" <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" maxlength="50"
show-word-limit placeholder="请输入经度"
placeholder='请输入详细地址' v-model="dataForm.longitude">
v-model="dataForm.address">
</el-input> </el-input>
<span style="margin-left: 20px">纬度</span>
</el-form-item> <el-input class="item_width_3"
<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" maxlength="50"
show-word-limit placeholder="请输入纬度"
placeholder='请输入小区名称' v-model="dataForm.latitude">
v-model="propertyForm.name">
</el-input> </el-input>
</div>
</el-form-item>
</el-form>
</el-form-item>
</el-form>
</div>
</div> </div>
<div class="div_btn"> <div class="div_btn">
<el-button @click="handleCancle">取 消</el-button> <el-button @click="handleCancle">取 消</el-button>
<el-button v-if="formType!='detail'" <el-button v-if="formType != 'detail'"
type="primary" type="primary"
@click="handleComfirm">确 定</el-button> @click="handleComfirm">确 定</el-button>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import { Loading } from 'element-ui' // 引入Loading服务 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 // 加载动画 let loading // 加载动画
export default { export default {
data () { data () {
return { return {
formType: 'add',//表单操作类型 add新增，edit编辑，detail详情 formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
agencyList: [], buildingId: '', //楼栋ID
gridList: [],
propertyList: [],
neighborHoodId: '',//小区ID
dataForm: { dataForm: {
neighborHoodName: '', // 小区名称【不超过50字】
agencyId: '', // 所属组织ID agencyId: '', // 所属组织ID
agencyName: '',
gridId: '', //所属网格ID gridId: '', //所属网格ID
propertyId: '', //关联物业 neighborHoodId: '',//所属小区id
address: '', //详细地址 buildingName: '',//房屋名称
remark: '', //备注【最大500字】 sort: 0,//排序
totalUnitNum: 0,//单元数
totalFloorNum: 0,//层数
totalHouseNum: 0,//户数
type: '1',//房屋类型
location: '', //坐标位置 location: '', //坐标位置
longitude: '', //经度 longitude: '', //经度
latitude: '', //纬度 latitude: '' //纬度
}, },
propertyFormShow: false, keyWords: '',
propertyForm: { agencyObj: {},
name: ''
}
} }
}, },
components: { components: {},
},
mounted () { mounted () {
this.initMap()
}, },
methods: { methods: {
async initForm (type, row) { async initForm (type, row, agencyObj) {
this.formType = type
if (row) {
this.neighborHoodId = row.neighborHoodId
this.dataForm = row
}
await this.loadAgency() this.agencyObj = agencyObj
await this.loadProperty() this.dataForm.agencyId = agencyObj.agencyId
}, this.dataForm.gridId = agencyObj.gridId
this.dataForm.neighborHoodId = agencyObj.id
async handleAgencyChanged () { map.setCenter(new TMap.LatLng(agencyObj.latitude, agencyObj.longitude))
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
} 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.formType = type
this.$message.error(msg) if (row) {
this.buildingId = row.buildingId
this.dataForm = row
} }
},
handleAddProperty () {
this.propertyForm.name = ''
this.propertyFormShow = true
}, },
async handleComfirm () { async handleComfirm () {
if (this.propertyFormShow) { let url = ''
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"
if (this.formType === 'add') { if (this.formType === 'add') {
// url = "/gov/org/neighborhood/neighborhoodadd" url = '/gov/org/building/buildingadd'
url = "http://yapi.elinkservice.cn/mock/245/gov/org/neighborhood/neighborhoodadd"
} else { } else {
// url = "/gov/org/neighborhood/neighborhoodadd" url = '/gov/org/building/buildingupdate'
url = "http://yapi.elinkservice.cn/mock/245/gov/org/neighborhood/neighborhoodadd"
this.dataForm.neighborHoodId = this.neighborHoodId this.dataForm.buildingId = this.buildingId
} }
const { data, code, msg } = await requestPost(url, this.dataForm) const { data, code, msg } = await requestPost(url, this.dataForm)
if (code === 0) { if (code === 0) {
this.$message({ this.$message({
type: "success", type: 'success',
message: "添加小区成功" message: '添加楼栋成功'
}); })
this.resetData()
this.propertyFormShow = false this.$emit('dialogOk')
} else { } else {
this.$message.error(msg) 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({ search = new window.TMap.service.Search({ pageSize: 10 })
type: "success", // 新建一个地点搜索类
message: "添加物业成功" markers = new TMap.MultiMarker({
}); map: map,
this.propertyForm.name = '' geometries: []
this.propertyFormShow = false })
this.loadProperty() infoWindowList = Array(10)
} else {
this.$message.error(msg)
}
// 监听地图平移结束
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 () { startLoading () {
@ -347,9 +309,14 @@ export default {
computed: { computed: {
dataRule () { dataRule () {
return { return {
neighborHoodName: [ buildingName: [
{ required: true, message: '小区名称不能为空', trigger: 'blur' }, { required: true, message: '楼栋名称不能为空', trigger: 'blur' },
{ min: 1, max: 50, message: '小区名称长度在 1 到 50个字符', trigger: 'blur' } {
min: 1,
max: 50,
message: '小区名称长度在 1 到 50个字符',
trigger: 'blur'
}
], ],
agencyId: [ agencyId: [
{ required: true, message: '所属组织不能为空', trigger: 'blur' } { required: true, message: '所属组织不能为空', trigger: 'blur' }
@ -357,34 +324,32 @@ export default {
gridId: [ gridId: [
{ required: true, message: '所属网格不能为空', trigger: 'blur' } { 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> </script>
<style scoped > <style scoped>
.item_width_1 { .item_width_1 {
width: 500px; width: 500px;
} }
.item_width_2 { .item_width_2 {
width: 400px; width: 400px;
} }
.item_width_3 {
margin-left: 10px;
width: 200px;
}
.div_map {
margin-top: 10px;
}
.div_btn { .div_btn {
display: flex; display: flex;

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

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

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

@ -16,6 +16,7 @@
class="filter-tree" class="filter-tree"
:data="treeData" :data="treeData"
:props="defaultProps" :props="defaultProps"
:highlight-current="true"
node-key="id" node-key="id"
:expand-on-click-node="false" :expand-on-click-node="false"
default-expand-all default-expand-all
@ -32,12 +33,15 @@
<el-card> <el-card>
<div :style="{height:rowHeight}"> <div :style="{height:rowHeight}">
<build-table v-if="selTreeLevel==='neighbourHood'" <build-table v-if="selTreeObj.level==='neighbourHood'"
ref="ref_neighTable"></build-table> ref="ref_neighTable"
<room-table v-else-if="selTreeLevel==='building'" @refreshTree="refreshTree"></build-table>
ref="ref_buildingTable"></room-table> <room-table v-else-if="selTreeObj.level==='building'"
ref="ref_buildingTable"
@refreshTree="refreshTree"></room-table>
<community-table v-else <community-table v-else
ref="ref_communityTable"></community-table> ref="ref_communityTable"
@refreshTree="refreshTree"></community-table>
</div> </div>
</el-card> </el-card>
@ -68,8 +72,7 @@ export default {
label: 'label' label: 'label'
}, },
selTreeId: '', selTreeObj: {},
selTreeLevel: '',
centerPoint: [] centerPoint: []
@ -80,10 +83,8 @@ export default {
}, },
async mounted () { async mounted () {
await this.loadOrgData() await this.loadOrgData()
await this.$refs['ref_communityTable'].initData(this.centerPoint)
await this.loadTree() await this.loadTree()
await this.$refs['ref_communityTable'].loadTable(this.selTreeId, this.selTreeLevel) await this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj)
}, },
computed: { computed: {
rowHeight () { rowHeight () {
@ -94,7 +95,6 @@ export default {
methods: { methods: {
async loadTree () { async loadTree () {
const url = "/gov/org/building/treelist" const url = "/gov/org/building/treelist"
// const url = "http://yapi.elinkservice.cn/mock/245/gov/org/building/treelist"
let params = {} let params = {}
const { data, code, msg } = await requestPost(url, params) const { data, code, msg } = await requestPost(url, params)
@ -103,8 +103,14 @@ export default {
this.treeData = data this.treeData = data
if (data.length > 0) { if (data.length > 0) {
this.selTreeId = data[0].id this.selTreeObj = data[0]
this.selTreeLevel = data[0].level if (!this.selTreeObj.latitude) {
this.selTreeObj.latitude = this.centerPoint[0]
}
if (!this.selTreeObj.longitude) {
this.selTreeObj.longitude = this.centerPoint[1]
}
} }
} else { } else {
@ -133,13 +139,61 @@ export default {
}, },
handleNodeClick (obj) { handleNodeClick (obj) {
if (obj.level === 'building') {
this.$refs['ref_buildingTable'].loadTable(obj.id, obj.level) this.getTreeObj(obj)
} else if (obj.level === 'neighbourHood') {
this.$refs['ref_neighTable'].loadTable(obj.id, obj.level) 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
// 树接口：
// 组织：组织id、组织名称、type、经度、纬度
// 小区：小区id、小区名称、type、所属网格id、所属网格名称、所属组织id、所属组织名称、经度、纬度
// 楼：楼id、楼名称、type、所属小区id、所属小区名称
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 { } 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
View File

@ -7,17 +7,7 @@
:rules="dataRule" :rules="dataRule"
:disabled="formType === 'detail'" :disabled="formType === 'detail'"
class="form"> 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="所属组织" <el-form-item label="所属组织"
label-width="150px" label-width="150px"
style="display: block"> style="display: block">
@ -38,6 +28,18 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </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="关联物业" <el-form-item label="关联物业"
prop="propertyId" prop="propertyId"
label-width="150px" label-width="150px"
@ -179,7 +181,7 @@ export default {
}, },
keyWords: '', keyWords: '',
centerPoint: [] agencyObj: {}
} }
}, },
components: {}, components: {},
@ -267,11 +269,11 @@ export default {
this.setMarker(lat, lng) this.setMarker(lat, lng)
}, },
async initForm (centerPoint, type, row) { async initForm (type, row, agencyObj) {
this.centerPoint = centerPoint this.agencyObj = agencyObj
// debugger // debugger
map.setCenter(new TMap.LatLng(this.centerPoint[0], this.centerPoint[1])) map.setCenter(new TMap.LatLng(agencyObj.latitude, agencyObj.longitude))
this.formType = type this.formType = type
if (row) { if (row) {
@ -281,7 +283,7 @@ export default {
await this.loadAgency() await this.loadAgency()
await this.loadGrid() await this.loadGrid()
// await this.loadProperty() await this.loadProperty()
}, },
//加载组织 //加载组织
@ -360,8 +362,8 @@ export default {
type: 'success', type: 'success',
message: '添加小区成功' message: '添加小区成功'
}) })
this.resetData()
this.propertyFormShow = false this.$emit('dialogOk')
} else { } else {
this.$message.error(msg) this.$message.error(msg)
} }
@ -392,10 +394,25 @@ export default {
this.propertyForm.name = '' this.propertyForm.name = ''
this.propertyFormShow = false this.propertyFormShow = false
} else { } else {
this.resetData()
this.$emit('dialogCancle') 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 () { startLoading () {
loading = Loading.service({ loading = Loading.service({

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

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

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

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

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

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

Write Preview
Loading…
Cancel
Save