diff --git a/src/views/modules/epidemic/epidemicreportuserinfo-add-or-update.vue b/src/views/modules/epidemic/epidemicreportuserinfo-add-or-update.vue
index c43adf2..568cb83 100644
--- a/src/views/modules/epidemic/epidemicreportuserinfo-add-or-update.vue
+++ b/src/views/modules/epidemic/epidemicreportuserinfo-add-or-update.vue
@@ -77,19 +77,19 @@
               <el-input v-model="dataForm.car" placeholder="有无车辆"></el-input>
             </el-form-item>
 
-            <el-form-item label="现居住地" prop="outLiveAddressName" label-width="135px">
-              <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="outLiveAddressName" label-width="135px">-->
+<!--              <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="goBarkTime" label-width="135px">
-              <el-date-picker v-model="dataForm.goBarkTime" type="date" placeholder="返回平阴时间" label-width="135px" value-format="yyyy-MM-dd"
-                              format="yyyy-MM-dd" style="width:200px">
-              </el-date-picker>
-            </el-form-item>
+<!--            <el-form-item label="拟返回平阴时间" prop="goBarkTime" label-width="135px">-->
+<!--              <el-date-picker v-model="dataForm.goBarkTime" type="date" placeholder="返回平阴时间" label-width="135px" value-format="yyyy-MM-dd"-->
+<!--                              format="yyyy-MM-dd" style="width:200px">-->
+<!--              </el-date-picker>-->
+<!--            </el-form-item>-->
 
           </div>
 
@@ -141,13 +141,11 @@
               <el-input v-model="dataForm.carNo" placeholder="车牌号"></el-input>
             </el-form-item>
 
-            <el-form-item label="现居住地详细地址" prop="outLiveAddressDetail" label-width="135px">
-              <el-input v-model="dataForm.outLiveAddressDetail" placeholder="现居住地详细地址" maxlength="200" clearable></el-input>
-            </el-form-item>
 
-            <el-form-item label="居住地关联人" prop="relationPeople" label-width="135px">
-              <el-input v-model="dataForm.relationPeople" placeholder="居住地关联人" maxlength="20" clearable @keyup.native="btKeyUpRelationPeople"></el-input>
-            </el-form-item>
+
+<!--            <el-form-item label="居住地关联人" prop="relationPeople" label-width="135px">-->
+<!--              <el-input v-model="dataForm.relationPeople" placeholder="居住地关联人" maxlength="20" clearable @keyup.native="btKeyUpRelationPeople"></el-input>-->
+<!--            </el-form-item>-->
 
 
 
@@ -213,15 +211,15 @@
               <el-input v-model="dataForm.nativePlace" placeholder="籍贯"></el-input>
             </el-form-item>
 
-            <el-form-item label="疫情风险等级" prop="riskGrade" label-width="135px">
-              <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="riskGrade" label-width="135px">-->
+<!--              <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="relationPeopleMobile" label-width="135px">
-              <el-input v-model="dataForm.relationPeopleMobile" placeholder="关联人联系电话" clearable maxlength="11" @keyup.native="btKeyUpRelationPeopleMobile"></el-input>
-            </el-form-item>
+<!--            <el-form-item label="关联人联系电话" prop="relationPeopleMobile" label-width="135px">-->
+<!--              <el-input v-model="dataForm.relationPeopleMobile" placeholder="关联人联系电话" clearable maxlength="11" @keyup.native="btKeyUpRelationPeopleMobile"></el-input>-->
+<!--            </el-form-item>-->
 
           </div>
           <div class="column">
@@ -265,44 +263,48 @@
               <el-input v-model="dataForm.hushaiStatus" placeholder="人户状况"></el-input>
             </el-form-item>
 
-            <el-form-item label="往返情况" prop="returnState" label-width="135px">
-              <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="135px">
-                <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="135px">
-                <el-cascader ref="qwmddname"
-                            v-model="dataForm.destinationAddressCodes"
-                            :options="options"
-                            @change="destinationChangeHandle"
-                            :props="{ checkStrictly: false, multiple: true, emitPath: true }">
-                </el-cascader>
+              <el-form-item label="现居住地详细地址" prop="outLiveAddressDetail" label-width="135px">
+                  <el-input v-model="dataForm.outLiveAddressDetail" placeholder="现居住地详细地址" maxlength="200" clearable></el-input>
               </el-form-item>
-              <el-form-item label="拟去往目的地详细地址"
-                            prop="destinationAddressDetail"
-                            label-width="135px">
-                <el-input v-model="dataForm.destinationAddressDetail"
-                          placeholder="去往目的地详细地址"
-                          maxlength="200"
-                          clearable></el-input>
-              </el-form-item>
-            </div>
+
+<!--            <el-form-item label="往返情况" prop="returnState" label-width="135px">-->
+<!--              <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="135px">-->
+<!--                <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="135px">-->
+<!--                <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="135px">-->
+<!--                <el-input v-model="dataForm.destinationAddressDetail"-->
+<!--                          placeholder="去往目的地详细地址"-->
+<!--                          maxlength="200"-->
+<!--                          clearable></el-input>-->
+<!--              </el-form-item>-->
+<!--            </div>-->
           </div>
         </div>
       <!--<el-form-item label="县内居住地详细地址" prop="liveAddressDetail" label-width="135px">-->
