Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
@@ -16,7 +16,7 @@
|
|||||||
<div class="title">行程信息</div>
|
<div class="title">行程信息</div>
|
||||||
<div class="item-flex">
|
<div class="item-flex">
|
||||||
<div class="label">人员类别</div>
|
<div class="label">人员类别</div>
|
||||||
<div class="value" :style="info.type == 0 ? 'color:#42D784;' : 'color:#f46;'">{{$dict.getLabel('epidemicMemberType', info.type)}}</div>
|
<div class="value" :style="(info.type == 0 || info.type == 3 || info.type == 9)? 'color:#42D784;' : 'color:#f46;'">{{$dict.getLabel('epidemicRecentPersonType', info.type)}}</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="item-flex">
|
<div class="item-flex">
|
||||||
<div class="label">返乡事由</div>
|
<div class="label">返乡事由</div>
|
||||||
@@ -87,7 +87,7 @@ export default {
|
|||||||
document.title = '返乡人员信息'
|
document.title = '返乡人员信息'
|
||||||
},
|
},
|
||||||
onLoad(option) {
|
onLoad(option) {
|
||||||
this.$dict.load('epidemicMemberType', 'epidemicRecentTravel', 'epidemicTouchInFourteen', 'epidemicRecentTestResult', 'epidemicRecentHealth').then(() => {
|
this.$dict.load('epidemicRecentPersonType', 'epidemicRecentTravel', 'epidemicTouchInFourteen', 'epidemicRecentTestResult', 'epidemicRecentHealth').then(() => {
|
||||||
this.id = option.id
|
this.id = option.id
|
||||||
this.getDetail()
|
this.getDetail()
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user