From f87282a19701a2023fbd8c60b759cba63fcd72bd Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Fri, 20 Aug 2021 17:45:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epidemic/persontesting-add-or-update.vue  | 259 +++++++++++------
 .../modules/epidemic/persontesting-look.vue   | 263 ++++++++++++++++++
 src/views/modules/epidemic/persontesting.vue  |  67 +++--
 3 files changed, 482 insertions(+), 107 deletions(-)
 create mode 100644 src/views/modules/epidemic/persontesting-look.vue

diff --git a/src/views/modules/epidemic/persontesting-add-or-update.vue b/src/views/modules/epidemic/persontesting-add-or-update.vue
index 6b0b091..0794247 100644
--- a/src/views/modules/epidemic/persontesting-add-or-update.vue
+++ b/src/views/modules/epidemic/persontesting-add-or-update.vue
@@ -1,57 +1,89 @@
 <template>
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-          <el-form-item label="姓名" prop="name">
-          <el-input v-model="dataForm.name" placeholder="姓名"></el-input>
+          <el-form-item label="姓名" prop="name" label-width="120px">
+          <el-input v-model="dataForm.name" placeholder="姓名" style="width:250px"></el-input>
       </el-form-item>
-          <el-form-item label="性别" prop="sex">
-          <el-input v-model="dataForm.sex" placeholder="性别"></el-input>
-      </el-form-item>
-          <el-form-item label="民族" prop="nation">
-          <el-input v-model="dataForm.nation" placeholder="民族"></el-input>
-      </el-form-item>
-          <el-form-item label="出生日期" prop="birthday">
-          <el-input v-model="dataForm.birthday" placeholder="出生日期"></el-input>
-      </el-form-item>
-          <el-form-item label="住址" prop="address">
-          <el-input v-model="dataForm.address" placeholder="住址"></el-input>
-      </el-form-item>
-          <el-form-item label="身份证号码" prop="idcard">
-          <el-input v-model="dataForm.idcard" placeholder="身份证号码"></el-input>
-      </el-form-item>
-          <el-form-item label="签发机关" prop="organ">
-          <el-input v-model="dataForm.organ" placeholder="签发机关"></el-input>
-      </el-form-item>
-          <el-form-item label="照片base64编码" prop="imgCode">
-          <el-input v-model="dataForm.imgCode" placeholder="照片base64编码"></el-input>
-      </el-form-item>
-          <el-form-item label="照片地址" prop="imgUrl">
-          <el-input v-model="dataForm.imgUrl" placeholder="照片地址"></el-input>
-      </el-form-item>
-          <el-form-item label="核酸接测结果" prop="testingResult">
-          <el-input v-model="dataForm.testingResult" placeholder="核酸接测结果"></el-input>
-      </el-form-item>
-          <el-form-item label="核酸检测时间" prop="testingTime">
-          <el-input v-model="dataForm.testingTime" placeholder="核酸检测时间"></el-input>
-      </el-form-item>
-          <el-form-item label="乐观锁" prop="revision">
-          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
-      </el-form-item>
-          <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
-      </el-form-item>
-          <el-form-item label="创建时间" prop="createdTime">
-          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
-      </el-form-item>
-          <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
-      </el-form-item>
-          <el-form-item label="更新时间" prop="updatedTime">
-          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
-      </el-form-item>
-          <el-form-item label="逻辑删除标识" prop="delFlag">
-          <el-input v-model="dataForm.delFlag" placeholder="逻辑删除标识"></el-input>
+          <el-form-item label="性别" prop="sex" label-width="120px">
+          <el-input v-model="dataForm.sex" placeholder="性别"style="width:250px"></el-input>
       </el-form-item>
