@@ -51,95 +51,105 @@
返回方式：
- {{ formData.trafficTypeName||'--' }}
-
-
- 具体方式：
- {{ formData.trafficTypeExplain||'--' }}
+ {{ formData.comeMode||'--' }}
班次：
- {{ formData.trafficTypeName||'--' }}
+ {{ formData.shift||'--' }}
48小时核酸：
- {{ formData.natOutcomeName||'--' }}
+ {{ formData.carryHesuanProof||'--' }}
- 健康码：
- {{ formData.natOutcomeName||'--' }}
+ 健康码异常：
+ {{ formData.healthCodeAbnormal||'--' }}
- 行程码：
- {{ formData.natOutcomeName||'--' }}
+ 行程码异常：
+ {{ formData.travelCodeAbnormal||'--' }}
- 核酸检测报告：
- {{ formData.natOutcomeName||'--' }}
+ 核酸检测报告异常：
+ {{ formData.detectionAbnormal||'--' }}
- 两码一报告：
- {{ formData.natOutcomeName||'--' }}
+ 两码一报告状态：
+ {{ formData.twoCodeOneReportStatus||'--' }}
是否有外地旅居史：
- {{ formData.natOutcomeName||'--' }}
+ {{ formData.nonlocalResidenceHistory||'--' }}
途径地区：
- {{ formData.natOutcomeName||'--' }}
+ {{ formData.viaAddressShow||'--' }}
同行人：
- {{ formData.natOutcomeName||'--' }}
+ {{ formData.travelPersonnel||'--' }}
户籍地：
- {{ formData.registeredResidence||'--' }}
+ {{ formData.registeredResidenceCity||'--' }}
户籍详细地址：
- {{ formData.passBy||'--' }}
+ {{ formData.registeredResidenceAddress||'--' }}
是否带车：
- {{ formData.describeContent||'--' }}
+ {{ formData.carryVehicle||'--' }}
带车车牌号：
- {{ formData.describeContent||'--' }}
+ {{ formData.carryVehicleNumber||'--' }}
车辆颜色：
- {{ formData.describeContent||'--' }}
+ {{ formData.carryVehicleNumberColor||'--' }}
目的地交通场站：
- {{ formData.describeContent||'--' }}
+ {{ formData.destinationStation||'--' }}
入鲁时间：
- {{ formData.sojournHistoryName||'--' }}
+ {{ formData.arriveLuTime||'--' }}
-
+
行程码：
- {{ formData.isolateTypeName||'--' }}
+ {{ '--' }}
+
+
+
+ 行程码：
+
+
+
+
+ ![]()
+
+
离开本地时间：
- {{ formData.isolateTypeName||'--' }}
+ {{ formData.invalidTime||'--' }}
备注：
@@ -187,11 +197,10 @@ export default {
async mounted () {
const { user } = this.$store.state
this.agencyId = user.agencyId
- //获取网格下拉框数据
- // await this.loadGrid()
+
},
destroyed () {
- this.nowAllCode = []
+
},
methods: {
@@ -223,94 +232,9 @@ export default {
},
- async loadGrid () {
- const url = "/gov/org/customergrid/gridoption"
-
- let params = {
- agencyId: this.agencyId
- }
-
- const { data, code, msg } = await requestPost(url, params)
-
- if (code === 0) {
- this.gridList = data
-
- } else {
- this.$message.error(msg)
- }
-
- },
- async handleSelGrid (value) {
-
- const url = "/epmetuser/icresiuser/demandusers"
-
- let params = {
- agencyId: this.agencyId,
- gridId: value
- }
-
- const { data, code, msg } = await requestPost(url, params)
-
- if (code === 0) {
- this.personList = data
-
- } else {
- this.$message.error(msg)
- }
-
- },
- async getArea (node, resolve) {
-
- const url = "/commonservice/areacode/nextarea"
- let params = {
- parentLevel: node.data ? node.data.level : '',
- parentAreaCode: node.data ? node.data.code : ''
- }
-
- const { data, code, msg } = await requestPost(url, params)
-
- if (code === 0) {
- const nodes = data.map(item => ({
- value: item.areaCode, //
- label: item.areaName,
- code: item.areaCode,
- level: item.level,
- leaf: node.level >= 4 // 5层级
- }))
- resolve(nodes)
-
- } else {
- this.$message.error(msg)
- }
-
- },
- async handleSelAddress (value) {
-
- const url = "/gov/org/house/gethouseinfo/" + value
-
- const { data, code, msg } = await requestPost(url)
-
- if (code === 0) {
- this.formData.presentAddress = data.agencyPathName
- this.formData.presentAddressCode = data.areaCode
- this.formData.detailAddress = data.allName
-
- } else {
- this.$message.error(msg)
- }
-
- },
- async handleSelPerson (personItem) {
- this.formData.userId = personItem.demandUserId
- this.formData.name = personItem.demandUserName
- this.formData.mobile = personItem.demandUserMobile
- this.formData.idCard = personItem.idCard
- this.handleSelAddress(personItem.houseId)
- },
-
async loadFormData (id) {
- const url = '/epmetuser/tripreport/detail'
+ const url = '/epmetuser/tripreport/yt-detail '
let params = {
id,
}
@@ -318,15 +242,28 @@ export default {
if (code === 0) {
console.log('deda-------', data)
this.formData = { ...data, channel: [], content: '' }
- this.sourceAllCode = data.sourceAddressPathCode && data.sourceAddressPathCode.split(',')
if (data.userType == 'icresi') this.isFromResi = true
- else this.nowAllCode = data.presentAddressPathCode && data.presentAddressPathCode.split(',')
+
+ this.formData.viaAddressShow = ''
+ if (this.formData.viaProvince) {
+ this.formData.viaAddressShow = this.formData.viaAddressShow + this.formData.viaProvince
+ }
+ if (this.formData.viaCity) {
+ this.formData.viaAddressShow = this.formData.viaAddressShow + '-' + this.formData.viaCity
+ }
+ if (this.formData.viaCounty) {
+ this.formData.viaAddressShow = this.formData.viaAddressShow + '-' + this.formData.viaCounty
+ }
+
+
} else {
this.$message.error(msg)
}
},
-
+ watchImg (src) {
+ window.open(src);
+ },
handleCancle () {
// this.resetData()
this.$emit('dialogCancle')
diff --git a/src/views/modules/base/epidemic/travelYantai/travelYantaiForm.vue b/src/views/modules/base/epidemic/travelYantai/travelYantaiForm.vue
index 58466b902..662137b1b 100644
--- a/src/views/modules/base/epidemic/travelYantai/travelYantaiForm.vue
+++ b/src/views/modules/base/epidemic/travelYantai/travelYantaiForm.vue
@@ -148,9 +148,9 @@
+ prop="comeMode">
+ v-model="formData.carryVehicleNumberColor">
{
if (valid) {
if (this.formData.channel.length > 0 && !this.formData.content) {
@@ -888,8 +901,8 @@ export default {
}, 5000)
let url = ''
- if (this.formType === 'add') url = '/epmetuser/tripreport/save'
- else url = '/epmetuser/tripreport/update'
+ if (this.formType === 'add') url = '/epmetuser/tripreport/yt-save'
+ else url = '/epmetuser/tripreport/yt-update'
const { data, code, msg } = await requestPost(url, this.formData)
@@ -924,10 +937,62 @@ export default {
resetData () {
this.$refs.ref_form.resetFields()
- this.formData.sourceAddressCode = ''
- this.formData.presentAddressCode = ''
- this.formData.sourceAddressPathCode = ''
- this.formData.presentAddressPathCode = ''
+ this.formData = {
+ gridId: '',
+ agencyId: '',//当前网格所属组织Id
+ 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.nowAllCode = []
this.tujingAllCode = []