From c2edec8ea20eeeefd015d1be28ab5b7163f6648b Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Fri, 10 Sep 2021 14:55:14 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E8=97=8F=E4=B8=8D=E5=BF=85=E8=A6=81?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epidemicreportuserinfo-add-or-update.vue  | 558 ++++++++++--------
 .../epidemic/epidemicreportuserinfo.vue       |  23 +-
 .../epidemic/epidemicreportuserinfoDetail.vue | 553 +++++++++--------
 3 files changed, 632 insertions(+), 502 deletions(-)

diff --git a/src/views/modules/epidemic/epidemicreportuserinfo-add-or-update.vue b/src/views/modules/epidemic/epidemicreportuserinfo-add-or-update.vue
index 73bd158..54d569f 100644
--- a/src/views/modules/epidemic/epidemicreportuserinfo-add-or-update.vue
+++ b/src/views/modules/epidemic/epidemicreportuserinfo-add-or-update.vue
@@ -48,7 +48,7 @@
       <el-form-item label="出生年月"
                     prop="birthday"
                     label-width="155px">
-        <el-input v-model="dataForm.birthday"
+        <el-input v-model="dataForm.birthday" disabled
                   placeholder="出生年月"></el-input>
       </el-form-item>
       <el-form-item label="身份证号"
@@ -69,53 +69,39 @@
                   maxlength="11"
                   @keyup.native="btKeyUpMobile"></el-input>
       </el-form-item>
-      <el-form-item label="户籍地"
-                    prop="householdRegisterName"
-                    label-width="155px">
-        <el-cascader style="width: 100%"
-                     ref="hjdname"
-                     v-model="dataForm.householdRegisterCodes"
-                     :options="options"
-                     @change="householdRegisterChangeHandle"
-                     :props="{ checkStrictly: true, emitPath: true}"
-                     clearable
-        >
-        </el-cascader>
-      </el-form-item>
-      <el-form-item label="户籍地详细地址"
-                    prop="householdRegisterDetail"
-                    label-width="155px">
-        <el-input v-model="dataForm.householdRegisterDetail"
-                  placeholder="户籍地详细地址"
-                  maxlength="200"
-                  clearable></el-input>
-      </el-form-item>
-      <el-form-item label="县内居住地"
-                    prop="liveAddressName"
-                    label-width="155px">
-        <!--                    <el-cascader-->
-        <!--                            ref="jzdname"-->
-        <!--                            v-model="dataForm.liveAddressCodes"-->
-        <!--                            :options="liveOptions"-->
-        <!--                            @change="liveAddressChangeHandle"-->
-        <!--                            :props="{ checkStrictly: false, multiple: true, emitPath: true }"-->
-        <!--                    >-->
-        <!--                    </el-cascader>-->
-
-        <el-select v-model="dataForm.liveAddressCode"
-                   placeholder="请选择">
-          <el-option v-for="item in liveOptions"
-                     :key="item.value"
-                     :label="item.label"
-                     :value="item.value">
-          </el-option>
-        </el-select>
-        <!--        <el-input v-model="dataForm.liveAddressName"  placeholder="县内居住地" maxlength="200" clearable></el-input>-->
-      </el-form-item>
-      <!--<el-form-item label="县内居住地详细地址" prop="liveAddressDetail" label-width="155px">-->
-      <!--<el-input v-model="dataForm.liveAddressDetail" placeholder="县内居住地详细地址" maxlength="200" clearable></el-input>-->
-      <!--</el-form-item>-->
-
+<!--      <el-form-item label="户籍地"-->
+<!--                    prop="householdRegisterName"-->
+<!--                    label-width="155px">-->
+<!--        <el-cascader style="width: 100%"-->
+<!--                     ref="hjdname"-->
+<!--                     v-model="dataForm.householdRegisterCodes"-->
+<!--                     :options="options"-->
+<!--                     @change="householdRegisterChangeHandle"-->
+<!--                     :props="{ checkStrictly: true, emitPath: true}"-->
+<!--                     clearable-->
+<!--        >-->
+<!--        </el-cascader>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="户籍地详细地址"-->
+<!--                    prop="householdRegisterDetail"-->
+<!--                    label-width="155px">-->
+<!--        <el-input v-model="dataForm.householdRegisterDetail"-->
+<!--                  placeholder="户籍地详细地址"-->
+<!--                  maxlength="200"-->
+<!--                  clearable></el-input>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="县内居住地"-->
+<!--                    prop="liveAddressName"-->
+<!--                    label-width="155px">-->
+<!--        <el-select v-model="dataForm.liveAddressCode"-->
+<!--                   placeholder="请选择">-->
+<!--          <el-option v-for="item in liveOptions"-->
+<!--                     :key="item.value"-->
+<!--                     :label="item.label"-->
+<!--                     :value="item.value">-->
+<!--          </el-option>-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
       <el-form-item label="身高"
                     prop="height"
                     label-width="155px">
@@ -125,8 +111,14 @@
       <el-form-item label="文化程度"
                     prop="standardOfCulture"
                     label-width="155px">
-        <el-input v-model="dataForm.standardOfCulture"
-                  placeholder="文化程度"></el-input>
+        <el-select v-model="dataForm.standardOfCulture"
+                   placeholder="请选择">
+          <el-option v-for="item in educationLevelList"
+                     :key="item.dictValue"
+                     :label="item.dictName"
+                     :value="item.dictValue">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="健康情况"
                     prop="health"
@@ -140,17 +132,19 @@
         <el-input v-model="dataForm.bloodType"
                   placeholder="血型"></el-input>
       </el-form-item>
-      <el-form-item label="婚姻状况"
-                    prop="maritalStatus"
-                    label-width="155px">
-        <el-input v-model="dataForm.maritalStatus"
-                  placeholder="婚姻状况"></el-input>
+      <el-form-item label="婚姻状况" prop="maritalStatus" label-width="155px">
+        <el-radio-group v-model="dataForm.maritalStatus">
+          <el-radio  v-for="item in maritalStatusList"
+                     :key="item.dictValue"
+                     :label="item.dictName">{{item.dictName}}</el-radio>
+        </el-radio-group>
       </el-form-item>
-      <el-form-item label="与户主关系"
-                    prop="relation"
-                    label-width="155px">
-        <el-input v-model="dataForm.relation"
-                  placeholder="与户主关系"></el-input>
+      <el-form-item label="与户主关系" prop="relation" label-width="155px">
+        <el-radio-group v-model="dataForm.relation">
+          <el-radio  v-for="item in relationList"
+                     :key="item.dictValue"
+                     :label="item.dictName">{{item.dictName}}</el-radio>
+        </el-radio-group>
       </el-form-item>
       <el-form-item label="国籍"
                     prop="nationality"
