diff --git a/src/views/modules/epidemic/epidemicreportuserinfo-add-or-update.vue b/src/views/modules/epidemic/epidemicreportuserinfo-add-or-update.vue
index 561c4a9..c43adf2 100644
--- a/src/views/modules/epidemic/epidemicreportuserinfo-add-or-update.vue
+++ b/src/views/modules/epidemic/epidemicreportuserinfo-add-or-update.vue
@@ -15,19 +15,27 @@
              :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
         <div class="row">
           <div class="column">
-            <el-form-item label="县内居住地" prop="liveAddressName" label-width="135px">
-              <!--                    <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" @click.native="changeLiveList(item.label)"></el-option>
-              </el-select>
-              <!--        <el-input v-model="dataForm.liveAddressName"  placeholder="县内居住地" maxlength="200" clearable></el-input>-->
+<!--            <el-form-item label="县内居住地" prop="liveAddressName" label-width="135px">-->
+<!--              &lt;!&ndash;                    <el-cascader&ndash;&gt;-->
+<!--              &lt;!&ndash;                            ref="jzdname"&ndash;&gt;-->
+<!--              &lt;!&ndash;                            v-model="dataForm.liveAddressCodes"&ndash;&gt;-->
+<!--              &lt;!&ndash;                            :options="liveOptions"&ndash;&gt;-->
+<!--              &lt;!&ndash;                            @change="liveAddressChangeHandle"&ndash;&gt;-->
+<!--              &lt;!&ndash;                            :props="{ checkStrictly: false, multiple: true, emitPath: true }"&ndash;&gt;-->
+<!--              &lt;!&ndash;                    >&ndash;&gt;-->
+<!--              &lt;!&ndash;                    </el-cascader>&ndash;&gt;-->
+<!--              <el-select v-model="dataForm.liveAddressCode" placeholder="请选择">-->
+<!--                <el-option v-for="item in liveOptions" :key="item.value" :label="item.label" :value="item.value" @click.native="changeLiveList(item.label)"></el-option>-->
+<!--              </el-select>-->
+<!--              &lt;!&ndash;        <el-input v-model="dataForm.liveAddressName"  placeholder="县内居住地" maxlength="200" clearable></el-input>&ndash;&gt;-->
+<!--            </el-form-item>-->
+            <el-form-item label="所属组织" prop="deptIdList" label-width="135px">
+              <el-cascader v-model="dataForm.deptIdList"
+                           ref="deptTree"
+                           :options="deptOptions"
+                           @change="changeDept"
+                           clearable>
+              </el-cascader>
             </el-form-item>
 
             <el-form-item label="楼号" prop="buildingNo" label-width="135px">
@@ -86,8 +94,12 @@
           </div>
 
           <div class="column">
-            <el-form-item label="社区/村庄" prop="community" label-width="135px">
-              <el-input v-model="dataForm.community" placeholder="社区/村庄"></el-input>
+<!--            <el-form-item label="社区/村庄" prop="community" label-width="135px">-->
+<!--              <el-input v-model="dataForm.community" placeholder="社区/村庄"></el-input>-->
+<!--            </el-form-item>-->
+
+            <el-form-item label="房屋性质" prop="houseProperty" label-width="135px">
+              <el-input v-model="dataForm.houseProperty" placeholder="房屋性质"></el-input>
             </el-form-item>
 
             <el-form-item label="单元" prop="unit" label-width="135px">
@@ -106,9 +118,9 @@
               <el-input v-model="dataForm.bloodType" placeholder="血型"></el-input>
             </el-form-item>
 
-<!--            <el-form-item label="与户主关系" prop="relation" label-width="135px">-->
-<!--              <el-input v-model="dataForm.relation" placeholder="与户主关系"></el-input>-->
-<!--            </el-form-item>-->
+            <el-form-item label="与户主关系" prop="relation" label-width="135px">
+              <el-input v-model="dataForm.relation" placeholder="与户主关系"></el-input>
+            </el-form-item>
 
             <el-form-item label="民族" prop="nation" label-width="135px">
               <el-input v-model="dataForm.nation" placeholder="民族"></el-input>
@@ -137,19 +149,12 @@
               <el-input v-model="dataForm.relationPeople" placeholder="居住地关联人" maxlength="20" clearable @keyup.native="btKeyUpRelationPeople"></el-input>
             </el-form-item>
 
-            <el-form-item label="所属组织" prop="deptIdList" label-width="135px">
-              <el-cascader v-model="dataForm.deptIdList"
-                           ref="deptTree"
-                           :options="deptOptions"
-                           @change="changeDept"
-                           clearable>
-              </el-cascader>
-            </el-form-item>
+
 
           </div>
           <div class="column">
-            <el-form-item label="网格名称" prop="gridName" label-width="135px">
-              <el-input v-model="dataForm.gridName" placeholder="网格名称"></el-input>
+            <el-form-item label="房屋地址" prop="houseAddress" label-width="135px">
+              <el-input v-model="dataForm.houseAddress" placeholder="房屋地址"></el-input>
             </el-form-item>
 
             <el-form-item label="房号" prop="roomNo" label-width="135px">
