疫情防控

2022-01-12 10:49:06 +08:00
parent bdfc9cf3c7
commit 7f56764456
4 changed files with 304 additions and 84 deletions
--- a/packages/3.0.0/AppHealthReport/components/Detail.vue
+++ b/packages/3.0.0/AppHealthReport/components/Detail.vue
@@ -11,57 +11,135 @@
          <template #content>
            <ai-wrapper
              label-width="120px">
-              <ai-info-item label="姓名" :value="info.title"></ai-info-item>
-              <ai-info-item label="填报时间" :value="info.areaName"></ai-info-item>
-              <ai-info-item label="身份证号" :value="info.beginTime"></ai-info-item>
-              <ai-info-item label="手机号码" :value="info.endTime"></ai-info-item>
-              <ai-info-item label="人员类别" isLine :value="info.address"></ai-info-item>
-            </ai-wrapper>
-          </template>
-        </ai-card>
-        <ai-card title="行程信息">
-          <template #content>
-            <ai-wrapper
-              label-width="120px">
-              <ai-info-item label="出发时间" :value="info.title"></ai-info-item>
-              <ai-info-item label="出发地区" :value="info.areaName"></ai-info-item>
-              <ai-info-item label="出发地址" isLine :value="info.beginTime"></ai-info-item>
-              <ai-info-item label="出行方式" :value="info.endTime"></ai-info-item>
-              <ai-info-item label="行程描述" isLine :value="info.address"></ai-info-item>
-              <ai-info-item label="到达时间" :value="info.contactPerson"></ai-info-item>
-              <ai-info-item label="到达地区" isLine :value="info.contactPhone"></ai-info-item>
-              <ai-info-item label="返乡地址" isLine :value="info.contactPerson"></ai-info-item>
-            </ai-wrapper>
-          </template>
-        </ai-card>
-        <ai-card title="健康状况">
-          <template #content>
-            <ai-wrapper
-              label-width="120px">
-              <ai-info-item label="体温" :value="info.title"></ai-info-item>
-              <ai-info-item label="当前健康状况" :value="info.areaName"></ai-info-item>
-            </ai-wrapper>
-          </template>
-        </ai-card>
-        <ai-card title="核酸检测">
-          <template #content>
-            <ai-wrapper
-              label-width="120px">
-              <ai-info-item label="检测日期" :value="info.title"></ai-info-item>
-              <ai-info-item label="检测结果" :value="info.areaName"></ai-info-item>
-              <ai-info-item label="本人健康码截图" isLine></ai-info-item>
+              <ai-info-item label="姓名" :value="info.name"></ai-info-item>
+              <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.areaName"></ai-info-item>
+              <ai-info-item label="本地地址" isLine :value="info.address"></ai-info-item>
            </ai-wrapper>
          </template>
        </ai-card>
      </div>
-      <ai-card title="异常处理" v-show="currIndex === 1">
+      <ai-card title="每日上报" v-show="currIndex === 1">
        <template #content>
