diff --git a/src/views/modules/epidemic/epidemicreportuserinfo.vue b/src/views/modules/epidemic/epidemicreportuserinfo.vue
index 20eae8e..96c5f2d 100644
--- a/src/views/modules/epidemic/epidemicreportuserinfo.vue
+++ b/src/views/modules/epidemic/epidemicreportuserinfo.vue
@@ -5,7 +5,8 @@
       <el-form :inline="true"
                :model="dataForm"
                @keyup.enter.native="beforeGetDataList()">
-        <el-form-item label="所属组织" label-width="90px">
+        <el-form-item label="所属组织"
+                      label-width="90px">
           <el-cascader v-model="deptIdList"
                        ref="deptTreeOld"
                        :options="options"
@@ -44,15 +45,16 @@
                     style="width:200px"></el-input>
         </el-form-item>
 
-
         <el-collapse style="width: 95%;margin-bottom: 15px">
           <el-collapse-item>
             <template slot="title">
               <div style="float: right">展开高级检索</div>
             </template>
             <el-form-item label="特殊人群"
-                          prop="specialCrowd" label-width="120px">
-              <el-select v-model="dataForm.specialCrowd" clearable
+                          prop="specialCrowd"
+                          label-width="120px">
+              <el-select v-model="dataForm.specialCrowd"
+                         clearable
                          placeholder="请选择">
                 <el-option v-for="item in specialCrowdList"
                            :key="item.dictValue"
@@ -61,15 +63,24 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="核酸检测状态" prop="checkState" label-width="120px">
-              <el-select v-model="dataForm.checkState" clearable placeholder="核酸检测状态">
-                <el-option v-for="item in checkStateList" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+            <el-form-item label="核酸检测状态"
+                          prop="checkState"
+                          label-width="120px">
+              <el-select v-model="dataForm.checkState"
+                         clearable
+                         placeholder="核酸检测状态">
+                <el-option v-for="item in checkStateList"
+                           :key="item.dictValue"
+                           :label="item.dictName"
+                           :value="item.dictValue">
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="已接种" label-width="120px"
+            <el-form-item label="已接种"
+                          label-width="120px"
                           prop="isInoculate">
-              <el-select v-model="dataForm.isInoculate" clearable
+              <el-select v-model="dataForm.isInoculate"
+                         clearable
                          placeholder="请选择">
                 <el-option v-for="item in inoculateStateArr"
                            :key="item.dictValue"
@@ -77,21 +88,30 @@
                            :value="item.dictValue">
                 </el-option>
               </el-select>
-              <el-tooltip class="item" effect="light" placement="top-end">
+              <el-tooltip class="item"
+                          effect="light"
+                          placement="top-end">
                 <div slot="content">
-                  未接种：从未接种过疫苗<br/>
-                  接种中：接种过疫苗，但没有完成全程接种<br/>
-                  接种完成：已经完成全程接种<br/>
-                  接种过：有过接种疫苗记录，包括接种中和接种完成记录<br/>
-                  第一针：没有完成全程接种，只接种过第一针<br/>
-                  第二针：没有完成全程接种，接种过第一针和第二针<br/>
+                  未接种：从未接种过疫苗<br />
+                  接种中：接种过疫苗，但没有完成全程接种<br />
+                  接种完成：已经完成全程接种<br />
+                  接种过：有过接种疫苗记录，包括接种中和接种完成记录<br />
+                  第一针：没有完成全程接种，只接种过第一针<br />
+                  第二针：没有完成全程接种，接种过第一针和第二针<br />
                 </div>
                 <i class="el-icon-question" />
               </el-tooltip>
             </el-form-item>
-            <el-form-item label="有无所属组织" prop="haveDept" label-width="120px">
-              <el-select v-model="dataForm.haveDept" clearable placeholder="有无所属组织">
-                <el-option v-for="item in haveDeptList" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+            <el-form-item label="有无所属组织"
+                          prop="haveDept"
+                          label-width="120px">
+              <el-select v-model="dataForm.haveDept"
+                         clearable
+                         placeholder="有无所属组织">
+                <el-option v-for="item in haveDeptList"
+                           :key="item.dictValue"
+                           :label="item.dictName"
+                           :value="item.dictValue">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -103,41 +123,103 @@
                         maxlength="500"
                         style="width:200px"></el-input>
             </el-form-item>
-            <el-form-item label="籍贯" prop="nativePlace" label-width="120px">
-              <el-input v-model="dataForm.nativePlace" placeholder="籍贯" clearable maxlength="49" style="width:200px"></el-input>
+            <el-form-item label="籍贯"
+                          prop="nativePlace"
+                          label-width="120px">
+              <el-input v-model="dataForm.nativePlace"
+                        placeholder="籍贯"
+                        clearable
+                        maxlength="49"
+                        style="width:200px"></el-input>
             </el-form-item>