@@ -224,9 +229,6 @@
               <el-input v-model="dataForm.plot" placeholder="小区"></el-input>
             </el-form-item>
 
-<!--            <el-form-item label="房屋性质" prop="houseProperty" label-width="135px">-->
-<!--              <el-input v-model="dataForm.houseProperty" placeholder="房屋性质"></el-input>-->
-<!--            </el-form-item>-->
 
             <el-form-item label="出生年月" prop="birthday" label-width="135px">
               <el-input v-model="dataForm.birthday" placeholder="出生年月"></el-input>
diff --git a/src/views/modules/epidemic/epidemicreportuserinfoDetail.vue b/src/views/modules/epidemic/epidemicreportuserinfoDetail.vue
index 52cd88d..97017b7 100644
--- a/src/views/modules/epidemic/epidemicreportuserinfoDetail.vue
+++ b/src/views/modules/epidemic/epidemicreportuserinfoDetail.vue
@@ -17,8 +17,13 @@
              :inline="true">
         <div class="row">
           <div class="column">
-            <el-form-item label="县内居住地" prop="liveAddressName" label-width="130px" label-height="100%">
-              <div class="column-content">{{dataForm.liveAddressName}}</div>
+<!--            <el-form-item label="县内居住地" prop="liveAddressName" label-width="130px" label-height="100%">-->
+<!--              <div class="column-content">{{dataForm.liveAddressName}}</div>-->
+<!--            </el-form-item>-->
+
+            <el-form-item label="所属组织" prop="daptName" label-width="130px">
+              <div class="column-content">{{dataForm.deptName}}</div>
+              <!-- <el-input v-model="dataForm.relationPeople" placeholder="居住地关联人" maxlength="20" clearable @keyup.native="btKeyUpRelationPeople"></el-input> -->
             </el-form-item>
 
             <el-form-item label="楼号" prop="buildingNo" label-width="130px">
@@ -88,9 +93,10 @@
           </div>
 
           <div class="column">
-            <el-form-item label="社区/村庄" prop="community" label-width="130px">
-              <div class="column-content">{{dataForm.community}}</div>
-              <!-- <el-input v-model="dataForm.community" placeholder="社区/村庄"></el-input> -->
+
+            <el-form-item label="房屋性质" prop="houseProperty" label-width="130px">
+<!--              <el-input v-model="dataForm.houseProperty" placeholder="房屋性质"></el-input>-->
+              <div class="column-content">{{dataForm.houseProperty}}</div>
             </el-form-item>
 
             <el-form-item label="单元" prop="unit" label-width="130px">
@@ -113,10 +119,10 @@
               <!-- <el-input v-model="dataForm.bloodType" placeholder="血型"></el-input> -->
             </el-form-item>
 
-<!--            <el-form-item label="与户主关系" prop="relation" label-width="130px">-->
-<!--              <div class="column-content">{{dataForm.relation}}</div>-->
-<!--              &lt;!&ndash; <el-input v-model="dataForm.relation" placeholder="与户主关系"></el-input> &ndash;&gt;-->
-<!--            </el-form-item>-->
+            <el-form-item label="与户主关系" prop="relation" label-width="130px">
+              <div class="column-content">{{dataForm.relation}}</div>
+              <!-- <el-input v-model="dataForm.relation" placeholder="与户主关系"></el-input> -->
+            </el-form-item>
 
             <el-form-item label="民族" prop="nation" label-width="130px">
               <div class="column-content">{{dataForm.nation}}</div>
@@ -150,16 +156,13 @@
               <!-- <el-input v-model="dataForm.relationPeople" placeholder="居住地关联人" maxlength="20" clearable @keyup.native="btKeyUpRelationPeople"></el-input> -->
             </el-form-item>
 
-            <el-form-item label="所属机构" prop="daptName" label-width="130px">
-              <div class="column-content">{{dataForm.deptName}}</div>
-              <!-- <el-input v-model="dataForm.relationPeople" placeholder="居住地关联人" maxlength="20" clearable @keyup.native="btKeyUpRelationPeople"></el-input> -->
-            </el-form-item>
+
 
           </div>
           <div class="column">
-            <el-form-item label="网格名称" prop="gridName" label-width="130px">
-              <div class="column-content">{{dataForm.gridName}}</div>
-              <!-- <el-input v-model="dataForm.gridName" placeholder="网格名称"></el-input> -->
+            <el-form-item label="房屋地址" prop="houseAddress" label-width="130px">
+<!--              <el-input v-model="dataForm.houseAddress" placeholder="房屋地址"></el-input>-->
+              <div class="column-content">{{dataForm.houseAddress}}</div>
             </el-form-item>
 
             <el-form-item label="房号" prop="roomNo" label-width="130px">