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

Merge branch 'dev-磐石1101' into dev

dev-用户反馈
jiangyy 3 years ago
parent
ebea2c7cf6 32896fae37
commit
33a6102c3a
4 changed files with 62 additions and 36 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. 6
      src/views/modules/base/epidemic/epidRisk/risk.vue
  2. 2
      src/views/modules/base/epidemic/travelPanshi/travelPanshi.vue
  3. 19
      src/views/modules/base/epidemic/travelPanshi/travelPanshiDetail.vue
  4. 71
      src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue

6
src/views/modules/base/epidemic/epidRisk/risk.vue
View File

@ -656,7 +656,13 @@ export default {
...mapGetters(['clientHeight', 'iframeHeight']) ...mapGetters(['clientHeight', 'iframeHeight'])
}, },
watch: { watch: {
sourceAllCode (val) {
if (val.length === 0) {
this.formData.name = ''
}
}
}, },
props: { props: {

2
src/views/modules/base/epidemic/travelPanshi/travelPanshi.vue
View File

@ -805,7 +805,7 @@ export default {
this.timeRange = [] this.timeRange = []
// this.pageSize = 20 // this.pageSize = 20
this.pageNo = 1 this.pageNo = 1
this.loadTable() // this.loadTable()
}, },

19
src/views/modules/base/epidemic/travelPanshi/travelPanshiDetail.vue
View File

@ -37,7 +37,7 @@
</div> </div>
<div class="info-prop"> <div class="info-prop">
<span class="info-title-3">48小时核酸：</span> <span class="info-title-3">48小时核酸：</span>
<span>{{ formData.natOutcome||'--' }}</span> <span>{{ formData.natOutcomeName||'--' }}</span>
</div> </div>
<div class="info-prop"> <div class="info-prop">
@ -55,15 +55,20 @@
</div> </div>
<div class="info-prop"> <div class="info-prop">
<span class="info-title-3">返回方式：</span> <span class="info-title-3">返回方式：</span>
<span>{{ formData.trafficType||'--' }}</span> <span>{{ formData.trafficTypeName||'--' }}</span>
</div>
<div v-if="formData.trafficTypeExplain"
class="info-prop">
<span class="info-title-3">具体方式：</span>
<span>{{ formData.trafficTypeExplain||'--' }}</span>
</div> </div>
<div class="info-prop"> <div class="info-prop">
<span class="info-title-3">7天内旅居史情况：</span> <span class="info-title-3">7天内旅居史情况：</span>
<span>{{ formData.sojournHistory||'--' }}</span> <span>{{ formData.sojournHistoryName||'--' }}</span>
</div> </div>
<div class="info-prop"> <div class="info-prop">
<span class="info-title-3">隔离状态：</span> <span class="info-title-3">隔离状态：</span>
<span>{{ formData.isolateType||'--' }}</span> <span>{{ formData.isolateTypeName||'--' }}</span>
</div> </div>
<div class="info-prop"> <div class="info-prop">
<span class="info-title-3">备注：</span> <span class="info-title-3">备注：</span>
@ -71,11 +76,11 @@
</div> </div>
<div class="info-prop"> <div class="info-prop">
<span class="info-title-3">是否落实"落地检"：</span> <span class="info-title-3">是否落实"落地检"：</span>
<span>{{ formData.isArriveCheck||'--' }}</span> <span>{{ formData.isArriveCheckName||'--' }}</span>
</div> </div>
<div class="info-prop"> <div class="info-prop">
<span class="info-title-3">是否到达曹县：</span> <span class="info-title-3">是否到达曹县：</span>
<span>{{ formData.isArrive||'--' }}</span> <span>{{ formData.isArriveName||'--' }}</span>
</div> </div>
<div class="info-prop"> <div class="info-prop">
@ -84,7 +89,7 @@
</div> </div>
<div class="info-prop"> <div class="info-prop">
<span class="info-title-3">类型：</span> <span class="info-title-3">类型：</span>
<span>{{ formData.tripDataType||'--' }}</span> <span>{{ formData.tripDataTypeName||'--' }}</span>
</div> </div>
</div> </div>

71
src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue
View File

@ -24,7 +24,7 @@
<el-form-item v-if="formType==='add'" <el-form-item v-if="formType==='add'"
label="所属网格" label="所属网格"
style="display: block"> style="display: block">
<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"
@ -41,7 +41,7 @@
label="居民" label="居民"
prop="userId" prop="userId"
style="display: block"> style="display: block">
<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
@ -59,7 +59,7 @@
<el-form-item label="姓名" <el-form-item label="姓名"
prop="name" prop="name"
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"
@ -72,7 +72,7 @@
<el-form-item label="手机号" <el-form-item label="手机号"
prop="mobile" prop="mobile"
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"
@ -82,7 +82,7 @@
<el-form-item label="证件号" <el-form-item label="证件号"
prop="idCard" prop="idCard"
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"
@ -92,7 +92,7 @@
<el-form-item label="户籍地" <el-form-item label="户籍地"
prop="registeredResidence" prop="registeredResidence"
style="display: block"> style="display: block">
<el-input class="item_width_2" <el-input class="item_width_4"
placeholder="请输入户籍地" placeholder="请输入户籍地"
clearable clearable
v-model="formData.registeredResidence"> v-model="formData.registeredResidence">
@ -105,7 +105,7 @@
<el-cascader ref="sourceArea" <el-cascader 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>
@ -114,7 +114,7 @@
<el-form-item label="详细地址" <el-form-item label="详细地址"
prop="sourceDetailAddress" prop="sourceDetailAddress"
style="display: block"> style="display: block">
<el-input class="item_width_2" <el-input class="item_width_4"
placeholder="请输入详细地址" placeholder="请输入详细地址"
clearable clearable
v-model="formData.sourceDetailAddress"> v-model="formData.sourceDetailAddress">
@ -123,7 +123,7 @@
<el-form-item label="来曹事由" <el-form-item label="来曹事由"
prop="describeContent" prop="describeContent"
style="display: block"> style="display: block">
<el-input class="item_width_2" <el-input class="item_width_4"
placeholder="请输入来曹事由" placeholder="请输入来曹事由"
clearable clearable
v-model="formData.describeContent"> v-model="formData.describeContent">
@ -141,7 +141,7 @@
<el-form-item label="来到本地时间" <el-form-item label="来到本地时间"
style="display: block" style="display: block"
prop="arriveDate"> prop="arriveDate">
<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"
@ -159,7 +159,7 @@
<template> <template>
<el-cascader ref="nowArea" <el-cascader ref="nowArea"
class="item_width_2" class="item_width_4"
:props="areaProps" :props="areaProps"
v-model="nowAllCode" v-model="nowAllCode"
clearable clearable
@ -169,7 +169,7 @@
<el-form-item label="详细地址" <el-form-item label="详细地址"
prop="detailAddress" prop="detailAddress"
style="display: block"> style="display: block">
<el-input class="item_width_2" <el-input class="item_width_4"
placeholder="请输入详细地址" placeholder="请输入详细地址"
clearable clearable
v-model="formData.detailAddress"> v-model="formData.detailAddress">
@ -179,7 +179,7 @@
<el-form-item label="返回方式" <el-form-item label="返回方式"
style="display: block" style="display: block"
prop="trafficType"> prop="trafficType">
<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>
@ -190,12 +190,23 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item>
<el-form-item v-if="formData.trafficType==='5'"
label="具体方式"
style="display: block"
prop="trafficTypeExplain">
<el-input class="item_width_4"
placeholder="请输入具体方式"
clearable
v-model="formData.trafficTypeExplain">
</el-input>
</el-form-item> </el-form-item>
<el-form-item label="7天内旅居史情况" <el-form-item label="7天内旅居史情况"
style="display: block" style="display: block"
prop="sojournHistory"> prop="sojournHistory">
<el-select class="item_width_2" <el-select class="item_width_4"
v-model.trim="formData.sojournHistory" v-model.trim="formData.sojournHistory"
placeholder="请选择" placeholder="请选择"
clearable> clearable>
@ -209,7 +220,7 @@
</el-form-item> </el-form-item>
<el-form-item label="隔离状态" <el-form-item label="隔离状态"
prop="isolateType"> prop="isolateType">
<el-select class="item_width_2" <el-select class="item_width_4"
v-model.trim="formData.isolateType" v-model.trim="formData.isolateType"
placeholder="请选择" placeholder="请选择"
clearable> clearable>
@ -256,11 +267,11 @@
<el-form-item label="上报时间" <el-form-item label="上报时间"
style="display: block" style="display: block"
prop="reportingTime"> prop="reportingTime">
<el-date-picker class="item_width_2" <el-date-picker class="item_width_4"
v-model="formData.reportingTime" v-model="formData.reportingTime"
format="yyyy-MM-dd HH:mm" format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd"
type="datetime" type="date"
clearable clearable
placeholder="选择时间"> placeholder="选择时间">
</el-date-picker> </el-date-picker>
@ -268,7 +279,7 @@
<el-form-item label="类型" <el-form-item label="类型"
prop="tripDataType"> prop="tripDataType">
<el-select class="item_width_2" <el-select class="item_width_4"
v-model.trim="formData.tripDataType" v-model.trim="formData.tripDataType"
placeholder="请选择" placeholder="请选择"
clearable> clearable>
@ -447,12 +458,15 @@ export default {
presentAddress: [ presentAddress: [
{ required: true, message: '来曹居住地点不能为空', trigger: 'change' }, { required: true, message: '来曹居住地点不能为空', trigger: 'change' },
], ],
// detailAddress: [ detailAddress: [
// { required: true, message: '来曹居住详细地址不能为空', trigger: 'change' }, { required: true, message: '来曹居住详细地址不能为空', trigger: 'change' },
// ], ],
trafficType: [ trafficType: [
{ required: true, message: '返回方式不能为空', trigger: 'change' }, { required: true, message: '返回方式不能为空', trigger: 'change' },
],
trafficTypeExplain: [
{ required: true, message: '具体方式不能为空', trigger: 'change' },
] ]
}, },
areaProps: { areaProps: {
@ -504,7 +518,7 @@ export default {
} else { } else {
const { user } = this.$store.state const { user } = this.$store.state
this.nowAllCode = user.areaCodePath // this.nowAllCode = user.areaCodePath
} }
// this.$refs['ref_form'].resetFields(); // this.$refs['ref_form'].resetFields();
@ -526,7 +540,7 @@ export default {
this.isFromResi = false this.isFromResi = false
this.formData.userType = 'input' this.formData.userType = 'input'
const { user } = this.$store.state const { user } = this.$store.state
this.nowAllCode = user.areaCodePath // this.nowAllCode = user.areaCodePath
} }
@ -633,7 +647,7 @@ export default {
if (code === 0) { if (code === 0) {
this.formData.presentAddress = data.agencyPathName this.formData.presentAddress = data.agencyPathName
this.formData.presentAddressCode = data.areaCode this.formData.presentAddressCode = data.areaCode
this.formData.detailAddress = data.allName // this.formData.detailAddress = data.allName
} else { } else {
this.$message.error(msg) this.$message.error(msg)
@ -659,9 +673,10 @@ export default {
console.log('deda-------', data) console.log('deda-------', data)
this.formData = { ...data, channel: [], content: '' } this.formData = { ...data, channel: [], content: '' }
this.sourceAllCode = data.sourceAddressPathCode && data.sourceAddressPathCode.split(',') this.sourceAllCode = data.sourceAddressPathCode && data.sourceAddressPathCode.split(',')
this.nowAllCode = data.presentAddressPathCode && data.presentAddressPathCode.split(',')
if (data.userType == 'icresi') this.isFromResi = true if (data.userType == 'icresi') this.isFromResi = true
else this.nowAllCode = data.presentAddressPathCode && data.presentAddressPathCode.split(',')
} else { } else {
this.$message.error(msg) this.$message.error(msg)
} }
@ -689,7 +704,7 @@ export default {
else url = '/epmetuser/tripreport/update' else url = '/epmetuser/tripreport/update'
console.log(' this.formData', this.formData) console.log(' this.formData', this.formData)
return false // return false
const { data, code, msg } = await requestPost(url, this.formData) const { data, code, msg } = await requestPost(url, this.formData)
if (code === 0) { if (code === 0) {

Write Preview
Loading…
Cancel
Save