jiangyy 3 years ago
parent
commit
a61c567d94
  1. 3
      src/assets/scss/modules/management/epidemic.scss
  2. 2
      src/views/modules/base/epidemic/travelDetail.vue
  3. 57
      src/views/modules/base/epidemic/travelForm.vue

3
src/assets/scss/modules/management/epidemic.scss

@ -16,6 +16,9 @@
.item_width_3 { .item_width_3 {
width: 180px; width: 180px;
} }
.item_width_4 {
width: 350px;
}
.btn-selperson { .btn-selperson {
margin-left: 20px; margin-left: 20px;

2
src/views/modules/base/epidemic/travelDetail.vue

@ -118,7 +118,7 @@ export default {
await this.loadFormData(row.id) await this.loadFormData(row.id)
this.initLoading = true this.initLoading = true
console.log('formtype', type)
}, },

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

@ -26,7 +26,7 @@
label="所属网格" label="所属网格"
style="display: block" style="display: block"
label-width="150px"> label-width="150px">
<el-select class="item_width_2" <el-select class="item_width_4"
v-model.trim="formData.gridId" v-model.trim="formData.gridId"
placeholder="请选择" placeholder="请选择"
:disabled="!isFromResi" :disabled="!isFromResi"
@ -44,7 +44,7 @@
prop="userId" prop="userId"
style="display: block" style="display: block"
label-width="150px"> label-width="150px">
<el-select class="item_width_2" <el-select class="item_width_4"
v-model.trim="formData.userId" v-model.trim="formData.userId"
placeholder="请选择" placeholder="请选择"
filterable filterable
@ -63,7 +63,7 @@
prop="name" prop="name"
label-width="150px" label-width="150px"
style="display: block"> style="display: block">
<el-input class="item_width_2" <el-input class="item_width_4"
placeholder="请输入姓名" placeholder="请输入姓名"
clearable clearable
:disabled="isFromResi" :disabled="isFromResi"
@ -77,7 +77,7 @@
prop="mobile" prop="mobile"
label-width="150px" label-width="150px"
style="display: block"> style="display: block">
<el-input class="item_width_2" <el-input class="item_width_4"
placeholder="请输入手机号" placeholder="请输入手机号"
clearable clearable
:disabled="isFromResi" :disabled="isFromResi"
@ -88,7 +88,7 @@
prop="idCard" prop="idCard"
label-width="150px" label-width="150px"
style="display: block"> style="display: block">
<el-input class="item_width_2" <el-input class="item_width_4"
placeholder="请输入身份证号或证件号" placeholder="请输入身份证号或证件号"
clearable clearable
:disabled="isFromResi" :disabled="isFromResi"
@ -100,7 +100,7 @@
style="display: block" style="display: block"
label-width="150px"> label-width="150px">
<el-input v-if="formType == 'detail'" <el-input v-if="formType == 'detail'"
class="item_width_2" class="item_width_4"
placeholder="请输入现居地" placeholder="请输入现居地"
clearable clearable
:disabled="isFromResi" :disabled="isFromResi"
@ -108,14 +108,14 @@
v-model="formData.presentAddress" /> v-model="formData.presentAddress" />
<template v-else> <template v-else>
<el-input v-if="isFromResi" <el-input v-if="isFromResi"
class="item_width_2 mw180" class="item_width_4 mw180"
placeholder="请输入现居地" placeholder="请输入现居地"
clearable clearable
:disabled="isFromResi" :disabled="isFromResi"
v-model="formData.presentAddress" /> v-model="formData.presentAddress" />
<el-cascader v-else <el-cascader v-else
ref="nowArea" ref="nowArea"
class="item_width_2" class="item_width_4"
:props="areaProps" :props="areaProps"
v-model="nowAllCode" v-model="nowAllCode"
clearable clearable
@ -126,7 +126,7 @@
prop="detailAddress" prop="detailAddress"
label-width="150px" label-width="150px"
style="display: block"> style="display: block">
<el-input class="item_width_2" <el-input class="item_width_4"
placeholder="请输入详细地址" placeholder="请输入详细地址"
clearable clearable
:disabled="isFromResi" :disabled="isFromResi"
@ -137,7 +137,7 @@
prop="trafficType" prop="trafficType"
style="display: block" style="display: block"
label-width="150px"> label-width="150px">
<el-select class="item_width_2" <el-select class="item_width_4"
v-model.trim="formData.trafficType" v-model.trim="formData.trafficType"
placeholder="请选择" placeholder="请选择"
clearable> clearable>
@ -153,7 +153,7 @@
prop="trafficTypeExplain" prop="trafficTypeExplain"
style="display: block" style="display: block"
label-width="150px"> label-width="150px">
<el-input class="item_width_2" <el-input class="item_width_4"
placeholder="请输入交通方式" placeholder="请输入交通方式"
clearable clearable
v-model="formData.trafficTypeExplain"> v-model="formData.trafficTypeExplain">
@ -164,7 +164,7 @@
style="display: block" style="display: block"
label-width="150px"> label-width="150px">
<el-input v-if="formType == 'detail'" <el-input v-if="formType == 'detail'"
class="item_width_2" class="item_width_4"
placeholder="" placeholder=""
clearable clearable
:disabled="isFromResi" :disabled="isFromResi"
@ -174,21 +174,20 @@
<el-cascader v-else <el-cascader v-else
ref="sourceArea" ref="sourceArea"
v-model="sourceAllCode" v-model="sourceAllCode"
class="item_width_2" class="item_width_4"
:props="areaProps" :props="areaProps"
@change="handleSourceArea" @change="handleSourceArea"
clearable></el-cascader> clearable></el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="详细地址" <el-form-item label="详细地址"
prop="detailAddress" prop="sourceDetailAddress"
label-width="150px" label-width="150px"
style="display: block"> style="display: block">
<el-input class="item_width_2" <el-input class="item_width_4"
placeholder="请输入详细地址" placeholder="请输入详细地址"
clearable clearable
:disabled="isFromResi" v-model="formData.sourceDetailAddress">
v-model="formData.detailAddress">
</el-input> </el-input>
</el-form-item> </el-form-item>
@ -196,7 +195,7 @@
prop="vaccineNum" prop="vaccineNum"
style="display: block" style="display: block"
label-width="150px"> label-width="150px">
<el-select class="item_width_2" <el-select class="item_width_4"
v-model.trim="formData.vaccineNum" v-model.trim="formData.vaccineNum"
placeholder="请选择" placeholder="请选择"
clearable> clearable>
@ -212,7 +211,7 @@
style="display: block" style="display: block"
prop="isNatRecord" prop="isNatRecord"
label-width="150px"> label-width="150px">
<el-select class="item_width_2" <el-select class="item_width_4"
v-model.trim="formData.isNatRecord" v-model.trim="formData.isNatRecord"
placeholder="请选择" placeholder="请选择"
clearable> clearable>
@ -228,7 +227,7 @@
style="display: block" style="display: block"
prop="arriveDate" prop="arriveDate"
label-width="150px"> label-width="150px">
<el-date-picker class="item_width_2" <el-date-picker class="item_width_4"
v-model="formData.arriveDate" v-model="formData.arriveDate"
:picker-options="pickerOptions" :picker-options="pickerOptions"
format="yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm"
@ -242,7 +241,7 @@
style="display: block" style="display: block"
prop="leaveDate" prop="leaveDate"
label-width="150px"> label-width="150px">
<el-date-picker class="item_width_2" <el-date-picker class="item_width_4"
v-model="formData.leaveDate" v-model="formData.leaveDate"
format="yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm"
value-format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm"
@ -374,6 +373,7 @@ export default {
presentAddressPathCode: '', presentAddressPathCode: '',
sourceAddress: '', sourceAddress: '',
sourceAddressPathCode: '', sourceAddressPathCode: '',
sourceDetailAddress: '',
arriveDate: '', arriveDate: '',
remark: '', remark: '',
leaveDate: '', leaveDate: '',
@ -406,6 +406,9 @@ export default {
sourceAddress: [ sourceAddress: [
{ required: true, message: '来自地区不能为空', trigger: 'change' }, { required: true, message: '来自地区不能为空', trigger: 'change' },
], ],
sourceDetailAddress: [
{ required: true, message: '来自地区详细地址不能为空', trigger: 'change' },
],
arriveDate: [ arriveDate: [
{ required: true, message: '来到本地时间不能为空', trigger: 'change' }, { required: true, message: '来到本地时间不能为空', trigger: 'change' },
], ],
@ -415,12 +418,12 @@ export default {
trafficTypeExplain: [ trafficTypeExplain: [
{ required: true, message: '其他交通方式不能为空', trigger: 'change' }, { required: true, message: '其他交通方式不能为空', trigger: 'change' },
], ],
// isNatRecord: [ isNatRecord: [
// { required: true, message: '48', trigger: 'change' }, { required: true, message: '48小时核酸记录不能为空', trigger: 'change' },
// ], ],
// vaccineNum: [ vaccineNum: [
// { required: true, message: '', trigger: 'change' }, { required: true, message: '疫苗接种针刺不能为空', trigger: 'change' },
// ] ]
}, },
areaProps: { areaProps: {
// checkStrictly: true, // checkStrictly: true,

Loading…
Cancel
Save