-            <el-form-item label="房屋地址" prop="houseAddress" label-width="120px">
-              <el-input v-model="dataForm.houseAddress" placeholder="房屋地址" clearable maxlength="49" style="width:200px"></el-input>
+            <el-form-item label="房屋地址"
+                          prop="houseAddress"
+                          label-width="120px">
+              <el-input v-model="dataForm.houseAddress"
+                        placeholder="房屋地址"
+                        clearable
+                        maxlength="49"
+                        style="width:200px"></el-input>
             </el-form-item>
-            <el-form-item label="小区" prop="plot" label-width="120px">
-              <el-input v-model="dataForm.plot" placeholder="小区" clearable maxlength="49" style="width:200px"></el-input>
+            <el-form-item label="小区"
+                          prop="plot"
+                          label-width="120px">
+              <el-input v-model="dataForm.plot"
+                        placeholder="小区"
+                        clearable
+                        maxlength="49"
+                        style="width:200px"></el-input>
             </el-form-item>
-            <el-form-item label="楼号" prop="buildingNo" label-width="120px">
-              <el-input v-model="dataForm.buildingNo" placeholder="楼号" clearable maxlength="49" style="width:200px"></el-input>
+            <el-form-item label="楼号"
+                          prop="buildingNo"
+                          label-width="120px">
+              <el-input v-model="dataForm.buildingNo"
+                        placeholder="楼号"
+                        clearable
+                        maxlength="49"
+                        style="width:200px"></el-input>
             </el-form-item>
-            <el-form-item label="单元" prop="unit" label-width="120px">
-              <el-input v-model="dataForm.unit" placeholder="单元" clearable maxlength="49" style="width:200px"></el-input>
+            <el-form-item label="单元"
+                          prop="unit"
+                          label-width="120px">
+              <el-input v-model="dataForm.unit"
+                        placeholder="单元"
+                        clearable
+                        maxlength="49"
+                        style="width:200px"></el-input>
             </el-form-item>
-            <el-form-item label="房间号" prop="roomNo" label-width="120px">
-              <el-input v-model="dataForm.roomNo" placeholder="房间号" clearable maxlength="49" style="width:200px"></el-input>
+            <el-form-item label="房间号"
+                          prop="roomNo"
+                          label-width="120px">
+              <el-input v-model="dataForm.roomNo"
+                        placeholder="房间号"
+                        clearable
+                        maxlength="49"
+                        style="width:200px"></el-input>
             </el-form-item>
-            <el-form-item label="现居住地" prop="outLiveAddressDetail" label-width="120px">
-              <el-input v-model="dataForm.outLiveAddressDetail" placeholder="现居住地" clearable maxlength="49" style="width:200px"></el-input>
+            <el-form-item label="现居住地"
+                          prop="outLiveAddressDetail"
+                          label-width="120px">
+              <el-input v-model="dataForm.outLiveAddressDetail"
+                        placeholder="现居住地"
+                        clearable
+                        maxlength="49"
+                        style="width:200px"></el-input>
             </el-form-item>
-            <el-form-item label="性别" prop="gender" label-width="120px">
-              <el-select v-model="dataForm.gender" placeholder="性别" clearable>
-                <el-option v-for="item in genderArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" >
+            <el-form-item label="性别"
+                          prop="gender"
+                          label-width="120px">
+              <el-select v-model="dataForm.gender"
+                         placeholder="性别"
+                         clearable>
+                <el-option v-for="item in genderArr"
+                           :key="item.dictValue"
+                           :label="item.dictName"
+                           :value="item.dictValue">
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="民族" prop="nation" label-width="120px">
-                <el-input v-model="dataForm.nation" placeholder="民族" clearable maxlength="49" style="width:200px"></el-input>
+            <el-form-item label="民族"
+                          prop="nation"
+                          label-width="120px">
+              <el-input v-model="dataForm.nation"
+                        placeholder="民族"
+                        clearable
+                        maxlength="49"
+                        style="width:200px"></el-input>
             </el-form-item>
-            <el-form-item label="曾用名" prop="formerName" label-width="120px">
-              <el-input v-model="dataForm.formerName" placeholder="曾用名" clearable maxlength="49" style="width:200px"></el-input>
+            <el-form-item label="曾用名"
+                          prop="formerName"
+                          label-width="120px">
+              <el-input v-model="dataForm.formerName"
+                        placeholder="曾用名"
+                        clearable
+                        maxlength="49"
+                        style="width:200px"></el-input>
             </el-form-item>
             <el-form-item label="出生日期"
-                          prop="startBirthdayTime" label-width="120px">
+                          prop="startBirthdayTime"
+                          label-width="120px">
               <el-date-picker v-model="dataForm.startBirthdayTime"
                               type="date"
                               :picker-options="pickerBeginDateBefore"
@@ -159,77 +241,186 @@
                               style="width:200px">
               </el-date-picker>
             </el-form-item>
