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

Merge branch 'dev' into test 

# Conflicts:
#	src/views/modules/base/community/community.vue
#	src/views/modules/base/community/roomForm.vue
test
wanggongfeng 3 years ago
parent
3f19d57b2b 5fba9a0408
commit
8f0b4d427f
3 changed files with 583 additions and 573 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. 670
      src/views/modules/base/community/community.vue
  2. 484
      src/views/modules/base/community/roomForm.vue
  3. 2
      src/views/modules/base/community/roomTable.vue

670
src/views/modules/base/community/community.vue
View File

@ -48,7 +48,6 @@
<div class="resi-cell-label">房主手机</div> <div class="resi-cell-label">房主手机</div>
<div class="resi-cell-value"> <div class="resi-cell-value">
<el-input v-model="ownerPhone" <el-input v-model="ownerPhone"
class="resi-cell-input"
size="small" size="small"
clearable clearable
placeholder="请输入内容"> placeholder="请输入内容">
@ -80,8 +79,13 @@
<div class="resi-cell-label">房屋用途</div> <div class="resi-cell-label">房屋用途</div>
<div class="resi-cell-value"> <div class="resi-cell-value">
<el-select v-model="purpose" placeholder="房屋用途" clearable> <el-select v-model="purpose"
<el-option v-for="item in purposeArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue"> placeholder="房屋用途"
clearable>
<el-option v-for="item in purposeArr"
:key="item.dictValue"
:label="item.dictName"
:value="item.dictValue">
</el-option> </el-option>
</el-select> </el-select>
@ -120,6 +124,8 @@
:ownerName="ownerName" :ownerName="ownerName"
:ownerPhone="ownerPhone" :ownerPhone="ownerPhone"
:rentFlag="rentFlag" :rentFlag="rentFlag"
:purpose="purpose"
:remark="remark"
@toNextLevel="toNextLevel" @toNextLevel="toNextLevel"
@refreshTree="refreshTree"></build-table> @refreshTree="refreshTree"></build-table>
@ -129,6 +135,8 @@
:ownerName="ownerName" :ownerName="ownerName"
:ownerPhone="ownerPhone" :ownerPhone="ownerPhone"
:rentFlag="rentFlag" :rentFlag="rentFlag"
:purpose="purpose"
:remark="remark"
ref="ref_buildingTable" ref="ref_buildingTable"
@refreshTree="refreshTree"></room-table> @refreshTree="refreshTree"></room-table>
@ -138,6 +146,8 @@
:ownerName="ownerName" :ownerName="ownerName"
:ownerPhone="ownerPhone" :ownerPhone="ownerPhone"
:rentFlag="rentFlag" :rentFlag="rentFlag"
:purpose="purpose"
:remark="remark"
ref="ref_communityTable" ref="ref_communityTable"
@refreshTree="refreshTree"></community-table> @refreshTree="refreshTree"></community-table>
@ -174,364 +184,364 @@
staffAgencyId: localStorage.getItem("agencyId"), staffAgencyId: localStorage.getItem("agencyId"),
showImportBtn: false, showImportBtn: false,
rentList: [ rentList: [
{ {
value: '1', value: '1',
label: '出租' label: '出租'
},
{
value: '2',
label: '闲置'
},
{
value: '0',
label: '自住'
},
],
ownerName: '',
ownerPhone: '',
rentFlag: '',
purpose: '',
remark: '',
showRoomTable: false,
selObj: {},
purposeArr: [
{ dictValue: '1', dictName: '住宅' },
{ dictValue: '2', dictName: '商业' },
{ dictValue: '3', dictName: '办公' },
{ dictValue: '4', dictName: '工业' },
{ dictValue: '5', dictName: '仓储' },
{ dictValue: '6', dictName: '商住混用' },
{ dictValue: '7', dictName: '其他' }
]
}
}, },
components: { {
CDialog value: '2',
label: '闲置'
}, },
async mounted () { {
this.treeLoading = true value: '0',
label: '自住'
await this.loadOrgData()
await this.loadTree()
await this.loadOpenNode()
await this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj)
if (this.treeData.length > 0) {
this.$nextTick(() => {
// ref_tree 元素的ref value 绑定的node-key
this.$refs.ref_tree.setCurrentKey(this.treeData[0].id);
});
}
this.treeLoading = false
}, },
computed: { ],
rowHeight () { ownerName: '',
ownerPhone: '',
rentFlag: '',
purpose: '',
remark: '',
showRoomTable: false,
selObj: {},
purposeArr: [
{ dictValue: '1', dictName: '住宅' },
{ dictValue: '2', dictName: '商业' },
{ dictValue: '3', dictName: '办公' },
{ dictValue: '4', dictName: '工业' },
{ dictValue: '5', dictName: '仓储' },
{ dictValue: '6', dictName: '商住混用' },
{ dictValue: '7', dictName: '其他' }
]
}
},
components: {
CDialog
},
async mounted () {
this.treeLoading = true
await this.loadOrgData()
await this.loadTree()
await this.loadOpenNode()
await this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj)
if (this.treeData.length > 0) {
this.$nextTick(() => {
// ref_tree 元素的ref value 绑定的node-key
this.$refs.ref_tree.setCurrentKey(this.treeData[0].id);
});
}
this.treeLoading = false
return this.$store.state.inIframe ? this.clientHeight - 140 + this.iframeHeight + 'px' : this.clientHeight - 140 + 'px' },
computed: {
rowHeight () {
}, return this.$store.state.inIframe ? this.clientHeight - 140 + this.iframeHeight + 'px' : this.clientHeight - 140 + 'px'
treeHeight () {
return this.$store.state.inIframe ? this.clientHeight - 200 + this.iframeHeight + 'px' : this.clientHeight - 200 + 'px'
}, },
treeHeight () {
return this.$store.state.inIframe ? this.clientHeight - 200 + this.iframeHeight + 'px' : this.clientHeight - 200 + 'px'
...mapGetters(['clientHeight', 'iframeHeight']) },
},
methods: {
handleSearch () { ...mapGetters(['clientHeight', 'iframeHeight'])
if (this.ownerName || this.ownerPhone || this.rentFlag || this.purpose || this.remark) { },
this.showRoomTable = true methods: {
this.$nextTick(() => { handleSearch () {
this.$refs['ref_buildingTable'].loadTable('search', this.selTreeObj) if (this.ownerName || this.ownerPhone || this.rentFlag || this.purpose || this.remark) {
}) this.showRoomTable = true
} else {
this.$message.warning('请输入查询条件')
}
this.$nextTick(() => {
this.$refs['ref_buildingTable'].loadTable('search', this.selTreeObj)
})
} else {
this.$message.warning('请输入查询条件')
}
},
//重置搜索条件 },
resetSearch () {
this.ownerName = ''
this.ownerPhone = ''
this.rentFlag = ''
this.purpose = ''
this.remark = ''
this.pageSize = 10
this.pageNo = 1
this.handleNodeClick(this.selObj)
// this.loadTable()
},
async loadOpenNode () { //重置搜索条件
const url = "/gov/org/building/tree-ids" resetSearch () {
let params = {} this.ownerName = ''
this.ownerPhone = ''
const { data, code, msg } = await requestPost(url, params) this.rentFlag = ''
this.purpose = ''
if (code === 0) { this.remark = ''
this.openNodes = data
this.pageSize = 10
this.pageNo = 1
this.handleNodeClick(this.selObj)
// this.loadTable()
},
} else { async loadOpenNode () {
this.$message.error(msg) const url = "/gov/org/building/tree-ids"
} let params = {}
},
async loadTree (isRefresh) { const { data, code, msg } = await requestPost(url, params)
const url = "/gov/org/building/treelist"
let params = {} if (code === 0) {
this.openNodes = data
const { data, code, msg } = await requestPost(url, params)
if (code === 0) { } else {
this.$message.error(msg)
this.treeData = data }
if (!isRefresh && data.length > 0) { },
async loadTree (isRefresh) {
this.selTreeObj = data[0] const url = "/gov/org/building/treelist"
if (!this.selTreeObj.latitude) { let params = {}
this.selTreeObj.latitude = this.centerPoint[0]
} const { data, code, msg } = await requestPost(url, params)
if (!this.selTreeObj.longitude) { if (code === 0) {
this.selTreeObj.longitude = this.centerPoint[1]
} this.treeData = data
} if (!isRefresh && data.length > 0) {
} else { this.selTreeObj = data[0]
this.$message.error(msg) if (!this.selTreeObj.latitude) {
} this.selTreeObj.latitude = this.centerPoint[0]
}, }
//加载组织数据 if (!this.selTreeObj.longitude) {
async loadOrgData () { this.selTreeObj.longitude = this.centerPoint[1]
const url = "/gov/org/agency/maporg" }
// const url = "http://yapi.elinkservice.cn/mock/245/gov/org/agency/maporg"
let params = {}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.centerPoint = []
this.centerPoint.push(data.latitude)
this.centerPoint.push(data.longitude)
} else {
this.$message.error(msg)
}
},
handleNodeClick (obj) {
this.ownerName = ''
this.ownerPhone = ''
this.rentFlag = ''
this.purpose = ''
this.remark = ''
this.showRoomTable = false
this.selObj = JSON.parse(JSON.stringify(obj))
this.getTreeObj(obj)
this.$nextTick(() => {
if (obj.level === 'building') {//点击楼栋
this.$refs['ref_buildingTable'].loadTable('tree', this.selTreeObj)
} else if (obj.level === 'neighborHood') {//点击小区
this.$refs['ref_neighTable'].loadTable(true, this.selTreeObj)
} else {
this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj)
}
})
},
//添加小区结束
async refreshTree () {
this.treeLoading = true
await this.loadTree(this.selTreeObj.id)
this.$nextTick(() => {
// ref_tree 元素的ref value 绑定的node-key
this.$refs.ref_tree.setCurrentKey(this.selTreeObj.id);
});
this.treeLoading = false
},
//进入下一级
toNextLevel (row, level) {
if (level === 'community') {
this.selTreeObj = this.$refs.ref_tree.getNode(row.neighborHoodId).data
this.openNodes.push(this.selTreeObj.id)
} else {
this.selTreeObj = this.$refs.ref_tree.getNode(row.buildingId).data
}
this.handleNodeClick(this.selTreeObj)
this.$nextTick(() => {
// ref_tree 元素的ref value 绑定的node-key
this.$refs.ref_tree.setCurrentKey(this.selTreeObj.id);
});
const node = document.getElementById(this.selTreeObj.id) // 通过Id获取到对应的dom元素
setTimeout(() => {
if (node) {
this.$nextTick(() => {
node.scrollIntoView({ block: 'center' }) // 通过scrollIntoView方法将对应的dom元素定位到可见区域 【block: 'center'】这个属性是在垂直方向居中显示
})
}
}, 100)
},
//解析树数据
getTreeObj (obj) {
// 树接口：
// 组织：组织id、组织名称、type、经度、纬度
// 小区：小区id、小区名称、type、所属网格id、所属网格名称、所属组织id、所属组织名称、经度、纬度
// 楼：楼id、楼名称、type、所属小区id、所属小区名称
if (obj.level === 'building') {//点击楼栋
let neighborHoodNode = this.$refs.ref_tree.getNode(obj.pid)//所属小区
let gridNode = this.$refs.ref_tree.getNode(neighborHoodNode.data.pid)//所属网格
let agencyNode = this.$refs.ref_tree.getNode(gridNode.data.pid)//所属社区
obj.agencyId = agencyNode.data.id
obj.agencyName = agencyNode.data.label
obj.gridId = gridNode.data.id
obj.gridName = gridNode.data.label
obj.neighborHoodId = neighborHoodNode.data.id
obj.neighborHoodName = neighborHoodNode.data.label
if (obj.agencyId === this.staffAgencyId) {
this.showImportBtn = true
} else {
this.showImportBtn = false
}
} else if (obj.level === 'neighborHood') {//点击小区
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
if (obj.agencyId === this.staffAgencyId) {
this.showImportBtn = true
} else {
this.showImportBtn = false
}
} else {
}
if (!obj.latitude) {
obj.latitude = this.centerPoint[0]
}
if (!obj.longitude) {
obj.longitude = this.centerPoint[1]
}
this.selTreeObj = obj
console.log(this.selTreeObj)
},
filterNode (value, data) {
if (!value) return true;
return data.label.indexOf(value) !== -1;
},
// 开启加载动画
startLoading () {
loading = Loading.service({
lock: true, // 是否锁定
text: '正在加载……', // 加载中需要显示的文字
background: 'rgba(0,0,0,.7)' // 背景颜色
})
},
// 结束加载动画
endLoading () {
// clearTimeout(timer);
if (loading) {
loading.close()
}
}
},
watch: {
filterText (val) {
this.$refs.ref_tree.filter(val);
}
},
components: {
communityTable, buildTable, roomTable
} }
}
</script>
<style lang="scss" scoped >
.div_main {
display: flex;
}
.scrollar {
margin-top: 10px;
}
.div_tree { } else {
flex: 0 0 280px; this.$message.error(msg)
background-color: #ffffff; }
border-radius: 5px; },
padding: 10px;
overflow-y: hidden;
}
.filter_tree {
overflow-x: auto;
}
.div_table { //加载组织数据
margin-left: 15px; async loadOrgData () {
// flex: 1; const url = "/gov/org/agency/maporg"
width: calc(100% - 300px); // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/agency/maporg"
background-color: #ffffff; let params = {}
border-radius: 5px;
padding: 10px;
}
.div_btn { const { data, code, msg } = await requestPost(url, params)
margin-top: 20px;
} if (code === 0) {
this.centerPoint = []
this.centerPoint.push(data.latitude)
this.centerPoint.push(data.longitude)
} else {
this.$message.error(msg)
}
.row { },
padding: 10px;
handleNodeClick (obj) {
this.ownerName = ''
this.ownerPhone = ''
this.rentFlag = ''
this.purpose = ''
this.remark = ''
this.showRoomTable = false
this.selObj = JSON.parse(JSON.stringify(obj))
this.getTreeObj(obj)
this.$nextTick(() => {
if (obj.level === 'building') {//点击楼栋
this.$refs['ref_buildingTable'].loadTable('tree', this.selTreeObj)
} else if (obj.level === 'neighborHood') {//点击小区
this.$refs['ref_neighTable'].loadTable(true, this.selTreeObj)
} else {
this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj)
}
})
},
//添加小区结束
async refreshTree () {
this.treeLoading = true
await this.loadTree(this.selTreeObj.id)
this.$nextTick(() => {
// ref_tree 元素的ref value 绑定的node-key
this.$refs.ref_tree.setCurrentKey(this.selTreeObj.id);
});
this.treeLoading = false
},
//进入下一级
toNextLevel (row, level) {
if (level === 'community') {
this.selTreeObj = this.$refs.ref_tree.getNode(row.neighborHoodId).data
this.openNodes.push(this.selTreeObj.id)
} else {
this.selTreeObj = this.$refs.ref_tree.getNode(row.buildingId).data
}
this.handleNodeClick(this.selTreeObj)
this.$nextTick(() => {
// ref_tree 元素的ref value 绑定的node-key
this.$refs.ref_tree.setCurrentKey(this.selTreeObj.id);
});
const node = document.getElementById(this.selTreeObj.id) // 通过Id获取到对应的dom元素
setTimeout(() => {
if (node) {
this.$nextTick(() => {
node.scrollIntoView({ block: 'center' }) // 通过scrollIntoView方法将对应的dom元素定位到可见区域 【block: 'center'】这个属性是在垂直方向居中显示
})
}
}, 100)
},
//解析树数据
getTreeObj (obj) {
// 树接口：
// 组织：组织id、组织名称、type、经度、纬度
// 小区：小区id、小区名称、type、所属网格id、所属网格名称、所属组织id、所属组织名称、经度、纬度
// 楼：楼id、楼名称、type、所属小区id、所属小区名称
if (obj.level === 'building') {//点击楼栋
let neighborHoodNode = this.$refs.ref_tree.getNode(obj.pid)//所属小区
let gridNode = this.$refs.ref_tree.getNode(neighborHoodNode.data.pid)//所属网格
let agencyNode = this.$refs.ref_tree.getNode(gridNode.data.pid)//所属社区
obj.agencyId = agencyNode.data.id
obj.agencyName = agencyNode.data.label
obj.gridId = gridNode.data.id
obj.gridName = gridNode.data.label
obj.neighborHoodId = neighborHoodNode.data.id
obj.neighborHoodName = neighborHoodNode.data.label
if (obj.agencyId === this.staffAgencyId) {
this.showImportBtn = true
} else {
this.showImportBtn = false
}
} else if (obj.level === 'neighborHood') {//点击小区
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
if (obj.agencyId === this.staffAgencyId) {
this.showImportBtn = true
} else {
this.showImportBtn = false
}
} else {
}
if (!obj.latitude) {
obj.latitude = this.centerPoint[0]
}
if (!obj.longitude) {
obj.longitude = this.centerPoint[1]
}
this.selTreeObj = obj
console.log(this.selTreeObj)
},
filterNode (value, data) {
if (!value) return true;
return data.label.indexOf(value) !== -1;
},
// 开启加载动画
startLoading () {
loading = Loading.service({
lock: true, // 是否锁定
text: '正在加载……', // 加载中需要显示的文字
background: 'rgba(0,0,0,.7)' // 背景颜色
})
},
// 结束加载动画
endLoading () {
// clearTimeout(timer);
if (loading) {
loading.close()
}
}
},
watch: {
filterText (val) {
this.$refs.ref_tree.filter(val);
}
},
components: {
communityTable, buildTable, roomTable
} }
}
</script>
<style lang="scss" scoped >
.div_main {
display: flex;
}
.scrollar {
margin-top: 10px;
}
.div_tree {
flex: 0 0 280px;
background-color: #ffffff;
border-radius: 5px;
padding: 10px;
overflow-y: hidden;
}
.filter_tree {
overflow-x: auto;
}
.div_table {
margin-left: 15px;
// flex: 1;
width: calc(100% - 300px);
background-color: #ffffff;
border-radius: 5px;
padding: 10px;
}
.div_btn {
margin-top: 20px;
}
.row {
padding: 10px;
}
</style> </style>
<style> <style>
/* .aui-content > .el-tabs > .el-tabs__content { /* .aui-content > .el-tabs > .el-tabs__content {
padding: 0px; padding: 0px;
} */ } */
.el-tree-node:focus > .el-tree-node__content { .el-tree-node:focus > .el-tree-node__content {
/* background-color: #ccc !important; */ /* background-color: #ccc !important; */
color: #2195fe; color: #2195fe;
} }
</style> </style>
<style lang="scss" scoped> <style lang="scss" scoped>
.div_tree { .div_tree {
/deep/ .el-scrollbar__wrap { /deep/ .el-scrollbar__wrap {
overflow-x: hidden !important; overflow-x: hidden !important;
}
} }
}
</style> </style>
<style lang="scss" scoped > <style lang="scss" scoped >
@import "@/assets/scss/modules/visual/communityManage.scss"; @import "@/assets/scss/modules/visual/communityManage.scss";
</style> </style>

