详细地址：
{{ formData.detailAddress||'--' }}
+
+ 返回方式：
+ {{ formData.trafficTypeName||'--' }}
+
来自地区：
{{ formData.sourceAddress||'--' }}
+
+ 详细地址：
+ {{ formData.sourceDetailAddress||'--' }}
+
+
+ 疫苗接种针次：
+ {{ formData.vaccineNumName||'--' }}
+
+
+ 48小时核酸：
+ {{ formData.isNatRecordName||'--' }}
+
来到本地时间：
{{ formData.arriveDate||'--' }}
@@ -130,7 +146,7 @@ export default {
await this.loadFormData(row.id)
this.initLoading = true
- console.log('formtype', type)
+
},
diff --git a/src/views/modules/base/epidemic/travelForm.vue b/src/views/modules/base/epidemic/travelForm.vue
index 30ca0369e..dd8e28a75 100644
--- a/src/views/modules/base/epidemic/travelForm.vue
+++ b/src/views/modules/base/epidemic/travelForm.vue
@@ -26,7 +26,7 @@
label="所属网格"
style="display: block"
label-width="150px">
-
-
-
+ v-model="formData.name"
+ style="margin-right:10px;">
添加到核酸检测关注名单
@@ -76,7 +77,7 @@
prop="mobile"
label-width="150px"
style="display: block">
-
-
-
-
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
小程序通知
+ label="0">小程序通知
-
@@ -263,7 +349,7 @@ export default {
gridList: [],
personList: [],
pickerOptions: {
- disabledDate(time) {
+ disabledDate (time) {
return time.getTime() > Date.now();
}
},
@@ -287,42 +373,114 @@ export default {
presentAddressPathCode: '',
sourceAddress: '',
sourceAddressPathCode: '',
+ sourceDetailAddress: '',
arriveDate: '',
remark: '',
leaveDate: '',
userType: 'input',
content: '',
- channel: []
+ channel: [],
+
+ trafficType: '',
+ trafficTypeExplain: '',
+ isNatRecord: '',
+ vaccineNum: '',
},
dataRule: {
name: [
- { required: true, message: '姓名不能为空', trigger: 'blur' }
+ { required: true, message: '姓名不能为空', trigger: 'change' }
],
idCard: [
- { required: true, validator: checkIdCard, trigger: 'blur' }
+ { required: true, validator: checkIdCard, trigger: 'change' }
],
mobile: [
- { required: true, validator: checkMObile, trigger: 'blur' },
+ { required: true, validator: checkMObile, trigger: 'change' },
],
presentAddress: [
- { required: true, message: '现居地不能为空', trigger: 'blur' },
+ { required: true, message: '现居地不能为空', trigger: 'change' },
],
detailAddress: [
- { required: true, message: '详细地址不能为空', trigger: 'blur' },
+ { required: true, message: '详细地址不能为空', trigger: 'change' },
],
sourceAddress: [
- { required: true, message: '来自地区不能为空', trigger: 'blur' },
+ { required: true, message: '来自地区不能为空', trigger: 'change' },
+ ],
+ sourceDetailAddress: [
+ { required: true, message: '来自地区详细地址不能为空', trigger: 'change' },
],
arriveDate: [
- { required: true, message: '来到本地时间不能为空', trigger: 'blur' },
+ { required: true, message: '来到本地时间不能为空', trigger: 'change' },
+ ],
+ trafficType: [
+ { required: true, message: '交通方式不能为空', trigger: 'change' },
+ ],
+ trafficTypeExplain: [
+ { required: true, message: '其他交通方式不能为空', trigger: 'change' },
+ ],
+ isNatRecord: [
+ { required: true, message: '48小时核酸记录不能为空', trigger: 'change' },
+ ],
+ vaccineNum: [
+ { required: true, message: '疫苗接种针刺不能为空', trigger: 'change' },
]
},
areaProps: {
// checkStrictly: true,
lazy: true,
lazyLoad: this.lzayLoadArea
- }
+ },
+
+ trafficTypeList: [
+ {
+ value: '0',
+ label: '飞机'
+ },
+ {
+ value: '1',
+ label: '动车'
+ },
+ {
+ value: '2',
+ label: '火车'
+ },
+ {
+ value: '3',
+ label: '自驾'
+ },
+ {
+ value: '4',
+ label: '其他'
+ },
+ ],
+ ymList: [
+ {
+ value: '0',
+ label: '0针'
+ },
+ {
+ value: '1',
+ label: '1针'
+ },
+ {
+ value: '2',
+ label: '2针'
+ },
+ {
+ value: '3',
+ label: '3针'
+ }
+ ],
+ hsList: [
+ {
+ value: '1',
+ label: '是'
+ },
+ {
+ value: '2',
+ label: '否'
+ }
+ ]
}
},
@@ -332,12 +490,13 @@ export default {
this.agencyId = user.agencyId
//获取网格下拉框数据
await this.loadGrid()
+ this.getTrafficType()
},
- destroyed() {
+ destroyed () {
this.nowAllCode = []
},
methods: {
- computedWd(val) {
+ computedWd (val) {
const len = val.length
const wd = len * 18
let w = ''
@@ -345,7 +504,7 @@ export default {
else w = 220
return w + 'px'
},
- lzayLoadArea(node, resolve) {
+ lzayLoadArea (node, resolve) {
// this.getArea(node, resolve)
setTimeout(() => {
this.getArea(node, resolve)
@@ -389,7 +548,7 @@ export default {
},
- handleSourceArea(val) {
+ handleSourceArea (val) {
console.log('val-----', val)
console.log('label-----', this.$refs.sourceArea.getCheckedNodes())
if (val.length > 0) {
@@ -405,7 +564,7 @@ export default {
}
},
- handleNowArea(val) {
+ handleNowArea (val) {
console.log('val-----', val)
console.log('label-----', this.$refs.nowArea.getCheckedNodes())
if (val.length > 0) {
@@ -437,6 +596,23 @@ export default {
this.$message.error(msg)
}
+ },
+ async getTrafficType () {
+ const url = "/sys/dict/data/dictlist"
+
+ let params = {
+ dictType: "traffic_type",
+ }
+
+ const { data, code, msg } = await requestPost(url, params)
+
+ if (code === 0) {
+ this.trafficTypeList = data
+
+ } else {
+ this.$message.error(msg)
+ }
+
},
async handleSelGrid (value) {
@@ -482,7 +658,7 @@ export default {
}
},
- async handleSelAddress(value) {
+ async handleSelAddress (value) {
const url = "/gov/org/house/gethouseinfo/" + value
@@ -613,7 +789,6 @@ export default {
min-width: 260px;
}
}
-