|
|
@ -148,9 +148,9 @@ |
|
|
|
|
|
|
|
|
<el-form-item label="返回方式" |
|
|
<el-form-item label="返回方式" |
|
|
style="display: block" |
|
|
style="display: block" |
|
|
prop="trafficType"> |
|
|
prop="comeMode"> |
|
|
<el-select class="item_width_4" |
|
|
<el-select class="item_width_4" |
|
|
v-model.trim="formData.trafficType" |
|
|
v-model.trim="formData.comeMode" |
|
|
placeholder="请选择" |
|
|
placeholder="请选择" |
|
|
clearable> |
|
|
clearable> |
|
|
<el-option v-for="item in trafficTypeList" |
|
|
<el-option v-for="item in trafficTypeList" |
|
|
@ -285,12 +285,12 @@ |
|
|
</el-input> |
|
|
</el-input> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
<el-form-item label="车辆颜色" |
|
|
<el-form-item label="车辆颜色" |
|
|
prop="carryVehiclenumberColor" |
|
|
prop="carryVehicleNumberColor" |
|
|
style="display: block"> |
|
|
style="display: block"> |
|
|
<el-input class="item_width_4" |
|
|
<el-input class="item_width_4" |
|
|
placeholder="请输入车辆颜色" |
|
|
placeholder="请输入车辆颜色" |
|
|
clearable |
|
|
clearable |
|
|
v-model="formData.carryVehiclenumberColor"> |
|
|
v-model="formData.carryVehicleNumberColor"> |
|
|
</el-input> |
|
|
</el-input> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
<el-form-item label="目的地交通场站" |
|
|
<el-form-item label="目的地交通场站" |
|
|
@ -481,7 +481,7 @@ export default { |
|
|
content: '', |
|
|
content: '', |
|
|
channel: [], |
|
|
channel: [], |
|
|
|
|
|
|
|
|
trafficType: '',//返回方式，前端写死下来框值，给后端直接传汉字，烟台的不使用字典表 |
|
|
comeMode: '',//返回方式，前端写死下来框值，给后端直接传汉字，烟台的不使用字典表 |
|
|
shift: '',//班次 |
|
|
shift: '',//班次 |
|
|
carryHesuanProof: '',//48小时核算 ，传是/否 |
|
|
carryHesuanProof: '',//48小时核算 ，传是/否 |
|
|
healthCodeAbnormal: '',//健康码异常，传是/否 |
|
|
healthCodeAbnormal: '',//健康码异常，传是/否 |
|
|
@ -505,7 +505,7 @@ export default { |
|
|
|
|
|
|
|
|
carryVehicle: '',//是否带车，传是/否 |
|
|
carryVehicle: '',//是否带车，传是/否 |
|
|
carryVehicleNumber: '',//带车车牌号 |
|
|
carryVehicleNumber: '',//带车车牌号 |
|
|
carryVehiclenumberColor: '',//车辆颜色 |
|
|
carryVehicleNumberColor: '',//车辆颜色 |
|
|
destinationStation: '',//目的地交通场站 |
|
|
destinationStation: '',//目的地交通场站 |
|
|
arriveLuTime: '',//入鲁时间yyyy-MM-dd HH:mm:ss |
|
|
arriveLuTime: '',//入鲁时间yyyy-MM-dd HH:mm:ss |
|
|
|
|
|
|
|
|
@ -585,7 +585,7 @@ export default { |
|
|
arriveDate: [ |
|
|
arriveDate: [ |
|
|
{ required: true, message: '来到本地时间不能为空', trigger: 'change' }, |
|
|
{ required: true, message: '来到本地时间不能为空', trigger: 'change' }, |
|
|
], |
|
|
], |
|
|
trafficType: [ |
|
|
comeMode: [ |
|
|
{ required: true, message: '返回方式不能为空', trigger: 'change' }, |
|
|
{ required: true, message: '返回方式不能为空', trigger: 'change' }, |
|
|
], |
|
|
], |
|
|
carryHesuanProof: [ |
|
|
carryHesuanProof: [ |
|
|
@ -660,7 +660,7 @@ export default { |
|
|
} else { |
|
|
} else { |
|
|
const { user } = this.$store.state |
|
|
const { user } = this.$store.state |
|
|
//默认：山东省37-菏泽市3717-曹县371721 |
|
|
//默认：山东省37-菏泽市3717-曹县371721 |
|
|
this.nowAllCode = ['37', '3717', '371721'] |
|
|
// this.nowAllCode = ['37', '3717', '371721'] |
|
|
} |
|
|
} |
|
|
// this.$refs['ref_form'].resetFields(); |
|
|
// this.$refs['ref_form'].resetFields(); |
|
|
|
|
|
|
|
|
@ -674,7 +674,7 @@ export default { |
|
|
this.formData.idCard = '' |
|
|
this.formData.idCard = '' |
|
|
this.formData.gridId = '' |
|
|
this.formData.gridId = '' |
|
|
this.formData.userId = '' |
|
|
this.formData.userId = '' |
|
|
this.resetData() |
|
|
|
|
|
if (value === '2') { |
|
|
if (value === '2') { |
|
|
this.isFromResi = true |
|
|
this.isFromResi = true |
|
|
this.formData.userType = 'icresi' |
|
|
this.formData.userType = 'icresi' |
|
|
@ -849,7 +849,7 @@ export default { |
|
|
|
|
|
|
|
|
async loadFormData (id) { |
|
|
async loadFormData (id) { |
|
|
|
|
|
|
|
|
const url = '/epmetuser/tripreport/detail' |
|
|
const url = '/epmetuser/tripreport/yt-detail ' |
|
|
let params = { |
|
|
let params = { |
|
|
id, |
|
|
id, |
|
|
} |
|
|
} |
|
|
@ -859,9 +859,22 @@ export default { |
|
|
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(',') |
|
|
this.nowAllCode = data.presentAddressPathCode && data.presentAddressPathCode.split(',') |
|
|
|
|
|
this.tujingAllCode = data.viaPathCode && data.viaPathCode.split(',') |
|
|
|
|
|
this.hujiAllCode = data.registeredResidencePathCode && data.registeredResidencePathCode.split(',') |
|
|
|
|
|
|
|
|
if (data.userType == 'icresi') this.isFromResi = true |
|
|
if (data.userType == 'icresi') this.isFromResi = true |
|
|
|
|
|
|
|
|
|
|
|
if (this.formData.travelCodeImg) { |
|
|
|
|
|
let obj = { |
|
|
|
|
|
id: "111", |
|
|
|
|
|
url: this.formData.travelCodeImg, |
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
this.replayImgList = []; |
|
|
|
|
|
this.replayImgList.push(obj); |
|
|
|
|
|
this.hideUploadBtn = true |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
} else { |
|
|
} else { |
|
|
this.$message.error(msg) |
|
|
this.$message.error(msg) |
|
|
} |
|
|
} |
|
|
@ -871,7 +884,7 @@ export default { |
|
|
async handleComfirm (formName) { |
|
|
async handleComfirm (formName) { |
|
|
console.log(' this.formData', this.formData) |
|
|
console.log(' this.formData', this.formData) |
|
|
console.log(' this.replayImgList', this.replayImgList) |
|
|
console.log(' this.replayImgList', this.replayImgList) |
|
|
return false |
|
|
// return false |
|
|
this.$refs[formName].validate(async (valid) => { |
|
|
this.$refs[formName].validate(async (valid) => { |
|
|
if (valid) { |
|
|
if (valid) { |
|
|
if (this.formData.channel.length > 0 && !this.formData.content) { |
|
|
if (this.formData.channel.length > 0 && !this.formData.content) { |
|
|
@ -888,8 +901,8 @@ export default { |
|
|
}, 5000) |
|
|
}, 5000) |
|
|
|
|
|
|
|
|
let url = '' |
|
|
let url = '' |
|
|
if (this.formType === 'add') url = '/epmetuser/tripreport/save' |
|
|
if (this.formType === 'add') url = '/epmetuser/tripreport/yt-save' |
|
|
else url = '/epmetuser/tripreport/update' |
|
|
else url = '/epmetuser/tripreport/yt-update' |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const { data, code, msg } = await requestPost(url, this.formData) |
|
|
const { data, code, msg } = await requestPost(url, this.formData) |
|
|
@ -924,10 +937,62 @@ export default { |
|
|
|
|
|
|
|
|
resetData () { |
|
|
resetData () { |
|
|
this.$refs.ref_form.resetFields() |
|
|
this.$refs.ref_form.resetFields() |
|
|
this.formData.sourceAddressCode = '' |
|
|
this.formData = { |
|
|
this.formData.presentAddressCode = '' |
|
|
gridId: '', |
|
|
this.formData.sourceAddressPathCode = '' |
|
|
agencyId: '',//当前网格所属组织Id |
|
|
this.formData.presentAddressPathCode = '' |
|
|
userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值 |
|
|
|
|
|
userType: 'input',//从居民信息里选择居民时:icresi；默认传：input |
|
|
|
|
|
name: '', |
|
|
|
|
|
idCard: '', |
|
|
|
|
|
mobile: '', |
|
|
|
|
|
heSuanCheck: false, |
|
|
|
|
|
presentAddress: '', |
|
|
|
|
|
presentAddressCode: '', |
|
|
|
|
|
presentAddressPathCode: '', |
|
|
|
|
|
detailAddress: '', |
|
|
|
|
|
|
|
|
|
|
|
sourceAddressCode: '', |
|
|
|
|
|
sourceAddress: '', |
|
|
|
|
|
sourceAddressPathCode: '', |
|
|
|
|
|
comeAreaFull: '',//来源地--详细地址（必填） |
|
|
|
|
|
|
|
|
|
|
|
arriveDate: '',//来到本地时间 |
|
|
|
|
|
remark: '',//备注 |
|
|
|
|
|
|
|
|
|
|
|
content: '', |
|
|
|
|
|
channel: [], |
|
|
|
|
|
|
|
|
|
|
|
comeMode: '',//返回方式，前端写死下来框值，给后端直接传汉字，烟台的不使用字典表 |
|
|
|
|
|
shift: '',//班次 |
|
|
|
|
|
carryHesuanProof: '',//48小时核算 ，传是/否 |
|
|
|
|
|
healthCodeAbnormal: '',//健康码异常，传是/否 |
|
|
|
|
|
travelCodeAbnormal: '',//行程码异常，传是/否 |
|
|
|
|
|
detectionAbnormal: '',//核酸检测报告异常，传是/否 |
|
|
|
|
|
twoCodeOneReportStatus: '',//两码一报告状态，传正常/异常 |
|
|
|
|
|
nonlocalResidenceHistory: '',//是否有外地旅居史，传是/否 |
|
|
|
|
|
|
|
|
|
|
|
viaProvince: '',//途径地-省 |
|
|
|
|
|
viaCity: '',//途径地-市 |
|
|
|
|
|
viaCounty: '',//途径地-县 |
|
|
|
|
|
viaCode: '',//途径地 |
|
|
|
|
|
viaPathCode: '',//途径地 |
|
|
|
|
|
|
|
|
|
|
|
travelPersonnel: '',//同行人 |
|
|
|
|
|
|
|
|
|
|
|
registeredResidenceCity: '',//户籍地 |
|
|
|
|
|
registeredResidenceCode: '',//户籍地 |
|
|
|
|
|
registeredResidencePathCode: '',//户籍地 |
|
|
|
|
|
registeredResidenceAddress: '',//户籍详细地址 |
|
|
|
|
|
|
|
|
|
|
|
carryVehicle: '',//是否带车，传是/否 |
|
|
|
|
|
carryVehicleNumber: '',//带车车牌号 |
|
|
|
|
|
carryVehicleNumberColor: '',//车辆颜色 |
|
|
|
|
|
destinationStation: '',//目的地交通场站 |
|
|
|
|
|
arriveLuTime: '',//入鲁时间yyyy-MM-dd HH:mm:ss |
|
|
|
|
|
|
|
|
|
|
|
travelCodeImg: '',//行程码url |
|
|
|
|
|
invalidTime: '',//离开本地时间yyyy-MM-dd HH:mm:ss |
|
|
|
|
|
} |
|
|
this.sourceAllCode = [] |
|
|
this.sourceAllCode = [] |
|
|
this.nowAllCode = [] |
|
|
this.nowAllCode = [] |
|
|
this.tujingAllCode = [] |
|
|
this.tujingAllCode = [] |
|
|
|
jiangyy
3 years ago