From 51a4350fc915638fcfa892251196626dd49e0269 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 23 Nov 2022 11:14:12 +0800 Subject: [PATCH] 11 --- .../travelYantai/travelYantaiDetail.vue | 110 +++-- .../travelYantai/travelYantaiForm.vue | 422 +++++++++--------- 2 files changed, 278 insertions(+), 254 deletions(-) diff --git a/src/views/modules/base/epidemic/travelYantai/travelYantaiDetail.vue b/src/views/modules/base/epidemic/travelYantai/travelYantaiDetail.vue index 915d8ff91..e778252e4 100644 --- a/src/views/modules/base/epidemic/travelYantai/travelYantaiDetail.vue +++ b/src/views/modules/base/epidemic/travelYantai/travelYantaiDetail.vue @@ -24,12 +24,18 @@ 证件号： {{ formData.showIdCard||'--' }} +
- 户籍地： - {{ formData.registeredResidence||'--' }} + 现居地： + {{ formData.presentAddress||'--' }} +
+
+ 详细地址： + {{ formData.detailAddress||'--' }}
+
- 来源地： + 来自地区： {{ formData.sourceAddress||'--' }}
@@ -37,77 +43,107 @@ 详细地址： {{ formData.sourceDetailAddress||'--' }} +
- 7天内到达或途经： - {{ formData.passBy||'--' }} + 来到本地时间： + {{ formData.arriveDate||'--' }}
+
- 来曹事由： - {{ formData.describeContent||'--' }} + 返回方式： + {{ formData.trafficTypeName||'--' }}
+
+ 具体方式： + {{ formData.trafficTypeExplain||'--' }} +
+ +
+ 班次： + {{ formData.trafficTypeName||'--' }} +
+
48小时核酸： {{ formData.natOutcomeName||'--' }}
- 来到本地时间： - {{ formData.arriveDate||'--' }} + 健康码： + {{ formData.natOutcomeName||'--' }}
- 在曹居住地点： - {{ formData.presentAddress||'--' }} + 行程码： + {{ formData.natOutcomeName||'--' }}
+
- 详细地址： - {{ formData.detailAddress||'--' }} + 核酸检测报告： + {{ formData.natOutcomeName||'--' }} +
+ +
+ 两码一报告： + {{ formData.natOutcomeName||'--' }}
+
- 返回方式： - {{ formData.trafficTypeName||'--' }} + 是否有外地旅居史： + {{ formData.natOutcomeName||'--' }}
-
- 具体方式： - {{ formData.trafficTypeExplain||'--' }} + +
+ 途径地区： + {{ formData.natOutcomeName||'--' }}
- 7天内旅居史情况： - {{ formData.sojournHistoryName||'--' }} + 同行人： + {{ formData.natOutcomeName||'--' }}
+
- 隔离状态： - {{ formData.isolateTypeName||'--' }} + 户籍地： + {{ formData.registeredResidence||'--' }}
+
- 备注： - {{ formData.remark||'--' }} + 户籍详细地址： + {{ formData.passBy||'--' }} +
+
+ 是否带车： + {{ formData.describeContent||'--' }} +
+
+ 带车车牌号： + {{ formData.describeContent||'--' }}
- 是否落实"落地检"： - {{ formData.isArriveCheckName||'--' }} + 车辆颜色： + {{ formData.describeContent||'--' }}
- 是否到达曹县： - {{ formData.isArriveName||'--' }} + 目的地交通场站： + {{ formData.describeContent||'--' }}
- 上报时间： - {{ formData.reportingTime||'--' }} + 入鲁时间： + {{ formData.sojournHistoryName||'--' }}
- 管控措施： - {{ formData.controlMeasures||'--' }} + 行程码： + {{ formData.isolateTypeName||'--' }}
- 类型： - {{ formData.tripDataTypeName||'--' }} + 离开本地时间： + {{ formData.isolateTypeName||'--' }}
- 上报人： - {{ formData.createdByName||'--' }} + 备注： + {{ formData.remark||'--' }}
diff --git a/src/views/modules/base/epidemic/travelYantai/travelYantaiForm.vue b/src/views/modules/base/epidemic/travelYantai/travelYantaiForm.vue index c78d99d6a..58466b902 100644 --- a/src/views/modules/base/epidemic/travelYantai/travelYantaiForm.vue +++ b/src/views/modules/base/epidemic/travelYantai/travelYantaiForm.vue @@ -123,12 +123,12 @@ + v-model="formData.comeAreaFull"> @@ -138,8 +138,8 @@ @@ -162,167 +162,155 @@ - - - - - - + v-model="formData.shift"> - 阴性 - 阳性 + 是 + 否 - - 正常 - 异常 + 是 + 否 - - 正常 - 异常 + 是 + 否 - - 正常 - 异常 + 是 + 否 - - 正常 - 异常 + 正常 + 异常 - 是 - 否 + 是 + 否 + v-model="formData.travelPersonnel"> + v-model="formData.registeredResidenceAddress"> - 是 - 否 + 是 + 否 + v-model="formData.carryVehicleNumber"> + v-model="formData.carryVehiclenumberColor"> + v-model="formData.destinationStation"> + prop="arriveLuTime"> @@ -341,23 +329,23 @@ :file-list="replayImgList" :on-change="handleEditChange" :on-success="handleSuccess" - :limit="3"> + :limit="1"> 选择图片
- 最多上传3张图片，图片支持jpg、jpeg、bmp、git或png格式 + 最多上传1张图片，图片支持jpg、jpeg、bmp、git或png格式
+ prop="invalidTime"> @@ -467,73 +455,103 @@ export default { nowAllCode: [], // 现居地全 code tujingAllCode: [], // 现居地全 code hujiAllCode: [], // 现居地全 code - icNatId: '', + formData: { gridId: '', agencyId: '',//当前网格所属组织Id userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值 - userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro + userType: 'input',//从居民信息里选择居民时:icresi；默认传：input name: '', idCard: '', mobile: '', heSuanCheck: false, presentAddress: '', presentAddressCode: '', + presentAddressPathCode: '', detailAddress: '', + sourceAddressCode: '', - presentAddressPathCode: '', sourceAddress: '', sourceAddressPathCode: '', - arriveDate: '', - remark: '', - leaveDate: '', - userType: 'input', - content: '', - channel: [], - - registeredResidence: '',//户籍地详细地址（必填） - sourceDetailAddress: '',//来源地--详细地址（必填） - natOutcome: '',//48小时核酸 0 阴性 1 阳性（必填） - trafficType: '',//交通方式，来源字典表(traffic_type) （必填） - - banci: '', - jiankangma: '', - xingchengma: '', - hesuan: '', - liangma: '', - waidi: '', - - tujing: '', - tujingCode: '', - tujingPathCode: '', + comeAreaFull: '',//来源地--详细地址（必填） - tongxing: '', + arriveDate: '',//来到本地时间 + remark: '',//备注 - huji: '', - hujiCode: '', - hujiPathCode: '', + content: '', + channel: [], - daiche: '', - chepaihao: '', - yanse: '', - changzhan: '', - rulu: '', - likai: '', - imageList: [], + trafficType: '',//返回方式，前端写死下来框值，给后端直接传汉字，烟台的不使用字典表 + 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 }, - trafficTypeList: [], - yesOrNoList: [ + trafficTypeList: [ { - value: '0', - label: '是' + value: '船', + label: '船' }, { - value: '1', - label: '否' - } + value: '飞机', + label: '飞机' + }, + { + value: '火车', + label: '火车' + }, + { + value: '民航', + label: '民航' + }, + { + value: '其他', + label: '其他' + }, + { + value: '汽车', + label: '汽车' + }, + { + value: '铁路', + label: '铁路' + }, + { + value: '长途客运', + label: '长途客运' + }, + { + value: '自驾包车', + label: '自驾包车' + }, ], @@ -550,10 +568,18 @@ export default { ], + presentAddress: [ + { required: true, message: '现居地不能为空', trigger: 'change' }, + ], + + detailAddress: [ + { required: true, message: '现居地详细地址不能为空', trigger: 'change' }, + ], + sourceAddress: [ { required: true, message: '来自地区不能为空', trigger: 'change' }, ], - sourceDetailAddress: [ + comeAreaFull: [ { required: true, message: '来自地区详细地址不能为空', trigger: 'change' }, ], arriveDate: [ @@ -562,7 +588,7 @@ export default { trafficType: [ { required: true, message: '返回方式不能为空', trigger: 'change' }, ], - natOutcome: [ + carryHesuanProof: [ { required: true, message: '48小时核酸不能为空', trigger: 'change' }, ], @@ -574,6 +600,11 @@ export default { lazy: true, lazyLoad: this.lzayLoadArea }, + areaPropsLevel2: { + // checkStrictly: true, + lazy: true, + lazyLoad: this.lzayLoadAreaLevel2 + }, hideUploadBtn: false, //图片相关 oss/file/uploadvariedfile @@ -592,9 +623,6 @@ export default { //获取网格下拉框数据 await this.loadGrid() - this.getTrafficType() - // this.getIsolateType() - this.getTripDataType() }, destroyed () { this.nowAllCode = [] @@ -609,9 +637,15 @@ export default { return w + 'px' }, lzayLoadArea (node, resolve) { - // this.getArea(node, resolve) + setTimeout(() => { - this.getArea(node, resolve) + this.getArea(node, resolve, 4) + }, 200) + }, + lzayLoadAreaLevel2 (node, resolve) { + + setTimeout(() => { + this.getArea(node, resolve, 2) }, 200) }, async initForm (type, row) { @@ -690,14 +724,25 @@ export default { console.log('label-----', this.$refs.tujingArea.getCheckedNodes()) if (val.length > 0) { const labels = this.$refs.tujingArea.getCheckedNodes()[0].pathLabels - this.formData.tujingCode = val[val.length - 1] + this.formData.viaCode = val[val.length - 1] this.formData.tujing = labels.join('-') - this.formData.tujingPathCode = val.join(',') - this.$refs.ref_form.clearValidate('tujing') + if (labels.length > 0) { + this.formData.viaProvince = labels[0] + } + if (labels.length > 1) { + this.formData.viaCity = labels[1] + } + if (labels.length > 2) { + this.formData.viaCounty = labels[2] + } + this.formData.viaPathCode = val.join(',') + this.$refs.ref_form.clearValidate('viaProvince') } else { - this.formData.tujingCode = '' - this.formData.tujing = '' - this.formData.tujingPathCode = '' + this.formData.viaCode = '' + this.formData.viaProvince = '' + this.formData.viaCity = '' + this.formData.viaCounty = '' + this.formData.viaPathCode = '' } }, @@ -706,14 +751,14 @@ export default { console.log('label-----', this.$refs.hujiArea.getCheckedNodes()) if (val.length > 0) { const labels = this.$refs.hujiArea.getCheckedNodes()[0].pathLabels - this.formData.hujiCode = val[val.length - 1] - this.formData.huji = labels.join('-') - this.formData.hujiPathCode = val.join(',') - this.$refs.ref_form.clearValidate('huji') + this.formData.registeredResidenceCode = val[val.length - 1] + this.formData.registeredResidenceCity = labels.join('-') + this.formData.registeredResidencePathCode = val.join(',') + this.$refs.ref_form.clearValidate('registeredResidenceCity') } else { - this.formData.hujiCode = '' - this.formData.huji = '' - this.formData.hujiPathCode = '' + this.formData.registeredResidenceCode = '' + this.formData.registeredResidenceCity = '' + this.formData.registeredResidencePathCode = '' } }, @@ -753,7 +798,7 @@ export default { } }, - async getArea (node, resolve) { + async getArea (node, resolve, levelNum) { const url = "/commonservice/areacode/nextarea" let params = { @@ -769,7 +814,7 @@ export default { label: item.areaName, code: item.areaCode, level: item.level, - leaf: node.level >= 4 // 5层级 + leaf: node.level >= levelNum // 5层级 })) resolve(nodes) @@ -824,6 +869,9 @@ export default { async handleComfirm (formName) { + console.log(' this.formData', this.formData) + console.log(' this.replayImgList', this.replayImgList) + return false this.$refs[formName].validate(async (valid) => { if (valid) { if (this.formData.channel.length > 0 && !this.formData.content) { @@ -843,8 +891,7 @@ export default { if (this.formType === 'add') url = '/epmetuser/tripreport/save' else url = '/epmetuser/tripreport/update' - console.log(' this.formData', this.formData) - // return false + const { data, code, msg } = await requestPost(url, this.formData) if (code === 0) { @@ -890,84 +937,25 @@ export default { }, removePic (file, fileList) { - this.formData.imageList.splice( - this.formData.imageList.findIndex((item) => item === file.url), - 1 - ); + this.replayImgList.splice( this.replayImgList.findIndex((item) => item.uid === file.uid), 1 ); - this.hideUploadBtn = fileList.length >= 3; + this.formData.travelCodeImg = ''; + this.hideUploadBtn = fileList.length >= 1; }, - // 最多上传3张图，超过时隐藏上传按钮 + // 最多上传1张图，超过时隐藏上传按钮 handleEditChange (file, fileList) { - this.hideUploadBtn = fileList.length >= 3; + this.hideUploadBtn = fileList.length >= 1; }, exceedPic () { - this.$message.warning("最多上传3张预览图片"); + this.$message.warning("最多上传1张图片"); }, handleSuccess (response, file, fileList) { - this.replayImgList.push(file); - this.formData.imageList.push(response.data.url); - }, - - - 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 getIsolateType () { - - const url = "/sys/dict/data/dictlist"; - - let params = { - // dictType: "isolatedState", - dictType: "isolate_type", - }; - - const { data, code, msg } = await requestPost(url, params) - - if (code === 0) { - this.isolateTypeList = data - - } else { - this.$message.error(msg) - } - - }, - async getTripDataType () { - - const url = "/sys/dict/data/dictlist"; - - let params = { - dictType: "trip_data_type", - }; - - const { data, code, msg } = await requestPost(url, params) - - if (code === 0) { - this.tripDataTypeList = data - - - } else { - this.$message.error(msg) - } + this.replayImgList.push(file); + this.formData.travelCodeImg = response.data.url; },