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

Merge branch 'feature/addsearch' into dev 

# Conflicts:
#	src/views/modules/base/community/community.vue
#	src/views/modules/base/community/roomForm.vue
test
wanggongfeng 3 years ago
parent
1d1366319d d4615a65c0
commit
3d49a20648
4 changed files with 609 additions and 609 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. 714
      src/views/modules/base/community/community.vue
  2. 500
      src/views/modules/base/community/roomForm.vue
  3. 2
      src/views/modules/communityParty/regionalParty/activitysForm.vue
  4. 2
      src/views/modules/visual/basicinfo/basicInfoCommunity.vue

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

@ -147,391 +147,391 @@
</template> </template>
<script> <script>
import CDialog from '@c/CDialog' import CDialog from '@c/CDialog'
import communityTable from './communityTable' import communityTable from './communityTable'
import buildTable from './buildTable' import buildTable from './buildTable'
import roomTable from './roomTable' import roomTable from './roomTable'
import { requestPost } from "@/js/dai/request"; import { requestPost } from "@/js/dai/request";
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import { Loading } from 'element-ui' // 引入Loading服务 import { Loading } from 'element-ui' // 引入Loading服务
let loading // 加载动画 let loading // 加载动画
export default { export default {
data () { data () {
return { return {
filterText: '', filterText: '',
treeLoading: true, treeLoading: true,
treeData: [], treeData: [],
openNodes: [], openNodes: [],
defaultProps: { defaultProps: {
children: 'children', children: 'children',
label: 'showName' label: 'showName'
}, },
selTreeObj: {}, selTreeObj: {},
centerPoint: [], centerPoint: [],
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: {
value: '2', CDialog
label: '闲置'
}, },
{ async mounted () {
value: '0', this.treeLoading = true
label: '自住'
}, await this.loadOrgData()
], await this.loadTree()
ownerName: '', await this.loadOpenNode()
ownerPhone: '',
rentFlag: '', await this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj)
purpose: '', if (this.treeData.length > 0) {
remark: '', this.$nextTick(() => {
showRoomTable: false, // ref_tree 元素的ref value 绑定的node-key
selObj: {}, this.$refs.ref_tree.setCurrentKey(this.treeData[0].id);
purposeArr: [ });
{ dictValue: '1', dictName: '住宅' }, }
{ dictValue: '2', dictName: '商业' }, this.treeLoading = false
{ 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
},
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'
}, },
computed: {
...mapGetters(['clientHeight', 'iframeHeight']) rowHeight () {
},
methods: {
handleSearch () {
if (this.ownerName || this.ownerPhone || this.rentFlag || this.purpose || this.remark) {
this.showRoomTable = true
this.$nextTick(() => {
this.$refs['ref_buildingTable'].loadTable('search', this.selTreeObj)
})
} else {
this.$message.warning('请输入查询条件')
}
},
//重置搜索条件 return this.$store.state.inIframe ? this.clientHeight - 140 + this.iframeHeight + 'px' : this.clientHeight - 140 + 'px'
resetSearch () {
this.ownerName = ''
this.ownerPhone = ''
this.rentFlag = ''
this.purpose = ''
this.remark = ''
this.pageSize = 10 },
this.pageNo = 1 treeHeight () {
this.handleNodeClick(this.selObj) return this.$store.state.inIframe ? this.clientHeight - 200 + this.iframeHeight + 'px' : this.clientHeight - 200 + 'px'
// this.loadTable()
},
async loadOpenNode () { },
const url = "/gov/org/building/tree-ids"
let params = {}
const { data, code, msg } = await requestPost(url, params) ...mapGetters(['clientHeight', 'iframeHeight'])
},
methods: {
if (code === 0) { handleSearch () {
this.openNodes = data if (this.ownerName || this.ownerPhone || this.rentFlag || this.purpose || this.remark) {
this.showRoomTable = true
this.$nextTick(() => {
this.$refs['ref_buildingTable'].loadTable('search', this.selTreeObj)
})
} else {
this.$message.warning('请输入查询条件')
}
} else {
this.$message.error(msg)
}
},
async loadTree (isRefresh) {
const url = "/gov/org/building/treelist"
let params = {}
const { data, code, msg } = await requestPost(url, params) },
if (code === 0) { //重置搜索条件
resetSearch () {
this.ownerName = ''
this.ownerPhone = ''
this.rentFlag = ''
this.purpose = ''
this.remark = ''
this.pageSize = 10
this.pageNo = 1
this.handleNodeClick(this.selObj)
// this.loadTable()
},
this.treeData = data async loadOpenNode () {
if (!isRefresh && data.length > 0) { const url = "/gov/org/building/tree-ids"
let params = {}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.openNodes = data
this.selTreeObj = data[0]
if (!this.selTreeObj.latitude) {
this.selTreeObj.latitude = this.centerPoint[0]
}
if (!this.selTreeObj.longitude) { } else {
this.selTreeObj.longitude = this.centerPoint[1] this.$message.error(msg)
} }
},
async loadTree (isRefresh) {
const url = "/gov/org/building/treelist"
let params = {}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.treeData = data
if (!isRefresh && data.length > 0) {
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 {
this.$message.error(msg)
}
},
//加载组织数据
async loadOrgData () {
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;
}
} else { .div_tree {
this.$message.error(msg) flex: 0 0 280px;
} background-color: #ffffff;
}, border-radius: 5px;
padding: 10px;
//加载组织数据 overflow-y: hidden;
async loadOrgData () { }
const url = "/gov/org/agency/maporg" .filter_tree {
// const url = "http://yapi.elinkservice.cn/mock/245/gov/org/agency/maporg" overflow-x: auto;
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 { .div_table {
this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj) margin-left: 15px;
} // flex: 1;
}) width: calc(100% - 300px);
background-color: #ffffff;
}, border-radius: 5px;
padding: 10px;
//添加小区结束 }
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') {//点击小区 .div_btn {
let gridNode = this.$refs.ref_tree.getNode(obj.pid) margin-top: 20px;
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 { .row {
padding: 10px;
}
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>

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

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

@ -223,7 +223,7 @@
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'
import Tinymce from '@c/tinymce/index.vue' import Tinymce from '@c/tinymce2/index.vue'
var map var map
var search var search

2
src/views/modules/visual/basicinfo/basicInfoCommunity.vue
View File

@ -46,7 +46,7 @@
</div> </div>
<div class="icon_roomstate"> <div class="icon_roomstate">
<div>出租</div> <div>{{item.rentFlag}}</div>
</div> </div>
<div class="icon_category"> <div class="icon_category">

Write Preview
Loading…
Cancel
Save