@@ -158,11 +152,12 @@
         <el-input v-model="dataForm.nationality"
                   placeholder="国籍"></el-input>
       </el-form-item>
-      <el-form-item label="政治面貌"
-                    prop="politicsStatus"
-                    label-width="155px">
-        <el-input v-model="dataForm.politicsStatus"
-                  placeholder="政治面貌"></el-input>
+      <el-form-item label="政治面貌" prop="politicsStatus" label-width="155px">
+        <el-radio-group v-model="dataForm.politicsStatus">
+          <el-radio  v-for="item in politicsStatusList"
+                     :key="item.dictValue"
+                     :label="item.dictName">{{item.dictName}}</el-radio>
+        </el-radio-group>
       </el-form-item>
       <el-form-item label="宗教信仰"
                     prop="faith"
@@ -182,11 +177,12 @@
         <el-input v-model="dataForm.professional"
                   placeholder="专业"></el-input>
       </el-form-item>
-      <el-form-item label="工作状态"
-                    prop="workStatus"
-                    label-width="155px">
-        <el-input v-model="dataForm.workStatus"
-                  placeholder="工作状态"></el-input>
+      <el-form-item label="就业情况" prop="workStatus" label-width="155px">
+        <el-radio-group v-model="dataForm.workStatus">
+          <el-radio  v-for="item in employmentStatusList"
+                     :key="item.dictValue"
+                     :label="item.dictName">{{item.dictName}}</el-radio>
+        </el-radio-group>
       </el-form-item>
       <el-form-item label="行业类别"
                     prop="industryCategory"
@@ -200,29 +196,41 @@
         <el-input v-model="dataForm.workUnits"
                   placeholder="工作单位（现/原）"></el-input>
       </el-form-item>
-      <el-form-item label="兵役状况"
-                    prop="military"
-                    label-width="155px">
-        <el-input v-model="dataForm.military"
-                  placeholder="兵役状况"></el-input>
+      <el-form-item label="服兵役" prop="military" label-width="155px">
+        <el-radio-group v-model="dataForm.military">
+          <el-radio  label="0">否</el-radio>
+          <el-radio  label="1">是</el-radio>
+        </el-radio-group>
       </el-form-item>
       <el-form-item label="人口类别"
                     prop="peopleCategories"
                     label-width="155px">
-        <el-input v-model="dataForm.peopleCategories"
-                  placeholder="人口类别"></el-input>
+        <el-select v-model="dataForm.peopleCategories"
+                   placeholder="请选择">
+          <el-option v-for="item in peopleCategoriesList"
+                     :key="item.dictValue"
+                     :label="item.dictName"
+                     :value="item.dictValue">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="特殊人群"
                     prop="specialCrowd"
                     label-width="155px">
-        <el-input v-model="dataForm.specialCrowd"
-                  placeholder="特殊人群"></el-input>
+        <el-select v-model="dataForm.specialCrowd"
+                   placeholder="请选择">
+          <el-option v-for="item in specialCrowdList"
+                     :key="item.dictValue"
+                     :label="item.dictName"
+                     :value="item.dictValue">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="有无车辆"
-                    prop="car"
-                    label-width="155px">
-        <el-input v-model="dataForm.car"
-                  placeholder="有无车辆"></el-input>
+      <el-form-item label="有无车辆" prop="car" label-width="155px">
+        <el-radio-group v-model="dataForm.car">
+          <el-radio  label="0">无</el-radio>
+          <el-radio  label="1">有</el-radio>
+        </el-radio-group>
       </el-form-item>
       <el-form-item label="车牌号"
                     prop="carNo"
@@ -242,167 +250,174 @@
         <el-input v-model="dataForm.nativePlace"
                   placeholder="籍贯"></el-input>
       </el-form-item>
