jiangyy 4 years ago
parent
commit
b64c2f07cb
  1. BIN
      src/assets/img/shuju/measure/hong@2x.png
  2. 10
      src/assets/scss/modules/visual/houseStatic.scss
  3. 11
      src/views/components/resiForm.vue
  4. 724
      src/views/modules/base/community/community.vue
  5. 501
      src/views/modules/base/community/roomForm.vue
  6. 1241
      src/views/modules/base/community/roomTable.vue
  7. 14
      src/views/modules/base/resi.vue
  8. 6
      src/views/modules/communityParty/members/cpts/record.vue
  9. 2
      src/views/modules/communityParty/members/index.vue
  10. 63
      src/views/modules/partymember/icpartyorg-add-or-update.vue
  11. 23
      src/views/modules/partymember/icpartyorgtree.vue
  12. 50
      src/views/modules/partymember/lookMember.vue
  13. 77
      src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
  14. 5
      src/views/modules/visual/basicinfo/basicInfoCommunity.vue
  15. 10
      src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
  16. 2
      src/views/modules/visual/communityParty/community.vue
  17. 22
      src/views/modules/visual/communityParty/gridParty.vue
  18. 7
      src/views/modules/visual/communityParty/memberInfo.vue
  19. 1
      src/views/modules/visual/communityParty/unitInfo.vue
  20. 12
      src/views/modules/visual/components/screen-map/index.vue

BIN
src/assets/img/shuju/measure/hong@2x.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

10
src/assets/scss/modules/visual/houseStatic.scss

