Browse Source

Merge branch 'feature/dev_zz_wgh' into dev

feature
YUJT 3 years ago
parent
commit
874785bf5a
  1. 84
      src/views/modules/cabaseinfo/caloudong.vue
  2. 85
      src/views/modules/cabaseinfo/capingfang.vue
  3. 84
      src/views/modules/cabaseinfo/carental.vue
  4. 86
      src/views/modules/cabaseinfo/caresident.vue
  5. 13
      src/views/modules/cabaseinfo/carotators-binding-house.vue
  6. 85
      src/views/modules/cabaseinfo/carotators.vue

84
src/views/modules/cabaseinfo/caloudong.vue

@ -3,13 +3,15 @@
<el-card>
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="所属网格" prop="gridId">
<el-cascader
:options="caLouDongOptions"
:props="{ checkStrictly: true }"
clearable
@change="handlePartyChange">
</el-cascader>
</el-form-item>
<el-select v-model="dataForm.gridId" filterable placeholder="请选择" clearable>
<el-option
v-for="item in optionsG"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="楼宇名称" prop="buildingName">
<el-input
v-model="dataForm.buildingName"
@ -176,38 +178,60 @@ export default {
communityName: "",
gridId:""
},
caLouDongOptions:[]
caLouDongOptions:[],
optionsG:[]
};
},
methods:{
getloudongOptions(){
this.$http.post(`/opendata/bmGrid/getCascadeMenu`).then(resp => {
if(resp.data.code === 0){
this.caLouDongOptions = this.removeEmptySubOrgList(resp.data.data)
}
}).catch(error => {
this.$message.error(error)
})
},
removeEmptySubOrgList (orgArray) {
orgArray.forEach((orgInfo) => {
if (orgInfo && orgInfo.children) {
if (orgInfo.children.length === 0) {
orgInfo.children = undefined
} else {
this.removeEmptySubOrgList(orgInfo.children)
}
}
})
return orgArray;
},
// getloudongOptions(){
// this.$http.post(`/opendata/bmGrid/getCascadeMenu`).then(resp => {
// if(resp.data.code === 0){
// this.caLouDongOptions = this.removeEmptySubOrgList(resp.data.data)
// }
// }).catch(error => {
// this.$message.error(error)
// })
// },
// removeEmptySubOrgList (orgArray) {
// orgArray.forEach((orgInfo) => {
// if (orgInfo && orgInfo.children) {
// if (orgInfo.children.length === 0) {
// orgInfo.children = undefined
// } else {
// this.removeEmptySubOrgList(orgInfo.children)
// }
// }
// })
// return orgArray;
// },
handlePartyChange(val) {
console.log('val------pp', val)
this.dataForm.gridId = val[val.length - 1]
},
async getGridList(type, agencyId) {
const { user } = await this.$store.state
console.log('user---ppp', user)
// addorupdate query
await this.$http
.post('/gov/org/customergrid/gridoption', { agencyId: agencyId || user.agencyId, purpose: type })
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取查询详情成功', res.data)
this.optionsG = res.data
if (type === 'query') this.optionsG = res.data
else this.optionsEditG = res.data
}
})
.catch(() => {
return this.$message.error('网络错误')
})
},
},
created(){
this.getloudongOptions()
// this.getloudongOptions()
this.getGridList('query')
},
components: {
AddOrUpdate,

85
src/views/modules/cabaseinfo/capingfang.vue

@ -3,13 +3,15 @@
<el-card>
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="所属网格" prop="gridId">
<el-cascader
:options="caLouDongOptions"
:props="{ checkStrictly: true }"
clearable
@change="handlePartyChange">
</el-cascader>
</el-form-item>
<el-select v-model="dataForm.gridId" filterable placeholder="请选择" clearable>
<el-option
v-for="item in optionsG"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="楼宇名称" prop="buildingName">
<el-input
v-model="dataForm.buildingName"
@ -176,38 +178,61 @@ export default {
communityName: "",
gridId:""
},
caLouDongOptions:[]
caLouDongOptions:[],
optionsG:[]
};
},
methods:{
getloudongOptions(){
this.$http.post(`/opendata/cabmGrid/getCascadeMenu`).then(resp => {
if(resp.data.code === 0){
this.caLouDongOptions = this.removeEmptySubOrgList(resp.data.data)
}
}).catch(error => {
this.$message.error(error)
})
},
removeEmptySubOrgList (orgArray) {
orgArray.forEach((orgInfo) => {
if (orgInfo && orgInfo.children) {
if (orgInfo.children.length === 0) {
orgInfo.children = undefined
} else {
this.removeEmptySubOrgList(orgInfo.children)
}
}
})
return orgArray;
},
// getloudongOptions(){
// this.$http.post(`/opendata/cabmGrid/getCascadeMenu`).then(resp => {
// if(resp.data.code === 0){
// this.caLouDongOptions = this.removeEmptySubOrgList(resp.data.data)
// }
// }).catch(error => {
// this.$message.error(error)
// })
// },
// removeEmptySubOrgList (orgArray) {
// orgArray.forEach((orgInfo) => {
// if (orgInfo && orgInfo.children) {
// if (orgInfo.children.length === 0) {
// orgInfo.children = undefined
// } else {
// this.removeEmptySubOrgList(orgInfo.children)
// }
// }
// })
// return orgArray;
// },
handlePartyChange(val) {
console.log('val------pp', val)
this.dataForm.gridId = val[val.length - 1]
},
async getGridList(type, agencyId) {
const { user } = await this.$store.state
console.log('user---ppp', user)
// addorupdate query
await this.$http
.post('/gov/org/customergrid/gridoption', { agencyId: agencyId || user.agencyId, purpose: type })
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取查询详情成功', res.data)
this.optionsG = res.data
if (type === 'query') this.optionsG = res.data
else this.optionsEditG = res.data
}
})
.catch(() => {
return this.$message.error('网络错误')
})
},
},
created(){
this.getloudongOptions()
// this.getloudongOptions()
this.getGridList()
},
components: {
AddOrUpdate,

84
src/views/modules/cabaseinfo/carental.vue

@ -3,13 +3,15 @@
<el-card>
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="所属网格" prop="gridId">
<el-cascader
:options="caLouDongOptions"
:props="{ checkStrictly: true }"
clearable
@change="handlePartyChange">
</el-cascader>
</el-form-item>
<el-select v-model="dataForm.gridId" filterable placeholder="请选择" clearable>
<el-option
v-for="item in optionsG"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="房屋编号" prop="houseName">
<el-input
v-model="dataForm.houseName"
@ -177,38 +179,60 @@ export default {
renterName: "",
gridId:""
},
caLouDongOptions:[]
caLouDongOptions:[],
optionsG:[]
};
},
methods:{
getloudongOptions(){
this.$http.post(`/opendata/bmGrid/getCascadeMenu`).then(resp => {
if(resp.data.code === 0){
this.caLouDongOptions = this.removeEmptySubOrgList(resp.data.data)
}
}).catch(error => {
this.$message.error(error)
})
},
removeEmptySubOrgList (orgArray) {
orgArray.forEach((orgInfo) => {
if (orgInfo && orgInfo.children) {
if (orgInfo.children.length === 0) {
orgInfo.children = undefined
} else {
this.removeEmptySubOrgList(orgInfo.children)
}
}
})
return orgArray;
},
// getloudongOptions(){
// this.$http.post(`/opendata/bmGrid/getCascadeMenu`).then(resp => {
// if(resp.data.code === 0){
// this.caLouDongOptions = this.removeEmptySubOrgList(resp.data.data)
// }
// }).catch(error => {
// this.$message.error(error)
// })
// },
// removeEmptySubOrgList (orgArray) {
// orgArray.forEach((orgInfo) => {
// if (orgInfo && orgInfo.children) {
// if (orgInfo.children.length === 0) {
// orgInfo.children = undefined
// } else {
// this.removeEmptySubOrgList(orgInfo.children)
// }
// }
// })
// return orgArray;
// },
handlePartyChange(val) {
console.log('val------pp', val)
this.dataForm.gridId = val[val.length - 1]
},
async getGridList(type, agencyId) {
const { user } = await this.$store.state
console.log('user---ppp', user)
// addorupdate query
await this.$http
.post('/gov/org/customergrid/gridoption', { agencyId: agencyId || user.agencyId, purpose: type })
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取查询详情成功', res.data)
this.optionsG = res.data
if (type === 'query') this.optionsG = res.data
else this.optionsEditG = res.data
}
})
.catch(() => {
return this.$message.error('网络错误')
})
},
},
created(){
this.getloudongOptions()
// this.getloudongOptions()
this.getGridList()
},
components: {
AddOrUpdate,

86
src/views/modules/cabaseinfo/caresident.vue

@ -3,13 +3,15 @@
<el-card>
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="所属网格" prop="gridId">
<el-cascader
:options="caLouDongOptions"
:props="{ checkStrictly: true }"
clearable
@change="handlePartyChange">
</el-cascader>
</el-form-item>
<el-select v-model="dataForm.gridId" filterable placeholder="请选择" clearable>
<el-option
v-for="item in optionsG"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="身份证号" prop="idCard">
<el-input v-model="dataForm.idCard" placeholder="身份证号" clearable></el-input>
</el-form-item>
@ -121,6 +123,7 @@
<template slot-scope="scope">
<el-button
type="text"
v-if="!scope.row.icResiUserId"
class="div-table-button--detail"
size="small"
@click="bndingHouseHandle(scope.row.idCard)"
@ -188,7 +191,8 @@ export default {
telephone: "",
gridId:""
},
caLouDongOptions:[]
caLouDongOptions:[],
optionsG:[]
};
},
methods:{
@ -199,34 +203,56 @@ export default {
closeBindHouse(){
this.bndingHouseVisible = false
},
getloudongOptions(){
this.$http.post(`/opendata/bmGrid/getCascadeMenu`).then(resp => {
if(resp.data.code === 0){
this.caLouDongOptions = this.removeEmptySubOrgList(resp.data.data)
}
}).catch(error => {
this.$message.error(error)
})
},
removeEmptySubOrgList (orgArray) {
orgArray.forEach((orgInfo) => {
if (orgInfo && orgInfo.children) {
if (orgInfo.children.length === 0) {
orgInfo.children = undefined
} else {
this.removeEmptySubOrgList(orgInfo.children)
}
}
})
return orgArray;
},
// getloudongOptions(){
// this.$http.post(`/opendata/bmGrid/getCascadeMenu`).then(resp => {
// if(resp.data.code === 0){
// this.caLouDongOptions = this.removeEmptySubOrgList(resp.data.data)
// }
// }).catch(error => {
// this.$message.error(error)
// })
// },
// removeEmptySubOrgList (orgArray) {
// orgArray.forEach((orgInfo) => {
// if (orgInfo && orgInfo.children) {
// if (orgInfo.children.length === 0) {
// orgInfo.children = undefined
// } else {
// this.removeEmptySubOrgList(orgInfo.children)
// }
// }
// })
// return orgArray;
// },
handlePartyChange(val) {
console.log('val------pp', val)
this.dataForm.gridId = val[val.length - 1]
},
async getGridList(type, agencyId) {
const { user } = await this.$store.state
console.log('user---ppp', user)
// addorupdate query
await this.$http
.post('/gov/org/customergrid/gridoption', { agencyId: agencyId || user.agencyId, purpose: type })
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取查询详情成功', res.data)
this.optionsG = res.data
if (type === 'query') this.optionsG = res.data
else this.optionsEditG = res.data
}
})
.catch(() => {
return this.$message.error('网络错误')
})
},
},
created(){
this.getloudongOptions()
// this.getloudongOptions()
this.getGridList()
},
components: {
AddOrUpdate,

13
src/views/modules/cabaseinfo/carotators-binding-house.vue

@ -4,13 +4,9 @@
<div v-show="!showedFuncPanel">
<div class="m-info">
<div class="wrap">
<div class="logo">
<span>房屋查询</span>
</div>
<div class="search">
<div class="input">
<el-dropdown
<!-- <el-dropdown
class="select"
placement="bottom"
v-model="searchData.type"
@ -18,12 +14,9 @@
>
<span class="select-show">
{{ { fangwu: "房屋" }[searchData.type]
}}<i class="el-icon-arrow-down el-icon--right"></i>
}}
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="fangwu">房屋</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</el-dropdown> -->
<input
type="text"