-      <el-form-item label="往返情况"
-                    prop="returnState"
-                    label-width="155px">
-        <el-select v-model="dataForm.returnState"
-                   placeholder="往返情况"
-                   @change="selectModel($event)">
-          <el-option v-for="item in returnStateArr"
-                     :key="item.dictValue"
-                     :label="item.dictName"
-                     :value="item.dictValue">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <div v-if="showFlagIn">
-        <el-form-item label="拟离开平阴时间"
-                      prop="leaveTime"
-                      label-width="155px">
-          <el-date-picker v-model="dataForm.leaveTime"
-                          type="date"
-                          placeholder="选择拟离开平阴时间"
-                          label-width="150px"
-                          value-format="yyyy-MM-dd"
-                          format="yyyy-MM-dd"
-                          style="width:200px">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="拟去往目的地"
-                      prop="destinationAddressName"
-                      label-width="155px">
-          <el-cascader ref="qwmddname"
-                       v-model="dataForm.destinationAddressCodes"
-                       :options="options"
-                       @change="destinationChangeHandle"
-                       :props="{ checkStrictly: true, emitPath: true}">
-          </el-cascader>
-        </el-form-item>
-        <el-form-item label="拟去往目的地详细地址"
-                      prop="destinationAddressDetail"
-                      label-width="155px">
-          <el-input v-model="dataForm.destinationAddressDetail"
-                    placeholder="去往目的地详细地址"
-                    maxlength="200"
-                    clearable></el-input>
-        </el-form-item>
-      </div>
-      <div v-if="showFlagOut">
-        <el-form-item label="居住地关联人"
-                      prop="relationPeople"
-                      label-width="155px">
-          <el-input v-model="dataForm.relationPeople"
-                    placeholder="居住地关联人"
-                    maxlength="20"
-                    clearable
-                    @keyup.native="btKeyUpRelationPeople"></el-input>
-        </el-form-item>
-        <el-form-item label="关联人联系电话"
-                      prop="relationPeopleMobile"
-                      label-width="155px">
-          <el-input v-model="dataForm.relationPeopleMobile"
-                    placeholder="关联人联系电话"
-                    clearable
-                    maxlength="11"
-                    @keyup.native="btKeyUpRelationPeopleMobile"></el-input>
-        </el-form-item>
-        <el-form-item label="疫情风险等级"
-                      prop="riskGrade"
-                      label-width="155px">
-          <el-select v-model="dataForm.riskGrade"
-                     placeholder="现居住地疫情风险等级">
-            <el-option v-for="item in riskGradeeArr"
-                       :key="item.dictValue"
-                       :label="item.dictName"
-                       :value="item.dictValue">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="拟返回平阴时间"
-                      prop="goBarkTime"
-                      label-width="155px">
-          <el-date-picker v-model="dataForm.goBarkTime"
-                          type="date"
-                          placeholder="返回平阴时间"
-                          label-width="155px"
-                          value-format="yyyy-MM-dd"
-                          format="yyyy-MM-dd"
-                          style="width:200px">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="现居住地"
-                      prop="outLiveAddressName"
-                      label-width="155px">
-          <el-cascader ref="zwjzdname"
-                       v-model="dataForm.outLiveAddressCodes"
-                       :options="options"
-                       @change="outLiveAddressChangeHandle"
-                       :props="{ checkStrictly: true, emitPath: true}">
-          </el-cascader>
-        </el-form-item>
-        <el-form-item label="现居住地详细地址"
-                      prop="outLiveAddressDetail"
-                      label-width="155px">
-          <el-input v-model="dataForm.outLiveAddressDetail"
-                    placeholder="现居住地详细地址"
-                    maxlength="200"
-                    clearable></el-input>
-        </el-form-item>
-      </div>
-      <el-form-item label="社区/村庄"
-                    prop="community"
-                    label-width="155px">
-        <el-input v-model="dataForm.community"
-                  placeholder="社区/村庄"></el-input>
-      </el-form-item>
-      <el-form-item label="网格名称"
-                    prop="gridName"
-                    label-width="155px">
-        <el-input v-model="dataForm.gridName"
-                  placeholder="网格名称"></el-input>
-      </el-form-item>
-      <el-form-item label="小区"
-                    prop="plot"
-                    label-width="155px">
-        <el-input v-model="dataForm.plot"
-                  placeholder="小区"></el-input>
-      </el-form-item>
-      <el-form-item label="楼号"
-                    prop="buildingNo"
-                    label-width="155px">
-        <el-input v-model="dataForm.buildingNo"
-                  placeholder="楼号"></el-input>
-      </el-form-item>
-      <el-form-item label="单元"
-                    prop="unit"
-                    label-width="155px">
-        <el-input v-model="dataForm.unit"
-                  placeholder="单元"></el-input>
-      </el-form-item>
-      <el-form-item label="房间号"
-                    prop="roomNo"
-                    label-width="155px">
-        <el-input v-model="dataForm.roomNo"
-                  placeholder="房间号"></el-input>
-      </el-form-item>
-      <el-form-item label="房屋性质"
-                    prop="houseProperty"
-                    label-width="155px">
-        <el-input v-model="dataForm.houseProperty"
-                  placeholder="房屋性质"></el-input>
-      </el-form-item>
-      <el-form-item label="家庭保障情况"
-                    prop="familySecurity"
-                    label-width="155px">
-        <el-input v-model="dataForm.familySecurity"
-                  placeholder="家庭保障情况"></el-input>
-      </el-form-item>
-      <el-form-item label="居住情况"
-                    prop="livingSituation"
-                    label-width="155px">
-        <el-input v-model="dataForm.livingSituation"
-                  placeholder="居住情况"></el-input>
-      </el-form-item>
+<!--      <el-form-item label="房屋性质" prop="houseProperty" label-width="155px">-->
+<!--        <el-radio-group v-model="dataForm.houseProperty">-->
+<!--          <el-radio  label="0">自住</el-radio>-->
+<!--          <el-radio  label="1">租赁</el-radio>-->
+<!--          <el-radio  label="2">经营</el-radio>-->
+<!--        </el-radio-group>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="往返情况"-->
+<!--                    prop="returnState"-->
+<!--                    label-width="155px">-->
+<!--        <el-select v-model="dataForm.returnState"-->
+<!--                   placeholder="往返情况"-->
+<!--                   @change="selectModel($event)">-->
+<!--          <el-option v-for="item in returnStateArr"-->
+<!--                     :key="item.dictValue"-->
+<!--                     :label="item.dictName"-->
+<!--                     :value="item.dictValue">-->
+<!--          </el-option>-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+<!--      <div v-if="showFlagIn">-->
+<!--        <el-form-item label="拟离开平阴时间"-->
+<!--                      prop="leaveTime"-->
+<!--                      label-width="155px">-->
+<!--          <el-date-picker v-model="dataForm.leaveTime"-->
+<!--                          type="date"-->
+<!--                          placeholder="选择拟离开平阴时间"-->
+<!--                          label-width="150px"-->
+<!--                          value-format="yyyy-MM-dd"-->
+<!--                          format="yyyy-MM-dd"-->
+<!--                          style="width:200px">-->
+<!--          </el-date-picker>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="拟去往目的地"-->
+<!--                      prop="destinationAddressName"-->
+<!--                      label-width="155px">-->
+<!--          <el-cascader ref="qwmddname"-->
+<!--                       v-model="dataForm.destinationAddressCodes"-->
+<!--                       :options="options"-->
+<!--                       @change="destinationChangeHandle"-->
+<!--                       :props="{ checkStrictly: true, emitPath: true}">-->
+<!--          </el-cascader>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="拟去往目的地详细地址"-->
+<!--                      prop="destinationAddressDetail"-->
+<!--                      label-width="155px">-->
+<!--          <el-input v-model="dataForm.destinationAddressDetail"-->
+<!--                    placeholder="去往目的地详细地址"-->
+<!--                    maxlength="200"-->
+<!--                    clearable></el-input>-->
+<!--        </el-form-item>-->
+<!--      </div>-->
+<!--      <div v-if="showFlagOut">-->
+<!--        <el-form-item label="居住地关联人"-->
+<!--                      prop="relationPeople"-->
+<!--                      label-width="155px">-->
+<!--          <el-input v-model="dataForm.relationPeople"-->
+<!--                    placeholder="居住地关联人"-->
+<!--                    maxlength="20"-->
+<!--                    clearable-->
+<!--                    @keyup.native="btKeyUpRelationPeople"></el-input>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="关联人联系电话"-->
+<!--                      prop="relationPeopleMobile"-->
+<!--                      label-width="155px">-->
+<!--          <el-input v-model="dataForm.relationPeopleMobile"-->
+<!--                    placeholder="关联人联系电话"-->
+<!--                    clearable-->
+<!--                    maxlength="11"-->
+<!--                    @keyup.native="btKeyUpRelationPeopleMobile"></el-input>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="疫情风险等级"-->
+<!--                      prop="riskGrade"-->
+<!--                      label-width="155px">-->
+<!--          <el-select v-model="dataForm.riskGrade"-->
+<!--                     placeholder="现居住地疫情风险等级">-->
+<!--            <el-option v-for="item in riskGradeeArr"-->
+<!--                       :key="item.dictValue"-->
+<!--                       :label="item.dictName"-->
+<!--                       :value="item.dictValue">-->
+<!--            </el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="拟返回平阴时间"-->
+<!--                      prop="goBarkTime"-->
+<!--                      label-width="155px">-->
+<!--          <el-date-picker v-model="dataForm.goBarkTime"-->
+<!--                          type="date"-->
+<!--                          placeholder="返回平阴时间"-->
+<!--                          label-width="155px"-->
+<!--                          value-format="yyyy-MM-dd"-->
+<!--                          format="yyyy-MM-dd"-->
+<!--                          style="width:200px">-->
+<!--          </el-date-picker>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="现居住地"-->
+<!--                      prop="outLiveAddressName"-->
+<!--                      label-width="155px">-->
+<!--          <el-cascader ref="zwjzdname"-->
+<!--                       v-model="dataForm.outLiveAddressCodes"-->
+<!--                       :options="options"-->
+<!--                       @change="outLiveAddressChangeHandle"-->
+<!--                       :props="{ checkStrictly: true, emitPath: true}">-->
+<!--          </el-cascader>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="现居住地详细地址"-->
+<!--                      prop="outLiveAddressDetail"-->
+<!--                      label-width="155px">-->
+<!--          <el-input v-model="dataForm.outLiveAddressDetail"-->
+<!--                    placeholder="现居住地详细地址"-->
+<!--                    maxlength="200"-->
+<!--                    clearable></el-input>-->
+<!--        </el-form-item>-->
+<!--      </div>-->
+<!--      <el-form-item label="社区/村庄"-->
+<!--                    prop="community"-->
+<!--                    label-width="155px">-->
+<!--        <el-input v-model="dataForm.community"-->
+<!--                  placeholder="社区/村庄"></el-input>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="网格名称"-->
+<!--                    prop="gridName"-->
+<!--                    label-width="155px">-->
+<!--        <el-input v-model="dataForm.gridName"-->
+<!--                  placeholder="网格名称"></el-input>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="小区"-->
+<!--                    prop="plot"-->
+<!--                    label-width="155px">-->
+<!--        <el-input v-model="dataForm.plot"-->
+<!--                  placeholder="小区"></el-input>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="楼号"-->
+<!--                    prop="buildingNo"-->
+<!--                    label-width="155px">-->
+<!--        <el-input v-model="dataForm.buildingNo"-->
+<!--                  placeholder="楼号"></el-input>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="单元"-->
+<!--                    prop="unit"-->
+<!--                    label-width="155px">-->
+<!--        <el-input v-model="dataForm.unit"-->
+<!--                  placeholder="单元"></el-input>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="房间号"-->
+<!--                    prop="roomNo"-->
+<!--                    label-width="155px">-->
+<!--        <el-input v-model="dataForm.roomNo"-->
+<!--                  placeholder="房间号"></el-input>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="房屋性质"-->
+<!--                    prop="houseProperty"-->
+<!--                    label-width="155px">-->
+<!--        <el-input v-model="dataForm.houseProperty"-->
+<!--                  placeholder="房屋性质"></el-input>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="家庭保障情况"-->
+<!--                    prop="familySecurity"-->
+<!--                    label-width="155px">-->
+<!--        <el-input v-model="dataForm.familySecurity"-->
+<!--                  placeholder="家庭保障情况"></el-input>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="居住情况"-->
+<!--                    prop="livingSituation"-->
+<!--                    label-width="155px">-->
+<!--        <el-input v-model="dataForm.livingSituation"-->
+<!--                  placeholder="居住情况"></el-input>-->
+<!--      </el-form-item>-->
     </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