@ -170,7 +170,7 @@
margin-top:1px;
width: 18px;
height: 8px;
background: #ff7800;
background: #3dda83;
border-radius: 4px;
}
@ -189,7 +189,7 @@
margin-top:1px;
width: 18px;
height: 8px;
background: #00E5ED;
background: #e43c26;
border-radius: 4px;
}
>span{
@ -299,21 +299,21 @@
font-size: 35px;
font-family: PingFang SC;
font-weight: bold;
color: #FAC126;
color: #3dda83;
}
.cz{
font-size: 35px;
font-family: PingFang SC;
font-weight: bold;
color: #45D97F;
color: #e43c26;
}
.xz{
font-size: 35px;
font-family: PingFang SC;
font-weight: bold;
color: #2865FA;
color: #fac126;
}
.colorwhite{

11
src/views/components/resiForm.vue

@ -205,14 +205,18 @@
</el-cascader>
<template v-else-if="n.itemType === 'radio'">
<el-radio v-for="ns in n.options" :key="ns.value" v-model.trim="form[n.columnName]"
:label="ns.value">
:label="ns.value" @change="hanldeChangeRadio(n)">
{{ ns.label }}
</el-radio>
<!-- <el-radio v-model.trim="form[n.columnName]" label="1">备选项</el-radio> -->
</template>
<template v-else-if="n.itemType === 'checkbox'">
<el-checkbox-group v-model.trim="form[n.columnName]">
<el-checkbox v-for="ns in n.options" :key="ns.value" :label="ns.value">{{ns.label}}</el-checkbox>
<template v-for="ns in n.options">
<el-checkbox v-if="ns.value != 'dangyuanzhongxinhu'" :key="ns.value" :label="ns.value">
{{ns.label}}
</el-checkbox>
</template>
<!-- <el-checkbox label="n.la"></el-checkbox> -->
</el-checkbox-group>
</template>
@ -487,6 +491,9 @@ export default {
// }
})
},
hanldeChangeRadio(n) {
this.$emit('changeradio', n)
},
handleValidBlur(n) {
console.log('n---', n)
if (n.columnName !== 'ID_CARD') return

724
src/views/modules/base/community/community.vue

@ -79,8 +79,13 @@
<div class="resi-cell-label">房屋用途</div>
<div class="resi-cell-value">
<el-select v-model="purpose" placeholder="房屋用途" clearable>
<el-option v-for="item in purposeArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
<el-select v-model="purpose"
placeholder="房屋用途"
clearable>
<el-option v-for="item in purposeArr"
:key="item.dictValue"
:label="item.dictName"
:value="item.dictValue">
</el-option>
</el-select>
@ -99,7 +104,6 @@
</div>
</div>
<el-button style="margin-left:10px"
class="diy-button--search"
size="small"
@ -120,6 +124,8 @@
:ownerName="ownerName"
:ownerPhone="ownerPhone"
:rentFlag="rentFlag"
:purpose="purpose"
:remark="remark"
@toNextLevel="toNextLevel"
@refreshTree="refreshTree"></build-table>
@ -129,6 +135,8 @@
:ownerName="ownerName"
:ownerPhone="ownerPhone"
:rentFlag="rentFlag"
:purpose="purpose"
:remark="remark"
ref="ref_buildingTable"
@refreshTree="refreshTree"></room-table>
@ -138,6 +146,8 @@
:ownerName="ownerName"
:ownerPhone="ownerPhone"
:rentFlag="rentFlag"
:purpose="purpose"
:remark="remark"
ref="ref_communityTable"
@refreshTree="refreshTree"></community-table>
@ -147,391 +157,391 @@
</template>
<script>
import CDialog from '@c/CDialog'
import communityTable from './communityTable'
import buildTable from './buildTable'
import roomTable from './roomTable'
import { requestPost } from "@/js/dai/request";
import { mapGetters } from 'vuex'
import { Loading } from 'element-ui' // Loading
let loading //
export default {
data () {
return {
filterText: '',
treeLoading: true,
treeData: [],
openNodes: [],
defaultProps: {
children: 'children',
label: 'showName'
},
selTreeObj: {},
centerPoint: [],
staffAgencyId: localStorage.getItem("agencyId"),
showImportBtn: false,
rentList: [
{
value: '1',
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: '其他' }
]
}
import CDialog from '@c/CDialog'
import communityTable from './communityTable'
import buildTable from './buildTable'
import roomTable from './roomTable'
import { requestPost } from "@/js/dai/request";
import { mapGetters } from 'vuex'
import { Loading } from 'element-ui' // Loading
let loading //
export default {
data () {
return {
filterText: '',
treeLoading: true,
treeData: [],
openNodes: [],
defaultProps: {
children: 'children',
label: 'showName'
},
selTreeObj: {},
centerPoint: [],
staffAgencyId: localStorage.getItem("agencyId"),
showImportBtn: false,
rentList: [
{
value: '1',
label: '出租'
},
components: {
CDialog
{
value: '2',
label: '闲置'
},
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
{
value: '0',
label: '自住'
},
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 () {
},
treeHeight () {
return this.$store.state.inIframe ? this.clientHeight - 200 + this.iframeHeight + 'px' : this.clientHeight - 200 + 'px'
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'
...mapGetters(['clientHeight', 'iframeHeight'])
},
methods: {
},
handleSearch () {
if (this.ownerName || this.ownerPhone || this.rentFlag || this.purpose || this.remark) {
this.showRoomTable = true
...mapGetters(['clientHeight', 'iframeHeight'])
},
methods: {
this.$nextTick(() => {
this.$refs['ref_buildingTable'].loadTable('search', this.selTreeObj)
})
} else {
this.$message.warning('请输入查询条件')
}
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('请输入查询条件')
}
},
//
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"
let params = {}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.openNodes = data
//
resetSearch () {
this.ownerName = ''
this.ownerPhone = ''
this.rentFlag = ''
this.purpose = ''
this.remark = ''
this.pageSize = 10
this.pageNo = 1
this.handleNodeClick(this.selObj)
// this.loadTable()
},
} 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) {
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) // Iddom
setTimeout(() => {
if (node) {
this.$nextTick(() => {
node.scrollIntoView({ block: 'center' }) // scrollIntoViewdom block: 'center'
})
}
}, 100)
},
//
getTreeObj (obj) {
//
// idtype
// idtypeidid
// idtypeid
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
async loadOpenNode () {
const url = "/gov/org/building/tree-ids"
let params = {}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.openNodes = data
} 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) {
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]
}
}
}
</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;
}
} else {
this.$message.error(msg)
}
},
.div_table {
margin-left: 15px;
// flex: 1;
width: calc(100% - 300px);
background-color: #ffffff;
border-radius: 5px;
padding: 10px;
}
//
async loadOrgData () {
const url = "/gov/org/agency/maporg"
// const url = "http://yapi.elinkservice.cn/mock/245/gov/org/agency/maporg"
let params = {}
.div_btn {
margin-top: 20px;
}
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)
}
.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) // Iddom
setTimeout(() => {
if (node) {
this.$nextTick(() => {
node.scrollIntoView({ block: 'center' }) // scrollIntoViewdom block: 'center'
})
}
}, 100)
},
//
getTreeObj (obj) {
//
// idtype
// idtypeidid
// idtypeid
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>
/* .aui-content > .el-tabs > .el-tabs__content {
/* .aui-content > .el-tabs > .el-tabs__content {
padding: 0px;
} */
.el-tree-node:focus > .el-tree-node__content {
/* background-color: #ccc !important; */
color: #2195fe;
}
.el-tree-node:focus > .el-tree-node__content {
/* background-color: #ccc !important; */
color: #2195fe;
}
</style>
<style lang="scss" scoped>
.div_tree {
/deep/ .el-scrollbar__wrap {
overflow-x: hidden !important;
}
.div_tree {
/deep/ .el-scrollbar__wrap {
overflow-x: hidden !important;
}
}
</style>
<style lang="scss" scoped >
@import "@/assets/scss/modules/visual/communityManage.scss";
@import "@/assets/scss/modules/visual/communityManage.scss";
</style>

501
src/views/modules/base/community/roomForm.vue

@ -115,6 +115,7 @@
label-width="150px"
style="display: block">
<el-input class="item_width_1"
maxlength="30"
placeholder="请输入备注"
v-model="dataForm.remark">
</el-input>
@ -135,260 +136,260 @@
</template>
<script>
import { mapGetters } from 'vuex'
import { Loading } from 'element-ui' // Loading
import { requestPost, requestGet } from '@/js/dai/request'
import { mapGetters } from 'vuex'
import { Loading } from 'element-ui' // Loading
import { requestPost, requestGet } from '@/js/dai/request'
let loading //
export default {
data () {
return {
formType: 'add', // addeditdetail
btnDisable: false,
unitList: [],
houseId: '', //ID
houseType: '1',
purpose: '1',
rentFlag: 0,
dataForm: {
neighborHoodId: '', // ID
buildingId: '',//ID
buildingUnitId: '',//ID
doorName: '',//
houseType: '',//
purpose: '',//
rentFlag: 0,//10 12 0
ownerPhone: '', //
ownerName: '', //
ownerIdCard: '', //
remark: '' //
},
keyWords: '',
agencyObj: {},
}
},
components: {},
mounted () {
let loading //
export default {
data () {
return {
formType: 'add', // addeditdetail
btnDisable: false,
unitList: [],
},
houseId: '', //ID
houseType: '1',
purpose: '1',
rentFlag: 0,
dataForm: {
neighborHoodId: '', // ID
buildingId: '',//ID
buildingUnitId: '',//ID
doorName: '',//
houseType: '',//
purpose: '',//
rentFlag: 0,//10 12 0
ownerPhone: '', //
ownerName: '', //
ownerIdCard: '', //
remark: '' //
},
keyWords: '',
agencyObj: {},
}
},
components: {},
mounted () {
},
methods: {
async initForm (type, row, agencyObj) {
this.$refs.ref_form.resetFields();
this.agencyObj = agencyObj
this.formType = type
if (row) {
this.houseId = row.houseId
await this.loadHouseInfo()
// this.dataForm = JSON.parse(JSON.stringify(row))
// this.houseId = this.dataForm.houseId
// this.dataForm.buildingUnitId = this.dataForm.unitNumKey
// this.dataForm = { ... this.dataForm }
// this.houseType = this.dataForm.houseTypeKey
// this.purpose = this.dataForm.purposeKey
// this.rentFlag = parseInt(this.dataForm.rentFlagKey)
} else {
this.dataForm.neighborHoodId = this.agencyObj.neighborHoodId
this.dataForm.buildingId = this.agencyObj.id
}
await this.loadUnitList()
},
async loadHouseInfo () {
const url = "/gov/org/ichouse/" + this.houseId
const { data, code, msg } = await requestGet(url)
if (code === 0) {
// debugger
this.dataForm = { ...data }
this.houseType = this.dataForm.houseType
this.purpose = this.dataForm.purpose
this.rentFlag = parseInt(this.dataForm.rentFlag)
} else {
this.$message.error(msg)
}
},
//
async loadUnitList () {
const url = '/gov/org/building/buildingunitlist'
let params = {
buildingId: this.dataForm.buildingId
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.unitList = data
} else {
this.$message.error(msg)
}
},
async handleComfirm () {
this.btnDisable = true
setTimeout(() => {
this.btnDisable = false
}, 10000)
this.dataForm.houseType = this.houseType
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)
} else {
this.addRoom()
}
})
},
async addRoom () {
const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //1518151817X
if (this.dataForm.ownerIdCard && regCard.test(this.dataForm.ownerIdCard) === false) {
this.btnDisable = false
this.$message({
type: 'warning',
message: '请输入正确的身份证号码'
})
return false;
}
const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //
if (this.dataForm.ownerPhone && regPhone.test(this.dataForm.ownerPhone) === false) {
this.btnDisable = false
this.$message({
type: 'warning',
message: '请输入正确的手机号码'
})
return false;
}
let url = ''
if (this.formType === 'add') {
url = '/gov/org/house/houseadd'
} else {
url = '/gov/org/house/houseupdate'
this.dataForm.houseId = this.houseId
}
const { data, code, msg } = await requestPost(url, this.dataForm)
this.btnDisable = false
if (code === 0) {
this.$message({
type: 'success',
message: '操作成功'
})
this.resetData()
this.$emit('dialogOk')
} else {
this.$message.error(msg)
}
},
handleCancle () {
this.resetData()
this.$emit('dialogCancle')
},
resetData () {
this.houseId = '' //ID
this.houseType = '1'
this.purpose = '1'
this.rentFlag = 0
this.dataForm = {
neighborHoodId: '', // ID
buildingId: '',//ID
buildingUnitId: '',//ID
doorName: '',//
houseType: '1',//
purpose: '1',//
rentFlag: 0,//10
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: {}
methods: {
async initForm (type, row, agencyObj) {
this.$refs.ref_form.resetFields();
this.agencyObj = agencyObj
this.formType = type
if (row) {
this.houseId = row.houseId
await this.loadHouseInfo()
// this.dataForm = JSON.parse(JSON.stringify(row))
// this.houseId = this.dataForm.houseId
// this.dataForm.buildingUnitId = this.dataForm.unitNumKey
// this.dataForm = { ... this.dataForm }
// this.houseType = this.dataForm.houseTypeKey
// this.purpose = this.dataForm.purposeKey
// this.rentFlag = parseInt(this.dataForm.rentFlagKey)
} else {
this.dataForm.neighborHoodId = this.agencyObj.neighborHoodId
this.dataForm.buildingId = this.agencyObj.id
}
await this.loadUnitList()
},
async loadHouseInfo () {
const url = "/gov/org/ichouse/" + this.houseId
const { data, code, msg } = await requestGet(url)
if (code === 0) {
// debugger
this.dataForm = { ...data }
this.houseType = this.dataForm.houseType
this.purpose = this.dataForm.purpose
this.rentFlag = parseInt(this.dataForm.rentFlag)
} else {
this.$message.error(msg)
}
},
//
async loadUnitList () {
const url = '/gov/org/building/buildingunitlist'
let params = {
buildingId: this.dataForm.buildingId
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.unitList = data
} else {
this.$message.error(msg)
}
},
async handleComfirm () {
this.btnDisable = true
setTimeout(() => {
this.btnDisable = false
}, 10000)
this.dataForm.houseType = this.houseType
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)
} else {
this.addRoom()
}
})
},
async addRoom () {
const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //1518151817X
if (this.dataForm.ownerIdCard && regCard.test(this.dataForm.ownerIdCard) === false) {
this.btnDisable = false
this.$message({
type: 'warning',
message: '请输入正确的身份证号码'
})
return false;
}
const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //
if (this.dataForm.ownerPhone && regPhone.test(this.dataForm.ownerPhone) === false) {
this.btnDisable = false
this.$message({
type: 'warning',
message: '请输入正确的手机号码'
})
return false;
}
let url = ''
if (this.formType === 'add') {
url = '/gov/org/house/houseadd'
} else {
url = '/gov/org/house/houseupdate'
this.dataForm.houseId = this.houseId
}
const { data, code, msg } = await requestPost(url, this.dataForm)
this.btnDisable = false
if (code === 0) {
this.$message({
type: 'success',
message: '操作成功'
})
this.resetData()
this.$emit('dialogOk')
} else {
this.$message.error(msg)
}
},
handleCancle () {
this.resetData()
this.$emit('dialogCancle')
},
resetData () {
this.houseId = '' //ID
this.houseType = '1'
this.purpose = '1'
this.rentFlag = 0
this.dataForm = {
neighborHoodId: '', // ID
buildingId: '',//ID
buildingUnitId: '',//ID
doorName: '',//
houseType: '1',//
purpose: '1',//
rentFlag: 0,//10
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: {}
}
</script>
<style lang="scss" scoped >
@import "@/assets/scss/modules/visual/communityManageForm.scss";
@import "@/assets/scss/modules/visual/communityManageForm.scss";
</style>

1241
src/views/modules/base/community/roomTable.vue

File diff suppressed because it is too large

14
src/views/modules/base/resi.vue

@ -197,7 +197,7 @@
<el-tabs v-model="activeName"
@tab-click="handleClick">
<el-tab-pane v-for="item in tabsList"
:key="item.columnName"
:key="item.groupId"
:label="item.label"
:name="'group' + item.groupId">
<resi-form :ref="'group' + item.groupId"
@ -245,7 +245,7 @@
<el-tabs v-model="activeName"
@tab-click="handleClick">
<el-tab-pane v-for="item in tabsList"
:key="item.columnName"
:key="item.groupId"
:label="item.label"
:name="'group' + item.groupId">
<edit-resi :ref="'group' + item.groupId"
@ -833,10 +833,11 @@ export default {
async handleChangeGroup (val) {
console.log('changeguoprrrrr----', val)
let { childGroup, value } = val
let hasT = false
let i = 0
// const list = { ...this.tabsList }
this.tabsList.forEach((item, index) => {
let list = [...this.tabsList]
list.forEach((item, index) => {
if (item.tableName === childGroup.tableName) {
hasT = true
i = index
@ -853,12 +854,13 @@ export default {
// console.log('')
}
})
this.tabsList.push(childGroup)
list.push(childGroup)
}
} else {
// console.log('changegroup----000', value)
if (hasT) this.tabsList.splice(i, 1)
if (hasT) list.splice(i, 1)
}
this.tabsList = [...list]
},
formetForm () {
const _baseForm = this.$refs.baseForm.handleForm()

6
src/views/modules/communityParty/members/cpts/record.vue

@ -80,7 +80,7 @@
class="btn-color-edit"
>取消</el-button>
</template>
<template v-else>
<!-- <template v-else>
<el-button
@click="handleChange(scope.row, 'edit')"
type="text"
@ -101,9 +101,7 @@
>删除</el-button
>
</el-popconfirm>
<!-- <el-button type="text" size="small" :disabled="disabled" class="btn-color-del"
@click="del(scope.row)">删除</el-button> -->
</template>
</template> -->
</template>
</el-table-column>
</el-table>

2
src/views/modules/communityParty/members/index.vue

@ -490,7 +490,7 @@ export default {
}
},
handleTimeChangePay (timvale) {
handleTimeChangePay (val) {
if (val.length > 0) {
this.searchForm.payStatrDate = val[0]
this.searchForm.payEndDate = val[0]

63
src/views/modules/partymember/icpartyorg-add-or-update.vue

@ -42,12 +42,13 @@
placeholder="请选择上级党组织"
:props="{ checkStrictly: true, label: 'partyOrgName', value: 'id', children: 'children' }"
@change="handleChangeOrg"
:disabled="dataForm.id || dataForm.orgId ? true : false"
clearable />
</el-form-item>
<el-form-item label="党组织介绍" prop="introduction">
<el-input style="width:300px" v-model="dataForm.introduction" type="textarea" maxlength="500" placeholder="党组织介绍"></el-input>
</el-form-item>
<el-form-item label="位置坐标"
<el-form-item label="党组织位置"
prop="longitude"
style="display: block">
<div class="item_width_1">
@ -70,7 +71,7 @@
</div>
</div>
<div id="lon_lat_id" style="margin-top: 10px; display: none">
<!-- <div id="lon_lat_id" style="margin-top: 10px; display: none">
<span>经度</span>
<el-input class="item_width_3"
maxlength="50"
@ -85,7 +86,7 @@
:readonly="true"
v-model="dataForm.latitude">
</el-input>
</div>
</div> -->
</div>
</el-form-item>
</el-form>
@ -123,11 +124,12 @@
latitude: '', //
address: '',
introduction: '', //
orgId: '',
customerId: '',
staffId:'',
orgPidName: '',
agencyName:''
agencyName:'',
pid: ''
},
orgListVisible: false,
agencyListVisible:false,
@ -159,13 +161,15 @@
this.getInfo()
} else {
this.initMap()
if(this.dataForm.orgPids) {
this.dataForm.mySelectOrg = this.dataForm.orgPids.split(':')
if(this.dataForm.orgId) {
this.dataForm.mySelectOrg = this.dataForm.orgId
this.dataForm.orgPid = this.dataForm.orgId
this.dataForm.orgPids = this.dataForm.orgPids + ':' + this.dataForm.orgId
console.log(this.dataForm.orgPid)
console.log(this.dataForm.orgPids)
} else {
this.dataForm.mySelectOrg = ''
}
this.orgListTreeSetDefaultHandle()
}
})
})
@ -220,17 +224,17 @@
}
this.$http.get('/gov/org/customeragency/getOrgTreeByUserAndType', {params: {agencyId: this.agencyId, orgType:value}}).then(({data: res}) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
}
this.agencyOrgList = this.removeEmptyChildren(res.data)
}).catch(() => {})
},
//
getOrgList() {
return this.$http.get('/resi/partymember/icPartyOrg/getTreelist', {params: {agencyId: this.agencyId}}).then(({data: res}) => {
return this.$http.get('/resi/partymember/icPartyOrg/getTreelist', {params: {agencyId: this.agencyId, orgPid: this.dataForm.id ? this.dataForm.pid : ''}}).then(({data: res}) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
}
this.orgList = this.removeEmptyChildren(res.data)
this.orgList.unshift({
partyOrgName: '一级组织',
@ -268,14 +272,14 @@
getInfo() {
this.$http.get(`/resi/partymember/icPartyOrg/${this.dataForm.id}`).then(({data: res}) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
}
this.dataForm = {
...this.dataForm,
...res.data
}
//
this.dataForm.mySelectOrg = this.dataForm.orgPids.split(':')
this.dataForm.mySelectOrg = this.dataForm.orgPid
//
this.dataForm.agencyId = this.dataForm.agencyId
this.initMap()
@ -292,23 +296,18 @@
orgType:this.dataForm.partyOrgType}
}).then(({data: res}) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
}
this.agencyOrgList = res.data
}).catch(() => {
})
},
// ,
orgListTreeSetDefaultHandle() {
this.dataForm.orgPid = '0'
this.dataForm.orgPidName = '一级组织'
},
// init
initMap () {
document.getElementById('app').innerHTML = ''
if (document.getElementById('app')) {
document.getElementById('mapSeach_id').style.display = "block"
document.getElementById('lon_lat_id').style.display = "block"
// document.getElementById('lon_lat_id').style.display = "block"
}
//
@ -416,13 +415,16 @@
},
//
dataFormSubmitHandle: debounce(function () {
if (!this.dataForm.latitude || !this.dataForm.longitude) {
return this.$message.error('请滑动地图选择党组织位置')
}
this.$refs['dataForm'].validate((valid) => {
if (!valid) {
return false
}
this.$http[!this.dataForm.id ? 'post' : 'put']('/resi/partymember/icPartyOrg/', this.dataForm).then(({data: res}) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
}
this.$message({
message: this.$t('prompt.success'),
@ -442,23 +444,16 @@
dataRule() {
return {
partyOrgName: [
{required: true, message: this.$t('validate.required'), trigger: 'blur'}
{required: true, message: "党组织名称不能为空", trigger: 'blur'}
],
mySelectOrg: [
{required: true, message: this.$t('validate.required'), trigger: 'blur'}
{required: true, message: "上级党组织不能为空", trigger: 'blur'}
],
partyOrgType: [
{required: true, message: this.$t('validate.required'), trigger: 'blur'}
],
longitude: [
{required: true, message: this.$t('validate.required'), trigger: 'blur'}
],
latitude: [
{required: true, message: this.$t('validate.required'), trigger: 'blur'}
{required: true, message: "党组织类型不能为空", trigger: 'blur'}
],
agencyId: [
{required: true, message: this.$t('validate.required'), trigger: 'blur'}
{required: true, message: "行政组织不能为空", trigger: 'blur'}
]
}
}

23
src/views/modules/partymember/icpartyorgtree.vue

@ -19,17 +19,17 @@
<el-table-column label="操作" align="center" width="300">
<template slot-scope="scope">
<el-button v-if="scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)"
@click="handleLook(scope.row.agencyId)"
@click="handleLook(scope.row.agencyPids, scope.row.id, scope.row)"
type="text"
size="small"
class="div-table-button--detail">{{'查看党员'}}</el-button>
<el-button v-if="scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)"
@click="addOrUpdateHandle('', scope.row.orgPids)"
<el-button v-if="(scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)) && scope.row.partyOrgType != '5'"
@click="addOrUpdateHandle('', scope.row.id, scope.row.orgPids)"
type="text"
size="small"
class="div-table-button--add">新增下级</el-button>
<el-button v-if="scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)"
@click="addOrUpdateHandle(scope.row.id)"
@click="addOrUpdateHandle(scope.row.id, '', '', scope.row.pid)"
type="text"
size="small"
class="div-table-button--edit">修改</el-button>
@ -98,7 +98,7 @@
}
await this.$http.get('/resi/partymember/icPartyOrg/getTreelist', {params: this.dataForm}).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
} else {
this.tableData = res.data
}
@ -106,12 +106,15 @@
this.tableLoading = false
},
// /
addOrUpdateHandle (id, orgPids) {
addOrUpdateHandle (id, orgId, orgPids, pid) {
console.log('pid:::::', pid)
this.addOrUpdateVisible = true
this.$nextTick(() => {
this.$refs.addOrUpdate.dataForm.id = id
//
this.$refs.addOrUpdate.dataForm.orgPids = orgPids //
this.$refs.addOrUpdate.dataForm.orgId = orgId //
this.$refs.addOrUpdate.dataForm.orgPids = orgPids
this.$refs.addOrUpdate.dataForm.pid = pid
this.$refs.addOrUpdate.init()
})
@ -125,7 +128,7 @@
}).then(() => {
this.$http.delete('/resi/partymember/icPartyOrg/delete', {'data': [id]}).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
}
this.$message({
message: this.$t('prompt.success'),
@ -139,10 +142,10 @@
}).catch(() => {})
},
//
handleLook(agencyId) {
handleLook(agencyPids, id, row) {
this.lookMemberShow = true
this.$nextTick(() => {
this.$refs.ref_table_Member.initForm(agencyId)
this.$refs.ref_table_Member.initForm(agencyPids.split(':')[agencyPids.split(':').length - 1], id)
})
},
lookMemberClose () {

50
src/views/modules/partymember/lookMember.vue

@ -6,7 +6,6 @@
<el-table ref="ref_table"
:data="tableData"
border
:height="tableHeight"
v-loading="tableLoading"
:header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
style="width: 100%"
@ -21,6 +20,16 @@
label="身份证号">
</el-table-column>
</el-table>
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page.sync="pageNo"
:page-sizes="[20, 50, 100, 200]"
:page-size="parseInt(pageSize)"
layout="sizes, prev, pager, next, total"
:total="total"
>
</el-pagination>
</div>
</div>
</div>
@ -41,21 +50,23 @@ export default {
//
tableData: [],
tableLoading: false,
orgPids: ''
agencyId: '',
partyOrgId: '',
pageNo: 1,
pageSize: 20,
total: 1,
}
},
props: {
},
computed: {
tableHeight () {
return this.$store.state.inIframe ? this.clientHeight - 410 + this.iframeHeight : this.clientHeight - 410
},
...mapGetters(['clientHeight', 'iframeHeight'])
},
components: {},
methods: {
initForm (agencyId) {
this.orgPids = agencyId
initForm (agencyId, id) {
this.agencyId = agencyId
this.partyOrgId = id
this.tableLoading = true
this.loadTable()
},
@ -66,17 +77,32 @@ export default {
//
async loadTable () {
let params = {
partyOrgId: this.orgPids,
pageNo: 1,
pageSize: 10000000
agencyId: this.agencyId,
partyOrgId: this.partyOrgId,
pageNo: this.pageNo,
pageSize: this.pageSize
}
const url = `/resi/partymember/icPartyMember/page`
const { data, code, msg } = await requestPost(url, params)
const { data, code, internalMsg, msg } = await requestPost(url, params)
this.tableLoading = false
if (code !== 0) {
return this.$message.error(internalMsg ? internalMsg : msg ? msg : '查询失败')
}
if (code === 0) {
this.tableData = data.list ? data.list : []
this.total = data.total || 0;
}
}
},
handleSizeChange (val) {
console.log(`每页 ${val}`)
this.pageSize = val
this.loadTable()
},
handleCurrentChange (val) {
console.log(`当前页: ${val}`);
this.pageNo = val;
this.loadTable();
},
},
}
</script>

77
src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue

@ -1,21 +1,21 @@
<template>
<el-dialog class="rent" :visible.sync="visible" :title="dataForm.flag === '1' ? '查看详情' : '审核'" :close-on-click-modal="false" :close-on-press-escape="false">
<el-form :inline="true" :model="dataForm" :rules="dataRule" ref="dataForm"
@keyup.enter.native="dataFormSubmitHandle()" label-width="140px" disabled>
@keyup.enter.native="dataFormSubmitHandle()" label-width="140px">
<div v-if="dataForm.flag === '2'">
<div style="margin-left: 50px;height: 30px;font-weight: bold;">房屋信息</div>
<el-form-item label="所属社区" prop="gridName">
<el-input v-model="dataForm.gridName" placeholder="网格"></el-input>
<el-input v-model="dataForm.gridName" placeholder="网格" disabled></el-input>
</el-form-item>
<el-form-item label="所属网格" prop="gridName">
<el-input v-model="dataForm.gridName" placeholder="所属网格"></el-input>
<el-input v-model="dataForm.gridName" placeholder="所属网格" disabled></el-input>
</el-form-item>
<br/>
<el-form-item label="房屋" prop="homeName">
<el-input v-model="dataForm.homeName" placeholder="房屋"></el-input>
<el-input v-model="dataForm.homeName" placeholder="房屋" disabled></el-input>
</el-form-item>
<el-form-item label="房主姓名" prop="ownerName">
<el-input v-model="dataForm.ownerName" placeholder="房主姓名"></el-input>
<el-input v-model="dataForm.ownerName" placeholder="房主姓名" disabled></el-input>
</el-form-item>
</div>
<div style="padding:20px 30px">
@ -30,6 +30,7 @@
<el-table-column prop="yfzgx" label="与户主关系" header-align="center" align="center" width="120"></el-table-column>
<el-table-column prop="mobile" label="手机" header-align="center" align="center" width="120"></el-table-column>
<el-table-column prop="idCard" label="身份证号" header-align="center" align="center" width="180"></el-table-column>
<el-table-column prop="unit" label="工作单位" header-align="center" align="center" width="180" show-overflow-tooltip></el-table-column>
<el-table-column prop="politicalStatus" label="政治面貌" header-align="center" align="center"></el-table-column>
<el-table-column prop="isMilitary" label="是否服过兵役" header-align="center" align="center" width="120"></el-table-column>
<el-table-column prop="nation" label="国籍" header-align="center" align="center"></el-table-column>
@ -52,52 +53,59 @@
<div style="margin-left: 50px;height: 30px;font-weight: bold;">合同信息</div>
<div style="margin-left: 50px;height: 30px;">出租人信息</div>
<el-form-item label="出租人姓名" prop="lessorName">
<el-input v-model="dataForm.lessorName" placeholder="出租人姓名"></el-input>
<el-input v-model="dataForm.lessorName" placeholder="出租人姓名" disabled></el-input>
</el-form-item>
<el-form-item label="出租人身份证" prop="lessorIdCard">
<el-input v-model="dataForm.lessorIdCard" placeholder="出租人身份证"></el-input>
<el-input v-model="dataForm.lessorIdCard" placeholder="出租人身份证" disabled></el-input>
</el-form-item>
<br/>
<el-form-item label="出租人手机" prop="lessorMobile">
<el-input v-model="dataForm.lessorMobile" placeholder="出租人手机"></el-input>
<el-input v-model="dataForm.lessorMobile" placeholder="出租人手机" disabled></el-input>
</el-form-item>
<el-form-item label="与房主关系" prop="lessorRelation">
<!--<el-input v-model="dataForm.lessorRelation" placeholder="与房主关系"></el-input>-->
<el-select v-model="dataForm.lessorRelation" placeholder="与房主关系" :disabled="dataForm.state !== '0'">
<el-option v-for="item in lessorRelationArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
<br/>
<el-form-item label="中介合同附件" prop="agencyImgList" v-if="dataForm.lessorRelation ==='中介'">
<template>
<label v-for="(item,index) in dataForm.agencyImgList" :key="index">
<img :src="item.fileUrl" @click="imgShow(item.fileUrl)" width="100" height="100" />
</label>
</template>
</el-form-item>
<br/>
<div style="margin-left: 50px;height: 30px;">承租人信息</div>
<el-form-item label="承租人姓名" prop="lesseeName">
<el-input v-model="dataForm.lesseeName" placeholder="承租人姓名"></el-input>
<el-input v-model="dataForm.lesseeName" placeholder="承租人姓名" disabled></el-input>
</el-form-item>
<el-form-item label="承租人身份证" prop="lesseeIdCard">
<el-input v-model="dataForm.lesseeIdCard" placeholder="承租人身份证"></el-input>
<el-input v-model="dataForm.lesseeIdCard" placeholder="承租人身份证" disabled></el-input>
</el-form-item>
<br/>
<el-form-item label="承租人手机" prop="lesseeMobile">
<el-input v-model="dataForm.lesseeMobile" placeholder="承租人手机"></el-input>
</el-form-item>
<br/>
<el-form-item label="与房主关系" prop="lessorRelation">
<el-input v-model="dataForm.lessorRelation" placeholder="与房主关系"></el-input>
<el-input v-model="dataForm.lesseeMobile" placeholder="承租人手机" disabled></el-input>
</el-form-item>
<br/>
<el-form-item label="中介合同附件" prop="agencyImgList" v-if="dataForm.lessorRelation ==='中介'">
<template>
<label v-for="(item,index) in dataForm.agencyImgList" :key="index">
<img :src="item.fileUrl" @click="imgShow(item.fileUrl)" width="100" height="100" />
</label>
</template>
<el-form-item label="工作单位" prop="lesseeUnit">
<el-input v-model="dataForm.lesseeUnit" placeholder="工作单位" disabled></el-input>
</el-form-item>
<br/>
<div style="margin-left: 50px;height: 30px;font-weight: bold;">合同内容</div>
<el-form-item label="签署日期" prop="signDate">
<el-input v-model="dataForm.signDate" placeholder="签署日期"></el-input>
<el-input v-model="dataForm.signDate" placeholder="签署日期" disabled></el-input>
</el-form-item>
<br/>
<el-form-item label="合同开始日期" prop="startDate">
<el-input v-model="dataForm.startDate" placeholder="合同开始日期"></el-input>
<el-input v-model="dataForm.startDate" placeholder="合同开始日期" disabled></el-input>
</el-form-item>
<el-form-item label="合同结束日期" prop="endDate">
<el-input v-model="dataForm.endDate" placeholder="合同结束日期"></el-input>
<el-input v-model="dataForm.endDate" placeholder="合同结束日期" disabled></el-input>
</el-form-item>
<br/>
@ -145,16 +153,30 @@ export default {
lessorName: '',
lessorIdCard: '',
lessorMobile: '',
lessorRelation: '',
lesseeName: '',
lesseeIdCard: '',
lesseeMobile: '',
lesseeUnit: '',
signDate: '',
startDate: '',
endDate: ''
},
dataListLoading: false,
dialogVisible: false,
dialogImageUrl: ''
dialogImageUrl: '',
lessorRelationArr: [
{ dictValue: '本人', dictName: '本人' },
{ dictValue: '配偶', dictName: '配偶' },
{ dictValue: '子女', dictName: '子女' },
{ dictValue: '父母', dictName: '父母' },
{ dictValue: '岳父母或公婆', dictName: '岳父母或公婆' },
{ dictValue: '祖父母', dictName: '祖父母' },
{ dictValue: '媳婿', dictName: '媳婿' },
{ dictValue: '孙子女', dictName: '孙子女' },
{ dictValue: '兄弟姐妹', dictName: '兄弟姐妹' },
{ dictValue: '中介', dictName: '中介' }
]
}
},
computed: {
@ -252,7 +274,8 @@ export default {
const params = {
id: this.dataForm.id,
state: type,
homeId: this.dataForm.homeId
homeId: this.dataForm.homeId,
lessorRelation: this.dataForm.lessorRelation
}
this.$http.post('/pli/power/rentContractInfo/review', params).then(({ data: res }) => {
if (res.code !== 0) {

5
src/views/modules/visual/basicinfo/basicInfoCommunity.vue

@ -46,7 +46,7 @@
</div>
<div class="icon_roomstate">
<div>{{item.rentFlag}}</div>
<div :style="{ color: item.rentFlag == '自住' ? '#3dda83' : item.rentFlag == '出租' ? '#e43c26' : '#fac126' }">{{item.rentFlag}}</div>
</div>
<div class="icon_category">
@ -163,9 +163,6 @@ export default {
runNum: 0,
runAgencyArray: [],
}
},
async mounted () {

10
src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue

@ -233,21 +233,21 @@ export default {
xzHouseTotal: 200,//
xzHouseRatio: '70%',//
},
houseColorArray: ['#FAC126', '#3DDA83', '#2865FA'],
houseColorArray: ['#3dda83', '#e43c26', '#fac126'],
housePieData: [],
legendArray: [
{
name: '自住房屋数',
url: require('../../../../../assets/img/shuju/measure/huang@2x.png')
url: require('../../../../../assets/img/shuju/measure/lv@2x.png')
},
{
name: '出租房屋数',
url: require('../../../../../assets/img/shuju/measure/lv@2x.png')
url: require('../../../../../assets/img/shuju/measure/hong@2x.png')
},
{
name: '闲置房屋数',
url: require('../../../../../assets/img/shuju/measure/lan@2x.png')
url: require('../../../../../assets/img/shuju/measure/huang@2x.png')
}
],
@ -265,7 +265,7 @@ export default {
ldUserRatio: '5%',//
},
userColorArray: ['#ff7800', '#00E5ED'],
userColorArray: ['#3dda83', '#e43c26'],
userPieData: [],
subList: [],

2
src/views/modules/visual/communityParty/community.vue

@ -1255,7 +1255,7 @@ export default {
}
}
.table-h {
height: 360px;
height: 320px;
}
.calc-h {
height: calc(100vh - 240px);

22
src/views/modules/visual/communityParty/gridParty.vue

@ -10,8 +10,7 @@
:options="propTree"
:props="{ checkStrictly: true }"
:show-all-levels="false"
:getCheckedNodes="getCheckedNodes"
clearable
:getCheckedNodes="getCheckedNodes"
@change="handleCascader">
</el-cascader>
</div>
@ -166,8 +165,9 @@ export default {
]
await this.loadOrgData()
await this.getWorkUserInfo()
this.loadMap()
this.isfirstInit = false
// this.loadMap()
this.getMapData()
// this.isfirstInit = false
// end
},
methods: {
@ -189,7 +189,6 @@ export default {
// };
const { data, code, msg } = await requestPost(url);
if (code === 0) {
console.log('data-org----o', data)
this.selectAgency = [`${data.agencyId}-${data.level}`]
this.orgType = data.level
this.agencyId = data.agencyId
@ -230,7 +229,6 @@ export default {
},
//
async handleCascader(val) {
console.log('val-vvv', val)
const _arr = val[val.length - 1].split('-')
const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
this.agencyId = _arr[0]
@ -238,7 +236,6 @@ export default {
this.orgType = orgType
this.noEduInit = false
this.agencyInfo = { ...this.orgData }
console.log('agencyInfo-----', this.agencyInfo)
this.eduCode = ''
await this.loadOrgData()
this.getEduCount(_arr[0])
@ -342,7 +339,6 @@ export default {
}
};
console.log('zlcm')
} else {
element.isClick = false
element.label = {
@ -400,7 +396,6 @@ export default {
this.visibleLoading = false
},
pieInitOks (dom) {
console.log('pies准备好了', dom)
this.pieEduChartS = dom
// this.pieInitState = true
},
@ -424,7 +419,6 @@ export default {
this.showedUnitMoreInfo = true
this.unitAclist = data.list
this.$nextTick(() => {
console.log(this.unitAclist[0].demandRecId)
this.$refs['unitdetailInfo'].getDetail(this.unitAclist[0].demandRecId)
})
} else {
@ -511,10 +505,11 @@ export default {
window.app.ajax.post(
url,
params,
(data, rspMsg) => {
(data, rspMsg) => {
this.unitMapList = data
this.isfirstInit = false
this.loadMap()
this.isfirstInit = false
this.$refs.map.handleClosePopup()
},
(rspMsg, data) => {
this.$message.error(rspMsg)
@ -526,9 +521,7 @@ export default {
this.userId = ''
const featureInfo = feature.values_.properties.info
this.userId = feature.values_.properties.info.id
console.log('feature.values_.properties.info:::', JSON.stringify(feature.values_.properties.info))
let coordinate = [featureInfo.longitude, featureInfo.latitude]
console.log(feature.values_.properties.info)
let showData = `
<div style='font-size:16px; color:#FFFFFF;'>个人信息</div>
<div style='font-size:12px; color:#FFFFFF;margin-top:10px'>姓名
@ -557,7 +550,6 @@ export default {
},
lookMore(e) {
this.userId = this.userId
console.log('userId:', this.userId)
this.showedMoreInfo = true
}
},

7
src/views/modules/visual/communityParty/memberInfo.vue

@ -29,6 +29,10 @@
<span class="item-field">需求类型</span>
<span v-if="info.categoryName">{{ info.categoryName }}</span>
</div>
<div class="item">
<span class="item-field">上报类型</span>
<span v-if="info.reportTypeName">{{ info.reportTypeName }}</span>
</div>
<div class="item">
<span class="item-field">上报人</span>
<span v-if="info.reportUserName">{{ info.reportUserName }}</span>
@ -171,7 +175,7 @@ export default {
margin-bottom: 0;
.list {
display: block;
width: 50%;
width: auto;
.item {
display: flex;
width: 100%;
@ -228,6 +232,7 @@ export default {
overflow: auto;
.left-item {
padding: 10px 0;
border-right: 1px dashed #1257c9;
cursor: pointer;
.item-title {
font-size: 16px;

1
src/views/modules/visual/communityParty/unitInfo.vue

@ -234,6 +234,7 @@ export default {
overflow: auto;
.left-item {
padding: 10px 0;
border-bottom: 1px dashed #1257c9;
cursor: pointer;
.item-title {
font-size: 16px;

12
src/views/modules/visual/components/screen-map/index.vue

@ -33,7 +33,8 @@
<div id="popup-content"
class="popup-content"></div>
<a href="#"
id="popup-goMore">更多>>>></a>
id="popup-goMore"
class="popup-goMore">更多>>>></a>
</div>
</div>
</template>
@ -745,6 +746,12 @@ const vueGis = {
// overlay x,y
},
//
handleClosePopup() {
this.overlay.setPosition(undefined);
document.getElementById("popup-closer").blur();
return false;
},
//
getRndBetween (lowerLimit, upperLimit) {
@ -888,6 +895,9 @@ export default vueGis;
.popup-content {
width: 300px;
}
.popup-goMore{
margin: 20px 0;
}
.ol-popup-closer:after {
content: "✖";
// color: rgba(1, 17, 104, 1);

Loading…
Cancel
Save