85
src/views/modules/cabaseinfo/carotators.vue

@ -3,13 +3,15 @@
<el-card>
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="所属网格" prop="gridId">
<el-cascader
:options="caLouDongOptions"
:props="{ checkStrictly: true }"
clearable
@change="handlePartyChange">
</el-cascader>
</el-form-item>
<el-select v-model="dataForm.gridId" filterable placeholder="请选择" clearable>
<el-option
v-for="item in optionsG"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="身份证号" prop="idCard">
<el-input v-model="dataForm.idCard" placeholder="身份证号" clearable></el-input>
</el-form-item>
@ -165,39 +167,60 @@ export default {
telephone: "",
gridId:""
},
caLouDongOptions:[]
caLouDongOptions:[],
optionsG:[]
};
},
methods:{
getloudongOptions(){
this.$http.post(`/opendata/bmGrid/getCascadeMenu`).then(resp => {
if(resp.data.code === 0){
this.caLouDongOptions = this.removeEmptySubOrgList(resp.data.data)
}
}).catch(error => {
this.$message.error(error)
})
},
removeEmptySubOrgList (orgArray) {
orgArray.forEach((orgInfo) => {
if (orgInfo && orgInfo.children) {
if (orgInfo.children.length === 0) {
orgInfo.children = undefined
} else {
this.removeEmptySubOrgList(orgInfo.children)
}
}
})
return orgArray;
},
// getloudongOptions(){
// this.$http.post(`/opendata/bmGrid/getCascadeMenu`).then(resp => {
// if(resp.data.code === 0){
// this.caLouDongOptions = this.removeEmptySubOrgList(resp.data.data)
// }
// }).catch(error => {
// this.$message.error(error)
// })
// },
// removeEmptySubOrgList (orgArray) {
// orgArray.forEach((orgInfo) => {
// if (orgInfo && orgInfo.children) {
// if (orgInfo.children.length === 0) {
// orgInfo.children = undefined
// } else {
// this.removeEmptySubOrgList(orgInfo.children)
// }
// }
// })
// return orgArray;
// },
handlePartyChange(val) {
console.log('val------pp', val)
this.dataForm.gridId = val[val.length - 1]
},
async getGridList(type, agencyId) {
const { user } = await this.$store.state
console.log('user---ppp', user)
// addorupdate query
await this.$http
.post('/gov/org/customergrid/gridoption', { agencyId: agencyId || user.agencyId, purpose: type })
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取查询详情成功', res.data)
this.optionsG = res.data
if (type === 'query') this.optionsG = res.data
else this.optionsEditG = res.data
}
})
.catch(() => {
return this.$message.error('网络错误')
})
},
},
created(){
this.getloudongOptions()
// this.getloudongOptions()
this.getGridList()
},
components: {
AddOrUpdate

Loading…
Cancel
Save