@@ -487,6 +502,18 @@ export default {
       ],
       options: [],
       liveOptions: [],
+      educationLevelList: [],
+      maritalStatusList: [],
+      relationList: [
+        { dictValue: '0', dictName: '子女' },
+        { dictValue: '1', dictName: '夫妻' },
+        { dictValue: '2', dictName: '父母' },
+        { dictValue: '3', dictName: '其他' }
+      ],
+      politicsStatusList: [],
+      employmentStatusList: [],
+      specialCrowdList: [],
+      peopleCategoriesList: [],
       isAble: false,
       showFlagIn: true,
       showFlagOut: false,
@@ -496,8 +523,8 @@ export default {
         { dictValue: '3', dictName: '高风险' }
       ],
       gender: [
-        { dictValue: '男', dictName: '男' },
-        { dictValue: '女', dictName: '女' }
+        { dictValue: '1', dictName: '男' },
+        { dictValue: '0', dictName: '女' }
       ],
       vueLoading: true
     }
@@ -527,6 +554,7 @@ export default {
       this.dataForm.destinationAddressCodes = []
       this.getOptions()
       this.getLiveOptions()
+      console.log(this.dataForm.id)
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
         if (this.dataForm.id) {
@@ -646,6 +674,42 @@ export default {
         })
         .catch(() => {
         })
+      this.$http.get(`/sys/dict/listSimple/education_level`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.educationLevelList = 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.maritalStatusList = res.data
+      }).catch(() => { })
+      this.$http.get(`/sys/dict/listSimple/politics_status`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.politicsStatusList = res.data
+      }).catch(() => { })
+      this.$http.get(`/sys/dict/listSimple/employment_status`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.employmentStatusList = res.data
+      }).catch(() => { })
+      this.$http.get(`/sys/dict/listSimple/people_categories`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.peopleCategoriesList = res.data
+      }).catch(() => { })
+      this.$http.get(`/sys/dict/listSimple/special_crowd`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.specialCrowdList = res.data
+      }).catch(() => { })
     },
     getLiveOptions () {
       this.$http
diff --git a/src/views/modules/epidemic/epidemicreportuserinfo.vue b/src/views/modules/epidemic/epidemicreportuserinfo.vue
index 4e4f0ad..3288e3e 100644
--- a/src/views/modules/epidemic/epidemicreportuserinfo.vue
+++ b/src/views/modules/epidemic/epidemicreportuserinfo.vue
@@ -35,7 +35,7 @@
                     @keyup.native="btKeyUpMobile"
                     style="width:200px"></el-input>
         </el-form-item>
-        <el-form-item label="所属机构" label-width="90px">
+        <el-form-item label="所属组织" label-width="90px">
           <el-cascader v-model="deptIdList"
                        :options="options"
                        :props="{ checkStrictly: true }"
@@ -176,11 +176,11 @@
 <!--            <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-button-->
+<!--                     type="primary"-->
+<!--                     @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>-->
+<!--        </el-form-item>-->
         <el-form-item>
           <el-button v-if="$hasPermission('demo:epidemicreportuserinfo:delete')"
                      type="danger"
@@ -200,6 +200,11 @@
             {{scope.$index+1}}
           </template>
         </el-table-column>
+        <el-table-column prop="allDeptNames"
+                         label="所属组织"
+                         header-align="center"
+                         align="center"
+                         width="180"></el-table-column>
         <el-table-column prop="userName"
                          label="姓名"
                          header-align="center"
@@ -297,11 +302,7 @@
                          align="center"
                          :formatter="specialCrowdFormat"
                          width="180"></el-table-column>
-        <el-table-column prop="allDeptNames"
-                         label="所属部门"
-                         header-align="center"
-                         align="center"
-                         width="180"></el-table-column>
+
         <el-table-column :label="$t('handle')"
                          fixed="right"
                          header-align="center"
diff --git a/src/views/modules/epidemic/epidemicreportuserinfoDetail.vue b/src/views/modules/epidemic/epidemicreportuserinfoDetail.vue
index 39cfc3a..2baf3cf 100644
--- a/src/views/modules/epidemic/epidemicreportuserinfoDetail.vue
+++ b/src/views/modules/epidemic/epidemicreportuserinfoDetail.vue
@@ -70,29 +70,29 @@
                   maxlength="11"
                   @keyup.native="btKeyUpMobile"></el-input>
       </el-form-item>
-      <el-form-item label="户籍地"
-                    prop="householdRegisterName"
-                    label-width="155px">
-        <el-input v-model="dataForm.householdRegisterName"
-                  placeholder="户籍地"></el-input>
+<!--      <el-form-item label="户籍地"-->
+<!--                    prop="householdRegisterName"-->
+<!--                    label-width="155px">-->
+<!--        <el-input v-model="dataForm.householdRegisterName"-->
+<!--                  placeholder="户籍地"></el-input>-->
 <!--        <el-cascader ref="hjdname"-->
 <!--                     v-model="dataForm.householdRegisterCodes"-->
 <!--                     :options="options"-->
 <!--                     @change="householdRegisterChangeHandle"-->
 <!--                     :props="{ checkStrictly: false, multiple: true, emitPath: true }">-->
 <!--        </el-cascader>-->
-      </el-form-item>
-      <el-form-item label="户籍地详细地址"
-                    prop="householdRegisterDetail"
-                    label-width="155px">
-        <el-input v-model="dataForm.householdRegisterDetail"
-                  placeholder="户籍地详细地址"
-                  maxlength="200"
-                  clearable></el-input>
-      </el-form-item>
-      <el-form-item label="县内居住地"
-                    prop="liveAddressName"
-                    label-width="155px">
+<!--      </el-form-item>-->
+<!--      <el-form-item label="户籍地详细地址"-->
+<!--                    prop="householdRegisterDetail"-->
+<!--                    label-width="155px">-->
+<!--        <el-input v-model="dataForm.householdRegisterDetail"-->
+<!--                  placeholder="户籍地详细地址"-->
+<!--                  maxlength="200"-->
+<!--                  clearable></el-input>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="县内居住地"-->
+<!--                    prop="liveAddressName"-->
+<!--                    label-width="155px">-->
         <!--                    <el-cascader-->
         <!--                            ref="jzdname"-->
         <!--                            v-model="dataForm.liveAddressCodes"-->
@@ -101,21 +101,15 @@
         <!--                            :props="{ checkStrictly: false, multiple: true, emitPath: true }"-->
         <!--                    >-->
         <!--                    </el-cascader>-->
-
-        <el-select v-model="dataForm.liveAddressCode"
-                   placeholder="请选择">
-          <el-option v-for="item in liveOptions"
-                     :key="item.value"
-                     :label="item.label"
-                     :value="item.value">
-          </el-option>
-        </el-select>
-        <!--        <el-input v-model="dataForm.liveAddressName"  placeholder="县内居住地" maxlength="200" clearable></el-input>-->
-      </el-form-item>
-      <!--<el-form-item label="县内居住地详细地址" prop="liveAddressDetail" label-width="155px">-->
-      <!--<el-input v-model="dataForm.liveAddressDetail" placeholder="县内居住地详细地址" maxlength="200" clearable></el-input>-->
-      <!--</el-form-item>-->
-
+<!--        <el-select v-model="dataForm.liveAddressCode"-->
+<!--                   placeholder="请选择">-->
+<!--          <el-option v-for="item in liveOptions"-->
+<!--                     :key="item.value"-->
+<!--                     :label="item.label"-->
+<!--                     :value="item.value">-->
+<!--          </el-option>-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
       <el-form-item label="身高"
                     prop="height"
                     label-width="155px">
@@ -125,8 +119,14 @@
       <el-form-item label="文化程度"
                     prop="standardOfCulture"
                     label-width="155px">
-        <el-input v-model="dataForm.standardOfCulture"
-                  placeholder="文化程度"></el-input>
+        <el-select v-model="dataForm.standardOfCulture"
+                   placeholder="请选择">
+          <el-option v-for="item in educationLevelList"
+                     :key="item.dictValue"
+                     :label="item.dictName"
+                     :value="item.dictValue">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="健康情况"
                     prop="health"
@@ -140,17 +140,19 @@
         <el-input v-model="dataForm.bloodType"
                   placeholder="血型"></el-input>
       </el-form-item>
-      <el-form-item label="婚姻状况"
-                    prop="maritalStatus"
-                    label-width="155px">
-        <el-input v-model="dataForm.maritalStatus"
-                  placeholder="婚姻状况"></el-input>
+      <el-form-item label="婚姻状况" prop="maritalStatus" label-width="155px">
+        <el-radio-group v-model="dataForm.maritalStatus">
+          <el-radio  v-for="item in maritalStatusList"
+                     :key="item.dictValue"
+                     :label="item.dictName">{{item.dictName}}</el-radio>
+        </el-radio-group>
       </el-form-item>
-      <el-form-item label="与户主关系"
-                    prop="relation"
-                    label-width="155px">
-        <el-input v-model="dataForm.relation"
-                  placeholder="与户主关系"></el-input>
+      <el-form-item label="与户主关系" prop="relation" label-width="155px">
+        <el-radio-group v-model="dataForm.relation">
+          <el-radio  v-for="item in relationList"
+                     :key="item.dictValue"
+                     :label="item.dictName">{{item.dictName}}</el-radio>
+        </el-radio-group>
       </el-form-item>
       <el-form-item label="国籍"
                     prop="nationality"
@@ -158,11 +160,12 @@
         <el-input v-model="dataForm.nationality"
                   placeholder="国籍"></el-input>
       </el-form-item>
-      <el-form-item label="政治面貌"
-                    prop="politicsStatus"
-                    label-width="155px">
-        <el-input v-model="dataForm.politicsStatus"
-                  placeholder="政治面貌"></el-input>
+      <el-form-item label="政治面貌" prop="politicsStatus" label-width="155px">
+        <el-radio-group v-model="dataForm.politicsStatus">
+          <el-radio  v-for="item in politicsStatusList"
+                     :key="item.dictValue"
+                     :label="item.dictName">{{item.dictName}}</el-radio>
+        </el-radio-group>
       </el-form-item>
       <el-form-item label="宗教信仰"
                     prop="faith"
@@ -182,11 +185,12 @@
         <el-input v-model="dataForm.professional"
                   placeholder="专业"></el-input>
       </el-form-item>
-      <el-form-item label="工作状态"
-                    prop="workStatus"
-                    label-width="155px">
-        <el-input v-model="dataForm.workStatus"
-                  placeholder="工作状态"></el-input>
+      <el-form-item label="就业情况" prop="workStatus" label-width="155px">
+        <el-radio-group v-model="dataForm.workStatus">
+          <el-radio  v-for="item in employmentStatusList"
+                     :key="item.dictValue"
+                     :label="item.dictName">{{item.dictName}}</el-radio>
+        </el-radio-group>
       </el-form-item>
       <el-form-item label="行业类别"
                     prop="industryCategory"
@@ -200,29 +204,41 @@
         <el-input v-model="dataForm.workUnits"
                   placeholder="工作单位（现/原）"></el-input>
       </el-form-item>
-      <el-form-item label="兵役状况"
-                    prop="military"
-                    label-width="155px">
-        <el-input v-model="dataForm.military"
-                  placeholder="兵役状况"></el-input>
+      <el-form-item label="服兵役" prop="military" label-width="155px">
+        <el-radio-group v-model="dataForm.military">
+          <el-radio  label="0">否</el-radio>
+          <el-radio  label="1">是</el-radio>
+        </el-radio-group>
       </el-form-item>
       <el-form-item label="人口类别"
                     prop="peopleCategories"
                     label-width="155px">
-        <el-input v-model="dataForm.peopleCategories"
-                  placeholder="人口类别"></el-input>
+        <el-select v-model="dataForm.peopleCategories"
+                   placeholder="请选择">
+          <el-option v-for="item in peopleCategoriesList"
+                     :key="item.dictValue"
+                     :label="item.dictName"
+                     :value="item.dictValue">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="特殊人群"
                     prop="specialCrowd"
                     label-width="155px">
-        <el-input v-model="dataForm.specialCrowd"
-                  placeholder="特殊人群"></el-input>
+        <el-select v-model="dataForm.specialCrowd"
+                   placeholder="请选择">
+          <el-option v-for="item in specialCrowdList"
+                     :key="item.dictValue"
+                     :label="item.dictName"
+                     :value="item.dictValue">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="有无车辆"
-                    prop="car"
-                    label-width="155px">
-        <el-input v-model="dataForm.car"
-                  placeholder="有无车辆"></el-input>
+      <el-form-item label="有无车辆" prop="car" label-width="155px">
+        <el-radio-group v-model="dataForm.car">
+          <el-radio  label="0">无</el-radio>
+          <el-radio  label="1">有</el-radio>
+        </el-radio-group>
       </el-form-item>
       <el-form-item label="车牌号"
                     prop="carNo"
@@ -242,166 +258,167 @@
         <el-input v-model="dataForm.nativePlace"
                   placeholder="籍贯"></el-input>
       </el-form-item>
-      <el-form-item label="往返情况"
-                    prop="returnState"
-                    label-width="155px">
-        <el-select v-model="dataForm.returnState"
-                   placeholder="往返情况">
-          <el-option v-for="item in returnStateArr"
-                     :key="item.dictValue"
-                     :label="item.dictName"
-                     :value="item.dictValue">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <div v-if="showFlagIn">
-        <el-form-item label="拟离开平阴时间"
-                      prop="leaveTime"
-                      label-width="155px">
-          <el-date-picker v-model="dataForm.leaveTime"
-                          type="date"
-                          placeholder="选择拟离开平阴时间"
-                          label-width="150px"
-                          value-format="yyyy-MM-dd"
-                          format="yyyy-MM-dd"
-                          style="width:200px">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="拟去往目的地"
-                      prop="destinationAddressName"
-                      label-width="155px">
-          <el-cascader ref="qwmddname"
-                       v-model="dataForm.destinationAddressCodes"
-                       :options="options"
-                       @change="destinationChangeHandle"
-                       :props="{ checkStrictly: false, multiple: true, emitPath: true }">
-          </el-cascader>
-        </el-form-item>
-        <el-form-item label="拟去往目的地详细地址"
-                      prop="destinationAddressDetail"
-                      label-width="155px">
-          <el-input v-model="dataForm.destinationAddressDetail"
-                    placeholder="去往目的地详细地址"
-                    maxlength="200"
-                    clearable></el-input>
-        </el-form-item>
-      </div>
-      <div v-if="showFlagOut">
-        <el-form-item label="居住地关联人"
-                      prop="relationPeople"
-                      label-width="155px">
-          <el-input v-model="dataForm.relationPeople"
-                    placeholder="居住地关联人"
-                    maxlength="20"
-                    clearable
-                    @keyup.native="btKeyUpRelationPeople"></el-input>
-        </el-form-item>
-        <el-form-item label="关联人联系电话"
-                      prop="relationPeopleMobile"
-                      label-width="155px">
-          <el-input v-model="dataForm.relationPeopleMobile"
-                    placeholder="关联人联系电话"
-                    clearable
-                    maxlength="11"
-                    @keyup.native="btKeyUpRelationPeopleMobile"></el-input>
-        </el-form-item>
-        <el-form-item label="疫情风险等级"
-                      prop="riskGrade"
-                      label-width="155px">
-          <el-select v-model="dataForm.riskGrade"
-                     placeholder="现居住地疫情风险等级">
-            <el-option v-for="item in riskGradeeArr"
-                       :key="item.dictValue"
-                       :label="item.dictName"
-                       :value="item.dictValue">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="拟返回平阴时间"
-                      prop="goBarkTime"
-                      label-width="155px">
-          <el-date-picker v-model="dataForm.goBarkTime"
-                          type="date"
-                          placeholder="返回平阴时间"
-                          label-width="155px"
-                          value-format="yyyy-MM-dd"
-                          format="yyyy-MM-dd"
-                          style="width:200px">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="现居住地"
-                      prop="outLiveAddressName"
-                      label-width="155px">
-          <el-cascader ref="zwjzdname"
-                       v-model="dataForm.outLiveAddressCodes"
-                       :options="options"
-                       @change="outLiveAddressChangeHandle"
-                       :props="{ checkStrictly: false, multiple: true, emitPath: true }">
-          </el-cascader>
-        </el-form-item>
-        <el-form-item label="现居住地详细地址"
-                      prop="outLiveAddressDetail"
-                      label-width="155px">
-          <el-input v-model="dataForm.outLiveAddressDetail"
-                    placeholder="现居住地详细地址"
-                    maxlength="200"
-                    clearable></el-input>
-        </el-form-item>
-      </div>
-      <el-form-item label="社区/村庄"
-                    prop="community"
-                    label-width="155px">
-        <el-input v-model="dataForm.community"
-                  placeholder="社区/村庄"></el-input>
-      </el-form-item>
-      <el-form-item label="网格名称"
-                    prop="gridName"
-                    label-width="155px">
-        <el-input v-model="dataForm.gridName"
-                  placeholder="网格名称"></el-input>
-      </el-form-item>
-      <el-form-item label="小区"
-                    prop="plot"
-                    label-width="155px">
-        <el-input v-model="dataForm.plot"
-                  placeholder="小区"></el-input>
-      </el-form-item>
-      <el-form-item label="楼号"
-                    prop="buildingNo"
-                    label-width="155px">
-        <el-input v-model="dataForm.buildingNo"
-                  placeholder="楼号"></el-input>
-      </el-form-item>
-      <el-form-item label="单元"
-                    prop="unit"
-                    label-width="155px">
-        <el-input v-model="dataForm.unit"
-                  placeholder="单元"></el-input>
-      </el-form-item>
-      <el-form-item label="房间号"
-                    prop="roomNo"
-                    label-width="155px">
-        <el-input v-model="dataForm.roomNo"
-                  placeholder="房间号"></el-input>
-      </el-form-item>
-      <el-form-item label="房屋性质"
-                    prop="houseProperty"
-                    label-width="155px">
-        <el-input v-model="dataForm.houseProperty"
-                  placeholder="房屋性质"></el-input>
-      </el-form-item>
-      <el-form-item label="家庭保障情况"
-                    prop="familySecurity"
-                    label-width="155px">
-        <el-input v-model="dataForm.familySecurity"
-                  placeholder="家庭保障情况"></el-input>
-      </el-form-item>
-      <el-form-item label="居住情况"
-                    prop="livingSituation"
-                    label-width="155px">
-        <el-input v-model="dataForm.livingSituation"
-                  placeholder="居住情况"></el-input>
-      </el-form-item>
+<!--      <el-form-item label="房屋性质" prop="houseProperty" label-width="155px">-->
+<!--        <el-radio-group v-model="dataForm.houseProperty">-->
+<!--          <el-radio  label="0">自住</el-radio>-->
+<!--          <el-radio  label="1">租赁</el-radio>-->
+<!--          <el-radio  label="2">经营</el-radio>-->
+<!--        </el-radio-group>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="往返情况"-->
+<!--                    prop="returnState"-->
+<!--                    label-width="155px">-->
+<!--        <el-select v-model="dataForm.returnState"-->
+<!--                   placeholder="往返情况">-->
+<!--          <el-option v-for="item in returnStateArr"-->
+<!--                     :key="item.dictValue"-->
+<!--                     :label="item.dictName"-->
+<!--                     :value="item.dictValue">-->
+<!--          </el-option>-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+<!--      <div v-if="showFlagIn">-->
+<!--        <el-form-item label="拟离开平阴时间"-->
+<!--                      prop="leaveTime"-->
+<!--                      label-width="155px">-->
+<!--          <el-date-picker v-model="dataForm.leaveTime"-->
+<!--                          type="date"-->
+<!--                          placeholder="选择拟离开平阴时间"-->
+<!--                          label-width="150px"-->
+<!--                          value-format="yyyy-MM-dd"-->
+<!--                          format="yyyy-MM-dd"-->
+<!--                          style="width:200px">-->
+<!--          </el-date-picker>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="拟去往目的地"-->
+<!--                      prop="destinationAddressName"-->
+<!--                      label-width="155px">-->
+<!--          <el-cascader ref="qwmddname"-->
+<!--                       v-model="dataForm.destinationAddressCodes"-->
+<!--                       :options="options"-->
+<!--                       @change="destinationChangeHandle"-->
+<!--                       :props="{ checkStrictly: false, multiple: true, emitPath: true }">-->
+<!--          </el-cascader>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="拟去往目的地详细地址"-->
+<!--                      prop="destinationAddressDetail"-->
+<!--                      label-width="155px">-->
+<!--          <el-input v-model="dataForm.destinationAddressDetail"-->
+<!--                    placeholder="去往目的地详细地址"-->
+<!--                    maxlength="200"-->
+<!--                    clearable></el-input>-->
+<!--        </el-form-item>-->
+<!--      </div>-->
+<!--      <div v-if="showFlagOut">-->
+<!--        <el-form-item label="居住地关联人"-->
+<!--                      prop="relationPeople"-->
+<!--                      label-width="155px">-->
+<!--          <el-input v-model="dataForm.relationPeople"-->
+<!--                    placeholder="居住地关联人"-->
+<!--                    maxlength="20"-->
+<!--                    clearable-->
+<!--                    @keyup.native="btKeyUpRelationPeople"></el-input>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="关联人联系电话"-->
+<!--                      prop="relationPeopleMobile"-->
+<!--                      label-width="155px">-->
+<!--          <el-input v-model="dataForm.relationPeopleMobile"-->
+<!--                    placeholder="关联人联系电话"-->
+<!--                    clearable-->
+<!--                    maxlength="11"-->
+<!--                    @keyup.native="btKeyUpRelationPeopleMobile"></el-input>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="疫情风险等级"-->
+<!--                      prop="riskGrade"-->
+<!--                      label-width="155px">-->
+<!--          <el-select v-model="dataForm.riskGrade"-->
+<!--                     placeholder="现居住地疫情风险等级">-->
+<!--            <el-option v-for="item in riskGradeeArr"-->
+<!--                       :key="item.dictValue"-->
+<!--                       :label="item.dictName"-->
+<!--                       :value="item.dictValue">-->
+<!--            </el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="拟返回平阴时间"-->
+<!--                      prop="goBarkTime"-->
+<!--                      label-width="155px">-->
+<!--          <el-date-picker v-model="dataForm.goBarkTime"-->
+<!--                          type="date"-->
+<!--                          placeholder="返回平阴时间"-->
+<!--                          label-width="155px"-->
+<!--                          value-format="yyyy-MM-dd"-->
+<!--                          format="yyyy-MM-dd"-->
+<!--                          style="width:200px">-->
+<!--          </el-date-picker>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="现居住地"-->
+<!--                      prop="outLiveAddressName"-->
+<!--                      label-width="155px">-->
+<!--          <el-cascader ref="zwjzdname"-->
+<!--                       v-model="dataForm.outLiveAddressCodes"-->
+<!--                       :options="options"-->
+<!--                       @change="outLiveAddressChangeHandle"-->
+<!--                       :props="{ checkStrictly: false, multiple: true, emitPath: true }">-->
+<!--          </el-cascader>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="现居住地详细地址"-->
+<!--                      prop="outLiveAddressDetail"-->
+<!--                      label-width="155px">-->
+<!--          <el-input v-model="dataForm.outLiveAddressDetail"-->
+<!--                    placeholder="现居住地详细地址"-->
+<!--                    maxlength="200"-->
+<!--                    clearable></el-input>-->
+<!--        </el-form-item>-->
+<!--      </div>-->
+<!--      <el-form-item label="社区/村庄"-->
+<!--                    prop="community"-->
+<!--                    label-width="155px">-->
+<!--        <el-input v-model="dataForm.community"-->
+<!--                  placeholder="社区/村庄"></el-input>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="网格名称"-->
+<!--                    prop="gridName"-->
+<!--                    label-width="155px">-->
+<!--        <el-input v-model="dataForm.gridName"-->
+<!--                  placeholder="网格名称"></el-input>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="小区"-->
+<!--                    prop="plot"-->
+<!--                    label-width="155px">-->
+<!--        <el-input v-model="dataForm.plot"-->
+<!--                  placeholder="小区"></el-input>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="楼号"-->
+<!--                    prop="buildingNo"-->
+<!--                    label-width="155px">-->
+<!--        <el-input v-model="dataForm.buildingNo"-->
+<!--                  placeholder="楼号"></el-input>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="单元"-->
+<!--                    prop="unit"-->
+<!--                    label-width="155px">-->
+<!--        <el-input v-model="dataForm.unit"-->
+<!--                  placeholder="单元"></el-input>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="房间号"-->
+<!--                    prop="roomNo"-->
+<!--                    label-width="155px">-->
+<!--        <el-input v-model="dataForm.roomNo"-->
+<!--                  placeholder="房间号"></el-input>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="家庭保障情况"-->
+<!--                    prop="familySecurity"-->
+<!--                    label-width="155px">-->
+<!--        <el-input v-model="dataForm.familySecurity"-->
+<!--                  placeholder="家庭保障情况"></el-input>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="居住情况"-->
+<!--                    prop="livingSituation"-->
+<!--                    label-width="155px">-->
+<!--        <el-input v-model="dataForm.livingSituation"-->
+<!--                  placeholder="居住情况"></el-input>-->
+<!--      </el-form-item>-->
     </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
@@ -483,6 +500,18 @@ export default {
       ],
       options: [],
       liveOptions: [],
+      educationLevelList: [],
+      maritalStatusList: [],
+      relationList: [
+        { dictValue: '0', dictName: '子女' },
+        { dictValue: '1', dictName: '夫妻' },
+        { dictValue: '2', dictName: '父母' },
+        { dictValue: '3', dictName: '其他' }
+      ],
+      politicsStatusList: [],
+      employmentStatusList: [],
+      specialCrowdList: [],
+      peopleCategoriesList: [],
       isAble: false,
       showFlagIn: true,
       showFlagOut: true,
@@ -492,8 +521,8 @@ export default {
         { dictValue: '3', dictName: '高风险' }
       ],
       gender: [
-        { dictValue: '男', dictName: '男' },
-        { dictValue: '女', dictName: '女' }
+        { dictValue: '1', dictName: '男' },
+        { dictValue: '0', dictName: '女' }
       ],
       vueLoading: true
     }
