elink-star
/
epmet-work-pc-chengyang
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'feature/dev_zz_wgh' into dev

feature
YUJT 3 years ago
parent
5da14e1c9d c0157e9314
commit
874785bf5a
6 changed files with 276 additions and 161 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. 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
View File

@ -3,13 +3,15 @@
<el-card> <el-card>
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="所属网格" prop="gridId"> <el-form-item label="所属网格" prop="gridId">
<el-cascader <el-select v-model="dataForm.gridId" filterable placeholder="请选择" clearable>
:options="caLouDongOptions" <el-option
:props="{ checkStrictly: true }" v-for="item in optionsG"
clearable :key="item.value"
@change="handlePartyChange"> :label="item.label"
</el-cascader> :value="item.value">
</el-form-item> </el-option>
</el-select>
</el-form-item>
<el-form-item label="楼宇名称" prop="buildingName"> <el-form-item label="楼宇名称" prop="buildingName">
<el-input <el-input
v-model="dataForm.buildingName" v-model="dataForm.buildingName"
@ -176,38 +178,60 @@ export default {
communityName: "", communityName: "",
gridId:"" gridId:""
}, },
caLouDongOptions:[] caLouDongOptions:[],
optionsG:[]
}; };
}, },
methods:{ methods:{
getloudongOptions(){ // getloudongOptions(){
this.$http.post(`/opendata/bmGrid/getCascadeMenu`).then(resp => { // this.$http.post(`/opendata/bmGrid/getCascadeMenu`).then(resp => {
if(resp.data.code === 0){ // if(resp.data.code === 0){
this.caLouDongOptions = this.removeEmptySubOrgList(resp.data.data) // this.caLouDongOptions = this.removeEmptySubOrgList(resp.data.data)
} // }
}).catch(error => { // }).catch(error => {
this.$message.error(error) // this.$message.error(error)
}) // })
}, // },
removeEmptySubOrgList (orgArray) { // removeEmptySubOrgList (orgArray) {
orgArray.forEach((orgInfo) => { // orgArray.forEach((orgInfo) => {
if (orgInfo && orgInfo.children) { // if (orgInfo && orgInfo.children) {
if (orgInfo.children.length === 0) { // if (orgInfo.children.length === 0) {
orgInfo.children = undefined // orgInfo.children = undefined
} else { // } else {
this.removeEmptySubOrgList(orgInfo.children) // this.removeEmptySubOrgList(orgInfo.children)
} // }
} // }
}) // })
return orgArray; // return orgArray;
}, // },
handlePartyChange(val) { handlePartyChange(val) {
console.log('val------pp', val) console.log('val------pp', val)
this.dataForm.gridId = val[val.length - 1] 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(){ created(){
this.getloudongOptions() // this.getloudongOptions()
this.getGridList('query')
}, },
components: { components: {
AddOrUpdate, AddOrUpdate,

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

@ -3,13 +3,15 @@
<el-card> <el-card>
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="所属网格" prop="gridId"> <el-form-item label="所属网格" prop="gridId">
<el-cascader <el-select v-model="dataForm.gridId" filterable placeholder="请选择" clearable>
:options="caLouDongOptions" <el-option
:props="{ checkStrictly: true }" v-for="item in optionsG"
clearable :key="item.value"
@change="handlePartyChange"> :label="item.label"
</el-cascader> :value="item.value">
</el-form-item> </el-option>
</el-select>
</el-form-item>
<el-form-item label="楼宇名称" prop="buildingName"> <el-form-item label="楼宇名称" prop="buildingName">
<el-input <el-input
v-model="dataForm.buildingName" v-model="dataForm.buildingName"
@ -176,38 +178,61 @@ export default {
communityName: "", communityName: "",
gridId:"" gridId:""
}, },
caLouDongOptions:[] caLouDongOptions:[],
optionsG:[]
}; };
}, },
methods:{ methods:{
getloudongOptions(){ // getloudongOptions(){
this.$http.post(`/opendata/cabmGrid/getCascadeMenu`).then(resp => { // this.$http.post(`/opendata/cabmGrid/getCascadeMenu`).then(resp => {
if(resp.data.code === 0){ // if(resp.data.code === 0){
this.caLouDongOptions = this.removeEmptySubOrgList(resp.data.data) // this.caLouDongOptions = this.removeEmptySubOrgList(resp.data.data)
} // }
}).catch(error => { // }).catch(error => {
this.$message.error(error) // this.$message.error(error)
}) // })
}, // },
removeEmptySubOrgList (orgArray) { // removeEmptySubOrgList (orgArray) {
orgArray.forEach((orgInfo) => { // orgArray.forEach((orgInfo) => {
if (orgInfo && orgInfo.children) { // if (orgInfo && orgInfo.children) {
if (orgInfo.children.length === 0) { // if (orgInfo.children.length === 0) {
orgInfo.children = undefined // orgInfo.children = undefined
} else { // } else {
this.removeEmptySubOrgList(orgInfo.children) // this.removeEmptySubOrgList(orgInfo.children)
} // }
} // }
}) // })
return orgArray; // return orgArray;
}, // },
handlePartyChange(val) { handlePartyChange(val) {
console.log('val------pp', val) console.log('val------pp', val)
this.dataForm.gridId = val[val.length - 1] 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(){ created(){
this.getloudongOptions() // this.getloudongOptions()
this.getGridList()
}, },
components: { components: {
AddOrUpdate, AddOrUpdate,

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

@ -3,13 +3,15 @@
<el-card> <el-card>
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="所属网格" prop="gridId"> <el-form-item label="所属网格" prop="gridId">
<el-cascader <el-select v-model="dataForm.gridId" filterable placeholder="请选择" clearable>
:options="caLouDongOptions" <el-option
:props="{ checkStrictly: true }" v-for="item in optionsG"
clearable :key="item.value"
@change="handlePartyChange"> :label="item.label"
</el-cascader> :value="item.value">
</el-form-item> </el-option>
</el-select>
</el-form-item>
<el-form-item label="房屋编号" prop="houseName"> <el-form-item label="房屋编号" prop="houseName">
<el-input <el-input
v-model="dataForm.houseName" v-model="dataForm.houseName"
@ -177,38 +179,60 @@ export default {
renterName: "", renterName: "",
gridId:"" gridId:""
}, },
caLouDongOptions:[] caLouDongOptions:[],
optionsG:[]
}; };
}, },
methods:{ methods:{
getloudongOptions(){ // getloudongOptions(){
this.$http.post(`/opendata/bmGrid/getCascadeMenu`).then(resp => { // this.$http.post(`/opendata/bmGrid/getCascadeMenu`).then(resp => {
if(resp.data.code === 0){ // if(resp.data.code === 0){
this.caLouDongOptions = this.removeEmptySubOrgList(resp.data.data) // this.caLouDongOptions = this.removeEmptySubOrgList(resp.data.data)
} // }
}).catch(error => { // }).catch(error => {
this.$message.error(error) // this.$message.error(error)
}) // })
}, // },
removeEmptySubOrgList (orgArray) { // removeEmptySubOrgList (orgArray) {
orgArray.forEach((orgInfo) => { // orgArray.forEach((orgInfo) => {
if (orgInfo && orgInfo.children) { // if (orgInfo && orgInfo.children) {
if (orgInfo.children.length === 0) { // if (orgInfo.children.length === 0) {
orgInfo.children = undefined // orgInfo.children = undefined
} else { // } else {
this.removeEmptySubOrgList(orgInfo.children) // this.removeEmptySubOrgList(orgInfo.children)
} // }
} // }
}) // })
return orgArray; // return orgArray;
}, // },
handlePartyChange(val) { handlePartyChange(val) {
console.log('val------pp', val) console.log('val------pp', val)
this.dataForm.gridId = val[val.length - 1] 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(){ created(){
this.getloudongOptions() // this.getloudongOptions()
this.getGridList()
}, },
components: { components: {
AddOrUpdate, AddOrUpdate,

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

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

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

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

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

@ -3,13 +3,15 @@
<el-card> <el-card>
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="所属网格" prop="gridId"> <el-form-item label="所属网格" prop="gridId">
<el-cascader <el-select v-model="dataForm.gridId" filterable placeholder="请选择" clearable>
:options="caLouDongOptions" <el-option
:props="{ checkStrictly: true }" v-for="item in optionsG"
clearable :key="item.value"
@change="handlePartyChange"> :label="item.label"
</el-cascader> :value="item.value">
</el-form-item> </el-option>
</el-select>
</el-form-item>
<el-form-item label="身份证号" prop="idCard"> <el-form-item label="身份证号" prop="idCard">
<el-input v-model="dataForm.idCard" placeholder="身份证号" clearable></el-input> <el-input v-model="dataForm.idCard" placeholder="身份证号" clearable></el-input>
</el-form-item> </el-form-item>
@ -165,39 +167,60 @@ export default {
telephone: "", telephone: "",
gridId:"" gridId:""
}, },
caLouDongOptions:[] caLouDongOptions:[],
optionsG:[]
}; };
}, },
methods:{ methods:{
// getloudongOptions(){
getloudongOptions(){ // this.$http.post(`/opendata/bmGrid/getCascadeMenu`).then(resp => {
this.$http.post(`/opendata/bmGrid/getCascadeMenu`).then(resp => { // if(resp.data.code === 0){
if(resp.data.code === 0){ // this.caLouDongOptions = this.removeEmptySubOrgList(resp.data.data)
this.caLouDongOptions = this.removeEmptySubOrgList(resp.data.data) // }
} // }).catch(error => {
}).catch(error => { // this.$message.error(error)
this.$message.error(error) // })
}) // },
}, // removeEmptySubOrgList (orgArray) {
removeEmptySubOrgList (orgArray) { // orgArray.forEach((orgInfo) => {
orgArray.forEach((orgInfo) => { // if (orgInfo && orgInfo.children) {
if (orgInfo && orgInfo.children) { // if (orgInfo.children.length === 0) {
if (orgInfo.children.length === 0) { // orgInfo.children = undefined
orgInfo.children = undefined // } else {
} else { // this.removeEmptySubOrgList(orgInfo.children)
this.removeEmptySubOrgList(orgInfo.children) // }
} // }
} // })
}) // return orgArray;
return orgArray; // },
},
handlePartyChange(val) { handlePartyChange(val) {
console.log('val------pp', val) console.log('val------pp', val)
this.dataForm.gridId = val[val.length - 1] 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(){ created(){
this.getloudongOptions() // this.getloudongOptions()
this.getGridList()
}, },
components: { components: {
AddOrUpdate AddOrUpdate

Write Preview
Loading…
Cancel
Save