@@ -386,7 +388,8 @@ export default {
         houseProperty: '',
         familySecurity: '',
         livingSituation: '',
-        deptId:''
+        deptId:'',
+        houseAddress: ''
       },
       returnStateArr: [
         { dictValue: '1', dictName: '在本地' },
diff --git a/src/views/modules/epidemic/epidemicreportuserinfo.vue b/src/views/modules/epidemic/epidemicreportuserinfo.vue
index 1f1bb9c..787cce8 100644
--- a/src/views/modules/epidemic/epidemicreportuserinfo.vue
+++ b/src/views/modules/epidemic/epidemicreportuserinfo.vue
@@ -166,6 +166,10 @@
           <el-button type="primary"
                      @click="beforeGetDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
+        <el-form-item>
+          <el-button type="primary"
+                     @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
         <el-form-item>
           <el-button type="primary"
                      @click="exports()">{{ $t('export') }}</el-button>
@@ -372,10 +376,10 @@
       <!-- 弹窗, 新增 / 修改 -->
       <add-or-update v-if="addOrUpdateVisible"
                      ref="addOrUpdate"
-                     @refreshDataList="beforeGetDataList()"></add-or-update>
+                     @refreshDataList="getDataList()"></add-or-update>
       <infoDetail v-if="detailVisible"
                   ref="infoDetail"
-                  @refreshDataList="beforeGetDataList()"></infoDetail>
+                  @refreshDataList="getDataList()"></infoDetail>
       <el-dialog title="导出选择"
                  :visible.sync="dialogVisibleExcel"
                  width="30%">
diff --git a/src/views/modules/epidemic/epidemicreportuserinfoDetail.vue b/src/views/modules/epidemic/epidemicreportuserinfoDetail.vue
index 97017b7..672cf77 100644
--- a/src/views/modules/epidemic/epidemicreportuserinfoDetail.vue
+++ b/src/views/modules/epidemic/epidemicreportuserinfoDetail.vue
@@ -73,22 +73,22 @@
               <!-- <el-input v-model="dataForm.car" placeholder="有无车辆"></el-input> -->
             </el-form-item>
 
-            <el-form-item label="现居住地" prop="outLiveAddressName" label-width="130px">
-              <div class="column-content">{{dataForm.outLiveAddressName}}</div>
+<!--            <el-form-item label="现居住地" prop="outLiveAddressName" label-width="130px">-->
+<!--              <div class="column-content">{{dataForm.outLiveAddressName}}</div>-->
               <!-- <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>-->
 
-            <el-form-item label="拟返回平阴时间" prop="goBarkTime" label-width="130px">
-              <div class="column-content">{{dataForm.goBarkTime}}</div>
+<!--            <el-form-item label="拟返回平阴时间" prop="goBarkTime" label-width="130px">-->
+<!--              <div class="column-content">{{dataForm.goBarkTime}}</div>-->
               <!-- <el-date-picker v-model="dataForm.goBarkTime" type="date" placeholder="返回平阴时间" label-width="130px" value-format="yyyy-MM-dd"
                               format="yyyy-MM-dd" style="width:200px">
               </el-date-picker> -->
-            </el-form-item>
+<!--            </el-form-item>-->
 
           </div>
 
@@ -146,15 +146,12 @@
               <!-- <el-input v-model="dataForm.carNo" placeholder="车牌号"></el-input> -->
             </el-form-item>
 
-            <el-form-item label="现居住地详细地址" prop="outLiveAddressDetail" label-width="130px">
-              <div class="column-content">{{dataForm.outLiveAddressDetail}}</div>
-              <!-- <el-input v-model="dataForm.outLiveAddressDetail" placeholder="现居住地详细地址" maxlength="200" clearable></el-input> -->
-            </el-form-item>
 
-            <el-form-item label="居住地关联人" prop="relationPeople" label-width="130px">
-              <div class="column-content">{{dataForm.relationPeople}}</div>
+
+<!--            <el-form-item label="居住地关联人" prop="relationPeople" label-width="130px">-->
+<!--              <div class="column-content">{{dataForm.relationPeople}}</div>-->
               <!-- <el-input v-model="dataForm.relationPeople" placeholder="居住地关联人" maxlength="20" clearable @keyup.native="btKeyUpRelationPeople"></el-input> -->
-            </el-form-item>
+<!--            </el-form-item>-->
 
 
 
@@ -226,17 +223,17 @@
               <!-- <el-input v-model="dataForm.nativePlace" placeholder="籍贯"></el-input> -->
             </el-form-item>
 
-            <el-form-item label="疫情风险等级" prop="riskGrade" label-width="130px">
-              <div class="column-content">{{getOptionsLabel(dataForm.riskGrade, riskGradeeArr)}}</div>
+<!--            <el-form-item label="疫情风险等级" prop="riskGrade" label-width="130px">-->
+<!--              <div class="column-content">{{getOptionsLabel(dataForm.riskGrade, riskGradeeArr)}}</div>-->
               <!-- <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>-->
 
-            <el-form-item label="关联人联系电话" prop="relationPeopleMobile" label-width="130px">
-              <div class="column-content">{{dataForm.relationPeopleMobile}}</div>
+<!--            <el-form-item label="关联人联系电话" prop="relationPeopleMobile" label-width="130px">-->
+<!--              <div class="column-content">{{dataForm.relationPeopleMobile}}</div>-->
               <!-- <el-input v-model="dataForm.relationPeopleMobile" placeholder="关联人联系电话" clearable maxlength="11" @keyup.native="btKeyUpRelationPeopleMobile"></el-input> -->
-            </el-form-item>
+<!--            </el-form-item>-->
 
           </div>
           <div class="column">
@@ -294,12 +291,17 @@
               <!-- <el-input v-model="dataForm.hushaiStatus" placeholder="人户状况"></el-input> -->
             </el-form-item>
 
-            <el-form-item label="往返情况" prop="returnState" label-width="130px">
-              <div class="column-content">{{getOptionsLabel(dataForm.returnState, returnStateArr)}}</div>
+              <el-form-item label="现居住地详细地址" prop="outLiveAddressDetail" label-width="130px">
+                  <div class="column-content">{{dataForm.outLiveAddressDetail}}</div>
+                  <!-- <el-input v-model="dataForm.outLiveAddressDetail" placeholder="现居住地详细地址" maxlength="200" clearable></el-input> -->
+              </el-form-item>
+
+<!--            <el-form-item label="往返情况" prop="returnState" label-width="130px">-->
+<!--              <div class="column-content">{{getOptionsLabel(dataForm.returnState, returnStateArr)}}</div>-->
               <!-- <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>
+<!--            </el-form-item>-->
 
           </div>
         </div>
@@ -307,41 +309,41 @@
       <!--<el-input v-model="dataForm.liveAddressDetail" placeholder="县内居住地详细地址" maxlength="200" clearable></el-input>-->
       <!--</el-form-item>-->
 
-      <div v-if="showFlagIn">
-        <el-form-item label="拟离开平阴时间"
-                      prop="leaveTime"
-                      label-width="130px">
-          <div class="column-content">{{dataForm.leaveTime}}</div>
-          <!-- <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="130px">
-          <div class="column-content">{{dataForm.destinationAddressCodes}}</div>
-          <!-- <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="130px">
-          <div class="column-content">{{dataForm.destinationAddressDetail}}</div>
-          <!-- <el-input v-model="dataForm.destinationAddressDetail"
-                    placeholder="去往目的地详细地址"
-                    maxlength="200"
-                    clearable></el-input> -->
-        </el-form-item>
-      </div>
+<!--      <div v-if="showFlagIn">-->
+<!--        <el-form-item label="拟离开平阴时间"-->
+<!--                      prop="leaveTime"-->
+<!--                      label-width="130px">-->
+<!--          <div class="column-content">{{dataForm.leaveTime}}</div>-->
+<!--          &lt;!&ndash; <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> &ndash;&gt;-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="拟去往目的地"-->
+<!--                      prop="destinationAddressName"-->
+<!--                      label-width="130px">-->
+<!--          <div class="column-content">{{dataForm.destinationAddressCodes}}</div>-->
+<!--          &lt;!&ndash; <el-cascader ref="qwmddname"-->
+<!--                       v-model="dataForm.destinationAddressCodes"-->
+<!--                       :options="options"-->
+<!--                       @change="destinationChangeHandle"-->
+<!--                       :props="{ checkStrictly: false, multiple: true, emitPath: true }">-->
+<!--          </el-cascader> &ndash;&gt;-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="拟去往目的地详细地址"-->
+<!--                      prop="destinationAddressDetail"-->
+<!--                      label-width="130px">-->
+<!--          <div class="column-content">{{dataForm.destinationAddressDetail}}</div>-->
+<!--          &lt;!&ndash; <el-input v-model="dataForm.destinationAddressDetail"-->
+<!--                    placeholder="去往目的地详细地址"-->
+<!--                    maxlength="200"-->
+<!--                    clearable></el-input> &ndash;&gt;-->
+<!--        </el-form-item>-->
+<!--      </div>-->
       <div v-if="showFlagOut">
       </div>
     </el-form>