484
src/views/modules/base/community/roomForm.vue
View File

@ -136,36 +136,36 @@
</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, requestGet } from '@/js/dai/request' import { requestPost, requestGet } 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详情
btnDisable: false, btnDisable: false,
unitList: [], unitList: [],
houseId: '', //房屋ID houseId: '', //房屋ID
houseType: '1', houseType: '1',
purpose: '1', purpose: '1',
rentFlag: 0, rentFlag: 0,
dataForm: { dataForm: {
neighborHoodId: '', // 所属小区ID neighborHoodId: '', // 所属小区ID
buildingId: '',//所属楼栋ID buildingId: '',//所属楼栋ID
buildingUnitId: '',//所属单元ID buildingUnitId: '',//所属单元ID
doorName: '',//门牌号 doorName: '',//门牌号
houseType: '',//房屋类型【楼房，平房，别墅】 houseType: '',//房屋类型【楼房，平房，别墅】
purpose: '',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】 purpose: '',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
rentFlag: 0,//房屋状态【是：1，否：0】 出租1、闲置2、自住 0 rentFlag: 0,//房屋状态【是：1，否：0】 出租1、闲置2、自住 0
ownerPhone: '', //房主电话 ownerPhone: '', //房主电话
ownerName: '', //房主名字 ownerName: '', //房主名字
ownerIdCard: '', //房主身份证 ownerIdCard: '', //房主身份证
remark: '' remark: '' // 备注
}, },
keyWords: '', keyWords: '',
agencyObj: {}, agencyObj: {},
@ -177,219 +177,219 @@
}, },
methods: { methods: {
async initForm (type, row, agencyObj) { async initForm (type, row, agencyObj) {
this.$refs.ref_form.resetFields(); this.$refs.ref_form.resetFields();
this.agencyObj = agencyObj this.agencyObj = agencyObj
this.formType = type this.formType = type
if (row) { if (row) {
this.houseId = row.houseId this.houseId = row.houseId
await this.loadHouseInfo() await this.loadHouseInfo()
// this.dataForm = JSON.parse(JSON.stringify(row)) // this.dataForm = JSON.parse(JSON.stringify(row))
// this.houseId = this.dataForm.houseId // this.houseId = this.dataForm.houseId
// this.dataForm.buildingUnitId = this.dataForm.unitNumKey // this.dataForm.buildingUnitId = this.dataForm.unitNumKey
// this.dataForm = { ... this.dataForm } // this.dataForm = { ... this.dataForm }
// this.houseType = this.dataForm.houseTypeKey // this.houseType = this.dataForm.houseTypeKey
// this.purpose = this.dataForm.purposeKey // this.purpose = this.dataForm.purposeKey
// this.rentFlag = parseInt(this.dataForm.rentFlagKey) // this.rentFlag = parseInt(this.dataForm.rentFlagKey)
} else { } else {
this.dataForm.neighborHoodId = this.agencyObj.neighborHoodId this.dataForm.neighborHoodId = this.agencyObj.neighborHoodId
this.dataForm.buildingId = this.agencyObj.id this.dataForm.buildingId = this.agencyObj.id
} }
await this.loadUnitList() await this.loadUnitList()
}, },
async loadHouseInfo () { async loadHouseInfo () {
const url = "/gov/org/ichouse/" + this.houseId const url = "/gov/org/ichouse/" + this.houseId
const { data, code, msg } = await requestGet(url) const { data, code, msg } = await requestGet(url)
if (code === 0) { if (code === 0) {
// debugger // debugger
this.dataForm = { ...data } this.dataForm = { ...data }
this.houseType = this.dataForm.houseType this.houseType = this.dataForm.houseType
this.purpose = this.dataForm.purpose this.purpose = this.dataForm.purpose
this.rentFlag = parseInt(this.dataForm.rentFlag) this.rentFlag = parseInt(this.dataForm.rentFlag)
} else { } else {
this.$message.error(msg) this.$message.error(msg)
} }
}, },
//加载单元 //加载单元
async loadUnitList () { async loadUnitList () {
const url = '/gov/org/building/buildingunitlist' const url = '/gov/org/building/buildingunitlist'
let params = { let params = {
buildingId: this.dataForm.buildingId buildingId: this.dataForm.buildingId
} }
const { data, code, msg } = await requestPost(url, params) const { data, code, msg } = await requestPost(url, params)
if (code === 0) { if (code === 0) {
this.unitList = data this.unitList = data
} else { } else {
this.$message.error(msg) this.$message.error(msg)
} }
}, },
async handleComfirm () { async handleComfirm () {
this.btnDisable = true this.btnDisable = true
setTimeout(() => { setTimeout(() => {
this.btnDisable = false this.btnDisable = false
}, 10000) }, 10000)
this.dataForm.houseType = this.houseType this.dataForm.houseType = this.houseType
this.dataForm.purpose = this.purpose this.dataForm.purpose = this.purpose
this.dataForm.rentFlag = this.rentFlag this.dataForm.rentFlag = this.rentFlag
this.$refs['ref_form'].validate((valid, messageObj) => { this.$refs['ref_form'].validate((valid, messageObj) => {
if (!valid) { if (!valid) {
this.btnDisable = false this.btnDisable = false
app.util.validateRule(messageObj) app.util.validateRule(messageObj)
} else { } else {
this.addRoom() this.addRoom()
} }
}) })
}, },
async addRoom () { async addRoom () {
const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
if (this.dataForm.ownerIdCard && regCard.test(this.dataForm.ownerIdCard) === false) { if (this.dataForm.ownerIdCard && regCard.test(this.dataForm.ownerIdCard) === false) {
this.btnDisable = false this.btnDisable = false
this.$message({ this.$message({
type: 'warning', type: 'warning',
message: '请输入正确的身份证号码' message: '请输入正确的身份证号码'
}) })
return false; return false;
} }
const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码 const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
if (this.dataForm.ownerPhone && regPhone.test(this.dataForm.ownerPhone) === false) { if (this.dataForm.ownerPhone && regPhone.test(this.dataForm.ownerPhone) === false) {
this.btnDisable = false this.btnDisable = false
this.$message({ this.$message({
type: 'warning', type: 'warning',
message: '请输入正确的手机号码' message: '请输入正确的手机号码'
}) })
return false; return false;
} }
let url = '' let url = ''
if (this.formType === 'add') { if (this.formType === 'add') {
url = '/gov/org/house/houseadd' url = '/gov/org/house/houseadd'
} else { } else {
url = '/gov/org/house/houseupdate' url = '/gov/org/house/houseupdate'
this.dataForm.houseId = this.houseId this.dataForm.houseId = this.houseId
} }
const { data, code, msg } = await requestPost(url, this.dataForm) const { data, code, msg } = await requestPost(url, this.dataForm)
this.btnDisable = false this.btnDisable = false
if (code === 0) { if (code === 0) {
this.$message({ this.$message({
type: 'success', type: 'success',
message: '操作成功' message: '操作成功'
}) })
this.resetData() this.resetData()
this.$emit('dialogOk') this.$emit('dialogOk')
} else { } else {
this.$message.error(msg) this.$message.error(msg)
} }
}, },
handleCancle () { handleCancle () {
this.resetData() this.resetData()
this.$emit('dialogCancle') this.$emit('dialogCancle')
}, },
resetData () { resetData () {
this.houseId = '' //房屋ID this.houseId = '' //房屋ID
this.houseType = '1' this.houseType = '1'
this.purpose = '1' this.purpose = '1'
this.rentFlag = 0 this.rentFlag = 0
this.dataForm = { this.dataForm = {
neighborHoodId: '', // 所属小区ID neighborHoodId: '', // 所属小区ID
buildingId: '',//所属楼栋ID buildingId: '',//所属楼栋ID
buildingUnitId: '',//所属单元ID buildingUnitId: '',//所属单元ID
doorName: '',//门牌号 doorName: '',//门牌号
houseType: '1',//房屋类型【楼房，平房，别墅】 houseType: '1',//房屋类型【楼房，平房，别墅】
purpose: '1',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】 purpose: '1',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
rentFlag: 0,//是否出租【是：1，否：0】 rentFlag: 0,//是否出租【是：1，否：0】
ownerPhone: '', //房主电话 ownerPhone: '', //房主电话
ownerName: '', //房主名字 ownerName: '', //房主名字
ownerIdCard: '', //房主身份证 ownerIdCard: '', //房主身份证
remark: '' // 备注 remark: '' // 备注
} }
}, },
// 开启加载动画 // 开启加载动画
startLoading () { startLoading () {
loading = Loading.service({ loading = Loading.service({
lock: true, // 是否锁定 lock: true, // 是否锁定
text: '正在加载……', // 加载中需要显示的文字 text: '正在加载……', // 加载中需要显示的文字
background: 'rgba(0,0,0,.7)' // 背景颜色 background: 'rgba(0,0,0,.7)' // 背景颜色
}) })
}, },
// 结束加载动画 // 结束加载动画
endLoading () { endLoading () {
// clearTimeout(timer); // clearTimeout(timer);
if (loading) { if (loading) {
loading.close() loading.close()
} }
}
},
computed: {
dataRule () {
return {
buildingUnitId: [
{ required: true, message: '所属单元不能为空', trigger: 'blur' },
],
doorName: [
{ required: true, message: '门牌号不能为空', trigger: 'blur' }
],
houseType: [
{ required: true, message: '房屋类型不能为空', trigger: 'blur' }
],
purpose: [
{ required: true, message: '房屋用途不能为空', trigger: 'blur' }
],
rentFlag: [
{ required: true, message: '是否出租不能为空', trigger: 'blur' }
],
ownerPhone: [
{ required: false }
],
ownerName: [
{ required: false }
],
ownerIdCard: [
{ required: false }
],
remark: [
{ required: false }
],
}
},
},
props: {}
} }
},
computed: {
dataRule () {
return {
buildingUnitId: [
{ required: true, message: '所属单元不能为空', trigger: 'blur' },
],
doorName: [
{ required: true, message: '门牌号不能为空', trigger: 'blur' }
],
houseType: [
{ required: true, message: '房屋类型不能为空', trigger: 'blur' }
],
purpose: [
{ required: true, message: '房屋用途不能为空', trigger: 'blur' }
],
rentFlag: [
{ required: true, message: '是否出租不能为空', trigger: 'blur' }
],
ownerPhone: [
{ required: false }
],
ownerName: [
{ required: false }
],
ownerIdCard: [
{ required: false }
],
remark: [
{ required: false }
]
}
},
},
props: {}
}
</script> </script>
<style lang="scss" scoped > <style lang="scss" scoped >
@import "@/assets/scss/modules/visual/communityManageForm.scss"; @import "@/assets/scss/modules/visual/communityManageForm.scss";
</style> </style>

2
src/views/modules/base/community/roomTable.vue
View File

@ -622,9 +622,9 @@
gridId: '', gridId: '',
ownerName: this.ownerName, ownerName: this.ownerName,
ownerPhone: this.ownerPhone, ownerPhone: this.ownerPhone,
rentFlag: this.rentFlag,
purpose: this.purpose, purpose: this.purpose,
remark: this.remark, remark: this.remark,
rentFlag: this.rentFlag,
buildingId: '', buildingId: '',
neighborHoodId: '' neighborHoodId: ''
} }

Write Preview
Loading…
Cancel
Save