kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev

Browse Source
This commit is contained in:
yanran200730
2022-01-20 09:16:39 +08:00
parent 31aba06df6 6e8e9dfe52
commit b4178e1e49
2 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
packages/3.0.0/AppReturnHomeRegister/components/Detail.vue vendored
View File

@@ -15,7 +15,9 @@
<ai-info-item label="填报时间" :value="info.createTime"></ai-info-item>
<ai-info-item label="身份证号" :value="info.idNumber"></ai-info-item>
<ai-info-item label="手机号码" :value="info.phone"></ai-info-item>
<ai-info-item label="人员类别" isLine :value="dict.getLabel('epidemicMemberType', info.type)"></ai-info-item>
<ai-info-item label="人员类别" isLine>
<span :style="info.type == 0 ? 'color:#42D784;' : 'color:#f46;'">{{dict.getLabel('epidemicMemberType', info.type)}}</span>
</ai-info-item>
</ai-wrapper>
</template>
</ai-card>
@@ -24,7 +26,9 @@
<ai-wrapper
label-width="120px">
<ai-info-item label="出发时间" :value="info.startTime"></ai-info-item>
<ai-info-item label="出发地区" :value="info.startAreaName"></ai-info-item>
<ai-info-item label="出发地区" >
<span :style="{color: info.denger == 1 ? '#FF4466' : '#333'}">{{info.startAreaName}} </span>
</ai-info-item>
<ai-info-item label="出发地址" isLine :value="info.startAddress"></ai-info-item>
<ai-info-item label="出行方式" :value="dict.getLabel('epidemicRecentTravel', info.travelType)"></ai-info-item>
<ai-info-item label="行程描述" isLine :value="info.description"></ai-info-item>
@@ -38,12 +42,15 @@
<template #content>
<ai-wrapper
label-width="120px">
<ai-info-item label="当前体温" :value="info.temperature + '℃'"></ai-info-item>
<ai-info-item label="14天内是否接触新冠确诊或疑似患者">
<span>{{ dict.getLabel('epidemicTouchInFourteen', info.touchInFourteen) }}</span>
<ai-info-item label="当前体温">
<span :style="info.temperature >= 37.3 ? 'color:#f46;' : ''">{{ info.temperature + '℃' }}</span>
</ai-info-item>
<ai-info-item label="当前健康状况" :value="info.status === '0' ? '异常' : '正常'">
<span>{{ info.healthName }}</span>
<ai-info-item label="14天内是否接触新冠确诊或疑似患者">
<span :class="'color-'+info.touchInFourteen">{{$dict.getLabel('epidemicTouchInFourteen', info.touchInFourteen)}}</span>
</ai-info-item>
<ai-info-item label="当前健康状况">
<span></span>
<span v-for="(item, index) in info.health" :key="index" :style="item != 0 ? 'color:#FF4466;' : ''"><span v-if="index>0">;</span>{{$dict.getLabel('epidemicRecentHealth', item)}}</span>
</ai-info-item>
</ai-wrapper>
</template>
@@ -53,7 +60,9 @@
<ai-wrapper
label-width="120px">
<ai-info-item label="检测日期" :value="info.checkTime && info.checkTime.split(' ')[0]"></ai-info-item>
<ai-info-item label="检测结果" :value="dict.getLabel('epidemicRecentTestResult', info.checkResult)"></ai-info-item>
<ai-info-item label="检测结果">
<span :style="info.checkResult == 1 ? 'color:#f46;' : 'color:#42D784;'">{{$dict.getLabel('epidemicRecentTestResult', info.checkResult)}}</span>
</ai-info-item>
<ai-info-item label="本人健康码截图" isLine>
<ai-uploader
:instance="instance"
@@ -186,6 +195,7 @@
healthName = healthName + this.$dict.getLabel('epidemicRecentHealth', v)
})
this.info.healthName = healthName
this.info.health = this.info.health.split(',')
}
})
},
@@ -257,4 +267,13 @@
</script>
<style scoped lang="scss">
.color-0{
color: #42D784;
}
.color-1{
color: #f46;
}
.color-2{
color: #1365DD;
}
</style>

2
packages/creditScore/scoreSupermarket/orderManagement.vue
View File

@@ -65,7 +65,7 @@
</ai-search-bar>
<ai-search-bar>
<template slot="left">
<el-button type="primary" icon="iconfont iconAdd" @click="add()">添加</el-button>
<!-- <el-button type="primary" icon="iconfont iconAdd" @click="add()">添加</el-button> -->
<ai-download
:instance="instance"
url="/app/appvillagerintegralshoporder/listExport"