-            <el-form-item label="文化程度" prop="standardOfCulture" label-width="120px">
-              <el-select v-model="dataForm.standardOfCulture" placeholder="文化程度" clearable>
-                <el-option v-for="item in standardOfCultureArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" >
+            <el-form-item label="文化程度"
+                          prop="standardOfCulture"
+                          label-width="120px">
+              <el-select v-model="dataForm.standardOfCulture"
+                         placeholder="文化程度"
+                         clearable>
+                <el-option v-for="item in standardOfCultureArr"
+                           :key="item.dictValue"
+                           :label="item.dictName"
+                           :value="item.dictValue">
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="健康状况" prop="health" label-width="120px">
-              <el-select v-model="dataForm.health" placeholder="健康状况" clearable>
-                <el-option v-for="item in healthArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" >
+            <el-form-item label="健康状况"
+                          prop="health"
+                          label-width="120px">
+              <el-select v-model="dataForm.health"
+                         placeholder="健康状况"
+                         clearable>
+                <el-option v-for="item in healthArr"
+                           :key="item.dictValue"
+                           :label="item.dictName"
+                           :value="item.dictValue">
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="婚姻状况" prop="maritalStatus" label-width="120px">
-              <el-select v-model="dataForm.maritalStatus" placeholder="婚姻状况" clearable>
-                <el-option v-for="item in maritalStatusArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" >
+            <el-form-item label="婚姻状况"
+                          prop="maritalStatus"
+                          label-width="120px">
+              <el-select v-model="dataForm.maritalStatus"
+                         placeholder="婚姻状况"
+                         clearable>
+                <el-option v-for="item in maritalStatusArr"
+                           :key="item.dictValue"
+                           :label="item.dictName"
+                           :value="item.dictValue">
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="与户主关系" prop="relation" label-width="120px">
-              <el-input v-model="dataForm.relation" placeholder="与户主关系" clearable maxlength="49" style="width:200px"></el-input>
+            <el-form-item label="与户主关系"
+                          prop="relation"
+                          label-width="120px">
+              <el-input v-model="dataForm.relation"
+                        placeholder="与户主关系"
+                        clearable
+                        maxlength="49"
+                        style="width:200px"></el-input>
             </el-form-item>
-            <el-form-item label="政治面貌" prop="politicsStatus" label-width="120px">
-              <el-select v-model="dataForm.politicsStatus" placeholder="政治面貌" clearable>
-                <el-option v-for="item in politicsStatusArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" >
+            <el-form-item label="政治面貌"
+                          prop="politicsStatus"
+                          label-width="120px">
+              <el-select v-model="dataForm.politicsStatus"
+                         placeholder="政治面貌"
+                         clearable>
+                <el-option v-for="item in politicsStatusArr"
+                           :key="item.dictValue"
+                           :label="item.dictName"
+                           :value="item.dictValue">
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="宗教信仰" prop="faith" label-width="120px">
-              <el-input v-model="dataForm.faith" placeholder="宗教信仰" clearable maxlength="49" style="width:200px"></el-input>
+            <el-form-item label="宗教信仰"
+                          prop="faith"
+                          label-width="120px">
+              <el-input v-model="dataForm.faith"
+                        placeholder="宗教信仰"
+                        clearable
+                        maxlength="49"
+                        style="width:200px"></el-input>
             </el-form-item>
-            <el-form-item label="毕业院校" prop="graduateSchool" label-width="120px">
-              <el-input v-model="dataForm.graduateSchool" placeholder="毕业院校" clearable maxlength="49" style="width:200px"></el-input>
+            <el-form-item label="毕业院校"
+                          prop="graduateSchool"
+                          label-width="120px">
+              <el-input v-model="dataForm.graduateSchool"
+                        placeholder="毕业院校"
+                        clearable
+                        maxlength="49"
+                        style="width:200px"></el-input>
             </el-form-item>
-            <el-form-item label="专业" prop="professional" label-width="120px">
-              <el-input v-model="dataForm.professional" placeholder="专业" clearable maxlength="49" style="width:200px"></el-input>
+            <el-form-item label="专业"
+                          prop="professional"
+                          label-width="120px">
+              <el-input v-model="dataForm.professional"
+                        placeholder="专业"
+                        clearable
+                        maxlength="49"
+                        style="width:200px"></el-input>
             </el-form-item>
