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

发送通知等修改

test
jiangyy 3 years ago
parent
40e9f1b204
commit
036ce60a67
3 changed files with 55 additions and 40 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. 7
      src/views/modules/base/epidemic/natFocus/nfSendNotice.vue
  2. 86
      src/views/modules/base/epidemic/travel.vue
  3. 2
      src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue

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

@ -96,8 +96,13 @@ export default {
async initForm (selectionAll) { async initForm (selectionAll) {
this.$refs['ref_form1'].resetFields(); this.$refs['ref_form1'].resetFields();
this.formData.userList = selectionAll // this.formData.userList = selectionAll
this.formData.userList = JSON.parse(JSON.stringify(selectionAll))
this.formData.userList.forEach(element => {
element.idCard = element.realIdCard
});
}, },

86
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
@ -546,9 +553,11 @@ 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,
realIdCard: item.realIdCard,
mobile: item.mobile mobile: item.mobile
} }
}) })
@ -556,7 +565,7 @@ export default {
}) })
}, },
handleAttention(row) { handleAttention (row) {
if (this.selectionAll.length === 0) { if (this.selectionAll.length === 0) {
this.$message.info('请选择要加入关注的名单') this.$message.info('请选择要加入关注的名单')
return false return false
@ -607,7 +616,7 @@ export default {
return { return {
name: item.name, name: item.name,
mobile: item.mobile, mobile: item.mobile,
idCard: item.idCard, idCard: item.realIdCard,
attentionType: 2 attentionType: 2
} }
}) })
@ -629,14 +638,14 @@ 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) ids.push(element.realIdCard)
}); });
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 +691,7 @@ export default {
}, },
addFormOk () { addFormOk () {
this.formShow = false this.formShow = false
this.sendNoticeFormShow = false
this.loadTable() this.loadTable()
}, },

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

@ -96,7 +96,7 @@ 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 = JSON.stringify(selectionAll) this.formData.userList = JSON.parse(JSON.stringify(selectionAll))
this.formData.userList.forEach(element => { this.formData.userList.forEach(element => {
element.idCard = element.realIdCard element.idCard = element.realIdCard

Write Preview
Loading…
Cancel
Save