+<!--          <el-form-item label="民族" prop="nation" label-width="120px">-->
+<!--          <el-input v-model="dataForm.nation" placeholder="民族"style="width:250px"></el-input>-->
+<!--      </el-form-item>-->
+        <el-form-item label="身份证号码" prop="idcard" label-width="120px">
+            <el-input v-model="dataForm.idcard" placeholder="身份证号码"style="width:250px"></el-input>
+        </el-form-item>
+        <el-form-item label="签发机关" prop="organ" label-width="120px">
+            <el-input v-model="dataForm.organ" placeholder="签发机关"style="width:250px"></el-input>
+        </el-form-item>
+<!--          <el-form-item label="出生日期" prop="birthday" label-width="120px">-->
+<!--              <el-date-picker-->
+<!--                      v-model="dataForm.birthday"-->
+<!--                      type="date"-->
+<!--                      placeholder="出生日期"-->
+<!--                      value-format="yyyy-MM-dd"-->
+<!--                      format="yyyy-MM-dd"-->
+<!--                      style="width:250px">-->
+<!--              </el-date-picker>-->
+<!--      </el-form-item>-->
+        <el-form-item label="核酸检测时间" prop="testingTime" label-width="120px">
+            <el-date-picker
+                    v-model="dataForm.testingTime"
+                    type="datetime"
+                    placeholder="核酸检测时间"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    format="yyyy-MM-dd HH:mm:ss"
+                    style="width:250px">
+            </el-date-picker>
+        </el-form-item>
+<!--          <el-form-item label="照片base64编码" prop="imgCode">-->
+<!--          <el-input v-model="dataForm.imgCode" placeholder="照片base64编码"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="照片地址" prop="imgUrl">-->
+<!--          <el-input v-model="dataForm.imgUrl" placeholder="照片地址"></el-input>-->
+<!--      </el-form-item>-->
+        <el-form-item label="照片"
+                      v-loading="loading"
+                      prop="imgUrl"
+                      label-width="120px">
+            <el-upload class="avatar-uploader"
+                       :action="uploadUrl"
+                       :show-file-list="false"
+                       :on-success="handleAvatarSuccess"
+                       :before-upload="beforeAvatarUpload">
+                <img v-if="dataForm.imgUrl"
+                     :src="dataForm.imgUrl"
+                     class="avatar">
+                <i v-else
+                   class="el-icon-plus avatar-uploader-icon"></i>
+                <div slot="tip"
+                     class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
+            </el-upload>
+        </el-form-item>
+        <el-form-item label="住址" prop="address" label-width="120px">
+            <el-input v-model="dataForm.address" placeholder="住址"></el-input>
+        </el-form-item>
+<!--          <el-form-item label="核酸接测结果" prop="testingResult">-->
+<!--          <el-input v-model="dataForm.testingResult" placeholder="核酸接测结果"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="乐观锁" prop="revision">-->
+<!--          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="创建人" prop="createdBy">-->
+<!--          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="创建时间" prop="createdTime">-->
+<!--          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="更新人" prop="updatedBy">-->
+<!--          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="更新时间" prop="updatedTime">-->
+<!--          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="逻辑删除标识" prop="delFlag">-->
+<!--          <el-input v-model="dataForm.delFlag" placeholder="逻辑删除标识"></el-input>-->
+<!--      </el-form-item>-->
       </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
@@ -61,6 +93,7 @@
 </template>
 
 <script>
+import Cookies from 'js-cookie'
 import debounce from 'lodash/debounce'
 export default {
   data () {
@@ -85,7 +118,9 @@ export default {
         updatedBy: '',
         updatedTime: '',
         delFlag: ''
-      }
+      },
+        uploadUrl: '',
+        loading: false,
     }
   },
   computed: {
@@ -97,54 +132,63 @@ export default {
         sex: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        nation: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        birthday: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        address: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
+        // nation: [
+          //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          // ],
+          // birthday: [
+          //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          // ],
+          // address: [
+          //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          // ],
         idcard: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        organ: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        imgCode: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        imgUrl: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        testingResult: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
+        // organ: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // imgCode: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // imgUrl: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // testingResult: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
         testingTime: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        revision: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        createdBy: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        createdTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        updatedBy: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        updatedTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        delFlag: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ]
+        // revision: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // createdBy: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // createdTime: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // updatedBy: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // updatedTime: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // delFlag: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ]
       }
     }
   },
