diff --git a/src/assets/scss/modules/visual/issue-info.scss b/src/assets/scss/modules/visual/issue-info.scss index dc3fe2fdb..20ac3ed44 100644 --- a/src/assets/scss/modules/visual/issue-info.scss +++ b/src/assets/scss/modules/visual/issue-info.scss @@ -90,11 +90,21 @@ flex: 0 0 1; font-size: 14px; } + .info-title-3 { + // width: 140px; + flex: 0 0 140px; + font-size: 14px; + } + > span, > div { display: block; max-width: 300px; } + .info-content{ + flex: 0 0 500px; + max-width: 500px; + } &::before { content: ""; diff --git a/src/views/modules/base/epidemic/travelPanshi/travelPanshi.vue b/src/views/modules/base/epidemic/travelPanshi/travelPanshi.vue index b0f12aa69..23918787d 100644 --- a/src/views/modules/base/epidemic/travelPanshi/travelPanshi.vue +++ b/src/views/modules/base/epidemic/travelPanshi/travelPanshi.vue @@ -39,23 +39,6 @@ - - - - - - - - - -
@@ -83,6 +66,36 @@ + + + + + + + + + + + + + + + + - - - + + --> - - + --> - - + --> - + + + 来源地: {{ formData.sourceAddress||'--' }}
+
详细地址: {{ formData.sourceDetailAddress||'--' }}
+
+ 7天内到达或途经: + {{ formData.passBy||'--' }} +
来曹事由: {{ formData.describeContent||'--' }} @@ -92,10 +97,18 @@ 上报时间: {{ formData.reportingTime||'--' }}
+
+ 管控措施: + {{ formData.controlMeasures||'--' }} +
类型: {{ formData.tripDataTypeName||'--' }}
+
+ 上报人: + {{ formData.createdByName||'--' }} +
diff --git a/src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue b/src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue index c136bce6a..e39473b3a 100644 --- a/src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue +++ b/src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue @@ -117,6 +117,15 @@ v-model="formData.sourceDetailAddress"> + + + + @@ -261,7 +270,7 @@ label="0">否 - + --> + + +
+
+ 姓名: + {{ formData.name||'--' }} +
+ +
+ 手机号: + {{ formData.showMobile||'--' }} +
- 姓名: - {{ info.name||'--' }} + 证件号: + {{ formData.showIdCard||'--' }} +
+
+ 户籍地: + {{ formData.registeredResidence||'--' }}
- 手机: - {{ info.mobile||'--' }} + 来源地: + {{ formData.sourceAddress||'--' }}
- 证件号: - {{ info.idCard||'--' }} + 详细地址: + {{ formData.sourceDetailAddress||'--' }}
- 来源地: - {{ info.sourceAddress||'--' }} + 7天内到达或途经: + {{ formData.passBy||'--' }} +
+
+ 来曹事由: + {{ formData.describeContent||'--' }} +
+
+ 48小时核酸: + {{ formData.natOutcomeName||'--' }}
- 来曹事由: - {{ info.describeContent||'--' }} + 来到本地时间: + {{ formData.arriveDate||'--' }} +
+ +
+ 在曹居住地点: + {{ formData.presentAddress||'--' }} +
+
+ 详细地址: + {{ formData.detailAddress||'--' }} +
+
+ 返回方式: + {{ formData.trafficTypeName||'--' }} +
+
+ 具体方式: + {{ formData.trafficTypeExplain||'--' }} +
+
+ 7天内旅居史情况: + {{ formData.sojournHistoryName||'--' }} +
+
+ 隔离状态: + {{ formData.isolateTypeName||'--' }}
- 48小时核酸: - {{ info.natOutComeName||'--' }} + 备注: + {{ formData.remark||'--' }} +
+
+ 是否落实"落地检": + {{ formData.isArriveCheckName||'--' }} +
+
+ 是否到达曹县: + {{ formData.isArriveName||'--' }} +
+ +
+ 上报时间: + {{ formData.reportingTime||'--' }}
- 7天旅居史: - {{ info.sojournHistoryName||'--' }} + 管控措施: + {{ formData.controlMeasures||'--' }}
- 隔离状态: - {{ info.isolateTypeName||'--' }} + 类型: + {{ formData.tripDataTypeName||'--' }}
- 来曹时间: - {{ info.arriveDate||'--' }} + 上报人: + {{ formData.createdByName||'--' }}
@@ -92,7 +152,7 @@ export default { data () { return { - info: { + formData: { name: "", mobile: "", idCard: "", @@ -132,8 +192,8 @@ export default { }); if (code === 0) { - this.$set(this.info, 'mobile', data.mobile) - this.$set(this.info, 'idCard', data.idCard) + this.$set(this.formData, 'mobile', data.mobile) + this.$set(this.formData, 'idCard', data.idCard) } else { this.$message.error(msg); } @@ -151,7 +211,7 @@ export default { //加载组织数据 async getInfo () { - const url = "/epmetuser/tripreport/emphasisTripDetail"; + const url = "/epmetuser/tripreport/detail"; // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icTripReportRecord/emphasisTripDetail"; let params = { id: this.detailId, @@ -160,10 +220,10 @@ export default { const { data, code, msg } = await requestPost(url, params); if (code === 0) { - this.info = data + this.formData = data - if (this.info.topicInfo && this.info.topicInfo.publishedTime) { - this.info.topicInfo.publishedTimeShow = dateFormat(new Date(this.info.topicInfo.publishedTime * 1000), "yyyy-MM-dd") + if (this.formData.topicInfo && this.formData.topicInfo.publishedTime) { + this.formData.topicInfo.publishedTimeShow = dateFormat(new Date(this.formData.topicInfo.publishedTime * 1000), "yyyy-MM-dd") } } else {