@@ -82,35 +103,41 @@
current: 1,
size: 10,
name: '',
+ checkResult: '',
areaId: '',
+ today: ''
},
+ dictList: [{
+ dictName: '否',
+ dictValue: '0'
+ }, {
+ dictName: '是',
+ dictValue: '1'
+ }],
info: {},
colConfigs: [
{ prop: 'name', label: '姓名' },
{ prop: 'phone', align: 'center', label: '电话' },
- { prop: 'startTime', align: 'center', label: '出发时间' },
+ { prop: 'areaName', align: 'center', label: '本地地区', width: '200px' },
+ { prop: 'createTime', align: 'center', label: '上报时间', width: '200px' },
+ { prop: 'diffNum', align: 'center', label: '已接种情况', formart: v => (v || 0) + '次' },
+ { prop: 'healthCode', align: 'center', label: '健康码', formart: v => v ? this.dict.getLabel('epidemicHealthCode', v) : '-' },
+ { prop: 'checkTime', align: 'center', label: '核酸日期', formart: v => v ? v.split(' ')[0] : '-' },
+ { prop: 'checkResult', align: 'center', label: '检测结果', formart: v => v ? this.dict.getLabel('epidemicRecentTestResult', v) : '-' },
{
- prop: 'startAreaName',
+ prop: 'status',
align: 'center',
- label: '出发地区',
+ label: '健康状态',
render: (h, {row}) => {
- return h('span', null, row.startAreaName + row.startAreaName)
+ return h('span', {
+ style: {
+ color: row.status === '0' ? 'red' : '#333'
+ }
+ }, row.status === '0' ? '异常' : '正常')
}
},
- { prop: 'arriveTime', align: 'center', label: '到达时间' },
- {
- prop: 'startAreaName',
- align: 'center',
- label: '出发地区',
- render: (h, {row}) => {
- return h('span', null, row.arriveAreaName + row.arriveAddress)
- }
- },
- { prop: 'checkTime', align: 'center', label: '核酸日期', formart: v => v.split(' ')[0] },
- { prop: 'status', align: 'center', label: '健康状态', formart: v => v === '0' ? '异常' : '正常' },
- // { prop: 'type', align: 'center', label: '今日上报' }
+ { prop: 'today', align: 'center', label: '今日上报', formart: v => v === '0' ? '未上报' : '已上报' },
],
- ids: [],
tableData: [],
total: 0,
loading: false,
@@ -132,7 +159,7 @@
this.disabledLevel = this.user.info.areaList.length - 1
this.search.areaId = this.user.info.areaId
this.loading = true
- this.dict.load(['marriageType', 'marriagePersonType', 'modeType']).then(() => {
+ this.dict.load(['epidemicTouchInFourteen', 'epidemicRecentHealth', 'epidemicRecentTestResult', 'epidemicHealthCode', 'epidemicVaccineTime']).then(() => {
this.getList()
})
},
@@ -176,7 +203,7 @@
},
getTotalInfo () {
- this.instance.post(`/app/appepidemicbackhomerecord/statistic`).then(res => {
+ this.instance.post(`/app/appepidemicreportmember/statistic`).then(res => {
if (res.code == 0) {
this.info = res.data
}
diff --git a/packages/3.0.0/AppReturnHomeRegister/components/Detail.vue b/packages/3.0.0/AppReturnHomeRegister/components/Detail.vue
index 329d0c44..d2c32611 100644
--- a/packages/3.0.0/AppReturnHomeRegister/components/Detail.vue
+++ b/packages/3.0.0/AppReturnHomeRegister/components/Detail.vue
@@ -29,7 +29,7 @@
-
+
@@ -185,6 +185,7 @@
}).then(res => {
if (res.code == 0) {
this.$message.success('解除异常成功!')
+ this.currIndex = 0
this.getInfo(this.params.id)
}
})
diff --git a/packages/3.0.0/AppReturnHomeRegister/components/List.vue b/packages/3.0.0/AppReturnHomeRegister/components/List.vue
index ec3ccf87..312e33a0 100644
--- a/packages/3.0.0/AppReturnHomeRegister/components/List.vue
+++ b/packages/3.0.0/AppReturnHomeRegister/components/List.vue
@@ -27,6 +27,13 @@
+
+
导出
@@ -83,7 +90,15 @@
size: 10,
name: '',
areaId: '',
+ status: ''
},
+ dictList: [{
+ dictName: '否',
+ dictValue: '0'
+ }, {
+ dictName: '是',
+ dictValue: '1'
+ }],
info: {},
colConfigs: [
{ prop: 'name', label: '姓名' },