+    created () {
+        // this.visible = true
+        this.$nextTick(() => {
+            // this.dataForm.communityId = this.dataForm.streetId = this.dataForm.gridId = null
+            // 富文本
+            // this.hideUpload = false
+            this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${Cookies.get('token')}`
+        })
+    },
   methods: {
     init () {
       this.visible = true
@@ -155,9 +199,17 @@ export default {
         }
       })
     },
+      // 上传图片
+      handleAvatarSuccess (res, file) {
+          this.loading = false
+          this.dataForm.imgUrl = res.data.url
+      },
+      beforeAvatarUpload (file) {
+          this.loading = true
+      },
     // 获取信息
     getInfo () {
-      this.$http.get(`/news/persontesting/${this.dataForm.id}`).then(({ data: res }) => {
+      this.$http.get(`/custom/persontesting/${this.dataForm.id}`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
@@ -173,7 +225,7 @@ export default {
         if (!valid) {
           return false
         }
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/news/persontesting/', this.dataForm).then(({ data: res }) => {
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/custom/persontesting/', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }
@@ -192,3 +244,28 @@ export default {
   }
 }
 </script>
+<style>
+    .avatar-uploader .el-upload {
+        border: 1px dashed #d9d9d9;
+        border-radius: 6px;
+        cursor: pointer;
+        position: relative;
+        overflow: hidden;
+    }
+    .avatar-uploader .el-upload:hover {
+        border-color: #409eff;
+    }
+    .avatar-uploader-icon {
+        font-size: 28px;
+        color: #8c939d;
+        width: 178px;
+        height: 178px;
+        line-height: 178px;
+        text-align: center;
+    }
+    .avatar {
+        width: 178px;
+        height: 178px;
+        display: block;
+    }
+</style>
\ No newline at end of file
diff --git a/src/views/modules/epidemic/persontesting-look.vue b/src/views/modules/epidemic/persontesting-look.vue
new file mode 100644
index 0000000..93fabe4
--- /dev/null
+++ b/src/views/modules/epidemic/persontesting-look.vue
@@ -0,0 +1,263 @@
+<template>
+  <el-dialog :visible.sync="visible" title="查看" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item label="姓名：" prop="name" label-width="120px">
+              {{dataForm.name}}
+      </el-form-item>
+          <el-form-item label="性别：" prop="sex" label-width="120px">
+              {{dataForm.sex}}
+      </el-form-item>
+<!--          <el-form-item label="民族" prop="nation" label-width="120px">-->
+<!--          <el-input v-model="dataForm.nation" placeholder="民族"style="width:250px"></el-input>-->
+<!--      </el-form-item>-->
+        <el-form-item label="身份证号码：" prop="idcard" label-width="120px">
+            {{dataForm.idcard}}
+        </el-form-item>
+        <el-form-item label="签发机关：" prop="organ" label-width="120px">
+            {{dataForm.organ}}
+        </el-form-item>
+<!--          <el-form-item label="出生日期" prop="birthday" label-width="120px">-->
+<!--              <el-date-picker-->
+<!--                      v-model="dataForm.birthday"-->
+<!--                      type="date"-->
+<!--                      placeholder="出生日期"-->
+<!--                      value-format="yyyy-MM-dd"-->
+<!--                      format="yyyy-MM-dd"-->
+<!--                      style="width:250px">-->
+<!--              </el-date-picker>-->
+<!--      </el-form-item>-->
+        <el-form-item label="核酸检测时间：" prop="testingTime" label-width="120px">
+            {{dataForm.testingTime}}
+        </el-form-item>
+<!--          <el-form-item label="照片base64编码" prop="imgCode">-->
+<!--          <el-input v-model="dataForm.imgCode" placeholder="照片base64编码"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="照片地址" prop="imgUrl">-->
+<!--          <el-input v-model="dataForm.imgUrl" placeholder="照片地址"></el-input>-->
+<!--      </el-form-item>-->
+        <el-form-item label="照片："
+                      v-loading="loading"
+                      prop="imgUrl"
+                      label-width="120px">
+            <el-upload class="avatar-uploader"
+                       :action="uploadUrl"
+                       disabled
+                       :show-file-list="false"
+                       :on-success="handleAvatarSuccess"
+                       :before-upload="beforeAvatarUpload">
+                <img v-if="dataForm.imgUrl"
+                     :src="dataForm.imgUrl"
+                     class="avatar">
+                <i v-else
+                   class="el-icon-plus avatar-uploader-icon"></i>
+            </el-upload>
+        </el-form-item>
+        <el-form-item label="住址：" prop="address" label-width="120px">
+            {{dataForm.address}}
+        </el-form-item>
+<!--          <el-form-item label="核酸接测结果" prop="testingResult">-->
+<!--          <el-input v-model="dataForm.testingResult" placeholder="核酸接测结果"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="乐观锁" prop="revision">-->
+<!--          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="创建人" prop="createdBy">-->
+<!--          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="创建时间" prop="createdTime">-->
+<!--          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="更新人" prop="updatedBy">-->
+<!--          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="更新时间" prop="updatedTime">-->
+<!--          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="逻辑删除标识" prop="delFlag">-->
+<!--          <el-input v-model="dataForm.delFlag" placeholder="逻辑删除标识"></el-input>-->
+<!--      </el-form-item>-->
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('返回') }}</el-button>
+<!--      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>-->
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import Cookies from 'js-cookie'
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        name: '',
+        sex: '',
+        nation: '',
+        birthday: '',
+        address: '',
+        idcard: '',
+        organ: '',
+        imgCode: '',
+        imgUrl: '',
+        testingResult: '',
+        testingTime: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: '',
+        delFlag: ''
+      },
+        uploadUrl: '',
+        loading: false,
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        name: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        sex: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        // nation: [
+          //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          // ],
+          // birthday: [
+          //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          // ],
+          // address: [
+          //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          // ],
+        idcard: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        // organ: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // imgCode: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // imgUrl: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // testingResult: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        testingTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        // revision: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // createdBy: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // createdTime: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // updatedBy: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // updatedTime: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // delFlag: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ]
+      }
+    }
+  },
+    created () {
+        // this.visible = true
+        this.$nextTick(() => {
+            // this.dataForm.communityId = this.dataForm.streetId = this.dataForm.gridId = null
+            // 富文本
+            // this.hideUpload = false
+            this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${Cookies.get('token')}`
+        })
+    },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+      // 上传图片
+      handleAvatarSuccess (res, file) {
+          this.loading = false
+          this.dataForm.imgUrl = res.data.url
+      },
+      beforeAvatarUpload (file) {
+          this.loading = true
+      },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/custom/persontesting/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/custom/persontesting/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
+<style>
+    .avatar-uploader .el-upload {
+        border: 1px dashed #d9d9d9;
+        border-radius: 6px;
+        cursor: pointer;
+        position: relative;
+        overflow: hidden;
+    }
+    .avatar-uploader .el-upload:hover {
+        border-color: #409eff;
+    }
+    .avatar-uploader-icon {
+        font-size: 28px;
+        color: #8c939d;
+        width: 178px;
+        height: 178px;
+        line-height: 178px;
+        text-align: center;
+    }
+    .avatar {
+        width: 178px;
+        height: 178px;
+        display: block;
+    }
+</style>
\ No newline at end of file
diff --git a/src/views/modules/epidemic/persontesting.vue b/src/views/modules/epidemic/persontesting.vue
index 81c5ce5..379b191 100644
--- a/src/views/modules/epidemic/persontesting.vue
+++ b/src/views/modules/epidemic/persontesting.vue
@@ -2,12 +2,26 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__persontesting}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        <el-form-item label="姓名">
+          <el-input v-model="dataForm.name"
+                    placeholder="姓名"
+                    clearable></el-input>
+        </el-form-item>
+        <el-form-item label="身份证号码">
+          <el-input v-model="dataForm.idcard"
+                    placeholder="身份证号码"
+                    clearable></el-input>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary"
+                     @click="exportHandle()">信息导出</el-button>
+        </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('news:persontesting:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
@@ -16,29 +30,35 @@
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+<!--        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>-->
+        <el-table-column label="序号" header-align="center" align="center" width="50px">
+          <template slot-scope="scope">
+            {{scope.$index+1}}
+          </template>
+        </el-table-column>
 <!--        <el-table-column prop="id" label="ID" header-align="center" align="center"></el-table-column>-->
         <el-table-column prop="name" label="姓名" header-align="center" align="center"></el-table-column>
         <el-table-column prop="sex" label="性别" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="nation" label="民族" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="birthday" label="出生日期" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="address" label="住址" header-align="center" align="center"></el-table-column>
+<!--        <el-table-column prop="nation" label="民族" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="birthday" label="出生日期" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="address" label="住址" header-align="center" align="center"></el-table-column>-->
         <el-table-column prop="idcard" label="身份证号码" header-align="center" align="center"></el-table-column>
         <el-table-column prop="organ" label="签发机关" header-align="center" align="center"></el-table-column>
 <!--        <el-table-column prop="imgCode" label="照片base64编码" header-align="center" align="center"></el-table-column>-->
-        <el-table-column prop="imgUrl" label="照片地址" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="testingResult" label="核酸接测结果" header-align="center" align="center"></el-table-column>
+<!--        <el-table-column prop="imgUrl" label="照片地址" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="testingResult" label="核酸接测结果" header-align="center" align="center"></el-table-column>-->
         <el-table-column prop="testingTime" label="核酸检测时间" header-align="center" align="center"></el-table-column>
 <!--        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>-->
 <!--        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>-->
-<!--        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>-->
+        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
 <!--        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>-->
 <!--        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>-->
 <!--        <el-table-column prop="delFlag" label="逻辑删除标识" header-align="center" align="center"></el-table-column>-->
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('news:persontesting:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('news:persontesting:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+<!--            <el-button v-if="$hasPermission('news:persontesting:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>-->
+            <el-button type="text" size="small" @click="lookDetail(scope.row.id)">{{ $t('查看') }}</el-button>
+            <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -53,6 +73,7 @@
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <person-look v-if="lookVisible" ref="personLook" @refreshDataList="getDataList"></person-look>
     </div>
   </el-card>
 </template>
@@ -60,23 +81,37 @@
 <script>
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './persontesting-add-or-update'
+import PersonLook from './persontesting-look'
 export default {
   mixins: [mixinViewModule],
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/news/persontesting/page',
+        getDataListURL: '/custom/persontesting/page',
         getDataListIsPage: true,
-        deleteURL: '/news/persontesting',
-        deleteIsBatch: true
+        deleteURL: '/custom/persontesting',
+        deleteIsBatch: true,
+        exportURL: '/custom/persontesting/export'
       },
       dataForm: {
         id: ''
-      }
+      },
+      lookVisible:false
+
     }
   },
   components: {
-    AddOrUpdate
+    AddOrUpdate,
+    PersonLook
+  },
+  methods: {
+    lookDetail (id) {
+      this.lookVisible = true
+      this.$nextTick(() => {
+        this.$refs.personLook.dataForm.id = id
+        this.$refs.personLook.init()
+      })
+    }
   }
 }
 </script>