Browse Source

通知记录添加状态

test
jiangyy 3 years ago
parent
commit
571fe1566c
  1. 354
      src/views/modules/base/epidemic/natFocus/natFocusList.vue
  2. 2
      src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue
  3. 27
      src/views/modules/base/epidemic/natFocus/nfNoticeList.vue
  4. 11
      src/views/modules/base/epidemic/natFocus/nfVisiteList.vue
  5. 2
      src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
  6. 17
      src/views/modules/base/epidemic/veroFocus/vfNoticeList.vue

354
src/views/modules/base/epidemic/natFocus/natFocusList.vue

@ -1,79 +1,69 @@
<template>
<div class="div_main">
<div class="div_search">
<el-form
:inline="true"
<el-form :inline="true"
:model="formData"
ref="ref_searchform"
:label-width="'90px'"
>
:label-width="'90px'">
<div>
<el-form-item label="姓名" prop="name">
<el-input
v-model="formData.name"
<el-form-item label="姓名"
prop="name">
<el-input v-model="formData.name"
size="small"
class="list_item_width_1"
clearable
placeholder="请输入姓名"
>
placeholder="请输入姓名">
</el-input>
</el-form-item>
<el-form-item label="手机号" prop="mobile">
<el-input
v-model="formData.mobile"
<el-form-item label="手机号"
prop="mobile">
<el-input v-model="formData.mobile"
size="small"
class="list_item_width_1"
clearable
placeholder="请输入手机号"
>
placeholder="请输入手机号">
</el-input>
</el-form-item>
<el-form-item label="证件号" prop="mobile">
<el-input
v-model="formData.idCard"
<el-form-item label="证件号"
prop="mobile">
<el-input v-model="formData.idCard"
size="small"
class="list_item_width_1"
clearable
placeholder="请输入身份证号或护照号"
>
placeholder="请输入身份证号或护照号">
</el-input>
</el-form-item>
<el-form-item label="关注原因" prop="mobile">
<el-input
v-model="formData.reason"
<el-form-item label="关注原因"
prop="mobile">
<el-input v-model="formData.reason"
size="small"
class="list_item_width_1"
clearable
placeholder="请输入关注原因"
>
placeholder="请输入关注原因">
</el-input>
</el-form-item>
<el-form-item label="隔离状态" prop="isolatedState">
<el-select
v-model="formData.isolatedState"
<el-form-item label="隔离状态"
prop="isolatedState">
<el-select v-model="formData.isolatedState"
size="small"
class="list_item_width_1"
placeholder="请选择"
clearable
>
<el-option
v-for="item in options.isolatedState"
clearable>
<el-option v-for="item in options.isolatedState"
:key="item.value"
:label="item.label"
:value="item.value"
>
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input
v-model="formData.remark"
<el-form-item label="备注"
prop="remark">
<el-input v-model="formData.remark"
size="small"
class="list_item_width_1"
clearable
placeholder="请输入备注"
>
placeholder="请输入备注">
</el-input>
</el-form-item>
</div>
@ -83,114 +73,88 @@
<div class="resi-cell-value">
<div class="resi-cell-col">
<el-form-item prop="villageId">
<el-select
v-model.trim="formData.villageId"
<el-select v-model.trim="formData.villageId"
placeholder="小区"
size="small"
clearable
class="resi-cell-select"
@change="handleChangeV"
>
<el-option
v-for="item in optionsV"
@change="handleChangeV">
<el-option v-for="item in optionsV"
:key="item.value"
:label="item.label"
:value="item.value"
>
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item prop="buildId">
<el-select
v-model.trim="formData.buildId"
<el-select v-model.trim="formData.buildId"
placeholder="楼号"
:disabled="!this.formData.villageId"
size="small"
clearable
class="resi-cell-select resi-cell-select-middle list_item_width_1"
@change="handleChangeB"
>
<el-option
v-for="item in optionsB"
@change="handleChangeB">
<el-option v-for="item in optionsB"
:key="item.value"
:label="item.label"
:value="item.value"
>
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item prop="unitId">
<el-select
v-model.trim="formData.unitId"
<el-select v-model.trim="formData.unitId"
placeholder="单元"
size="small"
:disabled="!this.formData.buildId"
clearable
class="resi-cell-select resi-cell-select-middle list_item_width_1"
@change="handleChangeD"
>
<el-option
v-for="item in optionsD"
@change="handleChangeD">
<el-option v-for="item in optionsD"
:key="item.value"
:label="item.label"
:value="item.value"
>
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item prop="homeId">
<el-select
v-model.trim="formData.homeId"
<el-select v-model.trim="formData.homeId"
placeholder="房号"
:disabled="!this.formData.unitId"
size="small"
clearable
class="resi-cell-select resi-cell-select-middle list_item_width_1"
>
<el-option
v-for="item in optionsH"
class="resi-cell-select resi-cell-select-middle list_item_width_1">
<el-option v-for="item in optionsH"
:key="item.value"
:label="item.label"
:value="item.value"
>
:value="item.value">
</el-option>
</el-select>
</el-form-item>
</div>
</div>
</el-form-item>
<el-button
style="margin-left: 30px"
<el-button style="margin-left: 30px"
size="small"
class="diy-button--search"
@click="handleSearch"
>查询</el-button
>
<el-button
style="margin-left: 10px"
@click="handleSearch">查询</el-button>
<el-button style="margin-left: 10px"
size="small"
class="diy-button--reset"
@click="resetSearch"
>重置</el-button
>
@click="resetSearch">重置</el-button>
</div>
</el-form>
</div>
<div class="div_table">
<div class="div_btn">
<el-button class="diy-button--add" size="small" @click="handleAdd"
>新增</el-button
>
<el-button
style="float: left"
<el-button class="diy-button--add"
size="small"
@click="handleAdd">新增</el-button>
<el-button style="float: left"
class="diy-button--export"
size="small"
@click="handleExportModule"
>下载模板</el-button
>
<el-upload
ref="upload"
@click="handleExportModule">下载模板</el-button>
<el-upload ref="upload"
:multiple="false"
:show-file-list="false"
:before-upload="beforeUpload"
@ -198,42 +162,28 @@
accept=".xlsx"
:limit="1"
:on-exceed="handleExceed"
:http-request="uploadFile"
>
<el-button
style="margin-left: 10px"
:http-request="uploadFile">
<el-button style="margin-left: 10px"
size="small"
class="diy-button--delete"
>导入</el-button
>
class="diy-button--delete">导入</el-button>
</el-upload>
<el-button
style="float: left; margin-left: 10px"
<el-button style="float: left; margin-left: 10px"
class="diy-button--reset"
size="small"
@click="handleExport"
>导出</el-button
>
@click="handleExport">导出</el-button>
<el-button
style="margin-left: 15px"
<el-button style="margin-left: 15px"
class="diy-button--more"
size="small"
@click="handleSendNotice"
>发送通知</el-button
>
<el-button
style="margin-left: 15px"
@click="handleSendNotice">发送通知</el-button>
<el-button style="margin-left: 15px"
class="diy-button--more"
size="small"
@click="handleDelete"
>取消关注</el-button
>
@click="handleDelete">取消关注</el-button>
</div>
<el-table
ref="ref_table"
<el-table ref="ref_table"
class="table"
:data="tableData"
border
@ -242,31 +192,24 @@
:header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
@select="handleSelectTable"
@select-all="handleSelAll"
style="width: 100%"
>
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column
label="序号"
style="width: 100%">
<el-table-column type="selection"
width="55"></el-table-column>
<el-table-column label="序号"
header-align="center"
align="center"
type="index"
width="50"
></el-table-column>
width="50"></el-table-column>
<el-table-column
prop="name"
<el-table-column prop="name"
header-align="center"
align="center"
label="姓名"
width="90"
>
width="90">
<template slot-scope="scope">
<a
style="cursor: pointer"
<a style="cursor: pointer"
v-if="scope.row.userId"
@click="handleWatchPeopleInfo(scope.$index)"
>{{ scope.row.name }}</a
>
@click="handleWatchPeopleInfo(scope.$index)">{{ scope.row.name }}</a>
<span v-else>{{ scope.row.name }}</span>
</template>
</el-table-column>
@ -288,133 +231,101 @@
>
</el-table-column> -->
<el-table-column
prop="allName"
<el-table-column prop="allName"
header-align="center"
align="center"
label="所属房屋"
min-width="200"
>
min-width="200">
</el-table-column>
<el-table-column
prop="reason"
<el-table-column prop="reason"
header-align="center"
align="center"
label="关注原因"
width="180"
>
width="180">
</el-table-column>
<el-table-column
prop="isolatedState"
<el-table-column prop="isolatedState"
header-align="center"
align="center"
label="隔离状态"
width="180"
>
width="180">
<template slot-scope="scope">
{{ optionsDict.isolatedState[scope.row.isolatedState] || "--" }}
</template>
</el-table-column>
<el-table-column
prop="lastNatTime"
<el-table-column prop="lastNatTime"
header-align="center"
align="center"
show-overflow-tooltip
label="最后一次核酸时间"
width="170"
>
width="170">
</el-table-column>
<el-table-column
prop="remark"
<el-table-column prop="remark"
header-align="center"
align="center"
show-overflow-tooltip
label="备注"
min-width="180"
>
min-width="180">
</el-table-column>
<el-table-column
label="操作"
<el-table-column label="操作"
fixed="right"
width="140"
header-align="center"
align="center"
class="operate"
>
class="operate">
<template slot-scope="scope">
<el-button
type="text"
<el-button type="text"
class="div-table-button--detail"
size="small"
@click="handleDetail(scope.row)"
>查看</el-button
>
<el-button
type="text"
@click="handleDetail(scope.row)">查看</el-button>
<el-button type="text"
class="div-table-button--edit"
size="small"
@click="handleEdit(scope.row)"
>修改</el-button
>
@click="handleEdit(scope.row)">修改</el-button>
<el-popover
popper-class="btn-popper"
<el-popover popper-class="btn-popper"
placement="bottom"
style="margin-left: 10px"
width="20"
trigger="hover"
>
trigger="hover">
<div class="table-more-btn">
<el-button
type="text"
<el-button type="text"
class="div-table-button--detail--noline"
size="small"
@click="handleNoticeList(scope.row)"
>通知记录</el-button
>
@click="handleNoticeList(scope.row)">通知记录</el-button>
</div>
<div class="table-more-btn">
<el-button
type="text"
<el-button type="text"
class="div-table-button--detail--noline"
size="small"
@click="handleVisiteList(scope.row)"
>随访记录</el-button
>
@click="handleVisiteList(scope.row)">随访记录</el-button>
</div>
<el-button
type="text"
<el-button type="text"
size="small"
class="div-table-button--more"
slot="reference"
>更多<i class="el-icon-caret-bottom"></i
></el-button>
slot="reference">更多<i class="el-icon-caret-bottom"></i></el-button>
</el-popover>
</template>
</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="pageSize"
layout="sizes, prev, pager, next, total"
:total="total"
>
:total="total">
</el-pagination>
</div>
</div>
<!-- 新增弹出框 -->
<el-dialog
:visible.sync="addFormShow"
<el-dialog :visible.sync="addFormShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
:destroy-on-close="true"
@ -422,87 +333,66 @@
width="1050px"
top="5vh"
class="dialog-h"
@closed="diaClose"
>
<nat-focus-add
ref="ref_form_add"
@closed="diaClose">
<nat-focus-add ref="ref_form_add"
@dialogCancle="diaClose"
@dialogOk="addFormOk"
></nat-focus-add>
@dialogOk="addFormOk"></nat-focus-add>
</el-dialog>
<!-- 修改弹出框 -->
<el-dialog
:visible.sync="editFormShow"
<el-dialog :visible.sync="editFormShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="editFormTitle"
width="1050px"
top="5vh"
class="dialog-h"
@closed="diaClose"
>
<nat-focus-edit
ref="ref_form_edit"
@closed="diaClose">
<nat-focus-edit ref="ref_form_edit"
@dialogCancle="diaClose"
@dialogOk="addFormOk"
></nat-focus-edit>
@dialogOk="addFormOk"></nat-focus-edit>
</el-dialog>
<!-- 发送通知弹出框 -->
<el-dialog
:visible.sync="sendNoticeFormShow"
<el-dialog :visible.sync="sendNoticeFormShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
title="发送通知"
width="850px"
top="5vh"
class="dialog-h"
@closed="diaClose"
>
<nf-send-notice
ref="ref_sendnotice"
@closed="diaClose">
<nf-send-notice ref="ref_sendnotice"
@dialogOk="sendNoticeOk"
@dialogCancle="diaClose"
></nf-send-notice>
@dialogCancle="diaClose"></nf-send-notice>
</el-dialog>
<!-- 通知记录弹出框 -->
<el-dialog
:visible.sync="noticeListFormShow"
<el-dialog :visible.sync="noticeListFormShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
title="通知记录"
width="1050px"
top="5vh"
class="dialog-h"
@closed="diaClose"
>
<nf-notice-list
ref="ref_noticelist"
@dialogCancle="diaClose"
></nf-notice-list>
@closed="diaClose">
<nf-notice-list ref="ref_noticelist"
@dialogCancle="diaClose"></nf-notice-list>
</el-dialog>
<!-- 随访记录弹出框 -->
<el-dialog
:visible.sync="visiteListFormShow"
<el-dialog :visible.sync="visiteListFormShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
title="随访记录"
width="1050px"
top="5vh"
class="dialog-h"
@closed="diaClose"
>
<nf-visite-list
ref="ref_visitelist"
@dialogCancle="diaClose"
></nf-visite-list>
@closed="diaClose">
<nf-visite-list ref="ref_visitelist"
@dialogCancle="diaClose"></nf-visite-list>
</el-dialog>
<people-more
v-if="showedPeopleMoreInfo && currentPepeleId"
<people-more v-if="showedPeopleMoreInfo && currentPepeleId"
:userId="currentPepeleId"
:gridName="currentPepeleGridName"
@close="showedPeopleMoreInfo = false"
/>
@close="showedPeopleMoreInfo = false" />
</div>
</template>
@ -902,7 +792,7 @@ export default {
handleNoticeList (row) {
this.noticeListFormShow = true;
this.$nextTick(() => {
this.$refs.ref_noticelist.initTable(row.idCard, "2");
this.$refs.ref_noticelist.initTable(row.realIdCard, "2");
});
},
handleVisiteList (row) {

2
src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue

@ -840,7 +840,7 @@ export default {
handleNoticeList(row) {
this.noticeListFormShow = true;
this.$nextTick(() => {
this.$refs.ref_noticelist.initTable(row.idCard, "2");
this.$refs.ref_noticelist.initTable(row.realIdCard, "2");
});
},
handleVisiteList(row) {

27
src/views/modules/base/epidemic/natFocus/nfNoticeList.vue

@ -38,6 +38,13 @@
min-width="380">
</el-table-column>
<el-table-column prop="sendResShow"
header-align="center"
align="center"
label="状态"
min-width="180">
</el-table-column>
</el-table>
<div>
@ -66,7 +73,7 @@ export default {
return {
tableLoading: false,
total: 0,
idCard: '',
realIdCard: '',
tableData: [],
pageSize: 20,
pageNo: 1,
@ -80,8 +87,8 @@ export default {
methods: {
async initTable (idCard, origin) {
this.idCard = idCard
async initTable (realIdCard, origin) {
this.realIdCard = realIdCard
this.origin = origin
await this.loadTable()
@ -93,7 +100,7 @@ export default {
const url = "/epmetuser/icNotice/page"
// const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNotice/page"
let params = {
idCard: this.idCard,
idCard: this.realIdCard,
pageNo: this.pageNo,
pageSize: this.pageSize,
origin: this.origin
@ -105,15 +112,9 @@ export default {
this.total = data.total
this.tableData = data.list
// data.list.forEach(item => {
// item.isEdit = false
// item.isNew = false
// let arrayInspectors = item.inspectors.split(',')
// item.inspectorArray = [...arrayInspectors]
// let arrayReviewTime = item.reviewTime.split(' ')
// item.reviewTime = arrayReviewTime[0]
// });
this.tableData.forEach(item => {
item.sendResShow = item.sendRes === '1' ? '成功' : item.sendRes === '0' ? '失败' : ''
});
// this.tableData = [...data.list]

11
src/views/modules/base/epidemic/natFocus/nfVisiteList.vue

@ -55,7 +55,8 @@
title="新增"
append-to-body
@closed="handleCancle">
<div v-if="dialogVisible" class="epidemic-form">
<div v-if="dialogVisible"
class="epidemic-form">
<el-form ref="ref_form"
:inline="true"
:model="formData"
@ -130,7 +131,7 @@ export default {
formData: {
visitTime: '',//访
content: '',//
idCard: '',
realIdCard: '',
name: '',
mobile: '',
origin: ''
@ -149,7 +150,7 @@ export default {
async initTable (row, origin) {
this.formData.idCard = row.idCard
this.formData.realIdCard = row.realIdCard
this.formData.name = row.name
this.formData.mobile = row.mobile
this.formData.origin = origin
@ -166,7 +167,7 @@ export default {
// const url = 'http://yapi.elinkservice.cn/mock/245/epmetuser/followup/page'
let params = {
name: this.formData.name,
idCard: this.formData.idCard,
idCard: this.formData.realIdCard,
pageNo: this.pageNo,
pageSize: this.pageSize,
origin: this.formData.origin
@ -224,7 +225,7 @@ export default {
const url = "/epmetuser/followup/export"
let params = {
idCard: this.formData.idCard,
idCard: this.formData.realIdCard,
name: this.formData.name,
origin: this.formData.origin
}

2
src/views/modules/base/epidemic/veroFocus/veroFocusList.vue

@ -713,7 +713,7 @@ export default {
handleNoticeList (row) {
this.noticeListFormShow = true;
this.$nextTick(() => {
this.$refs.ref_noticelist.initTable(row.idCard);
this.$refs.ref_noticelist.initTable(row.realIdCard);
});
},
handleVisiteList (row) {

17
src/views/modules/base/epidemic/veroFocus/vfNoticeList.vue

@ -38,6 +38,13 @@
min-width="380">
</el-table-column>
<el-table-column prop="sendResShow"
header-align="center"
align="center"
label="状态"
min-width="180">
</el-table-column>
</el-table>
<div>
@ -80,8 +87,8 @@ export default {
methods: {
async initTable (idCard) {
this.idCard = idCard
async initTable (realIdCard) {
this.realIdCard = realIdCard
await this.loadTable()
},
@ -92,7 +99,7 @@ export default {
const url = "/epmetuser/icNotice/page"
// const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNotice/page"
let params = {
idCard: this.idCard,
idCard: this.realIdCard,
pageNo: this.pageNo,
pageSize: this.pageSize,
origin: '1'
@ -103,7 +110,9 @@ export default {
if (code === 0) {
this.total = data.total
this.tableData = data.list
this.tableData.forEach(item => {
item.sendResShow = item.sendRes === '1' ? '成功' : item.sendRes === '0' ? '失败' : ''
});
// data.list.forEach(item => {
// item.isEdit = false
// item.isNew = false

Loading…
Cancel
Save