|
|
@ -27,8 +27,8 @@ |
|
|
|
<el-form-item label="所属房屋"> |
|
|
|
<div class="resi-cell-value"> |
|
|
|
<div class="resi-cell-col"> |
|
|
|
<el-form-item prop="villageId"> |
|
|
|
<el-select v-model.trim="formData.villageId" |
|
|
|
<el-form-item prop="neighborHoodId"> |
|
|
|
<el-select v-model.trim="formData.neighborHoodId" |
|
|
|
:disabled="!this.formData.gridId" |
|
|
|
placeholder="小区" |
|
|
|
size="small" |
|
|
@ -42,10 +42,10 @@ |
|
|
|
</el-option> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item prop="buildId"> |
|
|
|
<el-select v-model.trim="formData.buildId" |
|
|
|
<el-form-item prop="buildingId"> |
|
|
|
<el-select v-model.trim="formData.buildingId" |
|
|
|
placeholder="楼号" |
|
|
|
:disabled="!this.formData.villageId" |
|
|
|
:disabled="!this.formData.neighborHoodId" |
|
|
|
size="small" |
|
|
|
clearable |
|
|
|
class="resi-cell-select resi-cell-select-middle list_item_width_1" |
|
|
@ -57,11 +57,11 @@ |
|
|
|
</el-option> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item prop="unitId"> |
|
|
|
<el-select v-model.trim="formData.unitId" |
|
|
|
<el-form-item prop="buildingUnitId"> |
|
|
|
<el-select v-model.trim="formData.buildingUnitId" |
|
|
|
placeholder="单元" |
|
|
|
size="small" |
|
|
|
:disabled="!this.formData.buildId" |
|
|
|
:disabled="!this.formData.buildingId" |
|
|
|
clearable |
|
|
|
class="resi-cell-select resi-cell-select-middle list_item_width_1" |
|
|
|
@change="handleChangeD"> |
|
|
@ -72,10 +72,10 @@ |
|
|
|
</el-option> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item prop="homeId"> |
|
|
|
<el-select v-model.trim="formData.homeId" |
|
|
|
<el-form-item prop="houseId"> |
|
|
|
<el-select v-model.trim="formData.houseId" |
|
|
|
placeholder="房号" |
|
|
|
:disabled="!this.formData.unitId" |
|
|
|
:disabled="!this.formData.buildingUnitId" |
|
|
|
size="small" |
|
|
|
clearable |
|
|
|
class="resi-cell-select resi-cell-select-middle list_item_width_1"> |
|
|
@ -95,11 +95,11 @@ |
|
|
|
|
|
|
|
<div> |
|
|
|
<el-form-item label="变更时间" |
|
|
|
prop="startTime"> |
|
|
|
prop="startDate"> |
|
|
|
<el-date-picker v-model="timeRange" |
|
|
|
size="small" |
|
|
|
type="daterange" |
|
|
|
value-format="yyyy-MM-dd HH:mm:ss" |
|
|
|
value-format="yyyy-MM-dd" |
|
|
|
@change="handleTimeChange" |
|
|
|
range-separator="至" |
|
|
|
start-placeholder="开始时间" |
|
|
@ -135,95 +135,41 @@ |
|
|
|
type="index" |
|
|
|
width="50"></el-table-column> |
|
|
|
|
|
|
|
<el-table-column prop="name" |
|
|
|
<el-table-column prop="gridName" |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
label="姓名" |
|
|
|
width="90"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="mobile" |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
label="手机号" |
|
|
|
width="110"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="idCard" |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
label="身份证" |
|
|
|
width="170"> |
|
|
|
show-overflow-tooltip |
|
|
|
label="所属网格" |
|
|
|
min-width="150"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="allName" |
|
|
|
<el-table-column prop="houseName" |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
show-overflow-tooltip |
|
|
|
label="所属房屋" |
|
|
|
min-width="200"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="reason" |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
label="关注原因" |
|
|
|
width="180"> |
|
|
|
min-width="150"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="remark" |
|
|
|
<el-table-column prop="changeBefore" |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
show-overflow-tooltip |
|
|
|
label="备注" |
|
|
|
min-width="180"> |
|
|
|
label="变更前" |
|
|
|
min-width="250"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="lastInformTime" |
|
|
|
<el-table-column prop="changeAfter" |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
show-overflow-tooltip |
|
|
|
label="最后一次通知时间" |
|
|
|
width="170"> |
|
|
|
label="变更后" |
|
|
|
min-width="250"> |
|
|
|
</el-table-column> |
|
|
|
|
|
|
|
<el-table-column label="操作" |
|
|
|
fixed="right" |
|
|
|
width="140" |
|
|
|
<el-table-column prop="changeTime" |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
class="operate"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
|
|
|
|
<el-button type="text" |
|
|
|
class="div-table-button--detail" |
|
|
|
size="small" |
|
|
|
@click="handleDetail(scope.row)">查看</el-button> |
|
|
|
<el-button type="text" |
|
|
|
class="div-table-button--edit" |
|
|
|
size="small" |
|
|
|
@click="handleEdit(scope.row)">修改</el-button> |
|
|
|
|
|
|
|
<el-popover popper-class="btn-popper" |
|
|
|
placement="bottom" |
|
|
|
style="margin-left:10px" |
|
|
|
width="20" |
|
|
|
trigger="hover"> |
|
|
|
<div class="table-more-btn"> |
|
|
|
<el-button type="text" |
|
|
|
class="div-table-button--detail--noline" |
|
|
|
size="small" |
|
|
|
@click="handleNoticeList(scope.row)">通知记录</el-button> |
|
|
|
</div> |
|
|
|
|
|
|
|
<div class="table-more-btn"> |
|
|
|
<el-button type="text" |
|
|
|
class="div-table-button--detail--noline" |
|
|
|
size="small" |
|
|
|
@click="handleVisiteList(scope.row) ">随访记录</el-button> |
|
|
|
</div> |
|
|
|
|
|
|
|
<el-button type="text" |
|
|
|
size="small" |
|
|
|
class="div-table-button--more" |
|
|
|
slot="reference">更多<i class="el-icon-caret-bottom"></i></el-button> |
|
|
|
</el-popover> |
|
|
|
|
|
|
|
</template> |
|
|
|
label="变更时间" |
|
|
|
width="130"> |
|
|
|
</el-table-column> |
|
|
|
|
|
|
|
</el-table> |
|
|
|
<div> |
|
|
|
<el-pagination @size-change="handleSizeChange" |
|
|
@ -244,7 +190,7 @@ |
|
|
|
<script> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import util from '@js/util.js'; |
|
|
|
import { requestPost } from "@/js/dai/request"; |
|
|
|
import { mapGetters } from 'vuex' |
|
|
|
import { Loading } from 'element-ui' // 引入Loading服务 |
|
|
@ -259,15 +205,6 @@ export default { |
|
|
|
pageNo: 1, |
|
|
|
tableLoading: false, |
|
|
|
|
|
|
|
// formData: { |
|
|
|
// attentionType: 2,//关注类型,核酸检测:2,疫苗接种:1 |
|
|
|
// name: '', |
|
|
|
// mobile: '', |
|
|
|
// idCard: '', |
|
|
|
// remark: '', |
|
|
|
// reason: '', |
|
|
|
|
|
|
|
// }, |
|
|
|
optionsV: [], |
|
|
|
optionsB: [], |
|
|
|
optionsH: [], |
|
|
@ -281,12 +218,12 @@ export default { |
|
|
|
timeRange: [], |
|
|
|
formData: { |
|
|
|
gridId: '',//所属网格【网格Id】 |
|
|
|
villageId: '', |
|
|
|
buildId: '', |
|
|
|
unitId: '', |
|
|
|
homeId: '', |
|
|
|
startTime: '', |
|
|
|
endTime: '', |
|
|
|
neighborHoodId: '',//小区ID |
|
|
|
buildingId: '',//楼栋ID |
|
|
|
buildingUnitId: '',//楼栋单元ID |
|
|
|
houseId: '',//房屋ID |
|
|
|
startDate: '',//开始日期,eg:20220510 |
|
|
|
endDate: '',//结束日期,eg:20220510 |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -339,7 +276,7 @@ export default { |
|
|
|
async loadTable () { |
|
|
|
this.tableLoading = true |
|
|
|
|
|
|
|
const url = "/epmetuser/icEpidemicSpecialAttention/list" |
|
|
|
const url = "/gov/org/icHouseChangeRecord/list" |
|
|
|
// const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icEpidemicSpecialAttention/list" |
|
|
|
let params = { |
|
|
|
pageSize: this.pageSize, |
|
|
@ -353,31 +290,7 @@ export default { |
|
|
|
this.total = data.total |
|
|
|
this.tableData = data.list |
|
|
|
|
|
|
|
this.analysisTableSelection() |
|
|
|
this.tableData.forEach(item => { |
|
|
|
if (!item.allName) { |
|
|
|
item.allName = '--' |
|
|
|
} |
|
|
|
item.roomShow = '' |
|
|
|
if (!item.villageName && !item.buildName && !item.unitName && !item.homeName) { |
|
|
|
item.roomShow = '--' |
|
|
|
} else { |
|
|
|
if (item.villageName) { |
|
|
|
item.roomShow = item.roomShow + item.villageName |
|
|
|
} |
|
|
|
if (item.buildName) { |
|
|
|
item.roomShow = item.roomShow + item.buildName |
|
|
|
} |
|
|
|
if (item.unitName) { |
|
|
|
item.roomShow = item.roomShow + item.unitName |
|
|
|
} |
|
|
|
if (item.villageName) { |
|
|
|
item.roomShow = item.roomShow + item.homeName |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
}); |
|
|
|
} else { |
|
|
|
this.$message.error(msg) |
|
|
|
} |
|
|
@ -387,10 +300,10 @@ export default { |
|
|
|
|
|
|
|
handleChangeG (val) { |
|
|
|
console.log('val', val) |
|
|
|
this.formData.villageId = '' |
|
|
|
this.formData.buildId = '' |
|
|
|
this.formData.unitId = '' |
|
|
|
this.formData.homeId = '' |
|
|
|
this.formData.neighborHoodId = '' |
|
|
|
this.formData.buildingId = '' |
|
|
|
this.formData.buildingUnitId = '' |
|
|
|
this.formData.houseId = '' |
|
|
|
this.getValiheList() |
|
|
|
this.getBuildList() |
|
|
|
this.getUniList() |
|
|
@ -398,29 +311,29 @@ export default { |
|
|
|
}, |
|
|
|
handleChangeV (val) { |
|
|
|
console.log('val', val) |
|
|
|
this.formData.buildId = '' |
|
|
|
this.formData.unitId = '' |
|
|
|
this.formData.homeId = '' |
|
|
|
this.formData.buildingId = '' |
|
|
|
this.formData.buildingUnitId = '' |
|
|
|
this.formData.houseId = '' |
|
|
|
this.getBuildList() |
|
|
|
this.getUniList() |
|
|
|
this.getHouseList() |
|
|
|
}, |
|
|
|
handleChangeB (val) { |
|
|
|
console.log('val', val) |
|
|
|
this.formData.unitId = '' |
|
|
|
this.formData.homeId = '' |
|
|
|
this.formData.buildingUnitId = '' |
|
|
|
this.formData.houseId = '' |
|
|
|
this.getUniList() |
|
|
|
this.getHouseList() |
|
|
|
}, |
|
|
|
handleChangeD () { |
|
|
|
this.formData.homeId = '' |
|
|
|
this.formData.houseId = '' |
|
|
|
this.getHouseList() |
|
|
|
}, |
|
|
|
|
|
|
|
getValiheList () { |
|
|
|
const { user } = this.$store.state |
|
|
|
this.$http |
|
|
|
.post('/gov/org/icneighborhood/neighborhoodoption', { gridId: this.formData.gridId, agencyId: user.agencyId }) |
|
|
|
.post('/gov/org/icneighborhood/neighborhoodoption', { gridId: this.formData.gridId }) |
|
|
|
.then(({ data: res }) => { |
|
|
|
if (res.code !== 0) { |
|
|
|
return this.$message.error(res.msg) |
|
|
@ -436,7 +349,7 @@ export default { |
|
|
|
|
|
|
|
getBuildList () { |
|
|
|
this.$http |
|
|
|
.post('/gov/org/icbuilding/buildingoption', { neighborHoodId: this.formData.villageId }) |
|
|
|
.post('/gov/org/icbuilding/buildingoption', { neighborHoodId: this.formData.neighborHoodId }) |
|
|
|
.then(({ data: res }) => { |
|
|
|
if (res.code !== 0) { |
|
|
|
return this.$message.error(res.msg) |
|
|
@ -451,7 +364,7 @@ export default { |
|
|
|
}, |
|
|
|
getUniList () { |
|
|
|
this.$http |
|
|
|
.post('/gov/org/icbuildingunit/unitoption', { buildingId: this.formData.buildId }) |
|
|
|
.post('/gov/org/icbuildingunit/unitoption', { buildingId: this.formData.buildingId }) |
|
|
|
.then(({ data: res }) => { |
|
|
|
if (res.code !== 0) { |
|
|
|
return this.$message.error(res.msg) |
|
|
@ -466,7 +379,7 @@ export default { |
|
|
|
}, |
|
|
|
getHouseList () { |
|
|
|
this.$http |
|
|
|
.post('/gov/org/ichouse/houseoption', { unitId: this.formData.unitId }) |
|
|
|
.post('/gov/org/ichouse/houseoption', { buildingUnitId: this.formData.buildingUnitId }) |
|
|
|
.then(({ data: res }) => { |
|
|
|
if (res.code !== 0) { |
|
|
|
return this.$message.error(res.msg) |
|
|
@ -485,14 +398,14 @@ export default { |
|
|
|
const startTimeArray = util.dateFormatter(time[0], 'date').split('-') |
|
|
|
const endTimeArray = util.dateFormatter(time[1], 'date').split('-') |
|
|
|
|
|
|
|
this.formData.startTime = startTimeArray[0] + '-' + startTimeArray[1] + '-' + startTimeArray[2] + ' 00:00:00' |
|
|
|
this.formData.endTime = endTimeArray[0] + '-' + endTimeArray[1] + '-' + endTimeArray[2] + ' 23:59:59' |
|
|
|
this.formData.startDate = startTimeArray[0] + startTimeArray[1] + startTimeArray[2] |
|
|
|
this.formData.endDate = endTimeArray[0] + endTimeArray[1] + endTimeArray[2] |
|
|
|
|
|
|
|
// this.startTimeShow = startTimeArray[0] + '年' + startTimeArray[1] + '月' + startTimeArray[2] + '日' |
|
|
|
// this.endTimeShow = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日' |
|
|
|
} else { |
|
|
|
this.formData.startTime = '' |
|
|
|
this.formData.endTime = '' |
|
|
|
this.formData.startDate = '' |
|
|
|
this.formData.endDate = '' |
|
|
|
// this.startTimeShow = '' |
|
|
|
// this.endTimeShow = '' |
|
|
|
} |
|
|
@ -506,11 +419,13 @@ export default { |
|
|
|
resetSearch () { |
|
|
|
this.timeRange = [] |
|
|
|
this.formData = { |
|
|
|
attentionType: 2,//关注类型,核酸检测:2,疫苗接种:1 |
|
|
|
name: '', |
|
|
|
mobile: '', |
|
|
|
idCard: '', |
|
|
|
vaccinationCount: '', |
|
|
|
gridId: '',//所属网格【网格Id】 |
|
|
|
neighborHoodId: '',//小区ID |
|
|
|
buildingId: '',//楼栋ID |
|
|
|
buildingUnitId: '',//楼栋单元ID |
|
|
|
houseId: '',//房屋ID |
|
|
|
startDate: '',//开始日期,eg:20220510 |
|
|
|
endDate: '',//结束日期,eg:20220510 |
|
|
|
} |
|
|
|
|
|
|
|
this.pageNo = 1 |