|
|
|
@ -42,23 +42,18 @@ |
|
|
|
<resi-search ref="myResiSearch" /> |
|
|
|
<el-row class="resi-search"> |
|
|
|
<el-col :span="24"> |
|
|
|
<el-button |
|
|
|
size="small" |
|
|
|
<el-button size="small" |
|
|
|
class="diy-button--blue" |
|
|
|
@click="handleSearchFrom" |
|
|
|
>查询</el-button |
|
|
|
> |
|
|
|
@click="handleSearchFrom">查询</el-button> |
|
|
|
<!-- --> |
|
|
|
<el-button |
|
|
|
style="margin-left: 10px" |
|
|
|
<el-button style="margin-left:10px" |
|
|
|
size="small" |
|
|
|
class="diy-button--white" |
|
|
|
@click="" |
|
|
|
>重置</el-button |
|
|
|
> |
|
|
|
@click="resetSearchForm">重置</el-button> |
|
|
|
<!-- resetSearchForm --> |
|
|
|
</el-col> |
|
|
|
</el-row> |
|
|
|
|
|
|
|
</div> |
|
|
|
|
|
|
|
<div class="m-table"> |
|
|
|
@ -174,20 +169,20 @@ |
|
|
|
{{ scope.row.gender == 1 ? "男" : "女" }} |
|
|
|
</div> |
|
|
|
<div v-else-if="item.columnName == 'birthday'"> |
|
|
|
{{ scope.row.birthday.substr(0, 10) }} |
|
|
|
{{ scope.row.birthday?scope.row.birthday.substr(0, 10):'' }} |
|
|
|
</div> |
|
|
|
<div v-else-if="item.columnName == 'idNum'"> |
|
|
|
{{ |
|
|
|
{{scope.row.idNum? |
|
|
|
`${scope.row.idNum.substr(0, 11)}` + |
|
|
|
"******" + |
|
|
|
`${scope.row.idNum.substr(16, 2)}` |
|
|
|
`${scope.row.idNum.substr(16, 2)}`:'' |
|
|
|
}} |
|
|
|
</div> |
|
|
|
<div v-else-if="item.columnName == 'mobile'"> |
|
|
|
{{ |
|
|
|
{{scope.row.mobile? |
|
|
|
`${scope.row.mobile.substr(0, 3)}` + |
|
|
|
"******" + |
|
|
|
`${scope.row.mobile.substr(7, 4)}` |
|
|
|
`${scope.row.mobile.substr(7, 4)}`:'' |
|
|
|
}} |
|
|
|
</div> |
|
|
|
<span v-else>{{ handleFilterSpan(scope.row, item) }}</span> |
|
|
|
@ -286,6 +281,7 @@ |
|
|
|
:visible.sync="dialogVisible" |
|
|
|
width="986px" |
|
|
|
top="5vh" |
|
|
|
height="750px" |
|
|
|
append-to-body |
|
|
|
class="dialog-h" |
|
|
|
:close-on-click-modal="false" |
|
|
|
@ -297,7 +293,6 @@ |
|
|
|
ref="baseForm" |
|
|
|
:fixed="true" |
|
|
|
:form-list="formList" |
|
|
|
:resi-id="editUserId" |
|
|
|
@changegroup="handleChangeGroup" |
|
|
|
/> |
|
|
|
<!-- <div v-if="dialogVisible" |
|
|
|
@ -332,7 +327,6 @@ |
|
|
|
>取消</el-button |
|
|
|
> |
|
|
|
<el-button |
|
|
|
v-if="!editUserId" |
|
|
|
type="primary" |
|
|
|
size="small" |
|
|
|
:loading="btnLoading" |
|
|
|
@ -340,15 +334,6 @@ |
|
|
|
class="diy-button--blue" |
|
|
|
>保存</el-button |
|
|
|
> |
|
|
|
|
|
|
|
<el-button |
|
|
|
v-else |
|
|
|
type="primary" |
|
|
|
size="small" |
|
|
|
:loading="btnLoading" |
|
|
|
@click="handleEditSUbmit" |
|
|
|
>提交</el-button |
|
|
|
> |
|
|
|
</div> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
@ -698,8 +683,15 @@ export default { |
|
|
|
}, |
|
|
|
}); |
|
|
|
}, |
|
|
|
handleSearchFrom() { |
|
|
|
console.log(this.$refs.myResiSearch.form); |
|
|
|
handleSearchFrom(){ |
|
|
|
let obj = this.$refs.myResiSearch.form |
|
|
|
obj.categoryKey = obj.categoryKey.join(',') |
|
|
|
obj.agencyId = obj.agencyId.join(',') |
|
|
|
this.getTableData(obj) |
|
|
|
obj.categoryKey =[] |
|
|
|
console.log(obj.categoryKey); |
|
|
|
obj.agencyId = [] |
|
|
|
|
|
|
|
}, |
|
|
|
// 是否可以选中 |
|
|
|
checkSelectable(row, index) { |
|
|
|
@ -846,9 +838,10 @@ export default { |
|
|
|
}, |
|
|
|
|
|
|
|
resetSearchForm(formName) { |
|
|
|
// for(const n in this.form) { |
|
|
|
// this.form[n] = '' |
|
|
|
// } |
|
|
|
for(let n in this.$refs.myResiSearch.form) { |
|
|
|
this.$refs.myResiSearch.form[n] = '' |
|
|
|
} |
|
|
|
console.log(this.$refs.myResiSearch.form); |
|
|
|
this.searchList.forEach((item) => { |
|
|
|
this.$refs[`resiSearch${item.itemGroupId}`][0].resetForm(); |
|
|
|
// console.log('search-----refs', this.$refs[`resiSearch${item.itemGroupId}`]) |
|
|
|
@ -1051,7 +1044,6 @@ export default { |
|
|
|
console.log(tab, event); |
|
|
|
}, |
|
|
|
async handleLook(row) { |
|
|
|
this.formName = "居民详情"; |
|
|
|
console.log(row); |
|
|
|
this.lookInfo.userId = row.icResiUserId; |
|
|
|
this.lookInfo.gridName = row.GRID_ID; |
|
|
|
@ -1067,21 +1059,17 @@ export default { |
|
|
|
this.showedPeopleMoreInfo = false; |
|
|
|
}, |
|
|
|
async handleEdit(row) { |
|
|
|
// this.disabled = false; |
|
|
|
// this.editAgencyId = row.ORG_ID; |
|
|
|
this.editUserId = row.resiId; |
|
|
|
this.formName = "编辑居民"; |
|
|
|
this.dialogVisible = true; |
|
|
|
// await this.getFormList("edit"); |
|
|
|
// await this.getrowInfo(row.icResiUserId); |
|
|
|
this.disabled = false; |
|
|
|
this.editAgencyId = row.ORG_ID; |
|
|
|
this.editUserId = row.icResiUserId; |
|
|
|
await this.getFormList("edit"); |
|
|
|
await this.getrowInfo(row.icResiUserId); |
|
|
|
}, |
|
|
|
handlerReset() { |
|
|
|
this.$refs.baseForm.resetForm(); |
|
|
|
}, |
|
|
|
async handleAdd() { |
|
|
|
this.formName = "新增居民"; |
|
|
|
// await this.getFormList(); |
|
|
|
this.editUserId = ""; |
|
|
|
await this.getFormList(); |
|
|
|
this.dialogVisible = true; |
|
|
|
}, |
|
|
|
async handleChangeGroup(val) { |
|
|
|
@ -1184,56 +1172,49 @@ export default { |
|
|
|
|
|
|
|
async handleSUbmit() { |
|
|
|
const _baseForm = this.$refs.baseForm.submit_from(); |
|
|
|
(_baseForm.partyFlag = parseInt(_baseForm.partyFlag)), //党员 |
|
|
|
(_baseForm.subsistenceAllowanceFlag = parseInt( |
|
|
|
_baseForm.subsistenceAllowanceFlag |
|
|
|
)), //低保 |
|
|
|
(_baseForm.ensureHouseFlag = parseInt(_baseForm.ensureHouseFlag)), //保障房 |
|
|
|
(_baseForm.unemployedFlag = parseInt(_baseForm.unemployedFlag)), //失业 |
|
|
|
(_baseForm.fertileWomanFlag = parseInt(_baseForm.fertileWomanFlag)), //育龄妇女 |
|
|
|
(_baseForm.veteranFlag = parseInt(_baseForm.veteranFlag)), //退役军人 |
|
|
|
(_baseForm.unitedFrontFlag = parseInt(_baseForm.unitedFrontFlag)), //统战人员 |
|
|
|
(_baseForm.petitionOfficerFlag = parseInt( |
|
|
|
_baseForm.petitionOfficerFlag |
|
|
|
)), //信访人员 |
|
|
|
(_baseForm.volunteerFlag = parseInt(_baseForm.volunteerFlag)), //志愿者 |
|
|
|
(_baseForm.bereavedPersonFlag = parseInt(_baseForm.bereavedPersonFlag)), //失独 |
|
|
|
(_baseForm.tenantFlag = parseInt(_baseForm.tenantFlag)), //租户 |
|
|
|
(_baseForm.floatingFlag = parseInt(_baseForm.floatingFlag)), //流动人口 |
|
|
|
(_baseForm.specialCrowdFlag = parseInt(_baseForm.specialCrowdFlag)), //特殊人群 |
|
|
|
(_baseForm.oldPeopleFlag = parseInt(_baseForm.oldPeopleFlag)), //老年人 |
|
|
|
(_baseForm.emptyNesterFlag = parseInt(_baseForm.emptyNesterFlag)), //空巢 |
|
|
|
(_baseForm.liveAloneFlag = parseInt(_baseForm.liveAloneFlag)), //独居老人 |
|
|
|
(_baseForm.disabledFlag = parseInt(_baseForm.disabledFlag)), //失能老人 |
|
|
|
(_baseForm.dementedFlag = parseInt(_baseForm.dementedFlag)), //失智老人 |
|
|
|
(_baseForm.disabilityFlag = parseInt(_baseForm.disabilityFlag)), //是否残疾 |
|
|
|
(_baseForm.seriousIllnessFlag = parseInt(_baseForm.seriousIllnessFlag)), //大病 |
|
|
|
(_baseForm.chronicDiseaseFlag = parseInt(_baseForm.chronicDiseaseFlag)); //慢病 |
|
|
|
if ((_baseForm.hobbyInfoDto.hobbyCode = [])) { |
|
|
|
_baseForm.hobbyInfoDto.hobbyCode = ""; |
|
|
|
_baseForm.partyFlag = parseInt(_baseForm.partyFlag),//党员 |
|
|
|
_baseForm.subsistenceAllowanceFlag = parseInt(_baseForm.subsistenceAllowanceFlag), //低保 |
|
|
|
_baseForm.ensureHouseFlag = parseInt(_baseForm.ensureHouseFlag), //保障房 |
|
|
|
_baseForm.unemployedFlag = parseInt(_baseForm.unemployedFlag),//失业 |
|
|
|
_baseForm.fertileWomanFlag = parseInt(_baseForm.fertileWomanFlag), //育龄妇女 |
|
|
|
_baseForm.veteranFlag = parseInt(_baseForm.veteranFlag), //退役军人 |
|
|
|
_baseForm.unitedFrontFlag = parseInt(_baseForm.unitedFrontFlag),//统战人员 |
|
|
|
_baseForm.petitionOfficerFlag = parseInt(_baseForm.petitionOfficerFlag),//信访人员 |
|
|
|
_baseForm.volunteerFlag = parseInt(_baseForm.volunteerFlag), //志愿者 |
|
|
|
_baseForm.bereavedPersonFlag = parseInt(_baseForm.bereavedPersonFlag), //失独 |
|
|
|
_baseForm.tenantFlag = parseInt(_baseForm.tenantFlag), //租户 |
|
|
|
_baseForm.floatingFlag = parseInt(_baseForm.floatingFlag),//流动人口 |
|
|
|
_baseForm.specialCrowdFlag = parseInt(_baseForm.specialCrowdFlag),//特殊人群 |
|
|
|
_baseForm.oldPeopleFlag = parseInt(_baseForm.oldPeopleFlag), //老年人 |
|
|
|
_baseForm.emptyNesterFlag = parseInt(_baseForm.emptyNesterFlag), //空巢 |
|
|
|
_baseForm.liveAloneFlag = parseInt(_baseForm.liveAloneFlag), //独居老人 |
|
|
|
_baseForm.disabledFlag = parseInt(_baseForm.disabledFlag), //失能老人 |
|
|
|
_baseForm.dementedFlag = parseInt(_baseForm.dementedFlag), //失智老人 |
|
|
|
_baseForm.disabilityFlag = parseInt(_baseForm.disabilityFlag),//是否残疾 |
|
|
|
_baseForm.seriousIllnessFlag = parseInt(_baseForm.seriousIllnessFlag), //大病 |
|
|
|
_baseForm.chronicDiseaseFlag = parseInt(_baseForm.chronicDiseaseFlag) //慢病 |
|
|
|
if(_baseForm.hobbyInfoDto.hobbyCode = []) { |
|
|
|
_baseForm.hobbyInfoDto.hobbyCode = '' |
|
|
|
} else { |
|
|
|
_baseForm.hobbyInfoDto.hobbyCode.forEach((element) => { |
|
|
|
_baseForm.hobbyInfoDto.hobbyCode = |
|
|
|
_baseForm.hobbyInfoDto.hobbyCode + "," + element; |
|
|
|
_baseForm.hobbyInfoDto.hobbyCode.forEach(element => { |
|
|
|
_baseForm.hobbyInfoDto.hobbyCode = _baseForm.hobbyInfoDto.hobbyCode + ',' + element |
|
|
|
}); |
|
|
|
} |
|
|
|
if ((_baseForm.volunteerDto.volunteerCategory = [])) { |
|
|
|
_baseForm.volunteerDto.volunteerCategory = ""; |
|
|
|
if(_baseForm.volunteerDto.volunteerCategory = []) { |
|
|
|
_baseForm.volunteerDto.volunteerCategory = '' |
|
|
|
} else { |
|
|
|
_baseForm.volunteerDto.volunteerCategory.forEach((element) => { |
|
|
|
_baseForm.volunteerDto.volunteerCategory = |
|
|
|
_baseForm.volunteerDto.volunteerCategory + "," + element; |
|
|
|
_baseForm.volunteerDto.volunteerCategory.forEach(element => { |
|
|
|
_baseForm.volunteerDto.volunteerCategory = _baseForm.volunteerDto.volunteerCategory + ',' + element |
|
|
|
}); |
|
|
|
} |
|
|
|
if ((_baseForm.specialDto.specialCategoryCode = [])) { |
|
|
|
_baseForm.specialDto.specialCategoryCode = ""; |
|
|
|
if(_baseForm.specialDto.specialCategoryCode = []) { |
|
|
|
_baseForm.specialDto.specialCategoryCode = '' |
|
|
|
} else { |
|
|
|
_baseForm.specialDto.specialCategoryCode.forEach((element) => { |
|
|
|
_baseForm.specialDto.specialCategoryCode = |
|
|
|
_baseForm.specialDto.specialCategoryCode + "," + element; |
|
|
|
_baseForm.specialDto.specialCategoryCode.forEach(element => { |
|
|
|
_baseForm.specialDto.specialCategoryCode = _baseForm.specialDto.specialCategoryCode + ',' + element |
|
|
|
}); |
|
|
|
} |
|
|
|
this.submitAdd(_baseForm); |
|
|
|
this.submitAdd(_baseForm) |
|
|
|
}, |
|
|
|
handleDel(row) { |
|
|
|
let params = { |
|
|
|
@ -1319,11 +1300,13 @@ export default { |
|
|
|
this.btnLoading = false; |
|
|
|
}, |
|
|
|
|
|
|
|
async getTableData() { |
|
|
|
async getTableData(keyWord) { |
|
|
|
let params = { |
|
|
|
pageNo: this.currentPage, |
|
|
|
pageSize: this.pageSize, |
|
|
|
...keyWord |
|
|
|
}; |
|
|
|
console.log(params); |
|
|
|
this.tableLoading = true; |
|
|
|
const { data, code, msg } = await requestPost( |
|
|
|
"/actual/base/residentBaseInfo/page", |
|
|
|
@ -1577,7 +1560,7 @@ export default { |
|
|
|
.dialog-h-content { |
|
|
|
max-height: calc(83vh - 80px); |
|
|
|
box-sizing: border-box; |
|
|
|
padding: 50px 80px; |
|
|
|
padding: 0 10px 0px 79px; |
|
|
|
overflow: auto; |
|
|
|
} |
|
|
|
} |
|
|
|
|