-            <el-form-item label="工作状态" prop="workStatus" label-width="120px">
-              <el-select v-model="dataForm.workStatus" placeholder="工作状态" clearable>
-                <el-option v-for="item in workStatusArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" >
+            <el-form-item label="工作状态"
+                          prop="workStatus"
+                          label-width="120px">
+              <el-select v-model="dataForm.workStatus"
+                         placeholder="工作状态"
+                         clearable>
+                <el-option v-for="item in workStatusArr"
+                           :key="item.dictValue"
+                           :label="item.dictName"
+                           :value="item.dictValue">
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="行业类别" prop="industryCategory" label-width="120px">
-              <el-input v-model="dataForm.industryCategory" placeholder="行业类别" clearable maxlength="49" style="width:200px"></el-input>
+            <el-form-item label="行业类别"
+                          prop="industryCategory"
+                          label-width="120px">
+              <el-input v-model="dataForm.industryCategory"
+                        placeholder="行业类别"
+                        clearable
+                        maxlength="49"
+                        style="width:200px"></el-input>
             </el-form-item>
-            <el-form-item label="工作单位" prop="workUnits" label-width="120px">
-              <el-input v-model="dataForm.workUnits" placeholder="工作单位" clearable maxlength="49" style="width:200px"></el-input>
+            <el-form-item label="工作单位"
+                          prop="workUnits"
+                          label-width="120px">
+              <el-input v-model="dataForm.workUnits"
+                        placeholder="工作单位"
+                        clearable
+                        maxlength="49"
+                        style="width:200px"></el-input>
             </el-form-item>
-            <el-form-item label="兵役状况" prop="military" label-width="120px">
-              <el-input v-model="dataForm.military" placeholder="兵役状况" clearable maxlength="49" style="width:200px"></el-input>
+            <el-form-item label="兵役状况"
+                          prop="military"
+                          label-width="120px">
+              <el-input v-model="dataForm.military"
+                        placeholder="兵役状况"
+                        clearable
+                        maxlength="49"
+                        style="width:200px"></el-input>
             </el-form-item>
-            <el-form-item label="人口类别" prop="peopleCategories" label-width="120px">
-              <el-select v-model="dataForm.peopleCategories" placeholder="人口类别" clearable>
-                <el-option v-for="item in peopleCategoriesArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" >
+            <el-form-item label="人口类别"
+                          prop="peopleCategories"
+                          label-width="120px">
+              <el-select v-model="dataForm.peopleCategories"
+                         placeholder="人口类别"
+                         clearable>
+                <el-option v-for="item in peopleCategoriesArr"
+                           :key="item.dictValue"
+                           :label="item.dictName"
+                           :value="item.dictValue">
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="有无车辆" prop="car" label-width="120px">
-              <el-input v-model="dataForm.car" placeholder="有无车辆" clearable maxlength="49" style="width:200px"></el-input>
+            <el-form-item label="有无车辆"
+                          prop="car"
+                          label-width="120px">
+              <el-input v-model="dataForm.car"
+                        placeholder="有无车辆"
+                        clearable
+                        maxlength="49"
+                        style="width:200px"></el-input>
             </el-form-item>
-            <el-form-item label="车牌号" prop="carNo" label-width="120px">
-              <el-input v-model="dataForm.carNo" placeholder="车牌号" clearable maxlength="49" style="width:200px"></el-input>
+            <el-form-item label="车牌号"
+                          prop="carNo"
+                          label-width="120px">
+              <el-input v-model="dataForm.carNo"
+                        placeholder="车牌号"
+                        clearable
+                        maxlength="49"
+                        style="width:200px"></el-input>
             </el-form-item>
-            <el-form-item label="人户状况" prop="hushaiStatus" label-width="120px">
-              <el-input v-model="dataForm.hushaiStatus" placeholder="人户状况" clearable maxlength="49" style="width:200px"></el-input>
+            <el-form-item label="人户状况"
+                          prop="hushaiStatus"
+                          label-width="120px">
+              <el-input v-model="dataForm.hushaiStatus"
+                        placeholder="人户状况"
+                        clearable
+                        maxlength="49"
+                        style="width:200px"></el-input>
             </el-form-item>
-            <el-form-item label="血型" prop="bloodType" label-width="120px">
-              <el-input v-model="dataForm.bloodType" placeholder="血型" clearable maxlength="49" style="width:200px"></el-input>
+            <el-form-item label="血型"
+                          prop="bloodType"
+                          label-width="120px">
+              <el-input v-model="dataForm.bloodType"
+                        placeholder="血型"
+                        clearable
+                        maxlength="49"
+                        style="width:200px"></el-input>
             </el-form-item>
             <el-form-item label="核酸检测时间"
-                          prop="startCheckTime" label-width="120px">
+                          prop="startCheckTime"
+                          label-width="120px">
               <el-date-picker v-model="dataForm.startCheckTime"
                               type="date"
                               :picker-options="pickerBeginCheckDateBefore"
@@ -251,18 +442,38 @@
                               style="width:200px">
               </el-date-picker>
             </el-form-item>
-            <el-form-item label="户口类型" prop="accountType" label-width="120px">
-              <el-input v-model="dataForm.accountType" placeholder="户口类型" clearable maxlength="49" style="width:200px"></el-input>
+            <el-form-item label="户口类型"
+                          prop="accountType"
+                          label-width="120px">
+              <el-input v-model="dataForm.accountType"
+                        placeholder="户口类型"
+                        clearable
+                        maxlength="49"
+                        style="width:200px"></el-input>
             </el-form-item>