@@ -518,7 +547,7 @@ export default {
       this.vueLoading = true
       // 清空组织树选中
       this.dataForm.destinationAddressCodes = []
-      // this.getOptions()
+      this.getOptions()
       this.getLiveOptions()
       this.vueLoading = false
       this.$nextTick(() => {
@@ -617,18 +646,54 @@ export default {
       this.dataForm.destinationAddressName = destinationAddressName
     },
     getOptions () {
-      this.$http
-        .get(`/custom/select/getSysArea`)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.options = res.data
-          this.vueLoading = false
-          this.isAble = false
-        })
-        .catch(() => {
-        })
+      // this.$http
+      //   .get(`/custom/select/getSysArea`)
+      //   .then(({ data: res }) => {
+      //     if (res.code !== 0) {
+      //       return this.$message.error(res.msg)
+      //     }
+      //     this.options = res.data
+      //     this.vueLoading = false
+      //     this.isAble = false
+      //   })
+      //   .catch(() => {
+      //   })
+      this.$http.get(`/sys/dict/listSimple/education_level`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.educationLevelList = 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.maritalStatusList = res.data
+      }).catch(() => { })
+      this.$http.get(`/sys/dict/listSimple/politics_status`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.politicsStatusList = res.data
+      }).catch(() => { })
+      this.$http.get(`/sys/dict/listSimple/employment_status`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.employmentStatusList = res.data
+      }).catch(() => { })
+      this.$http.get(`/sys/dict/listSimple/people_categories`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.peopleCategoriesList = res.data
+      }).catch(() => { })
+      this.$http.get(`/sys/dict/listSimple/special_crowd`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.specialCrowdList = res.data
+      }).catch(() => { })
     },
     getLiveOptions () {
       this.$http
@@ -724,4 +789,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>