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

Merge branch 'yantai_master' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov

yantai_master
dai 3 years ago
parent
5258c58af3 7cfb1df98b
commit
62ac13ee6b
5 changed files with 202 additions and 58 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      src/assets/scss/modules/visual/issue-info.scss
  2. 101
      src/views/modules/base/epidemic/travelPanshi/travelPanshi.vue
  3. 13
      src/views/modules/base/epidemic/travelPanshi/travelPanshiDetail.vue
  4. 26
      src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue
  5. 110
      src/views/modules/visual/communityGovern/zhongdianxingcheng/detail.vue

10
src/assets/scss/modules/visual/issue-info.scss
View File

@ -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: "";

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

@ -39,23 +39,6 @@
</el-input>
</el-form-item>
<el-form-item label="7天内旅居情况"
prop="idCard">
<el-select class="list_item_width_1"
v-model.trim="formData.sojournHistory"
placeholder="请选择"
clearable>
<el-option v-for="item in dangerLevelList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
</div>
<div>
<el-form-item label="来源地"
prop="sourceAddress">
@ -83,6 +66,36 @@
</el-form-item>
<el-form-item label="7天内旅居情况"
prop="idCard">
<el-select class="list_item_width_1"
v-model.trim="formData.sojournHistory"
placeholder="请选择"
clearable>
<el-option v-for="item in dangerLevelList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="隔离状态"
prop="idCard">
<el-select class="list_item_width_1"
v-model.trim="formData.isolateType"
placeholder="请选择"
clearable>
<el-option v-for="item in isolateTypeList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-button style="margin-left:30px"
size="small"
class="diy-button--search"
@ -179,16 +192,14 @@
label="证件号"
width="180">
</el-table-column>
<el-table-column prop="registeredResidence"
<!-- <el-table-column prop="registeredResidence"
header-align="center"
align="center"
label="户籍地"
show-overflow-tooltip
min-width="160">
<!-- <template slot-scope="scope">
{{scope.row.presentAddress + scope.row.detailAddress}}
</template> -->
</el-table-column>
</el-table-column> -->
<el-table-column prop="sourceAddress"
header-align="center"
align="center"
@ -196,7 +207,7 @@
show-overflow-tooltip
min-width="180">
</el-table-column>
<el-table-column prop="describeContent"
<!-- <el-table-column prop="describeContent"
header-align="center"
align="center"
label="来曹事由"
@ -209,7 +220,7 @@
label="48小时核酸"
show-overflow-tooltip
min-width="100">
</el-table-column>
</el-table-column> -->
<el-table-column prop="arriveDate"
header-align="center"
align="center"
@ -222,12 +233,12 @@
label="在曹居住地点"
width="160">
</el-table-column>
<el-table-column prop="trafficTypeName"
<!-- <el-table-column prop="trafficTypeName"
header-align="center"
align="center"
label="返回方式"
width="100">
</el-table-column>
</el-table-column> -->
<el-table-column prop="sojournHistoryName"
header-align="center"
align="center"
@ -240,19 +251,25 @@
label="隔离状态"
width="100">
</el-table-column>
<el-table-column prop="latestNoticeTime"
<el-table-column prop="controlMeasures"
header-align="center"
align="center"
label="管控措施"
width="100">
</el-table-column>
<!-- <el-table-column prop="latestNoticeTime"
header-align="center"
align="center"
label="最近一次通知时间"
width="140">
</el-table-column>
<el-table-column prop="remark"
</el-table-column> -->
<!-- <el-table-column prop="remark"
header-align="center"
align="center"
show-overflow-tooltip
label="备注"
min-width="120">
</el-table-column>
</el-table-column> -->
<el-table-column label="操作"
fixed="right"
@ -428,8 +445,27 @@ export default {
sourceAddressCode: '',
startDate: '',
endDate: '',
sojournHistory: ''
sojournHistory: '',
isolateType: '',
},
isolateTypeList: [
{
value: '0',
label: '集中隔离'
},
{
value: '1',
label: '居家隔离'
},
{
value: '2',
label: '居家健康监测'
},
{
value: '4',
label: '不需要隔离'
},
],
dangerLevelList: [],
@ -825,7 +861,8 @@ export default {
sourceAddressCode: '',
startDate: '',
endDate: '',
sojournHistory: ''
sojournHistory: '',
isolateType: '',
}
this.searchAreacode = []

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

