|
|
|
@ -1,50 +1,54 @@ |
|
|
|
<template> |
|
|
|
<div class="resi-container"> |
|
|
|
<el-card ref="searchCard" class="search-card"> |
|
|
|
<el-form ref="searchForm" :inline="true" :model="fmData" class="demo-form-inline"> |
|
|
|
<el-form-item v-if="communityList.length > 0" label="所在社区" prop="orgId"> |
|
|
|
<el-select |
|
|
|
v-model.trim="fmData.orgId" |
|
|
|
<el-card ref="searchCard" |
|
|
|
class="search-card"> |
|
|
|
<el-form ref="searchForm" |
|
|
|
:inline="true" |
|
|
|
:model="fmData" |
|
|
|
class="demo-form-inline"> |
|
|
|
<el-form-item v-if="communityList.length > 0" |
|
|
|
label="所在社区" |
|
|
|
prop="orgId"> |
|
|
|
<el-select v-model.trim="fmData.orgId" |
|
|
|
placeholder="所在社区" |
|
|
|
size="small" |
|
|
|
clearable |
|
|
|
class="resi-cell-input" |
|
|
|
> |
|
|
|
<el-option |
|
|
|
v-for="item in communityList" |
|
|
|
class="resi-cell-input"> |
|
|
|
<el-option v-for="item in communityList" |
|
|
|
:key="item.orgId" |
|
|
|
:label="item.orgName" |
|
|
|
:value="item.orgId" |
|
|
|
> |
|
|
|
:value="item.orgId"> |
|
|
|
</el-option> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="居住地址" prop="address"> |
|
|
|
<el-input |
|
|
|
v-model="fmData.address" |
|
|
|
<el-form-item label="居住地址" |
|
|
|
prop="address"> |
|
|
|
<el-input v-model="fmData.address" |
|
|
|
class="resi-cell-input" |
|
|
|
size="small" |
|
|
|
clearable |
|
|
|
placeholder="请输入" |
|
|
|
> |
|
|
|
placeholder="请输入"> |
|
|
|
</el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="填写时间" prop="startTime"> |
|
|
|
<el-date-picker |
|
|
|
v-model="timeRange" |
|
|
|
<el-form-item label="填写时间" |
|
|
|
prop="startTime"> |
|
|
|
<el-date-picker v-model="timeRange" |
|
|
|
type="daterange" |
|
|
|
clearable |
|
|
|
size="small" |
|
|
|
range-separator="至" |
|
|
|
start-placeholder="开始日期" |
|
|
|
end-placeholder="结束日期" |
|
|
|
value-format="yyyy-MM-dd" |
|
|
|
> |
|
|
|
value-format="yyyy-MM-dd"> |
|
|
|
</el-date-picker> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item> |
|
|
|
<el-button class="diy-button--search" size="small" @click="handleSearch">查询</el-button> |
|
|
|
<el-button class="diy-button--reset" size="small" @click="resetForm('searchForm')">重置</el-button> |
|
|
|
<el-button class="diy-button--search" |
|
|
|
size="small" |
|
|
|
@click="handleSearch">查询</el-button> |
|
|
|
<el-button class="diy-button--reset" |
|
|
|
size="small" |
|
|
|
@click="resetForm('searchForm')">重置</el-button> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
|
|
|
|
@ -52,40 +56,79 @@ |
|
|
|
<el-card class="resi-card-table"> |
|
|
|
<div class="resi-row-btn"> |
|
|
|
|
|
|
|
<el-button @click="handleChu" class="diy-button--reset" size="small" |
|
|
|
>导出</el-button |
|
|
|
> |
|
|
|
<el-button @click="handleChu" |
|
|
|
class="diy-button--reset" |
|
|
|
size="small">导出</el-button> |
|
|
|
</div> |
|
|
|
<el-table |
|
|
|
:data="tableData" |
|
|
|
<el-table :data="tableData" |
|
|
|
border |
|
|
|
style="width: 100%" |
|
|
|
class="resi-table" |
|
|
|
:height="tableHeight" |
|
|
|
:span-method="arraySpanMethod" |
|
|
|
> |
|
|
|
<el-table-column label="序号" prop="desc" align="center" width="50" /> |
|
|
|
<el-table-column prop="houseHolderName" width="120" label="户主姓名" align="center" /> |
|
|
|
<el-table-column prop="address" align="center" label="居住地址" :show-overflow-tooltip="true" /> |
|
|
|
<el-table-column prop="houseType" align="center" width="120" label="自有/租住" > |
|
|
|
:span-method="arraySpanMethod"> |
|
|
|
<el-table-column label="序号" |
|
|
|
prop="desc" |
|
|
|
align="center" |
|
|
|
width="50" /> |
|
|
|
<el-table-column prop="houseHolderName" |
|
|
|
width="100" |
|
|
|
label="户主姓名" |
|
|
|
align="center" /> |
|
|
|
<el-table-column prop="address" |
|
|
|
align="center" |
|
|
|
min-width="140" |
|
|
|
label="居住地址" |
|
|
|
:show-overflow-tooltip="true" /> |
|
|
|
<el-table-column prop="houseType" |
|
|
|
align="center" |
|
|
|
width="100" |
|
|
|
label="自有/租住"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<span> |
|
|
|
{{ scope.row.houseType == '1' ? '自有' : '租住' }} |
|
|
|
</span> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="totalResi" width="120" align="center" label="居住成员人数" /> |
|
|
|
<el-table-column prop="memberName" width="120" label="成员姓名" align="center" :show-overflow-tooltip="true" /> |
|
|
|
<el-table-column prop="memberIdNum" width="180" align="center" label="成员身份证" /> |
|
|
|
<el-table-column prop="memberMobile" width="140" align="center" label="成员手机号" /> |
|
|
|
<el-table-column prop="heSuanCount" width="140" align="center" label="参加几轮核酸检测 " /> |
|
|
|
<el-table-column prop="ymjz" width="140" align="center" label="疫苗接种情况"> |
|
|
|
<el-table-column prop="totalResi" |
|
|
|
width="80" |
|
|
|
align="center" |
|
|
|
label="居住人数" /> |
|
|
|
<el-table-column prop="memberName" |
|
|
|
width="100" |
|
|
|
label="成员姓名" |
|
|
|
align="center" |
|
|
|
:show-overflow-tooltip="true" /> |
|
|
|
<el-table-column prop="memberIdNum" |
|
|
|
width="180" |
|
|
|
align="center" |
|
|
|
label="成员身份证" /> |
|
|
|
<el-table-column prop="memberMobile" |
|
|
|
width="140" |
|
|
|
align="center" |
|
|
|
label="成员手机号" /> |
|
|
|
<el-table-column prop="heSuanCount" |
|
|
|
width="120" |
|
|
|
align="center" |
|
|
|
label="核酸检测次数" /> |
|
|
|
|
|
|
|
<el-table-column prop="ymjz" |
|
|
|
width="140" |
|
|
|
align="center" |
|
|
|
label="疫苗接种情况"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<span v-if="scope.row.ymjz == 1">全程接种</span> |
|
|
|
<span v-if="scope.row.ymjz == 2">未全程接种</span> |
|
|
|
<span v-if="scope.row.ymjz == 0">未接种</span> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="domicilePlace" |
|
|
|
min-width="140" |
|
|
|
align="center" |
|
|
|
label="户籍所在地 " /> |
|
|
|
<el-table-column prop="workPlace" |
|
|
|
min-width="120" |
|
|
|
align="center" |
|
|
|
label="单位或学校 " /> |
|
|
|
<!-- <el-table-column prop="organizationCreatedTime" align="center" label="创建时间"> --> |
|
|
|
<!-- <el-table-column fixed="right" label="操作" align="center" width="100"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
@ -123,30 +166,26 @@ |
|
|
|
</el-table-column> --> |
|
|
|
</el-table> |
|
|
|
<div> |
|
|
|
<el-pagination |
|
|
|
@size-change="handleSizeChange" |
|
|
|
<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" |
|
|
|
> |
|
|
|
:total="total"> |
|
|
|
</el-pagination> |
|
|
|
</div> |
|
|
|
</el-card> |
|
|
|
|
|
|
|
<!-- 修改弹出框 --> |
|
|
|
<el-dialog |
|
|
|
:visible.sync="formShow" |
|
|
|
<el-dialog :visible.sync="formShow" |
|
|
|
:close-on-click-modal="false" |
|
|
|
:close-on-press-escape="false" |
|
|
|
:title="formTitle" |
|
|
|
width="850px" |
|
|
|
top="5vh" |
|
|
|
class="dialog-h" |
|
|
|
@closed="handleClose" |
|
|
|
> |
|
|
|
@closed="handleClose"> |
|
|
|
<!-- <edit-form |
|
|
|
ref="eleEditForm" |
|
|
|
@dialogCancle="handleClose" |
|
|
|
@ -163,7 +202,7 @@ import { mapGetters } from "vuex"; |
|
|
|
import axios from "axios"; |
|
|
|
|
|
|
|
export default { |
|
|
|
data() { |
|
|
|
data () { |
|
|
|
return { |
|
|
|
openSearch: false, |
|
|
|
|
|
|
|
@ -190,14 +229,14 @@ export default { |
|
|
|
}, |
|
|
|
computed: { |
|
|
|
...mapGetters(['clientHeight', 'iframeHeight']), |
|
|
|
tableHeight() { |
|
|
|
tableHeight () { |
|
|
|
const h = this.clientHeight - 360 + this.iframeHeigh |
|
|
|
const _h = this.clientHeight - 360 |
|
|
|
return this.$store.state.inIframe ? h : _h |
|
|
|
} |
|
|
|
}, |
|
|
|
watch: { |
|
|
|
timeRange(val) { |
|
|
|
timeRange (val) { |
|
|
|
if (Array.isArray(val) && val.length == 2) { |
|
|
|
this.fmData.startTime = val[0]; |
|
|
|
this.fmData.endTime = val[1]; |
|
|
|
@ -207,12 +246,12 @@ export default { |
|
|
|
} |
|
|
|
}, |
|
|
|
}, |
|
|
|
mounted() { |
|
|
|
mounted () { |
|
|
|
this.getcommunityList() |
|
|
|
this.getTableData(); |
|
|
|
}, |
|
|
|
methods: { |
|
|
|
arraySpanMethod({ row, column, rowIndex, columnIndex }) { |
|
|
|
arraySpanMethod ({ row, column, rowIndex, columnIndex }) { |
|
|
|
// console.log('row-----r', row) |
|
|
|
// console.log('column-----c', column) |
|
|
|
if (columnIndex === 0 || columnIndex === 1 || columnIndex === 2 || columnIndex === 3 || columnIndex === 4) { |
|
|
|
@ -230,7 +269,7 @@ export default { |
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
async handleChu() { |
|
|
|
async handleChu () { |
|
|
|
const url = |
|
|
|
"/epmetuser/icresicollect/export"; |
|
|
|
const { pageSize, pageNo, fmData } = this; |
|
|
|
@ -265,49 +304,49 @@ export default { |
|
|
|
return this.$message.error("网络错误"); |
|
|
|
}); |
|
|
|
}, |
|
|
|
handleSizeChange(val) { |
|
|
|
handleSizeChange (val) { |
|
|
|
console.log(`每页 ${val} 条`); |
|
|
|
this.pageSize = val; |
|
|
|
window.localStorage.setItem("pageSize", val); |
|
|
|
this.getTableData(); |
|
|
|
}, |
|
|
|
handleCurrentChange(val) { |
|
|
|
handleCurrentChange (val) { |
|
|
|
console.log(`当前页: ${val}`); |
|
|
|
this.pageNo = val; |
|
|
|
this.getTableData(); |
|
|
|
}, |
|
|
|
|
|
|
|
handleClose() { |
|
|
|
handleClose () { |
|
|
|
this.formShow = false; |
|
|
|
}, |
|
|
|
handleSearch(val) { |
|
|
|
handleSearch (val) { |
|
|
|
console.log(this.fmData); |
|
|
|
this.pageNo = 1; |
|
|
|
this.getTableData(); |
|
|
|
}, |
|
|
|
resetForm(formName) { |
|
|
|
resetForm (formName) { |
|
|
|
this.$refs[formName].resetFields() |
|
|
|
this.timeRange = '' |
|
|
|
this.handleSearch() |
|
|
|
}, |
|
|
|
|
|
|
|
async handleWatch(rowIndex) { |
|
|
|
async handleWatch (rowIndex) { |
|
|
|
this.formShow = true; |
|
|
|
await nextTick(); |
|
|
|
this.$refs.eleEditForm.initForm("detail", this.tableData[rowIndex]); |
|
|
|
}, |
|
|
|
|
|
|
|
async handleEdit(rowIndex) { |
|
|
|
async handleEdit (rowIndex) { |
|
|
|
this.formShow = true; |
|
|
|
await nextTick(); |
|
|
|
this.$refs.eleEditForm.initForm("edit", this.tableData[rowIndex]); |
|
|
|
}, |
|
|
|
handleEditSuccess() { |
|
|
|
handleEditSuccess () { |
|
|
|
this.handleClose(); |
|
|
|
this.getTableData(); |
|
|
|
}, |
|
|
|
|
|
|
|
async handleDel(rowData, rowIndex) { |
|
|
|
async handleDel (rowData, rowIndex) { |
|
|
|
console.log(rowData, rowIndex); |
|
|
|
const url = |
|
|
|
"/heart/iccommunityselforganization/delcommunityselforganization"; |
|
|
|
@ -324,7 +363,7 @@ export default { |
|
|
|
this.$message.success("操作失败！"); |
|
|
|
} |
|
|
|
}, |
|
|
|
async getcommunityList() { |
|
|
|
async getcommunityList () { |
|
|
|
const url = |
|
|
|
"/gov/org/agency/community-list"; |
|
|
|
const { data, code, msg } = await requestPost(url); |
|
|
|
@ -334,7 +373,7 @@ export default { |
|
|
|
} else { |
|
|
|
} |
|
|
|
}, |
|
|
|
async getTableData() { |
|
|
|
async getTableData () { |
|
|
|
const url = |
|
|
|
"/epmetuser/icresicollect/list"; |
|
|
|
const { pageSize, pageNo, fmData } = this; |
|
|
|
@ -365,12 +404,12 @@ export default { |
|
|
|
} |
|
|
|
}, |
|
|
|
// 数组扁平化 |
|
|
|
formatArr(arr) { |
|
|
|
formatArr (arr) { |
|
|
|
let res = [] |
|
|
|
let arr1 = arr.map((n, index) => { |
|
|
|
return { |
|
|
|
...n, |
|
|
|
list: n.list.length> 0 ? n.list.map(i => { |
|
|
|
list: n.list.length > 0 ? n.list.map(i => { |
|
|
|
return { |
|
|
|
|
|
|
|
...n, |
|
|
|
@ -427,5 +466,4 @@ export default { |
|
|
|
position: relative; |
|
|
|
overflow: visible; |
|
|
|
} |
|
|
|
|
|
|
|
</style> |
|
|
|
|
jiangyy
3 years ago