elink-star
/
epmet-oper-gov
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' into yantai_master

dev-烟台0301
jiangyy 3 years ago
parent
f290702155 13702a6cf8
commit
5568174f14
1 changed files with 306 additions and 362 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. 324
      src/views/modules/base/collect.vue

324
src/views/modules/base/collect.vue
View File

@ -1,12 +1,11 @@
<template> <template>
<div class="resi-container"> <div class="resi-container">
<el-card ref="searchCard" class="search-card"> <el-card ref="searchCard"
<el-form class="search-card">
ref="searchForm" <el-form ref="searchForm"
:inline="true" :inline="true"
:model="fmData" :model="fmData"
class="demo-form-inline" class="demo-form-inline">
>
<!-- <el-form-item <!-- <el-form-item
v-if="communityList.length > 0" v-if="communityList.length > 0"
label="所在社区" label="所在社区"
@ -28,95 +27,82 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> --> </el-form-item> -->
<el-form-item label="居住地址" prop="address"> <el-form-item label="居住地址"
<el-input prop="address">
v-model="fmData.address" <el-input v-model="fmData.address"
class="resi-cell-input" class="resi-cell-input"
size="small" size="small"
clearable clearable
placeholder="请输入" placeholder="请输入">
>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="户籍地址" prop="domicilePlace"> <el-form-item label="户籍地址"
<el-input prop="domicilePlace">
v-model="fmData.domicilePlace" <el-input v-model="fmData.domicilePlace"
class="resi-cell-input" class="resi-cell-input"
size="small" size="small"
clearable clearable
placeholder="请输入" placeholder="请输入">
>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="填写时间" prop="startTime"> <el-form-item label="填写时间"
<el-date-picker prop="startTime">
v-model="timeRange" <el-date-picker v-model="timeRange"
type="daterange" type="daterange"
clearable clearable
size="small" size="small"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd">
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button class="diy-button--search"
class="diy-button--search"
size="small" size="small"
@click="handleSearch" @click="handleSearch">查询</el-button>
>查询</el-button <el-button class="diy-button--reset"
>
<el-button
class="diy-button--reset"
size="small" size="small"
@click="resetForm('searchForm')" @click="resetForm('searchForm')">重置</el-button>
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-card> </el-card>
<el-card class="resi-card-table"> <el-card class="resi-card-table">
<div class="resi-row-btn"> <div class="resi-row-btn">
<el-button @click="handleChu" class="diy-button--reset" size="small" <el-button @click="handleChu"
>导出</el-button class="diy-button--reset"
> size="small">导出</el-button>
</div> </div>
<el-table <el-table :data="tableData"
:data="tableData"
border border
style="width: 100%" style="width: 100%"
class="resi-table" class="resi-table"
:height="tableHeight" :height="tableHeight"
:span-method="arraySpanMethod" :span-method="arraySpanMethod">
> <el-table-column label="序号"
<el-table-column label="序号" prop="desc" align="center" width="50"/> prop="desc"
<el-table-column align="center"
prop="houseHolderName" width="50" />
<el-table-column prop="houseHolderName"
width="100" width="100"
label="户主姓名" label="户主姓名"
align="center" align="center"
:show-overflow-tooltip="true" :show-overflow-tooltip="true" />
/> <el-table-column prop="address"
<el-table-column
prop="address"
align="center" align="center"
min-width="140" min-width="140"
label="居住地址" label="居住地址"
:show-overflow-tooltip="true" :show-overflow-tooltip="true">
>
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.homeId == 'other'" class="badge">房屋缺失</span> <span v-if="scope.row.homeId == 'other'"
class="badge">房屋缺失</span>
<span>{{scope.row.address}}</span> <span>{{scope.row.address}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="houseType"
prop="houseType"
align="center" align="center"
width="100" width="100"
label="房屋状态" label="房屋状态">
>
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.houseType == 1">出租</span> <span v-if="scope.row.houseType == 1">出租</span>
<span v-if="scope.row.houseType == 2">闲置</span> <span v-if="scope.row.houseType == 2">闲置</span>
@ -124,109 +110,85 @@
<span v-if="scope.row.houseType == 0">自住</span> <span v-if="scope.row.houseType == 0">自住</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="totalResi"
prop="totalResi"
width="80" width="80"
align="center" align="center"
label="居住人数" label="居住人数" />
/> <el-table-column prop="memberName"
<el-table-column
prop="memberName"
width="100" width="100"
label="成员姓名" label="成员姓名"
align="center" align="center"
:show-overflow-tooltip="true" :show-overflow-tooltip="true" />
/> <el-table-column prop="memberIdNum"
<el-table-column
prop="memberIdNum"
width="180" width="180"
align="center" align="center"
label="成员证件号" label="成员证件号"
:show-overflow-tooltip="true" :show-overflow-tooltip="true" />
/> <el-table-column prop="memberMobile"
<el-table-column
prop="memberMobile"
width="140" width="140"
align="center" align="center"
label="成员手机号" label="成员手机号"
:show-overflow-tooltip="true" :show-overflow-tooltip="true" />
/> <el-table-column prop="relationship"
<el-table-column
prop="relationship"
min-width="120" min-width="120"
align="center" align="center"
label="与户主关系" label="与户主关系"
:show-overflow-tooltip="true" :show-overflow-tooltip="true">
>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{getRelationshipName(scope.row.relationship)}}</span> <span>{{getRelationshipName(scope.row.relationship)}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="heSuanCount"
prop="heSuanCount"
width="120" width="120"
align="center" align="center"
label="核酸检测次数" label="核酸检测次数" />
/>
<el-table-column <el-table-column prop="ymjz"
prop="ymjz"
width="140" width="140"
align="center" align="center"
label="疫苗接种情况" label="疫苗接种情况">
>
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.ymjz == 1">全程接种</span> <span v-if="scope.row.ymjz == 1">全程接种</span>
<span v-if="scope.row.ymjz == 2">未全程接种</span> <span v-if="scope.row.ymjz == 2">未全程接种</span>
<span v-if="scope.row.ymjz == 0">未接种</span> <span v-if="scope.row.ymjz == 0">未接种</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="domicilePlace"
prop="domicilePlace"
min-width="140" min-width="140"
align="center" align="center"
label="户籍地址" label="户籍地址"
:show-overflow-tooltip="true" :show-overflow-tooltip="true" />
/> <el-table-column prop="workPlace"
<el-table-column
prop="workPlace"
min-width="120" min-width="120"
align="center" align="center"
label="单位名称" label="单位名称"
:show-overflow-tooltip="true" :show-overflow-tooltip="true" />
/> <el-table-column prop="remark"
<el-table-column
prop="remark"
align="center" align="center"
label="备注" label="备注"
:show-overflow-tooltip="true" :show-overflow-tooltip="true">
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="faceImg"
prop="faceImg"
min-width="120" min-width="120"
align="center" align="center"
label="人脸" label="人脸">
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-image <el-image style="max-height: 50px; max-width: 50px;"
style="max-height: 50px; max-width: 50px;"
:src="scope.row.faceImg" :src="scope.row.faceImg"
:preview-src-list="[scope.row.faceImg]"> :preview-src-list="[scope.row.faceImg]">
<div slot="error" class="image-slot"> <div slot="error"
class="image-slot">
<!-- <i class="el-icon-picture-outline"></i> --> <!-- <i class="el-icon-picture-outline"></i> -->
</div> </div>
</el-image> </el-image>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="checkState"
prop="checkState"
min-width="120" min-width="120"
align="center" align="center"
label="状态" label="状态"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
fixed="right" fixed="right">
>
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.checkState === '0'">未审核</span> <span v-if="scope.row.checkState === '0'">未审核</span>
<span v-else-if="scope.row.checkState === '1'">未通过</span> <span v-else-if="scope.row.checkState === '1'">未通过</span>
@ -234,90 +196,81 @@
<span v-else></span> <span v-else></span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="100" fixed="right"> <el-table-column label="操作"
align="center"
width="100"
fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button type="text"
type="text"
class="div-table-button--detail" class="div-table-button--detail"
size="small" size="small"
@click="handleWatch('look', scope.row)" @click="handleWatch('look', scope.row)">查看</el-button>
>查看</el-button <!-- <el-button type="text"
> class="div-table-button--detail"
<el-button size="small"
type="text" @click="handleWatch('check', scope.row)">审核</el-button> -->
<el-button type="text"
class="div-table-button--detail" class="div-table-button--detail"
size="small" size="small"
v-if="scope.row.agencyId == agencyId && scope.row.checkState === '0'" v-if="scope.row.agencyId == agencyId && scope.row.checkState === '0'"
@click="handleWatch('check', scope.row)" @click="handleWatch('check', scope.row)">审核</el-button>
>审核</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div> <div>
<el-pagination <el-pagination @size-change="handleSizeChange"
@size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page.sync="pageNo" :current-page.sync="pageNo"
:page-sizes="[20, 50, 100, 200]" :page-sizes="[20, 50, 100, 200]"
:page-size="parseInt(pageSize)" :page-size="parseInt(pageSize)"
layout="sizes, prev, pager, next, total" layout="sizes, prev, pager, next, total"
:total="total" :total="total">
>
</el-pagination> </el-pagination>
</div> </div>
</el-card> </el-card>
<!-- 修改弹出框 --> <!-- 修改弹出框 -->
<el-dialog <el-dialog :visible.sync="formShow"
:visible.sync="formShow"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
title="信息详情" title="信息详情"
width="1100px" width="1100px"
top="5vh" top="5vh"
class="dialog-h" class="dialog-h"
@closed="handleClose" @closed="handleClose">
>
<div class="scroll-h"> <div class="scroll-h">
<el-form <el-form ref="ref_form"
ref="ref_form"
:inline="true" :inline="true"
:model="dataForm" :model="dataForm"
:disabled="true" :disabled="true"
class="form" class="form">
> <el-form-item label="户主姓名:"
<el-form-item
label="户主姓名:"
prop="houseHolderName" prop="houseHolderName"
label-width="150px" label-width="150px">
>
<!-- <el-input class="item_width_1" <!-- <el-input class="item_width_1"
v-model="dataForm.houseHolderName"> v-model="dataForm.houseHolderName">
</el-input> --> </el-input> -->
<div class="wd50">{{ dataForm.houseHolderName }}</div> <div class="wd50">{{ dataForm.houseHolderName }}</div>
</el-form-item> </el-form-item>
<el-form-item label="居住地址:" prop="address" label-width="150px"> <el-form-item label="居住地址:"
prop="address"
label-width="150px">
<!-- <el-input class="wd50" v-model="dataForm.address"> <!-- <el-input class="wd50" v-model="dataForm.address">
</el-input> --> </el-input> -->
<div class="wd50">{{ dataForm.address }}</div> <div class="wd50">{{ dataForm.address }}</div>
</el-form-item> </el-form-item>
<div> <div>
<el-form-item <el-form-item label="房屋状态:"
label="房屋状态:"
prop="houseType" prop="houseType"
label-width="150px" label-width="150px">
>
<!-- <el-input class="item_width_1" <!-- <el-input class="item_width_1"
v-model="dataForm.houseType"> v-model="dataForm.houseType">
</el-input> --> </el-input> -->
<div class="wd50">{{ dataForm.houseType }}</div> <div class="wd50">{{ dataForm.houseType }}</div>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="居住人数:"
label="居住人数:"
prop="totalResi" prop="totalResi"
label-width="150px" label-width="150px">
>
<!-- <el-input class="item_width_1" <!-- <el-input class="item_width_1"
v-model="dataForm.totalResi"> v-model="dataForm.totalResi">
</el-input> --> </el-input> -->
@ -325,92 +278,70 @@
</el-form-item> </el-form-item>
</div> </div>
</el-form> </el-form>
<el-table <el-table :data="dataForm.list"
:data="dataForm.list"
border border
style="width: 1060px; margin: 20px" style="width: 1060px; margin: 20px"
class="resi-table" class="resi-table"
:height="dialogTableHeight" :height="dialogTableHeight">
> <el-table-column label="序号"
<el-table-column
label="序号"
type="index" type="index"
align="center" align="center"
width="50" width="50" />
/> <el-table-column prop="memberName"
<el-table-column
prop="memberName"
width="100" width="100"
label="成员姓名" label="成员姓名"
align="center" align="center"
:show-overflow-tooltip="true" :show-overflow-tooltip="true" />
/> <el-table-column prop="memberIdNum"
<el-table-column
prop="memberIdNum"
width="180" width="180"
align="center" align="center"
label="成员证件号" label="成员证件号"
:show-overflow-tooltip="true" :show-overflow-tooltip="true" />
/> <el-table-column prop="memberMobile"
<el-table-column
prop="memberMobile"
width="140" width="140"
align="center" align="center"
label="成员手机号" label="成员手机号"
:show-overflow-tooltip="true" :show-overflow-tooltip="true" />
/> <el-table-column prop="heSuanCount"
<el-table-column
prop="heSuanCount"
width="120" width="120"
align="center" align="center"
label="核酸检测次数" label="核酸检测次数" />
/>
<el-table-column <el-table-column prop="ymjz"
prop="ymjz"
width="140" width="140"
align="center" align="center"
label="疫苗接种情况" label="疫苗接种情况">
>
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.ymjz == 1">全程接种</span> <span v-if="scope.row.ymjz == 1">全程接种</span>
<span v-if="scope.row.ymjz == 2">未全程接种</span> <span v-if="scope.row.ymjz == 2">未全程接种</span>
<span v-if="scope.row.ymjz == 0">未接种</span> <span v-if="scope.row.ymjz == 0">未接种</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="domicilePlace"
prop="domicilePlace"
min-width="140" min-width="140"
align="center" align="center"
label="户籍所在地 " label="户籍所在地 "
:show-overflow-tooltip="true" :show-overflow-tooltip="true" />
/> <el-table-column prop="workPlace"
<el-table-column
prop="workPlace"
min-width="120" min-width="120"
align="center" align="center"
label="单位或学校 " label="单位或学校 "
:show-overflow-tooltip="true" :show-overflow-tooltip="true" />
/> <el-table-column prop="remark"
<el-table-column
prop="remark"
align="center" align="center"
label="备注" label="备注"
:show-overflow-tooltip="true" :show-overflow-tooltip="true">
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="faceImg"
prop="faceImg"
min-width="120" min-width="120"
align="center" align="center"
label="人脸" label="人脸">
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-image <el-image style="max-height: 50px; max-width: 50px;"
style="max-height: 50px; max-width: 50px;"
:src="scope.row.faceImg" :src="scope.row.faceImg"
:preview-src-list="[scope.row.faceImg]"> :preview-src-list="[scope.row.faceImg]">
<div slot="error" class="image-slot"> <div slot="error"
class="image-slot">
<!-- <i class="el-icon-picture-outline"></i> --> <!-- <i class="el-icon-picture-outline"></i> -->
</div> </div>
</el-image> </el-image>
@ -419,8 +350,12 @@
</el-table> </el-table>
<div class="resi-btns"> <div class="resi-btns">
<el-button @click="formShow = false">{{ $t('cancel') }}</el-button> <el-button @click="formShow = false">{{ $t('cancel') }}</el-button>
<el-button v-if="dialogType == 'check'" type="danger" @click="checkHandle('1')">{{ $t('checkBTGBtn') }}</el-button> <el-button v-if="dialogType == 'check'"
<el-button v-if="dialogType == 'check'" type="danger" @click="showAddHouse">{{ $t('checkTGBtn') }}</el-button> type="danger"
@click="checkHandle('1')">{{ $t('checkBTGBtn') }}</el-button>
<el-button v-if="dialogType == 'check'"
type="danger"
@click="showAddHouse">{{ $t('checkTGBtn') }}</el-button>
</div> </div>
</div> </div>
</el-dialog> </el-dialog>
@ -758,10 +693,19 @@ export default {
doorName: this.dataForm.doorName || '' doorName: this.dataForm.doorName || ''
} }
if (type == '1') { if (type == '1') {
this.$prompt('请输入不通过的原因', '提示', { const h = this.$createElement
this.$prompt(
h('p', null, [h('i', { style: 'color: red' }, '* '),
h('span', null, '请输入不通过的原因：')]),
'提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
inputPattern: /^.+$/,
inputErrorMessage: '请输入原因'
}).then(({ value }) => { }).then(({ value }) => {
// if (!value) {
// return this.$message.error('请填写审核不通过原因')
// }
params.checkReason = value params.checkReason = value
this.$http.post('/epmetuser/icresicollect/collectCheck', params).then(({ data: res }) => { this.$http.post('/epmetuser/icresicollect/collectCheck', params).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
@ -856,8 +800,8 @@ export default {
} }
.badge { .badge {
display: block; display: block;
color: #F1F2E5; color: #f1f2e5;
background-color: #D7000F; background-color: #d7000f;
border-radius: 12px; border-radius: 12px;
width: 70px; width: 70px;
} }

Write Preview
Loading…
Cancel
Save