@ -32,10 +32,15 @@
<span class="info-title-3">来源地：</span>
<span>{{ formData.sourceAddress||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">详细地址：</span>
<span>{{ formData.sourceDetailAddress||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">7天内到达或途经：</span>
<span>{{ formData.passBy||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">来曹事由：</span>
<span>{{ formData.describeContent||'--' }}</span>
@ -92,10 +97,18 @@
<span class="info-title-3">上报时间：</span>
<span>{{ formData.reportingTime||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">管控措施：</span>
<span>{{ formData.controlMeasures||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">类型：</span>
<span>{{ formData.tripDataTypeName||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">上报人：</span>
<span>{{ formData.createdByName||'--' }}</span>
</div>
</div>
</div>

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

@ -117,6 +117,15 @@
v-model="formData.sourceDetailAddress">
</el-input>
</el-form-item>
<el-form-item label="7天内到达或途经"
prop="passBy"
style="display: block">
<el-input class="item_width_4"
placeholder="行程卡来源地为多个时，请增加行程"
clearable
v-model="formData.passBy">
</el-input>
</el-form-item>
<el-form-item label="来曹事由"
prop="describeContent"
style="display: block">
@ -261,7 +270,7 @@
label="0">否</el-radio>
</el-form-item>
<el-form-item label="上报时间"
<!-- <el-form-item label="上报时间"
style="display: block"
prop="reportingTime">
<el-date-picker class="item_width_4"
@ -272,6 +281,19 @@
clearable
placeholder="选择时间">
</el-date-picker>
</el-form-item> -->
<el-form-item label="管控措施"
prop="controlMeasures"
style="display: block">
<el-input class="item_width_1"
type="textarea"
maxlength="500"
show-word-limit
:autosize="{ minRows: 4, maxRows: 10 }"
clearable
placeholder="请输入内容"
v-model="formData.controlMeasures"></el-input>
</el-form-item>
<el-form-item label="类型"
@ -413,6 +435,8 @@ export default {
isArrive: '',//是否达到曹县 0:否 1:是 【磐石】 （非必填）
reportingTime: '',//上报时间（非必填）
tripDataType: '',//行程记录类型，字典表(trip_data_type)【磐石】 （非必填）
controlMeasures: '',//管控措施【磐石】
passBy: '',//7天内到达或途经【磐石】
},

110
src/views/modules/visual/communityGovern/zhongdianxingcheng/detail.vue
View File

@ -19,44 +19,104 @@
</div>
<div class="m-content">
<div class="m-info">
<div class="info-prop">
<span class="info-title-3">姓名：</span>
<span class="info-content">{{ formData.name||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">手机号：</span>
<span class="info-content">{{ formData.showMobile||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">姓名：</span>
<span>{{ info.name||'--' }}</span>
<span class="info-title-3">证件号：</span>
<span class="info-content">{{ formData.showIdCard||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">户籍地：</span>
<span class="info-content">{{ formData.registeredResidence||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">手机：</span>
<span>{{ info.mobile||'--' }}</span>
<span class="info-title-3">来源地：</span>
<span class="info-content">{{ formData.sourceAddress||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">证件号：</span>
<span>{{ info.idCard||'--' }}</span>
<span class="info-title-3">详细地址：</span>
<span class="info-content">{{ formData.sourceDetailAddress||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">来源地：</span>
<span>{{ info.sourceAddress||'--' }}</span>
<span class="info-title-3">7天内到达或途经：</span>
<span class="info-content">{{ formData.passBy||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">来曹事由：</span>
<span class="info-content">{{ formData.describeContent||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">48小时核酸：</span>
<span class="info-content">{{ formData.natOutcomeName||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">来曹事由：</span>
<span>{{ info.describeContent||'--' }}</span>
<span class="info-title-3">来到本地时间：</span>
<span class="info-content">{{ formData.arriveDate||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">在曹居住地点：</span>
<span class="info-content">{{ formData.presentAddress||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">详细地址：</span>
<span class="info-content">{{ formData.detailAddress||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">返回方式：</span>
<span class="info-content">{{ formData.trafficTypeName||'--' }}</span>
</div>
<div v-if="formData.trafficTypeExplain"
class="info-prop">
<span class="info-title-3">具体方式：</span>
<span class="info-content">{{ formData.trafficTypeExplain||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">7天内旅居史情况：</span>
<span class="info-content">{{ formData.sojournHistoryName||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">隔离状态：</span>
<span class="info-content">{{ formData.isolateTypeName||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">48小时核酸：</span>
<span>{{ info.natOutComeName||'--' }}</span>
<span class="info-title-3">备注：</span>
<span class="info-content">{{ formData.remark||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">是否落实"落地检"：</span>
<span class="info-content">{{ formData.isArriveCheckName||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">是否到达曹县：</span>
<span class="info-content">{{ formData.isArriveName||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">上报时间：</span>
<span class="info-content">{{ formData.reportingTime||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">7天旅居史：</span>
<span>{{ info.sojournHistoryName||'--' }}</span>
<span class="info-title-3">管控措施：</span>
<span class="info-content">{{ formData.controlMeasures||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">隔离状态：</span>
<span>{{ info.isolateTypeName||'--' }}</span>
<span class="info-title-3">类型：</span>
<span class="info-content">{{ formData.tripDataTypeName||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">来曹时间：</span>
<span>{{ info.arriveDate||'--' }}</span>
<span class="info-title-3">上报人：</span>
<span class="info-content">{{ formData.createdByName||'--' }}</span>
</div>
</div>
@ -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 {

Write Preview
Loading…
Cancel
Save