Browse Source

Merge branch 'dev-fangyi0919'

dev-map-local
jiangyy 3 years ago
parent
commit
f3c19db93e
  1. 761
      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. 20
      src/views/modules/base/epidemic/natFocus/nfSendNotice.vue
  5. 11
      src/views/modules/base/epidemic/natFocus/nfVisiteList.vue
  6. 95
      src/views/modules/base/epidemic/travel.vue
  7. 5
      src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
  8. 17
      src/views/modules/base/epidemic/veroFocus/vfNoticeList.vue
  9. 15
      src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue

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

File diff suppressed because it is too large

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]

20
src/views/modules/base/epidemic/natFocus/nfSendNotice.vue

@ -78,7 +78,8 @@ export default {
isSelChannel: false,
channel: [],
content: '',
userList: [],
// userList: [],
bdIds: []
},
@ -93,11 +94,19 @@ export default {
methods: {
async initForm (selectionAll) {
async initForm (selectionAll, origin) {
this.$refs['ref_form1'].resetFields();
this.formData.userList = selectionAll
if (origin) {
this.formData.origin = origin
}
// this.formData.userList = selectionAll
// this.formData.userList = JSON.parse(JSON.stringify(selectionAll))
this.formData.bdIds = []
selectionAll.forEach(element => {
this.formData.bdIds.push(element.id)
});
},
@ -126,7 +135,7 @@ export default {
let url = ''
url = '/epmetuser/icNotice/sendNotice'
url = '/epmetuser/icNotice/sendNoticeV2'
const { data, code, msg } = await requestPost(url, this.formData)
@ -164,7 +173,8 @@ export default {
isSelChannel: false,
channel: [],
content: '',
userList: [],
// userList: [],
bdIds: []
}
},

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
}

95
src/views/modules/base/epidemic/travel.vue

@ -1,6 +1,7 @@
<template>
<div class="div_main">
<div ref="div_search" class="div_search">
<div ref="div_search"
class="div_search">
<el-form :inline="true"
:model="formData"
ref="ref_searchform"
@ -35,7 +36,7 @@
class="list_item_width_1"
clearable
placeholder="请输入身份证号或证件号">
</el-input>
</el-input>
</el-form-item>
@ -85,11 +86,11 @@
size="small"
@click="handleAdd">新增</el-button>
<el-button
class="diy-button--export"
<el-button class="diy-button--export"
size="small"
@click="handleExportModule">下载模板</el-button>
<el-upload :headers="$getElUploadHeaders()" ref="upload"
<el-upload :headers="$getElUploadHeaders()"
ref="upload"
:multiple='false'
:show-file-list='false'
:before-upload="beforeUpload"
@ -99,9 +100,9 @@
:on-exceed="handleExceed"
:http-request="uploadHttpRequest">
<el-button size="small"
style="margin-left: 10px"
class="diy-button--delete"
:loading="importLoading">{{importBtnTitle}}</el-button>
style="margin-left: 10px"
class="diy-button--delete"
:loading="importLoading">{{importBtnTitle}}</el-button>
</el-upload>
<el-button style="margin-left:10px"
@ -130,20 +131,23 @@
v-loading="tableLoading"
:header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
style="width: 100%"
@selection-change="handleSelectionChange">
@selection-change="handleSelectionChange">
<el-table-column type="selection"
width="55" fixed="left"></el-table-column>
width="55"
fixed="left"></el-table-column>
<el-table-column label="序号"
header-align="center"
align="center"
type="index"
width="50" fixed="left"></el-table-column>
width="50"
fixed="left"></el-table-column>
<el-table-column prop="name"
header-align="center"
align="center"
label="姓名"
width="100" fixed="left">
width="100"
fixed="left">
</el-table-column>
<el-table-column prop="mobile"
header-align="center"
@ -218,8 +222,8 @@
class="div-table-button--detail"
size="small"
@click="handleDetail(scope.row)">查看</el-button>
<!-- v-if="scope.row.userType != 'resi'" -->
<el-button type="text"
<!-- v-if="scope.row.userType != 'resi'" -->
<el-button type="text"
class="div-table-button--edit"
size="small"
@click="handleEdit(scope.row)">修改</el-button>
@ -255,30 +259,31 @@
slot="reference">更多<i class="el-icon-caret-bottom"></i></el-button>
</el-popover> -->
<el-dropdown trigger="hover">
<span class="el-dropdown-link" style="margin-left:10px;">
<span class="el-dropdown-link"
style="margin-left:10px;">
<el-button type="text"
size="small"
class="div-table-button--more"
slot="reference">更多<i class="el-icon-caret-bottom"></i></el-button>
size="small"
class="div-table-button--more"
slot="reference">更多<i class="el-icon-caret-bottom"></i></el-button>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item>
<el-button type="text"
class="div-table-button--detail--noline"
size="small"
@click="handleNoticeList(scope.row)">通知记录</el-button>
class="div-table-button--detail--noline"
size="small"
@click="handleNoticeList(scope.row)">通知记录</el-button>
</el-dropdown-item>
<el-dropdown-item>
<el-button type="text"
class="div-table-button--detail--noline"
size="small"
@click="handleVisiteList(scope.row) ">随访记录</el-button>
class="div-table-button--detail--noline"
size="small"
@click="handleVisiteList(scope.row) ">随访记录</el-button>
</el-dropdown-item>
<el-dropdown-item>
<el-button type="text"
class="div-table-button--delete--noline "
size="small"
@click="handleDelete(scope.row)">删除</el-button>
class="div-table-button--delete--noline "
size="small"
@click="handleDelete(scope.row)">删除</el-button>
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
@ -307,9 +312,10 @@
top="5vh"
class="dialog-h"
@closed="diaClose">
<travel-form v-if="formShow" ref="ref_form"
@dialogCancle="addFormCancle"
@dialogOk="addFormOk"></travel-form>
<travel-form v-if="formShow"
ref="ref_form"
@dialogCancle="addFormCancle"
@dialogOk="addFormOk"></travel-form>
</el-dialog>
<!-- 发送通知弹出框 -->
<el-dialog :visible.sync="sendNoticeFormShow"
@ -321,6 +327,7 @@
class="dialog-h"
@closed="diaClose">
<nf-send-notice ref="ref_sendnotice"
@dialogOk="addFormOk"
@dialogCancle="diaClose"></nf-send-notice>
</el-dialog>
<!-- 通知记录弹出框 -->
@ -427,7 +434,7 @@ export default {
},
methods: {
lzayLoadArea(node, resolve) {
lzayLoadArea (node, resolve) {
this.getArea(node, resolve)
// setTimeout(() => {
@ -437,7 +444,7 @@ export default {
this.loadTable()
},
handleSelectionChange(val) {
handleSelectionChange (val) {
console.log('val----', val)
this.selectionAll = val
},
@ -495,7 +502,7 @@ export default {
}
this.tableLoading = false
},
handleAreaChange(val) {
handleAreaChange (val) {
if (val.length > 0) {
const len = val.length - 1
@ -525,7 +532,7 @@ export default {
handleNoticeList (row) {
this.noticeListFormShow = true
this.$nextTick(() => {
this.$refs.ref_noticelist.initTable(row.idCard, '0')
this.$refs.ref_noticelist.initTable(row.realIdCard, '0')
})
},
@ -546,17 +553,20 @@ export default {
this.sendNoticeFormShow = true
this.$nextTick(() => {
const arr = this.selectionAll.map(item => {
return {
userId: item.userId,
idCard: item.idCard,
mobile: item.mobile
realIdCard: item.realIdCard,
mobile: item.mobile,
id: item.id
}
})
this.$refs.ref_sendnotice.initForm(arr, '0')
})
},
handleAttention(row) {
handleAttention (row) {
if (this.selectionAll.length === 0) {
this.$message.info('请选择要加入关注的名单')
return false
@ -606,8 +616,8 @@ export default {
list: this.selectionAll.map(item => {
return {
name: item.name,
mobile: item.mobile,
idCard: item.idCard,
mobile: item.realMobile,
idCard: item.realIdCard,
attentionType: 2
}
})
@ -629,14 +639,16 @@ export default {
async deleteFocus (row) {
const url = "/epmetuser/icEpidemicSpecialAttention/cancel-attention"
// const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del"
let idCards = []
let ids = []
this.selectionAll.forEach(element => {
idCards.push(element.idCard)
if (element.epidemicId !== '' && element.epidemicId !== null && element.epidemicId !== undefined) {
ids.push(element.epidemicId)
}
});
let params = {
attentionType: 2,
idCards: idCards
ids: ids
}
const { data, code, msg } = await requestPost(url, params)
@ -682,6 +694,7 @@ export default {
},
addFormOk () {
this.formShow = false
this.sendNoticeFormShow = false
this.loadTable()
},

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

@ -144,7 +144,8 @@
class="diy-button--export"
size="small"
@click="handleExportModule">下载模板</el-button>
<el-upload :headers="$getElUploadHeaders()" ref="upload"
<el-upload :headers="$getElUploadHeaders()"
ref="upload"
:multiple="false"
:show-file-list="false"
:before-upload="beforeUpload"
@ -713,7 +714,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

15
src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue

@ -78,7 +78,8 @@ export default {
isSelChannel: false,
channel: [],
content: '',
userList: [],
// userList: [],
bdIds: []
},
@ -96,7 +97,12 @@ export default {
async initForm (selectionAll) {
console.log(selectionAll)
this.$refs['ref_form1'].resetFields();
this.formData.userList = selectionAll
// this.formData.userList = JSON.parse(JSON.stringify(selectionAll))
this.formData.bdIds = []
selectionAll.forEach(element => {
this.formData.bdIds.push(element.id)
});
},
@ -120,7 +126,7 @@ export default {
let url = ''
url = '/epmetuser/icNotice/sendNotice'
url = '/epmetuser/icNotice/sendNoticeV2'
const { data, code, msg } = await requestPost(url, this.formData)
@ -158,7 +164,8 @@ export default {
isSelChannel: false,
channel: [],
content: '',
userList: [],
// userList: [],
bdIds: []
}
},

Loading…
Cancel
Save