-            <el-form-item label="家庭类别" prop="familyCategory" label-width="120px">
-              <el-select v-model="dataForm.familyCategory" placeholder="家庭类别" clearable>
-                <el-option v-for="item in familyCategoryArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" >
+            <el-form-item label="家庭类别"
+                          prop="familyCategory"
+                          label-width="120px">
+              <el-select v-model="dataForm.familyCategory"
+                         placeholder="家庭类别"
+                         clearable>
+                <el-option v-for="item in familyCategoryArr"
+                           :key="item.dictValue"
+                           :label="item.dictName"
+                           :value="item.dictValue">
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="救助情况" prop="helpStatus" label-width="120px">
-              <el-select v-model="dataForm.helpStatus" placeholder="救助情况" clearable>
-                <el-option v-for="item in helpStatusArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" >
+            <el-form-item label="救助情况"
+                          prop="helpStatus"
+                          label-width="120px">
+              <el-select v-model="dataForm.helpStatus"
+                         placeholder="救助情况"
+                         clearable>
+                <el-option v-for="item in helpStatusArr"
+                           :key="item.dictValue"
+                           :label="item.dictName"
+                           :value="item.dictValue">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -277,18 +488,23 @@
                      @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" v-if="$hasPermission('epidemic:person:export')"
