Browse Source

Merge branch 'dev-fangyi' into test

shibei_master
13176889840 3 years ago
parent
commit
c4fabf4676
  1. 12
      src/views/modules/base/epidemic/antiInfo.vue
  2. 145
      src/views/modules/base/epidemic/travel.vue
  3. 611
      src/views/modules/base/epidemic/travelForm.vue

12
src/views/modules/base/epidemic/antiInfo.vue

@ -135,8 +135,8 @@
</el-form-item>
<el-form-item label="疫苗接种针次"
prop="vaccinateCount">
<el-input v-model="searchForm.vaccinateCount"
prop="vaccineCount">
<el-input v-model="searchForm.vaccineCount"
size="small"
class="list_item_width_1"
clearable
@ -145,8 +145,8 @@
</el-form-item>
<el-form-item label="核酸检测次数"
prop="testCount">
<el-input v-model="searchForm.testCount"
prop="natCount">
<el-input v-model="searchForm.natCount"
size="small"
class="list_item_width_1"
clearable
@ -522,8 +522,8 @@ export default {
name: '',
mobile: '',
idCard: '',
vaccinateCount: '',
testCount: ''
vaccineCount: '',
natCount: ''
},
formDetail: {
name: '',

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

@ -4,12 +4,12 @@
<el-form :inline="true"
:model="formData"
ref="ref_searchform"
:label-width="'90px'">
:label-width="'100px'">
<div>
<el-form-item label="姓名"
prop="personInCharge">
<el-input v-model="formData.personInCharge"
prop="name">
<el-input v-model="formData.name"
size="small"
class="list_item_width_1"
clearable
@ -17,10 +17,20 @@
</el-input>
</el-form-item>
<el-form-item label="身份证"
<el-form-item label="手机号"
prop="mobile">
<el-input v-model="formData.mobile"
size="small"
class="list_item_width_1"
clearable
placeholder="请输入姓名">
</el-input>
</el-form-item>
<el-form-item label="身份证"
prop="idCard">
<el-input v-model="formData.idCard"
size="small"
class="list_item_width_1"
clearable
@ -29,8 +39,22 @@
</el-form-item>
<el-form-item label="接种时间"
prop="scheduledStartTime">
</div>
<div>
<el-form-item label="来自地区"
prop="sourceAddressCode">
<el-input v-model="formData.sourceAddressCode"
size="small"
class="list_item_width_1"
clearable
placeholder="请输入姓名">
</el-input>
</el-form-item>
<el-form-item label="来到本地时间"
prop="startDate">
<el-date-picker v-model="timeRange"
size="small"
type="daterange"
@ -97,7 +121,7 @@
type="index"
width="50"></el-table-column>
<el-table-column prop="personInCharge"
<el-table-column prop="name"
header-align="center"
align="center"
label="姓名"
@ -107,33 +131,58 @@
header-align="center"
align="center"
label="手机号"
width="110">
width="120">
</el-table-column>
<el-table-column prop="gridNames"
<el-table-column prop="idCard"
header-align="center"
align="center"
label="身份证"
min-width="170">
width="180">
</el-table-column>
<el-table-column prop="time"
<el-table-column prop="detailAddress"
header-align="center"
align="center"
label="检测时间"
width="120">
label="现居地"
show-overflow-tooltip
min-width="160">
</el-table-column>
<el-table-column prop="ninePlaceNames"
<el-table-column prop="sourceAddress"
header-align="center"
align="center"
label="来自地区"
show-overflow-tooltip
label="检测机构"
min-width="230">
min-width="160">
</el-table-column>
<el-table-column prop="ninePlaceNames"
<el-table-column prop="arriveDate"
header-align="center"
align="center"
label="来到本地时间"
width="160">
</el-table-column>
<el-table-column prop="leaveDate"
header-align="center"
align="center"
label="离开本地时间"
width="160">
</el-table-column>
<el-table-column prop="latestNoticeTime"
header-align="center"
align="center"
label="最近一次通知时间"
width="160">
</el-table-column>
<el-table-column prop="remark"
header-align="center"
align="center"
show-overflow-tooltip
label="检测结果"
min-width="80">
label="备注"
min-width="120">
</el-table-column>
<el-table-column prop="heSuanCheck"
header-align="center"
align="center"
label="核酸检测关注名单"
width="160">
</el-table-column>
<el-table-column label="操作"
@ -182,9 +231,9 @@
top="5vh"
class="dialog-h"
@closed="diaClose">
<nat-form ref="ref_form"
<travel-form ref="ref_form"
@dialogCancle="addFormCancle"
@dialogOk="addFormOk"></nat-form>
@dialogOk="addFormOk"></travel-form>
</el-dialog>
</div>
@ -192,7 +241,7 @@
<script>
import natForm from './natInfo/natForm'
import travelForm from './travelForm'
import { requestPost } from "@/js/dai/request";
import { mapGetters } from 'vuex'
@ -203,7 +252,7 @@ export default {
return {
loading: false,
total: 0,
pageSize: 10,
pageSize: 20,
pageNo: 0,
tableLoading: false,
sHeight: 0,
@ -212,11 +261,12 @@ export default {
timeRange: [],
formData: {
personInCharge: '',//
name: '',//
mobile: '',//
gridId: '',//Id
ninePlaceVal: '',//Value
isPage: true,//(:true :false)
idCard: '',
sourceAddressCode: '',
startDate: '',
endDate: ''
},
tableData: [],
@ -228,7 +278,7 @@ export default {
}
},
components: {
natForm
travelForm
},
async created () {
@ -256,7 +306,7 @@ export default {
async loadTable () {
this.tableLoading = true
const url = "/gov/org/placepatrolteam/getlist"
const url = "/epmetuser/tripreport/page"
// const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/getlist"
let params = {
pageSize: this.pageSize,
@ -270,13 +320,13 @@ export default {
this.total = data.total
this.tableData = data.list
this.tableData.forEach(item => {
if (item.time) {
let timeArray = item.time.split(' ')
item.time = timeArray[0]
}
// this.tableData.forEach(item => {
// if (item.time) {
// let timeArray = item.time.split(' ')
// item.time = timeArray[0]
// }
});
// });
} else {
this.$message.error(msg)
}
@ -285,12 +335,12 @@ export default {
handleScheduledTimeChange (time) {
if (time) {
this.formData.scheduledStartTime = time[0]
this.formData.scheduledEndTime = time[1]
this.formData.startDate = time[0]
this.formData.endDate = time[1]
} else {
this.formData.scheduledStartTime = ''
this.formData.scheduledEndTime = ''
this.formData.startDate = ''
this.formData.endDate = ''
}
@ -376,15 +426,12 @@ export default {
//
resetSearch () {
this.formData = {
personInCharge: '',//
mobile: '',//
gridId: '',//Id
ninePlaceVal: '',//Value
isPage: true,//(:true :false)
}
this.pageSize = 10
this.pageNo = 0
this.$refs.ref_searchform.resetFields()
this.formData.startDate = ''
this.formData.endDate = ''
this.timeRange = []
this.pageSize = 20
this.pageNo = 1
this.loadTable()
},

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

@ -0,0 +1,611 @@
<template>
<div class="epidemic-form">
<div class="dialog-h-content scroll-h">
<el-form ref="ref_form"
:inline="true"
:model="formData"
:rules="dataRule"
:disabled="formType==='detail'"
class="form">
<el-form-item v-if="formType==='add'"
label="录入方式"
label-width="150px"
style="display: block">
<el-radio-group v-model="enterType"
@change="handleChangeEnterType">
<el-radio :label="'1'">手动输入</el-radio>
<el-radio :label="'2'">选择居民</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="formType==='add'"
label="所属网格"
style="display: block"
label-width="150px">
<el-select class="item_width_2"
v-model.trim="formData.gridId"
placeholder="请选择"
:disabled="!isFromResi"
clearable>
<el-option v-for="item in gridList"
@click.native="handleSelGrid(item.value)"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item v-if="formType==='add'"
label="居民"
prop="userId"
style="display: block"
label-width="150px">
<el-select class="item_width_2"
v-model.trim="formData.userId"
placeholder="请选择"
filterable
:disabled="!isFromResi"
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>
<el-form-item label="姓名"
prop="name"
label-width="150px"
style="display: block">
<el-input class="item_width_2"
placeholder="请输入姓名"
clearable
:disabled="isFromResi"
v-model="formData.name">
</el-input>
</el-form-item>
<el-form-item label="手机号"
prop="mobile"
label-width="150px"
style="display: block">
<el-input class="item_width_2"
placeholder="请输入手机号"
clearable
:disabled="isFromResi"
v-model="formData.mobile">
</el-input>
</el-form-item>
<el-form-item label="身份证号"
prop="idCard"
label-width="150px"
style="display: block">
<el-input class="item_width_2"
placeholder="请输入身份证号"
clearable
:disabled="isFromResi"
v-model="formData.idCard">
</el-input>
</el-form-item>
<el-form-item label="检测时间"
style="display: block"
prop="natTime"
label-width="150px">
<el-date-picker class="item_width_2"
v-model="formData.natTime"
format="yyyy-MM-dd HH:mm"
value-format="yyyy-MM-dd HH:mm"
type="datetime"
clearable
placeholder="选择时间">
</el-date-picker>
</el-form-item>
<el-form-item label="检测地点"
prop="natAddress"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
placeholder="请输入检测地点"
clearable
v-model="formData.natAddress">
</el-input>
</el-form-item>
<el-form-item label="检测结果"
prop="type"
label-width="150px"
style="display: block">
<el-radio-group v-model="formData.natResult">
<el-radio :label="'0'">阴性</el-radio>
<el-radio :label="'1'">阳性</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item class="block"
label-width="150px"
style="display: block"
label="添加图片"
prop="attach">
<el-upload :action="uploadUlr"
list-type="picture-card"
:limit="limitNum"
:class="{hide:hideUploadEdit}"
accept=".jpg,.png,.gif"
:on-preview="handlePictureCardPreview"
:on-success="handleFileSuccess"
:on-remove="handleRemove"
:before-upload="beforeUpload"
:on-change="handleEditChange"
:file-list="fileList">
<i v-if="formType!=='detail'"
class="el-icon-plus"></i>
<div v-if="formType!=='detail'"
slot="tip"
class="el-upload__tip">请选择1张图片只能上传jpgpnggif格式</div>
</el-upload>
</el-form-item>
<el-form-item label="通知渠道"
prop="channel"
label-width="150px"
style="display: block">
<el-checkbox-group v-model="formData.channel">
<el-checkbox key="0"
label="0">小程序通知</el-checkbox>
<!-- <el-checkbox key="1"
label="1">短信通知</el-checkbox> -->
</el-checkbox-group>
</el-form-item>
<el-form-item label="通知内容"
prop="content"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
type="textarea"
maxlength="1000"
show-word-limit
:autosize="{ minRows: 4, maxRows: 10 }"
clearable
placeholder="请输入通知内容"
v-model="formData.content"></el-input>
</el-form-item>
</el-form>
</div>
<div class="form_div_btn">
<el-button size="small"
@click="handleCancle"> </el-button>
<el-button v-if="formType != 'detail'"
size="small"
type="primary"
:disabled="btnDisable"
@click="handleComfirm"> </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>
<script>
import { Loading } from 'element-ui' // Loading
import { requestPost } from '@/js/dai/request'
import { dateFormats } from '@/utils/index'
let loading //
export default {
data () {
return {
formType: 'add', // addeditdetail
hideUploadEdit: false, // ''
limitNum: 1,
enterType: '1',//1 2
isFromResi: false,//
gridList: [],
personList: [],
btnDisable: false,
icNatId: '',
formData: {
icNatId: '',
agencyId: '',//Id
userId: '',//idicResiUserId
userType: 'icresi',//resi;icresi;import;synchro
name: '',
idCard: '',
mobile: '',
natTime: '',
natAddress: '',
natResult: '',
channel: [],
content: '',
fileName: '',//
attachmentType: '',// - image - video - voice - doc
attachmentUrl: '',//
},
fileList: [],
uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
dialogImageUrl: '',
dialogVisible: false,
}
},
components: {},
async mounted () {
const { user } = this.$store.state
this.agencyId = user.agencyId
//
await this.loadGrid()
},
methods: {
async initForm (type, icNatId) {
this.formData.agencyId = this.agencyId
this.$refs['ref_form'].resetFields();
this.formType = type
if (icNatId) {
this.icNatId = icNatId
this.formData.icNatId = icNatId
this.isFromResi = false
await this.loadFormData()
}
},
handleChangeEnterType (value) {
this.formData.name = ''
this.formData.mobile = ''
this.formData.idCard = ''
this.formData.gridId = ''
this.formData.userId = ''
if (value === '2') {
this.isFromResi = true
} else {
this.isFromResi = false
}
},
async loadGrid () {
const url = "/gov/org/customergrid/gridoption"
let params = {
agencyId: this.agencyId
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.gridList = data
} else {
this.$message.error(msg)
}
},
async handleSelGrid (value) {
const url = "/epmetuser/icresiuser/demandusers"
let params = {
agencyId: this.agencyId,
gridId: value
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.personList = data
} else {
this.$message.error(msg)
}
},
async handleSelPerson (personItem) {
this.formData.userId = personItem.demandUserId
this.formData.name = personItem.demandUserName
this.formData.mobile = personItem.demandUserMobile
this.formData.idCard = personItem.idCard
},
async loadFormData () {
// const url = 'http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/detail'
const url = '/epmetuser/icNat/detail'
let params = {
icNatId: this.icNatId,
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.formData = data
this.formData.icNatId = this.icNatId
this.fileList = []
if (data.fileName) {
let obj = {
name: data.fileName,
type: data.attachmentType,
url: data.attachmentUrl,
}
// data.attachmentList.forEach(element => {
// element.name = element.fileName
// element.type = element.attachmentType
// element.size = element.attachmentSize
// });
this.fileList.push(obj)
}
this.hideUploadEdit = this.fileList.length >= this.limitNum;
} else {
this.$message.error(msg)
}
},
async handleComfirm () {
const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //
if (regPhone.test(this.formData.mobile) === false) {
this.btnDisable = false
this.$message({
type: 'warning',
message: '请输入正确的手机号码'
})
return false;
}
const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //1518151817X
if (regCard.test(this.formData.idCard) === false) {
this.btnDisable = false
this.$message({
type: 'warning',
message: '请输入正确的身份证号码'
})
return false;
}
if (this.formData.channel.length > 0 && !this.formData.content) {
this.$message({
type: 'warning',
message: '请填写通知内容'
})
return false;
}
this.btnDisable = true
setTimeout(() => {
this.btnDisable = false
}, 5000)
let url = ''
if (this.formType === 'add') {
url = '/epmetuser/icNat/add'
// url = "http://yapi.elinkservice.cn/mock/102/epmetuser/icNat/add"
this.formData.icNatId = ''
} else {
url = '/epmetuser/icNat/edit'
// url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/edit"
}
const { data, code, msg } = await requestPost(url, this.formData)
if (code === 0) {
this.$message({
type: 'success',
message: '操作成功'
})
this.resetData()
this.$emit('dialogOk')
this.btnDisable = false
} else {
this.btnDisable = false
this.$message.error(msg)
}
},
handleCancle () {
this.resetData()
this.$emit('dialogCancle')
},
handleRemove (file, fileList) {
this.hideUploadEdit = fileList.length >= this.limitNum;
this.formData.fileName = ''
this.formData.attachmentUrl = ''
this.formData.attachmentType = ''
this.fileList = []
},
handlePictureCardPreview (file) {
this.dialogImageUrl = file.url;
this.dialogVisible = true;
},
handleEditChange (file, fileList) {
this.hideUploadEdit = fileList.length >= this.limitNum;
},
beforeUpload (file) {
const array = file.name.split('.')
const extension = array[array.length - 1]
// const isLt1M = (file.size / 1024 / 1024) < 5
if (extension !== 'jpg'
&& extension !== 'png'
&& extension !== 'gif'
) {
this.$message.error('只能上传jpg、png、gif文件!')
return false
}
// if (!isLt1M) {
// this.$message.error(' 5MB!')
// }
// return isLt1M
},
handleFileSuccess (res, file) {
if (res.code === 0 && res.msg === 'success') {
const array = file.name.split('.')
const fileType = array[array.length - 1]
this.formData.fileName = file.name
this.formData.attachmentUrl = res.data.url
this.formData.attachmentType = 'image'
file.attachmentFormat = fileType
file.attachmentSize = file.size
} else this.$message.error(res.msg)
},
resetData () {
this.icNatId = ''
this.fileList = []
this.hideUploadEdit = false
this.formData = {
icNatId: '',
agencyId: '',//Id
userId: '',//idicResiUserId
userType: 'icresi',//resi;icresi;import;synchro
name: '',
idCard: '',
mobile: '',
natTime: '',
natAddress: '',
natResult: '',
channel: [],
content: '',
fileName: '',//
attachmentType: '',// - image - video - voice - doc
attachmentUrl: '',//
}
},
//
startLoading () {
loading = Loading.service({
lock: true, //
text: '正在加载……', //
background: 'rgba(0,0,0,.7)' //
})
},
//
endLoading () {
// clearTimeout(timer);
if (loading) {
loading.close()
}
}
},
computed: {
dataRule () {
return {
name: [
{ required: true, message: '姓名不能为空', trigger: 'blur' }
],
idCard: [
{ required: true, message: '身份证号不能为空', trigger: 'blur' }
],
mobile: [
{ required: true, message: '手机号不能为空', trigger: 'blur' },
],
natTime: [
{ required: true, message: '检测时间不能为空', trigger: 'blur' },
],
natAddress: [
{ required: false },
],
natResult: [
{ required: true },
],
natAddress: [
{ required: false },
],
channel: [
{ required: false },
],
content: [
{ required: false },
],
}
},
},
props: {
// serviceList: {
// type: Array,
// default: []
// },
}
}
</script>
<style lang="scss" scoped >
@import "@/assets/scss/modules/management/epidemic.scss";
</style>
<style lang='scss'>
//
.hide .el-upload--picture-card {
display: none;
}
// /
.el-upload-list__item {
transition: none !important;
}
</style>
Loading…
Cancel
Save