Browse Source

1

shibei_master
jiangyy 3 years ago
parent
commit
f3da964aa3
  1. 2
      src/views/modules/base/epidemic/natFocus/natFocusList.vue
  2. 3
      src/views/modules/base/epidemic/natFocus/nfVisiteList.vue
  3. 326
      src/views/modules/base/epidemic/travel.vue
  4. 109
      src/views/modules/base/epidemic/travelForm.vue

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

@ -521,7 +521,7 @@ export default {
this.visiteListFormShow = true
this.$nextTick(() => {
this.$refs.ref_visitelist.initTable(row)
this.$refs.ref_visitelist.initTable(row, '2')
})

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

@ -147,11 +147,12 @@ export default {
methods: {
async initTable (row) {
async initTable (row, origin) {
this.formData.idCard = row.idCard
this.formData.name = row.name
this.formData.mobile = row.mobile
this.formData.origin = origin
await this.loadTable()

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

@ -84,7 +84,7 @@
size="small"
@click="handleAdd">新增</el-button>
<el-button style="float:left"
<el-button
class="diy-button--export"
size="small"
@click="handleExportModule">下载模板</el-button>
@ -96,16 +96,26 @@
accept=".xls,.xlsx"
:limit="1"
:on-exceed="handleExceed"
:http-request="uploadFile">
<el-button style="margin-left:10px"
size="small"
class="diy-button--delete">导入</el-button>
:http-request="uploadHttpRequest">
<el-button size="small"
style="margin-left: 10px"
class="diy-button--delete"
:loading="importLoading">{{importBtnTitle}}</el-button>
</el-upload>
<el-button style="float:left;margin-left:10px"
<el-button style="margin-left:10px"
class="diy-button--reset"
size="small"
@click="handleExport">导出</el-button>
:loading="exportBtn"
@click="handleExport">{{ exportBtnTitle }}</el-button>
<el-button style="margin-left:15px"
class="diy-button--more"
size="small"
@click="handleSendNotice">发送通知</el-button>
<el-button style="margin-left:15px"
class="diy-button--more"
size="small"
@click="handleDeletes">取消关注</el-button>
</div>
<el-table class="table"
@ -114,7 +124,10 @@
:height="tableHeight"
v-loading="tableLoading"
:header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
style="width: 100%">
style="width: 100%"
@selection-change="handleSelectionChange">
<el-table-column type="selection"
width="55"></el-table-column>
<el-table-column label="序号"
header-align="center"
align="center"
@ -125,7 +138,7 @@
header-align="center"
align="center"
label="姓名"
width="90">
width="100">
</el-table-column>
<el-table-column prop="mobile"
header-align="center"
@ -178,7 +191,7 @@
label="备注"
min-width="120">
</el-table-column>
<el-table-column prop="heSuanCheck"
<el-table-column prop="heSuanCheckDesc"
header-align="center"
align="center"
label="核酸检测关注名单"
@ -197,15 +210,41 @@
class="div-table-button--detail"
size="small"
@click="handleDetail(scope.row)">查看</el-button>
<el-button type="text"
<el-button v-if="scope.row.userType != 'resi'" type="text"
class="div-table-button--edit"
size="small"
@click="handleEdit(scope.row)">修改</el-button>
<el-popover popper-class="btn-popper"
placement="bottom"
style="margin-left:10px"
width="20"
trigger="click">
<div class="more-btn">
<el-button type="text"
class="div-table-button--detail--noline"
size="small"
@click="handleNoticeList(scope.row)">通知记录</el-button>
</div>
<div class="more-btn">
<el-button type="text"
class="div-table-button--detail--noline"
size="small"
@click="handleVisiteList(scope.row) ">随访记录</el-button>
</div>
<div v-if="scope.row.userType != 'resi'" class="more-btn">
<el-button type="text"
class="div-table-button--delete--noline "
size="small"
@click="handleDelete(scope.row)">删除</el-button>
</div>
<el-button type="text"
size="small"
class="div-table-button--more"
slot="reference">更多<i class="el-icon-caret-bottom"></i></el-button>
</el-popover>
</template>
</el-table-column>
@ -231,17 +270,55 @@
top="5vh"
class="dialog-h"
@closed="diaClose">
<travel-form ref="ref_form"
<travel-form v-if="formShow" ref="ref_form"
@dialogCancle="addFormCancle"
@dialogOk="addFormOk"></travel-form>
</el-dialog>
<!-- 发送通知弹出框 -->
<el-dialog :visible.sync="sendNoticeFormShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
title="发送通知"
width="1050px"
top="5vh"
class="dialog-h"
@closed="diaClose">
<nf-send-notice ref="ref_sendnotice"
@dialogCancle="diaClose"></nf-send-notice>
</el-dialog>
<!-- 通知记录弹出框 -->
<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>
</el-dialog>
<!-- 随访记录弹出框 -->
<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>
</el-dialog>
</div>
</template>
<script>
import travelForm from './travelForm'
import nfNoticeList from './natFocus/nfNoticeList'
import nfSendNotice from './natFocus/nfSendNotice'
import nfVisiteList from './natFocus/nfVisiteList'
import { requestPost } from "@/js/dai/request";
import { mapGetters } from 'vuex'
@ -250,6 +327,13 @@ let loading // 加载动画
export default {
data () {
return {
sendNoticeFormShow: false,
visiteListFormShow: false,
noticeListFormShow: false,
exportBtn: false,
exportBtnTitle: '导出',
importBtnTitle: '导入',
importLoading: false,
loading: false,
total: 0,
pageSize: 20,
@ -258,7 +342,7 @@ export default {
sHeight: 0,
agencyId: '',
selectionAll: [],
timeRange: [],
formData: {
name: '',//
@ -278,7 +362,10 @@ export default {
}
},
components: {
travelForm
travelForm,
nfNoticeList,
nfSendNotice,
nfVisiteList
},
async created () {
@ -300,8 +387,10 @@ export default {
this.loadTable()
},
handleSelectionChange(val) {
console.log('val----', val)
this.selectionAll = val
},
async loadTable () {
this.tableLoading = true
@ -347,8 +436,84 @@ export default {
},
diaClose () {
this.$refs.ref_form.resetData()
// this.$refs.ref_form.resetData()
this.formShow = false
this.sendNoticeFormShow = false
this.noticeListFormShow = false
this.visiteListFormShow = false
},
handleNoticeList (row) {
this.noticeListFormShow = true
this.$nextTick(() => {
this.$refs.ref_noticelist.initTable(row.idCard)
})
},
handleVisiteList (row) {
this.visiteListFormShow = true
this.$nextTick(() => {
this.$refs.ref_visitelist.initTable(row, '0')
})
},
handleSendNotice () {
if (this.selectionAll.length === 0) {
this.$message.info('请选择要通知的人员')
return false
}
this.sendNoticeFormShow = true
this.$nextTick(() => {
this.$refs.ref_sendnotice.initForm(this.selectionAll)
})
},
async handleDeletes (row) {
if (this.selectionAll.length === 0) {
this.$message.info('请选择要取消关注的名单')
return false
}
this.$confirm("确认取消关注选择的名单?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
this.deleteFocus(row)
})
.catch(err => {
if (err == "cancel") {
}
});
},
async deleteFocus (row) {
const url = "/epmetuser/icEpidemicSpecialAttention/cancel-attention"
// const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del"
let idCards = []
this.selectionAll.forEach(element => {
idCards.push(element.idCard)
});
let params = {
attentionType: 0,
idCards: idCards
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.$message({
type: "success",
message: "操作成功"
});
this.loadTable()
} else {
this.$message.error(msg)
}
},
handleDetail (row) {
@ -446,27 +611,48 @@ export default {
//
async handleExport () {
let title = this.agencyObj.label
title = title + '—房屋列表'
const url = "/gov/org/house/exporthouseinfo"
this.exportBtn = true
this.exportBtnTitle = '正在导出...'
let params = {
ownerName: this.ownerName,
ownerPhone: this.ownerPhone,
buildingId: this.agencyObj.id
...this.formData
}
app.ajax.exportFilePost(
url,
params,
(data, rspMsg) => {
this.download(data, title + '.xls')
},
(rspMsg, data) => {
this.$message.error(rspMsg);
}
);
// .post('epmetuser/icresiuser/exportExcel', params)
// await axios({
// url: window.SITE_CONFIG['apiURL'] + '/epmetuser/tripreport/export',
// // url: 'epmetuser/icresiuser/exportExcel',
// method: 'post',
// data: params,
// responseType: 'blob'
// })
await this.$http({
method: 'POST',
url: '/epmetuser/tripreport/export',
responseType: 'blob',
data: params
})
.then(res => {
console.log('resllll', res)
let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
console.log('filename', fileName)
let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
var url = window.URL.createObjectURL(blob)
var aLink = document.createElement('a')
aLink.style.display = 'none'
aLink.href = url
aLink.setAttribute('download', fileName)
document.body.appendChild(aLink)
aLink.click()
document.body.removeChild(aLink) //
window.URL.revokeObjectURL(url) //blob
})
.catch((err) => {
console.log('获取导出情失败', err)
this.$message.error('获取导出失败')
})
this.exportBtnTitle = '导出'
this.exportBtn = false
},
@ -496,24 +682,40 @@ export default {
},
handleExportModule () {
async handleExportModule () {
let title = ''
title = '房屋模板'
const url = "/gov/org/house/exporttemplate"
const url = "/epmetuser/tripreport/template-download"
let params = {}
app.ajax.exportFilePost(
await this.$http({
method: 'POST',
url,
params,
(data, rspMsg) => {
this.download(data, title + '.xls')
},
(rspMsg, data) => {
this.$message.error(rspMsg);
}
);
responseType: 'blob',
data: params
})
.then(res => {
console.log('res----dddd', res)
// this.download(res.data, title + '.xls')
if (res.headers["content-disposition"]) {
let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
console.log('filename', fileName)
let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
var url = window.URL.createObjectURL(blob)
var aLink = document.createElement('a')
aLink.style.display = 'none'
aLink.href = url
aLink.setAttribute('download', fileName)
document.body.appendChild(aLink)
aLink.click()
document.body.removeChild(aLink) //
window.URL.revokeObjectURL(url) //blob
} else this.$message.error('下载失败')
})
.catch(err => {
console.log('err', err)
return this.$message.error('网络错误')
})
},
//
@ -536,6 +738,32 @@ export default {
handleExceed (files, fileList) {
this.$message.warning(`当前限制选择 1 个文件,请删除后继续上传`)
},
async uploadHttpRequest (file) {
this.importLoading = true
this.importBtnTitle = '正在上传中...'
this.$message({
showClose: true,
message: '导入中,请到系统管理-导入记录中查看进度',
duration: 0
})
const formData = new FormData() //FormDataappend('key', value)
formData.append('file', file.file) //
await this.$http
.post('/epmetuser/tripreport/import', formData).then(res => {
console.log('res-up', res)
if (res.data.code == 0 && res.data.msg == 'success') {
// this.$message.success('')
this.loadTable()
} else this.$message.error(res.data.msg)
}).catch(err => {
console.log('失败', err)
file.onError() //
// this.$message.error('')
})
this.importLoading = false
this.importBtnTitle = '导入'
this.$refs.upload.clearFiles()
},
async uploadFile () {
if (this.fileName == "") {

109
src/views/modules/base/epidemic/travelForm.vue

@ -104,19 +104,8 @@
clearable
:disabled="isFromResi"
v-model="formData.presentAddress" />
<el-select v-else class="item_width_2"
v-model.trim="formData.presentAddress"
placeholder="请选择"
filterable
clearable>
<el-option v-for="item in personList"
@click.native="handleSelPerson(item)"
:key="item.demandUserId"
:label="item.demandUserName"
:value="item.demandUserId">
</el-option>
</el-select>
<el-cascader v-else ref="nowArea" class="item_width_2" :props="areaProps"
v-model="nowAllCode" clearable @change="handleNowArea"></el-cascader>
</el-form-item>
<el-form-item label="详细地址"
prop="detailAddress"
@ -129,30 +118,9 @@
v-model="formData.detailAddress">
</el-input>
</el-form-item>
<el-form-item
label="来自地区"
prop="sourceAddress"
style="display: block"
label-width="150px">
<!-- <el-input class="item_width_2"
placeholder="请输入来自地区"
clearable
:disabled="isFromResi"
v-model="formData.sourceAddress">
</el-input> -->
<el-cascader :props="areaProps"></el-cascader>
<!-- <el-select class="item_width_2"
v-model.trim="formData.sourceAddress"
placeholder="请选择"
filterable
clearable>
<el-option v-for="item in personList"
@click.native="handleSelPerson(item)"
:key="item.demandUserId"
:label="item.demandUserName"
:value="item.demandUserId">
</el-option>
</el-select> -->
<el-form-item label="来自地区" prop="sourceAddress" style="display: block" label-width="150px">
<el-cascader ref="sourceArea" v-model="sourceAllCode" class="item_width_2" :props="areaProps"
@change="handleSourceArea" clearable></el-cascader>
</el-form-item>
<el-form-item label="来到本地时间"
@ -224,7 +192,6 @@
</el-form>
</div>
<div class="form_div_btn">
<el-button size="small"
@click="handleCancle"> </el-button>
@ -235,15 +202,6 @@
@click="handleComfirm('ref_form')"> </el-button>
</div>
<el-dialog :visible.sync="dialogVisible"
width="550px"
top="5vh"
append-to-body>
<img width="100%"
:src="dialogImageUrl"
alt="">
</el-dialog>
</div>
</template>
@ -288,7 +246,8 @@ export default {
personList: [],
btnDisable: false,
sourceAllCode: [], // code
nowAllCode: [], // code
icNatId: '',
formData: {
gridId: '',
@ -302,9 +261,9 @@ export default {
presentAddress: '',
presentAddressCode: '',
detailAddress: '',
sourceAddressCode: '370203',
sourceAddressCode: '',
presentAddressPathCode: '',
sourceAddress: '市北区',
sourceAddress: '',
sourceAddressPathCode: '',
arriveDate: '',
remark: '',
@ -319,10 +278,10 @@ export default {
{ required: true, message: '姓名不能为空', trigger: 'blur' }
],
idCard: [
{ validator: checkIdCard, trigger: 'blur' }
{ required: true, validator: checkIdCard, trigger: 'blur' }
],
mobile: [
{ validator: checkMObile, trigger: 'blur' },
{ required: true, validator: checkMObile, trigger: 'blur' },
],
presentAddress: [
{ required: true, message: '现居地不能为空', trigger: 'blur' },
@ -355,12 +314,18 @@ export default {
methods: {
lzayLoadArea(node, resolve) {
this.getArea(node, resolve)
// setTimeout(() => {
// }, 1000)
},
async initForm (type, row) {
console.log('row----', row)
if (type != 'add') {
this.formData = { ...row, channel: [], content: '' }
this.sourceAllCode = row.sourceAddressPathCode && row.sourceAddressPathCode.split(',')
if (row.userType == 'icresi') this.isFromResi = true
else this.nowAllCode = row.presentAddressPathCode.split(',')
}
this.formData.agencyId = this.agencyId
@ -386,7 +351,35 @@ export default {
}
},
handleSourceArea(val) {
console.log('val-----', val)
console.log('label-----', this.$refs.sourceArea.getCheckedNodes())
if (val.length > 0) {
const labels = this.$refs.sourceArea.getCheckedNodes()[0].pathLabels
this.formData.sourceAddressCode = val[val.length - 1]
this.formData.sourceAddress = labels.join('-')
this.formData.sourceAddressPathCode = val.join(',')
} else {
this.formData.sourceAddressCode = ''
this.formData.sourceAddress = ''
this.formData.sourceAddressPathCode = ''
}
},
handleNowArea(val) {
console.log('val-----', val)
console.log('label-----', this.$refs.nowArea.getCheckedNodes())
if (val.length > 0) {
const labels = this.$refs.nowArea.getCheckedNodes()[0].pathLabels
this.formData.presentAddressCode = val[val.length - 1]
this.formData.presentAddress = labels.join('-')
this.formData.presentAddressPathCode = val.join(',')
} else {
this.formData.presentAddressCode = ''
this.formData.presentAddress = ''
this.formData.presentAddressPathCode = ''
}
},
async loadGrid () {
const url = "/gov/org/customergrid/gridoption"
@ -426,10 +419,9 @@ export default {
async getArea (node, resolve) {
const url = "/commonservice/areacode/nextarea"
let params = {
parentLevel: this.agencyId,
parentAreaCode: node.data ? node.data.value : ''
parentLevel: node.data ? node.data.level : '',
parentAreaCode: node.data ? node.data.code : ''
}
const { data, code, msg } = await requestPost(url, params)
@ -438,8 +430,9 @@ export default {
const nodes = data.map(item => ({
value: item.areaCode, //
label: item.areaName,
code1: item.parentCode,
leaf: node.level >= 5 // 5
code: item.areaCode,
level: item.level,
leaf: node.level >= 4 // 5
}))
resolve(nodes)
@ -615,6 +608,8 @@ export default {
this.formData.presentAddressCode = ''
this.formData.sourceAddressPathCode = ''
this.formData.presentAddressPathCode = ''
this.sourceAllCode = []
this.nowAllCode = []
},
//
startLoading () {

Loading…
Cancel
Save