+          <el-button type="primary"
+                     v-if="$hasPermission('epidemic:person:export')"
                      @click="exports()">{{ $t('export') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('epidemicreportuserinfo:reset')" type="primary"  @click="resetState">重置核酸检测状态</el-button>
+          <el-button v-if="$hasPermission('epidemicreportuserinfo:reset')"
+                     type="primary"
+                     @click="resetState">重置核酸检测状态</el-button>
         </el-form-item>
 
-          <el-form-item>
-              <el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
-          </el-form-item>
+        <el-form-item>
+          <el-button type="danger"
+                     @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
 
-        <el-form-item label="导入网格" label-width="90px">
+        <el-form-item label="导入网格"
+                      label-width="90px">
           <el-cascader v-model="deptIdListUpload"
                        ref="deptTree"
                        :options="options"
@@ -297,7 +513,8 @@
           </el-cascader>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="beforeImportUser">导入</el-button>
+          <el-button type="primary"
+                     @click="beforeImportUser">导入</el-button>
         </el-form-item>
 
         <el-form-item>
@@ -306,30 +523,39 @@
                      :limit="1"
                      :on-success='uploadSuccess'
                      :on-error='errorExceed'>
-            <el-button id="importBut" style="display: none" type="primary">导入</el-button>
+            <el-button id="importBut"
+                       style="display: none"
+                       type="primary">导入</el-button>
           </el-upload>
         </el-form-item>
-<!--        <el-form-item>-->
-<!--          <el-upload class="upload-demo"-->
-<!--                     ref="upload"-->
-<!--                     v-loading="uploeadLoeading"-->
-<!--                     :action="uploadUrl"-->
-<!--                     :limit="1"-->
-<!--                     :on-success='uploadSuccess'-->
-<!--                     :on-error='errorExceed'-->
-<!--                     :before-upload='beforeUpload'-->
-<!--                     accept=".xls,.xlsx">-->
-<!--            <el-button type="primary">批量导入</el-button>-->
-<!--          </el-upload>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item>-->
-<!--          <el-button-->
-<!--                     type="primary"-->
-<!--                     @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>-->
-<!--        </el-form-item>-->
+        <!--        <el-form-item>-->
+        <!--          <el-upload class="upload-demo"-->
+        <!--                     ref="upload"-->
+        <!--                     v-loading="uploeadLoeading"-->
+        <!--                     :action="uploadUrl"-->
+        <!--                     :limit="1"-->
+        <!--                     :on-success='uploadSuccess'-->
+        <!--                     :on-error='errorExceed'-->
+        <!--                     :before-upload='beforeUpload'-->
+        <!--                     accept=".xls,.xlsx">-->
+        <!--            <el-button type="primary">批量导入</el-button>-->
+        <!--          </el-upload>-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item>-->
+        <!--          <el-button-->
+        <!--                     type="primary"-->
+        <!--                     @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>-->
+        <!--        </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 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 label="序号"
                          header-align="center"
                          align="center"
@@ -360,6 +586,67 @@
                          header-align="center"
                          align="center"
                          width="150"></el-table-column>
+
+        <el-table-column prop="checkStateName"
+                         label="核酸检测状态"
+                         header-align="center"
+                         align="center"
+                         width="150"></el-table-column>
+        <!--        <el-table-column prop="householdRegisterName"-->
+        <!--                         label="户籍地"-->
+        <!--                         header-align="center"-->
+        <!--                         align="center"-->
+        <!--                         width="150"></el-table-column>-->
+        <!--        <el-table-column prop="outLiveAddressName"-->
+        <!--                         label="现居住地名称"-->
+        <!--                         header-align="center"-->
+        <!--                         align="center"-->
+        <!--                         width="150"></el-table-column>-->
+        <!--        <el-table-column prop="street"-->
+        <!--                         label="街道/乡镇"-->
+        <!--                         header-align="center"-->
+        <!--                         align="center"-->
+        <!--                         width="150"-->
+        <!--                         show-overflow-tooltip></el-table-column>-->
+        <!--        <el-table-column prop="community"-->
+        <!--                         label="社区/村庄"-->
+        <!--                         header-align="center"-->
+        <!--                         align="center"-->
+        <!--                         width="180"-->
+        <!--                         show-overflow-tooltip></el-table-column>-->
+        <!--        <el-table-column prop="gridName"-->
+        <!--                         label="网格名称"-->
+        <!--                         header-align="center"-->
+        <!--                         align="center"-->
+        <!--                         width="110"></el-table-column>-->
+        <!--        <el-table-column prop="plot"-->
+        <!--                         label="小区"-->
+        <!--                         header-align="center"-->
+        <!--                         align="center"-->
+        <!--                         width="180"-->
+        <!--                         show-overflow-tooltip></el-table-column>-->
+        <!--        <el-table-column prop="buildingNo"-->
+        <!--                         label="楼号"-->
+        <!--                         header-align="center"-->
+        <!--                         align="center"-->
+        <!--                         width="100"-->
+        <!--                         show-overflow-tooltip></el-table-column>-->
+        <!--        <el-table-column prop="unit"-->
+        <!--                         label="单元号"-->
+        <!--                         header-align="center"-->
+        <!--                         align="center"-->
+        <!--                         width="100"></el-table-column>-->
+        <!--        <el-table-column prop="roomNo"-->
+        <!--                         label="房间号"-->
+        <!--                         header-align="center"-->
+        <!--                         align="center"-->
+        <!--                         width="100"></el-table-column>-->
+        <!-- <el-table-column prop="peopleCategories"
+                         label="人口类别"
+                         header-align="center"
+                         align="center"
+                         :formatter="peopleCategoriesFormat"
+                         width="180"></el-table-column> -->
         <el-table-column prop="isInoculate"
                          label="是否接种"
                          header-align="center"
@@ -369,71 +656,17 @@
             <!-- <el-tag size="small" :type="scope.row.vaccinationState === 0 ? 'danger' : 'success'">
               {{scope.row.vaccinationState === 2 ? '接种完成' : scope.row.vaccinationState === 0 ? '未接种' : '第'+scope.row.vaccinationNum+'针'}}
             </el-tag> -->
-            <el-tag v-if='scope.row.vaccinationState === 0' size="small" type="danger">未接种</el-tag>
-            <el-tag v-else-if='scope.row.vaccinationState === 1' size="small" type="success">第 {{scope.row.vaccinationNum}} 针</el-tag>
-            <el-tag v-else-if='scope.row.vaccinationState === 2' size="small" type="success">接种完成</el-tag>
+            <el-tag v-if='scope.row.vaccinationState === 0'
+                    size="small"
+                    type="danger">未接种</el-tag>
+            <el-tag v-else-if='scope.row.vaccinationState === 1'
+                    size="small"
+                    type="success">第 {{scope.row.vaccinationNum}} 针</el-tag>
+            <el-tag v-else-if='scope.row.vaccinationState === 2'
+                    size="small"
+                    type="success">接种完成</el-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="checkStateName"
-                         label="核酸检测状态"
-                         header-align="center"
-                         align="center"
-                         width="150"></el-table-column>
-<!--        <el-table-column prop="householdRegisterName"-->
-<!--                         label="户籍地"-->
-<!--                         header-align="center"-->
-<!--                         align="center"-->
-<!--                         width="150"></el-table-column>-->
-<!--        <el-table-column prop="outLiveAddressName"-->
-<!--                         label="现居住地名称"-->
-<!--                         header-align="center"-->
-<!--                         align="center"-->
-<!--                         width="150"></el-table-column>-->
-<!--        <el-table-column prop="street"-->
-<!--                         label="街道/乡镇"-->
-<!--                         header-align="center"-->
-<!--                         align="center"-->
-<!--                         width="150"-->
-<!--                         show-overflow-tooltip></el-table-column>-->
-<!--        <el-table-column prop="community"-->
-<!--                         label="社区/村庄"-->
-<!--                         header-align="center"-->
-<!--                         align="center"-->
-<!--                         width="180"-->
-<!--                         show-overflow-tooltip></el-table-column>-->
-<!--        <el-table-column prop="gridName"-->
-<!--                         label="网格名称"-->
-<!--                         header-align="center"-->
-<!--                         align="center"-->
-<!--                         width="110"></el-table-column>-->
-<!--        <el-table-column prop="plot"-->
-<!--                         label="小区"-->
-<!--                         header-align="center"-->
-<!--                         align="center"-->
-<!--                         width="180"-->
-<!--                         show-overflow-tooltip></el-table-column>-->
-<!--        <el-table-column prop="buildingNo"-->
-<!--                         label="楼号"-->
-<!--                         header-align="center"-->
-<!--                         align="center"-->
-<!--                         width="100"-->
-<!--                         show-overflow-tooltip></el-table-column>-->
-<!--        <el-table-column prop="unit"-->
-<!--                         label="单元号"-->
-<!--                         header-align="center"-->
-<!--                         align="center"-->
-<!--                         width="100"></el-table-column>-->
-<!--        <el-table-column prop="roomNo"-->
-<!--                         label="房间号"-->
-<!--                         header-align="center"-->
-<!--                         align="center"-->
-<!--                         width="100"></el-table-column>-->
-        <el-table-column prop="peopleCategories"
-                         label="人口类别"
-                         header-align="center"
-                         align="center"
-                         :formatter="peopleCategoriesFormat"
-                         width="180"></el-table-column>
         <el-table-column prop="specialCrowd"
                          label="特殊人群"
                          header-align="center"
@@ -484,7 +717,8 @@
         </el-table>
         <template slot="footer">
           <!--<el-button type="primary" @click="importResult">忽略错误</el-button>-->
-          <el-button type="primary" @click="exportError">导出错误数据</el-button>
+          <el-button type="primary"
+                     @click="exportError">导出错误数据</el-button>
         </template>
       </el-dialog>
 
@@ -521,19 +755,28 @@
           <el-button @click="dialogVisibleExcel = false">取 消</el-button>
         </span>
       </el-dialog>
-      <el-dialog title="身份验证" :visible.sync="dialogVisibleSMS" width="30%">
+      <el-dialog title="身份验证"
+                 :visible.sync="dialogVisibleSMS"
+                 width="30%">
         <div style="text-align: left">
           <el-form>
             <el-form-item>
               <span style="display:inline-block">验证码将下发到 {{this.checkMobile}} ，请注意查收。</span>
             </el-form-item>
-            <el-input v-model="smsCode" placeholder="请输入验证码" style="width:62%; padding-right:10px;"></el-input>
-            <el-button type="primary" @click="sendSMS()" style="width:36%" :disabled="this.isDisabled">{{this.buttonName}}</el-button>
+            <el-input v-model="smsCode"
+                      placeholder="请输入验证码"
+                      style="width:62%; padding-right:10px;"></el-input>
+            <el-button type="primary"
+                       @click="sendSMS()"
+                       style="width:36%"
+                       :disabled="this.isDisabled">{{this.buttonName}}</el-button>
           </el-form>
         </div>
-        <span slot="footer" class="dialog-footer">
+        <span slot="footer"
+              class="dialog-footer">
           <el-button @click="dialogVisibleSMS = false">取 消</el-button>
-          <el-button type="primary" @click="postCheckSMSCode()">确 定</el-button>
+          <el-button type="primary"
+                     @click="postCheckSMSCode()">确 定</el-button>
         </span>
       </el-dialog>
     </div>
@@ -569,9 +812,9 @@ export default {
         streetId: '',
         communityId: '',
         gridId: '',
-        haveDept:'',
-        startBirthdayTime:'',
-        endBirthdayTime:'',
+        haveDept: '',
+        startBirthdayTime: '',
+        endBirthdayTime: '',
         startCheckTime: '',
         endCheckTime: ''
       },
@@ -608,15 +851,15 @@ export default {
         }
       },
       haveDeptList: [
-        {dictValue: '1', dictName: '有'},
-        {dictValue: '2', dictName: '无'},
+        { dictValue: '1', dictName: '有' },
+        { dictValue: '2', dictName: '无' },
       ],
       faultDataVisible: false,
-      errordataList:[],
+      errordataList: [],
       uploadUrl: '',
       checkStateList: [
-        {dictValue: '0', dictName: '已检测'},
-        {dictValue: '1', dictName: '未检测'},
+        { dictValue: '0', dictName: '已检测' },
+        { dictValue: '1', dictName: '未检测' },
       ],
       deptIdList: [],
       deptIdListUpload: [],
@@ -644,10 +887,10 @@ export default {
       options: [],
       standardOfCultureArr: [],
       maritalStatusArr: [],
-      healthArr:[],
+      healthArr: [],
       politicsStatusArr: [],
       workStatusArr: [],
-      familyCategoryArr:[],
+      familyCategoryArr: [],
       peopleCategoriesArr: [],
       inoculateStateArr: [
         { dictValue: '0', dictName: '未接种' },
@@ -658,7 +901,7 @@ export default {
         { dictValue: '2', dictName: '第二针' }
       ],
       genderArr: [],
-      helpStatusArr:[],
+      helpStatusArr: [],
       companyStateArr: [],
       exportTemplate: false,
       uploeadLoeading: false,
@@ -709,17 +952,17 @@ export default {
       }
     },
     'deptIdListUpload': function (val) {
-        if (val.length > 0){
-            this.gridIdImport = val[val.length - 1]
-            this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/custom/epidemicuserinfo/importExcel?token=
+      if (val.length > 0) {
+        this.gridIdImport = val[val.length - 1]
+        this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/custom/epidemicuserinfo/importExcel?token=
            ${Cookies.get('token')}&gridId=` + val[val.length - 1]
-        }else{
-            this.gridIdImport = ''
-        }
+      } else {
+        this.gridIdImport = ''
+      }
     }
   },
   methods: {
-    resetState(){
+    resetState () {
       this.$confirm('此操作将重置所有人员的核酸检测状态为未检测, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -729,7 +972,7 @@ export default {
           lock: true,
           fullscreen: true,
           text: '操作中请稍后',
-          background:'rgba(0, 0, 0, 0.8)'
+          background: 'rgba(0, 0, 0, 0.8)'
         });
 
         this.$http['post']('/custom/epidemicuserinfo/resetUserCheckState').then(({ data: res }) => {
@@ -756,22 +999,22 @@ export default {
       this.faultDataVisible = false
       this.getDataList()
     },
-      // 导出错误数据
-      exportError(){
-          var params = qs.stringify({
-              // 'token': window.localStorage.getItem('token'),
-              'token': Cookies.get('token'),
-              ...this.dataForm
-          })
-          window.location.href = `${window.SITE_CONFIG['apiURL']}${this.mixinViewModuleOptions.exportErrorInfoURL}?${params}`
-          this.$message({
-              type: 'success',
-              message: '下载成功'
-          });
-      },
+    // 导出错误数据
+    exportError () {
+      var params = qs.stringify({
+        // 'token': window.localStorage.getItem('token'),
+        'token': Cookies.get('token'),
+        ...this.dataForm
+      })
+      window.location.href = `${window.SITE_CONFIG['apiURL']}${this.mixinViewModuleOptions.exportErrorInfoURL}?${params}`
+      this.$message({
+        type: 'success',
+        message: '下载成功'
+      });
+    },
     beforeImportUser () {
       //所属组织全都不选，直接上传
-      if (this.gridIdImport === ''){
+      if (this.gridIdImport === '') {
         document.getElementById('importBut').click()
         return false
       }
@@ -790,7 +1033,7 @@ export default {
         type: 'warning'
       }).then(() => {
         document.getElementById('importBut').click()
-      }).catch(() => {})
+      }).catch(() => { })
     },
     beforeGetDataListSearch () {
       if (this.companyArr.length > 0) {
@@ -849,14 +1092,14 @@ export default {
     },
     getOptions () {
       this.$http
-          .get(`/sys/user/deptOptions/getByLoginUser`)
-          .then(({ data: res }) => {
-            if (res.code !== 0) {
-              return this.$message.error(res.msg)
-            }
-            this.options = res.data.options
-          })
-          .catch(() => { })
+        .get(`/sys/user/deptOptions/getByLoginUser`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.options = res.data.options
+        })
+        .catch(() => { })
       this.$http.get(`/sys/dict/listSimple/politics_status`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
@@ -875,18 +1118,18 @@ export default {
         }
         this.specialCrowdList = res.data
       }).catch(() => { })
-        this.$http.get(`/sys/dict/listSimple/education_level`).then(({ data: res }) => {
-            if (res.code !== 0) {
-                return this.$message.error(res.msg)
-            }
-            this.standardOfCultureArr = res.data
-        }).catch(() => { })
-        this.$http.get(`/sys/dict/listSimple/marital_status`).then(({ data: res }) => {
-            if (res.code !== 0) {
-                return this.$message.error(res.msg)
-            }
-            this.maritalStatusArr = res.data
-        }).catch(() => { })
+      this.$http.get(`/sys/dict/listSimple/education_level`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.standardOfCultureArr = res.data
+      }).catch(() => { })
+      this.$http.get(`/sys/dict/listSimple/marital_status`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.maritalStatusArr = res.data
+      }).catch(() => { })
       this.$http.get(`/sys/dict/listSimple/body_status`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
@@ -1037,7 +1280,7 @@ export default {
               return this.$message.error(res.msg + '手机号格式错误！')
             }
             // 手机号****处理
-            this.checkMobile = res.msg.replace(res.msg.substring(3,7), '****')
+            this.checkMobile = res.msg.replace(res.msg.substring(3, 7), '****')
             this.dialogVisibleSMS = true
           }
           if (res.code === 0) {