-          <ai-wrapper
-            label-width="120px">
-            <ai-info-item label="异常状况" :value="info.title"></ai-info-item>
-          </ai-wrapper>
+          <ai-table
+            class="detail-table__table"
+            :tableData="tableData"
+            :col-configs="colConfigs"
+            :total="total"
+            :current.sync="search.current"
+            :size.sync="search.size"
+            @getList="getList">
+            <el-table-column slot="options" width="140px" fixed="right" label="操作" align="center">
+              <template slot-scope="{ row }">
+                <div class="table-options">
+                  <el-button type="text" @click="toDetail(row.id)">详情</el-button>
+                </div>
+              </template>
+            </el-table-column>
+          </ai-table>
+          <ai-dialog
+            :visible.sync="isShow"
+            width="890px"
+            customFooter
+            title="上报详情">
+            <ai-bar title="健康状况"></ai-bar>
+            <ai-wrapper
+              label-width="120px">
+              <ai-info-item label="当前体温">
+                <span :style="{color: reportInfo.temperature < 35 || reportInfo.temperature > 38 ? '#FF4466' : '#42D784'}">{{ reportInfo.temperature }}℃</span>
+              </ai-info-item>
+              <ai-info-item label="14天内是否接触新冠确诊或疑似患者">
+                <span :style="{color: reportInfo.touchInFourteen === '0' ? '#42D784' : '#FF4466'}">{{ $dict.getLabel('epidemicTouchInFourteen', reportInfo.touchInFourteen) }}</span>
+              </ai-info-item>
+              <ai-info-item label="当前健康状况" isLine>
+                <span :style="{color: !reportInfo.isHealth ? '#42D784' : '#FF4466'}">{{ reportInfo.healthName }}</span>
+              </ai-info-item>
+            </ai-wrapper>
+            <ai-bar title="核酸检测信息"></ai-bar>
+            <ai-wrapper
+              label-width="120px">
+              <ai-info-item label="检测日期">
+                <span>{{ reportInfo.checkTime && reportInfo.checkTime.split(' ')[0] }}</span>
+              </ai-info-item>
+              <ai-info-item label="检测结果">
+                <span :style="{color: reportInfo.checkResult === '0' ? '#42D784' : '#FF4466'}">{{ $dict.getLabel('epidemicRecentTestResult', reportInfo.checkResult) }}</span>
+              </ai-info-item>
+              <ai-info-item label="健康码状态">
+                <span :style="{color: reportInfo.healthCode === '0' ? '#42D784' : '#FF4466'}">{{ $dict.getLabel('epidemicHealthCode', reportInfo.healthCode) }}</span>
+              </ai-info-item>
+              <ai-info-item label="已接种疫苗次数">
+                <span :style="{color: reportInfo.vaccine !== '0' ? '#42D784' : '#FF4466'}">{{ $dict.getLabel('epidemicVaccineTime', reportInfo.vaccine) }}</span>
+              </ai-info-item>
+              <ai-info-item label="本人健康码截图" isLine>
+                <ai-uploader
+                  :instance="instance"
+                  v-model="reportInfo.checkPhoto"
+                  disabled
+                  :limit="9">
+                </ai-uploader>
+              </ai-info-item>
+            </ai-wrapper>
+            <div class="dialog-footer" slot="footer">
+              <el-button @click="isShow = false">关闭</el-button>
+            </div>
+          </ai-dialog>
        </template>
      </ai-card>
+      <div v-show="currIndex === 2">
+        <ai-card title="异常处理">
+          <template #right>
+            <el-button type="primary" @click="release">解除异常</el-button>
+          </template>
+          <template #content>
+            <ai-wrapper
+              label-width="120px">
+              <ai-info-item label="姓名" :value="info.name"></ai-info-item>
+              <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="异常状况">
+                <span :style="{color: info.unusual ? 'red' : '#333'}">{{ info.unusual || '-' }}</span>
+              </ai-info-item>
+            </ai-wrapper>
+          </template>
+        </ai-card>
+        <ai-card title="异常情况记录">
+          <template #right>
+            <el-button type="primary" @click="isShowAdd = true">添加</el-button>
+          </template>
+          <template #content>
+            <ai-table
+              :tableData="recordList"
+              :col-configs="recordConfigs"
+              :total="recordTotal"
+              :current.sync="recordSerch.current"
+              :size.sync="recordSerch.size"
+              @getList="getRecordList">
+              <el-table-column slot="options" width="120px" fixed="right" label="操作" align="center">
+                <template slot-scope="{ row }">
+                  <div class="table-options">
+                    <el-button type="text" @click="remove(row.id)">删除</el-button>
+                  </div>
+                </template>
+              </el-table-column>
+            </ai-table>
+          </template>
+        </ai-card>
+        <ai-dialog
+          :visible.sync="isShowAdd"
+          width="800px"
+          @close="form.content = ''"
+          title="添加异常记录"
+          @onConfirm="onConfirm">
+          <el-form class="ai-form" label-width="120px" :model="form" ref="form">
+            <el-form-item label="记录" prop="content" style="width: 100%;" :rules="[{ required: true, message: '请输入记录' }]">
+              <el-input type="textarea" :rows="5" :maxlength="500" v-model="form.content" clearable placeholder="请输入记录" show-word-limit></el-input>
+            </el-form-item>
+          </el-form>
+        </ai-dialog>
+      </div>
    </template>
  </ai-detail>
 </template>
@@ -81,44 +159,143 @@
        total: 0,
        info: {},
        id: '',
+        isShowAdd: false,
+        recordTotal: 0,
+        recordSerch: {
+          current: 1,
+          size: 10
+        },
        search: {
          current: 1,
          size: 10
        },
+        form: {
+          content: ''
+        },
+        recordConfigs: [
+          {prop: 'content', label: '说明', align: 'center' },
+          {prop: 'createTime', label: '创建时间', align: 'center'}
+        ],
+        reportInfo: {},
+        isShow: false,
        currIndex: 0,
        tableData: [],
