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

Merge branch 'dev-fangyi0919'

dev-map-local
jiangyy 3 years ago
parent
20d7eb7bf7 707ce0216b
commit
f3c19db93e
9 changed files with 443 additions and 510 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. 759
      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

759
src/views/modules/base/epidemic/natFocus/natFocusList.vue
View File

File diff suppressed because it is too large

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

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

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

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

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

@ -78,7 +78,8 @@ export default {
isSelChannel: false, isSelChannel: false,
channel: [], channel: [],
content: '', content: '',
userList: [], // userList: [],
bdIds: []
}, },
@ -93,11 +94,19 @@ export default {
methods: { methods: {
async initForm (selectionAll) { async initForm (selectionAll, origin) {
this.$refs['ref_form1'].resetFields(); 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 = '' let url = ''
url = '/epmetuser/icNotice/sendNotice' url = '/epmetuser/icNotice/sendNoticeV2'
const { data, code, msg } = await requestPost(url, this.formData) const { data, code, msg } = await requestPost(url, this.formData)
@ -164,7 +173,8 @@ export default {
isSelChannel: false, isSelChannel: false,
channel: [], channel: [],
content: '', content: '',
userList: [], // userList: [],
bdIds: []
} }
}, },

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

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

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

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

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

@ -144,7 +144,8 @@
class="diy-button--export" class="diy-button--export"
size="small" size="small"
@click="handleExportModule">下载模板</el-button> @click="handleExportModule">下载模板</el-button>
<el-upload :headers="$getElUploadHeaders()" ref="upload" <el-upload :headers="$getElUploadHeaders()"
ref="upload"
:multiple="false" :multiple="false"
:show-file-list="false" :show-file-list="false"
:before-upload="beforeUpload" :before-upload="beforeUpload"
@ -713,7 +714,7 @@ export default {
handleNoticeList (row) { handleNoticeList (row) {
this.noticeListFormShow = true; this.noticeListFormShow = true;
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.ref_noticelist.initTable(row.idCard); this.$refs.ref_noticelist.initTable(row.realIdCard);
}); });
}, },
handleVisiteList (row) { handleVisiteList (row) {

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

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

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

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

Write Preview
Loading…
Cancel
Save