+        recordList: [],
        colConfigs: [
-          {prop: 'name', label: '报名人员名称', align: 'center' },
-          {prop: 'createTime', label: '报名时间', align: 'center'},
-          {prop: 'phone', label: '联系方式', align: 'center' }
+          {prop: 'createTime', label: '上报日期', align: 'center', dateFormart: 'YYYY-MM-DD'},
+          {prop: 'status', label: '健康状态', align: 'center', formart: v => v === '0' ? '异常' : '正常' }
        ],
-        tabList: ['基本信息', '异常处理']
+        tabList: ['基本信息', '每日上报']
      }
    },

    created () {
      if (this.params && this.params.id) {
        this.id = this.params.id
-        // this.getInfo(this.params.id)
-        // this.getList(this.params.id)
+        this.dict.load(['epidemicRecentHealth', 'epidemicRecentTravel', 'epidemicTouchInFourteen', 'epidemicMemberType', 'epidemicRecentTestResult']).then(() => {
+          this.getInfo(this.params.id)
+          this.getList(this.params.id)
+          this.getRecordList(this.params.id)
+        })
      }
    },

    methods: {
      getInfo (id) {
-        this.instance.post(`/app/appvillageactivityinfo/queryDetailById?id=${id}`).then(res => {
+        this.instance.post(`/app/appepidemicreportmember/queryDetailById?id=${id}`).then(res => {
          if (res.code === 0) {
            this.info = res.data
-            // this.info.url = res.data.url ? JSON.parse(res.data.url) : []
+            if (res.data.status === '0') {
+              this.tabList = ['基本信息', '每日上报', '异常处理']
+            } else {
+              this.tabList = ['基本信息', '每日上报']
+            }
+            this.currIndex = 0
+          }
+        })
+      },
+
+      getRecordList (id) {
+        this.instance.post(`/app/appepidemicunusuallog/list`, null, {
+          params: {
+            ...this.search,
+            recordId: id
+          }
+        }).then(res => {
+          if (res.code == 0) {
+            this.recordList = res.data.records
+            this.recordTotal = res.data.total
+          }
+        })
+      },
+
+      onConfirm() {
+        this.$refs.form.validate(v => {
+          if (v) {
+            this.instance.post('/app/appepidemicunusuallog/addOrUpdate', {
+              ...this.form,
+              recordId: this.params.id
+            }).then(res => {
+              if (res?.code == 0) {
+                this.isShowAdd = false
+                this.getRecordList(this.params.id)
+                this.$message.success('添加成功!')
+              }
+            })
+          }
+        })
+      },
+
+      release () {
+        this.$confirm('确定解除异常？').then(() => {
+          this.instance.post(`/app/appepidemicreportmember/release`, {
+            id: this.params.id
+          }).then(res => {
+            if (res.code == 0) {
+              this.$message.success('解除异常成功！')
+              this.currIndex = 0
+              this.getInfo(this.params.id)
+            }
+          })
+        })
+      },
+
+      remove(id) {
+        this.$confirm('确定删除该数据？').then(() => {
+          this.instance.post(`/app/appepidemicunusuallog/delete?ids=${id}`).then(res => {
+            if (res.code == 0) {
+              this.$message.success('删除成功！')
+              this.getList(this.params.id)
+            }
+          })
+        })
+      },
+
+      toDetail (id) {
+        this.instance.post(`/app/appepidemichealthreport/queryDetailById?id=${id}`).then(res => {
+          if (res.code === 0) {
+            this.reportInfo = res.data
+            this.reportInfo.checkPhoto = JSON.parse(res.data.checkPhoto)
+            let healthName = ''
+            this.reportInfo.isHealth = false
+            res.data.health.split(',').forEach(v => {
+              if (v > 0) {
+                this.reportInfo.isHealth = true
+              }
+              healthName = healthName + this.dict.getLabel('epidemicRecentHealth', v)
+            })
+            this.reportInfo.healthName = healthName
+
+            this.isShow = true
          }
        })
      },

      getList (id) {
-        this.instance.post(`/app/appvillageactivityuser/list`, null, {
+        this.instance.post(`/app/appepidemichealthreport/list`, null, {
          params: {
            ...this.search,
-            activityId: id
+            memberId: id
          }
        }).then(res => {
          if (res.code == 0) {
--- a/packages/3.0.0/AppHealthReport/components/List.vue
+++ b/packages/3.0.0/AppHealthReport/components/List.vue
@@ -4,29 +4,39 @@
    <template slot="content">
      <div class="statistics-top">
        <div class="statistics-top__item">
-          <span>返乡人数</span>
+          <span>上报人数</span>
          <h2 style="color: #2266FF;">{{ info.total }}</h2>
        </div>
        <div class="statistics-top__item">
-          <span>今日新增返乡</span>
+          <span>今日上报</span>
          <h2 style="color: #22AA99;">{{ info.today }}</h2>
        </div>
        <div class="statistics-top__item">
-          <span>异常人数</span>
-          <h2 style="color: #F8B425">{{ info.unusual }}</h2>
+          <span>今日未报</span>
+          <h2 style="color: #F8B425">{{ info.unReport }}</h2>
        </div>
        <div class="statistics-top__item">
-          <span>今日异常人数</span>
-          <h2 style="color: red">{{ info.todayUnusual }}</h2>
-        </div>
-        <div class="statistics-top__item">
-          <span>异常处理</span>
-          <h2 style="color: red">{{ info.release }}</h2>
+          <span>今日异常</span>
+          <h2 style="color: red">{{ info.unusual }}</h2>
        </div>
      </div>
      <div class="content">
        <ai-search-bar bottomBorder>
          <template #left>
+            <ai-select
+              v-model="search.checkResult"
+              clearable
+              placeholder="请选择检查结果"
+              :selectList="dict.getDict('epidemicRecentTestResult')"
+              @change="search.current = 1, getList()">
+            </ai-select>
+            <ai-select
+              v-model="search.today"
+              clearable
+              placeholder="今日是否上报"
+              :selectList="dictList"
+              @change="search.current = 1, getList()">
+            </ai-select>
            <ai-download :instance="instance" url="/app/apphomesteadinfo/export" :params="param" fileName="宅基地管理模板" :disabled="tableData.length == 0">
              <el-button icon="iconfont iconExported" :disabled="tableData.length == 0">导出</el-button>
            </ai-download>
@@ -52,6 +62,17 @@
          :current.sync="search.current"
          :size.sync="search.size"
          @getList="getList">
+          <el-table-column slot="healthCode" align="center" label="健康码">
+            <template slot-scope="{ row }">
+              <ai-uploader
+                v-if="row.healthCode"
+                :instance="instance"
+                :value="JSON.parse(row.healthCode)"
+                disabled
+                :limit="1">
+              </ai-uploader>
+            </template>
+          </el-table-column>
          <el-table-column slot="options" width="140px" fixed="right" label="操作" align="center">
            <template slot-scope="{ row }">
              <div class="table-options">
@@ -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
          }
--- a/packages/3.0.0/AppReturnHomeRegister/components/Detail.vue
+++ b/packages/3.0.0/AppReturnHomeRegister/components/Detail.vue
@@ -29,7 +29,7 @@
              <ai-info-item label="出行方式" :value="dict.getLabel('epidemicRecentTravel', info.travelType)"></ai-info-item>
              <ai-info-item label="行程描述" isLine :value="info.description"></ai-info-item>
              <ai-info-item label="到达时间" :value="info.arriveTime"></ai-info-item>
-              <ai-info-item label="到达地区" isLine :value="info.arriveAreaName"></ai-info-item>
+              <ai-info-item label="到达地区" :value="info.arriveAreaName"></ai-info-item>
              <ai-info-item label="返乡地址" isLine :value="info.arriveAddress"></ai-info-item>
            </ai-wrapper>
          </template>
@@ -185,6 +185,7 @@
          }).then(res => {
            if (res.code == 0) {
              this.$message.success('解除异常成功！')
+              this.currIndex = 0
              this.getInfo(this.params.id)
            }
          })
--- a/packages/3.0.0/AppReturnHomeRegister/components/List.vue
+++ b/packages/3.0.0/AppReturnHomeRegister/components/List.vue
@@ -27,6 +27,13 @@
      <div class="content">
        <ai-search-bar bottomBorder>
          <template #left>
+            <ai-select
+              v-model="search.status"
+              clearable
+              placeholder="请选择健康状态"
+              :selectList="dictList"
+              @change="search.current = 1, getList()">
+            </ai-select>
            <ai-download :instance="instance" url="/app/apphomesteadinfo/export" :params="param" fileName="宅基地管理模板" :disabled="tableData.length == 0">
              <el-button icon="iconfont iconExported" :disabled="tableData.length == 0">导出</el-button>
            </ai-download>
@@ -83,7 +90,15 @@
          size: 10,
          name: '',
          areaId: '',
+          status: ''
        },
+        dictList: [{
+          dictName: '否',
+          dictValue: '0'
+        }, {
+          dictName: '是',
+          dictValue: '1'
+        }],
        info: {},
        colConfigs: [
          { prop: 'name', label: '姓名' },