diff --git a/package.json b/package.json
index 08f3cbb5a..f210dea7e 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "jsencrypt": "3.0.3",
     "lodash": "4.17.15",
     "mint-ui": "2.2.13",
-    "node-sass": "4.12.0",
+    "node-sass": "^4.12.0",
     "ol": "6.9.0",
     "particles.js": "2.0.0",
     "portfinder": "1.0.21",
diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index fb4b098a7..6dbda4e2b 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -1,26 +1,24 @@
 <template>
   <div class="resi-container">
     <!-- <el-card class="resi-card"> -->
-    <el-row class="resi-row-box" :class="!isArrow && 'resi-row-more'">
-      <el-row v-if="showGrid" class="resi-row">
-        <el-col :span="6">
-          <div class="resi-cell">
-            <div class="resi-cell-label">所属组织</div>
-            <div class="resi-cell-value">
-              <el-cascader
-                class="customer_cascader"
-                ref="myCascader"
-                v-model="agencyIdArray"
-                filterable
-                :options="orgOptions"
-                :props="orgOptionProps"
-                :show-all-levels="false"
-                @change="handleChangeAgency"
-              ></el-cascader>
+      <el-row class="resi-row-box" :class="!isArrow && 'resi-row-more'">
+        <el-row v-if="showGrid" class="resi-row">
+          <el-col :span="6">
+            <div class="resi-cell">
+              <div class="resi-cell-label">所属组织</div>
+              <div class="resi-cell-value">
+                <el-cascader class="customer_cascader"
+                             ref="myCascader"
+                             v-model="agencyIdArray"
+                             filterable
+                             :options="orgOptions"
+                             :props="orgOptionProps"
+                             :show-all-levels="false"
+                             @change="handleChangeAgency"></el-cascader>
+              </div>
             </div>
-          </div>
-        </el-col>
-        <!--          <el-col :span="6">
+          </el-col>
+<!--          <el-col :span="6">
             <div class="resi-cell">
               <div class="resi-cell-label">所属网格</div>
               <div class="resi-cell-value">
@@ -262,7 +260,7 @@
 </template>
 
 <script>
-import inputRange from "./rangeInput.vue";
+import inputRange from './rangeInput.vue'
 export default {
   name: "ResiSearch",
   components: {
@@ -327,19 +325,19 @@ export default {
     });
     let constForm = {
       ...form,
-      GRID_ID: "",
-      VILLAGE_ID: "",
-      BUILD_ID: "",
-      UNIT_ID: "",
-      HOME_ID: "",
-    };
+      GRID_ID: '',
+      VILLAGE_ID: '',
+      BUILD_ID: '',
+      UNIT_ID: '',
+      HOME_ID: ''
+    }
     let orgOptionProps = {
       multiple: false,
-      value: "agencyId",
-      label: "agencyName",
-      children: "subAgencyList",
-      checkStrictly: true,
-    };
+      value: 'agencyId',
+      label: 'agencyName',
+      children: 'subAgencyList',
+      checkStrictly: true
+    }
 
     return {
       pageLoading: false,
@@ -356,22 +354,22 @@ export default {
       itemList,
       fixedList: [],
       fixedForm: {
-        AGENCY_ID: "",
-        GRID_ID: "",
-        VILLAGE_ID: "",
-        BUILD_ID: "",
-        UNIT_ID: "",
-        HOME_ID: "",
+        AGENCY_ID: '',
+        GRID_ID: '',
+        VILLAGE_ID: '',
+        BUILD_ID: '',
+        UNIT_ID: '',
+        HOME_ID: ''
       },
       constForm,
       form: {
         ...form,
-        AGENCY_ID: "",
-        GRID_ID: "",
-        VILLAGE_ID: "",
-        BUILD_ID: "",
-        UNIT_ID: "",
-        HOME_ID: "",
+        AGENCY_ID: '',
+        GRID_ID: '',
+        VILLAGE_ID: '',
+        BUILD_ID: '',
+        UNIT_ID: '',
+        HOME_ID: ''
       },
       tempFormList,
       pickerOptions: {
@@ -406,14 +404,10 @@ export default {
         ],
       },
 
-      queryType: {
-        AGENCY_ID: "like",
-      },
-      ageObj: {
-        start:"",
-        end:""
-      },
-    };
+      queryType:{
+        'AGENCY_ID':'like'
+      }
+    }
   },
   computed: {
     sliceList() {
@@ -572,46 +566,41 @@ export default {
       // const e = this.computedBirth(val.start)
     },
     handleChangeAgency(val) {
-      let obj = this.$refs["myCascader"].getCheckedNodes()[0].data;
+      let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
       if (obj) {
-        if (obj.level === "grid") {
-          this.form.GRID_ID =
-            this.agencyIdArray.length > 0
-              ? this.agencyIdArray[this.agencyIdArray.length - 1]
-              : "";
-          this.form.AGENCY_ID = "";
-        } else {
-          this.form.AGENCY_ID =
-            this.agencyIdArray.length > 0
-              ? this.agencyIdArray[this.agencyIdArray.length - 1]
-              : "";
-          this.form.GRID_ID = "";
+        if(obj.level === 'grid'){
+          this.form.GRID_ID =  this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
+          this.form.AGENCY_ID=''
+        }else{
+          this.form.AGENCY_ID = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
+          this.form.GRID_ID = ''
         }
-      } else {
-        this.form.AGENCY_ID = "";
-        this.form.GRID_ID = "";
+
+      }else{
+         this.form.AGENCY_ID=''
+         this.form.GRID_ID = ''
       }
 
-      this.form.VILLAGE_ID = "";
-      this.form.BUILD_ID = "";
-      this.form.UNIT_ID = "";
-      this.form.HOME_ID = "";
-      this.getValiheList();
+      this.form.VILLAGE_ID = ''
+      this.form.BUILD_ID = ''
+      this.form.UNIT_ID = ''
+      this.form.HOME_ID = ''
+      this.getValiheList()
     },
     handleChangeGrid(val) {
-      console.log("val", val);
-      this.form.VILLAGE_ID = "";
-      this.form.BUILD_ID = "";
-      this.form.UNIT_ID = "";
-      this.form.HOME_ID = "";
-      this.getValiheList();
+      console.log('val', val)
+      this.form.VILLAGE_ID = ''
+      this.form.BUILD_ID = ''
+      this.form.UNIT_ID = ''
+      this.form.HOME_ID = ''
+      this.getValiheList()
     },
     handleChangeV(val) {
-      console.log("val", val);
-      this.form.BUILD_ID = "";
-      this.form.UNIT_ID = "";
-      this.form.HOME_ID = "";
-      this.getBuildList();
+      console.log('val', val)
+      this.form.BUILD_ID = ''
+      this.form.UNIT_ID = ''
+      this.form.HOME_ID = ''
+      this.getBuildList()
     },
     handleChangeB(val) {
       console.log("val", val);
@@ -633,20 +622,30 @@ export default {
             let hasVal = false;
             this.fixedList.forEach((item, index) => {
               if (item.columnName == val) {
-                hasVal = true;
-                item.columnValue[0] = this.form[val];
-                if (!this.form[val]) this.fixedList.splice(index, 1);
-                console.log("fixedList----val", this.fixedList);
+                hasVal = true
+                item.columnValue[0] = this.form[val]
+                if (!this.form[val]) this.fixedList.splice(index, 1)
+                console.log('fixedList----val', this.fixedList)
               } else {
+                let columnValue = undefined;
+                let valueInForm = this.form[val]
+                if (valueInForm instanceof Array) {
+                  // 如果参数本身就是数组，直接赋值
+                  columnValue = valueInForm
+                } else {
+                  // 如果参数不是数组，构造为数组
+                  columnValue = [valueInForm]
+                }
+
                 _item = {
                   queryType: this.queryType[val]
                     ? this.queryType[val]
                     : "equal", //'equal',
                   tableName: "ic_resi_user",
                   columnName: val,
-                  columnValue: [this.form[val]],
-                };
-                console.log("fixedList----else", _item);
+                  columnValue: [this.form[val]]
+                }
+                console.log('fixedList----else', _item)
                 // this.$set(this.fixedList, index, _item)
               }
             });
@@ -662,7 +661,7 @@ export default {
           }
         }
       }
-      console.log("fixedList----999", this.fixedList);
+      console.log('fixedList----999', this.fixedList)
       this.tempFormList.forEach((item) => {
         if (item.columnName === val) item.isChange = true;
       });
@@ -706,7 +705,7 @@ export default {
     getValiheList() {
       const { user } = this.$store.state;
       this.$http
-        .post("/gov/org/icneighborhood/neighborhoodoption", {
+        .post('/gov/org/icneighborhood/neighborhoodoption', {
           gridId: this.form.GRID_ID,
           agencyId: this.form.AGENCY_ID,
           // agencyId: user.agencyId
diff --git a/src/views/modules/base/collect.vue b/src/views/modules/base/collect.vue
index 4ae414aa8..dfa9e969a 100644
--- a/src/views/modules/base/collect.vue
+++ b/src/views/modules/base/collect.vue
@@ -1,11 +1,12 @@
 <template>
   <div class="resi-container">
-    <el-card ref="searchCard"
-             class="search-card">
-      <el-form ref="searchForm"
-               :inline="true"
-               :model="fmData"
-               class="demo-form-inline">
+    <el-card ref="searchCard" class="search-card">
+      <el-form
+        ref="searchForm"
+        :inline="true"
+        :model="fmData"
+        class="demo-form-inline"
+      >
         <!-- <el-form-item
           v-if="communityList.length > 0"
           label="所在社区"
@@ -27,82 +28,118 @@
             </el-option>
           </el-select>
         </el-form-item> -->
-        <el-form-item label="居住地址"
-                      prop="address">
-          <el-input v-model="fmData.address"
-                    class="resi-cell-input"
-                    size="small"
-                    clearable
-                    placeholder="请输入">
+        <el-form-item label="居住地址" prop="address">
+          <el-input
+            v-model="fmData.address"
+            class="resi-cell-input"
+            size="small"
+            clearable
+            placeholder="请输入"
+          >
           </el-input>
         </el-form-item>
-        <el-form-item label="户籍地址"
-                      prop="domicilePlace">
-          <el-input v-model="fmData.domicilePlace"
-                    class="resi-cell-input"
-                    size="small"
-                    clearable
-                    placeholder="请输入">
+        <el-form-item label="户籍地址" prop="domicilePlace">
+          <el-input
+            v-model="fmData.domicilePlace"
+            class="resi-cell-input"
+            size="small"
+            clearable
+            placeholder="请输入"
+          >
           </el-input>
         </el-form-item>
-        <el-form-item label="填写时间"
-                      prop="startTime">
-          <el-date-picker v-model="timeRange"
-                          type="daterange"
-                          clearable
-                          size="small"
-                          range-separator="至"
-                          start-placeholder="开始日期"
-                          end-placeholder="结束日期"
-                          value-format="yyyy-MM-dd">
+        <el-form-item label="户主姓名" prop="houseHolderName">
+          <el-input
+            v-model="fmData.houseHolderName"
+            class="resi-cell-input"
+            size="small"
+            clearable
+            placeholder="请输入"
+          >
+          </el-input>
+        </el-form-item>
+        <el-form-item label="审核状态" prop="checkState">
+          <el-select v-model="fmData.checkState">
+            <el-option
+              v-for="item in checkStateList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="填写时间" prop="startTime">
+          <el-date-picker
+            v-model="timeRange"
+            type="daterange"
+            clearable
+            size="small"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            value-format="yyyy-MM-dd"
+          >
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button class="diy-button--search"
-                     size="small"
-                     @click="handleSearch">查询</el-button>
-          <el-button class="diy-button--reset"
-                     size="small"
-                     @click="resetForm('searchForm')">重置</el-button>
+          <el-button
+            class="diy-button--search"
+            size="small"
+            @click="handleSearch"
+            >查询</el-button
+          >
+          <el-button
+            class="diy-button--reset"
+            size="small"
+            @click="resetForm('searchForm')"
+            >重置</el-button
+          >
         </el-form-item>
       </el-form>
     </el-card>
     <el-card class="resi-card-table">
       <div class="resi-row-btn">
-        <el-button @click="handleChu"
-                   class="diy-button--reset"
-                   size="small">导出</el-button>
+        <el-button @click="handleChu" class="diy-button--reset" size="small"
+          >导出</el-button
+        >
       </div>
-      <el-table :data="tableData"
-                border
-                style="width: 100%"
-                class="resi-table"
-                :height="tableHeight"
-                :span-method="arraySpanMethod">
-        <el-table-column label="序号"
-                         prop="desc"
-                         align="center"
-                         width="50" />
-        <el-table-column prop="houseHolderName"
-                         width="100"
-                         label="户主姓名"
-                         align="center"
-                         :show-overflow-tooltip="true" />
-        <el-table-column prop="address"
-                         align="center"
-                         min-width="140"
-                         label="居住地址"
-                         :show-overflow-tooltip="true">
+      <el-table
+        :data="tableData"
+        border
+        style="width: 100%"
+        class="resi-table"
+        :height="tableHeight"
+        :span-method="arraySpanMethod"
+      >
+        <el-table-column label="序号" prop="desc" align="center" width="50" />
+        <el-table-column
+          prop="houseHolderName"
+          width="100"
+          label="户主姓名"
+          align="center"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          prop="address"
+          align="center"
+          min-width="140"
+          label="居住地址"
+          :show-overflow-tooltip="true"
+        >
           <template slot-scope="scope">
-            <span v-if="scope.row.homeId == 'other'"
-                  class="badge">房屋缺失</span>
-            <span>{{scope.row.address}}</span>
+            <span v-if="scope.row.homeId == 'other'" class="badge"
+              >房屋缺失</span
+            >
+            <span>{{ scope.row.address }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="houseType"
-                         align="center"
-                         width="100"
-                         label="房屋状态">
+        <el-table-column
+          prop="houseType"
+          align="center"
+          width="100"
+          label="房屋状态"
+        >
           <template slot-scope="scope">
             <span v-if="scope.row.houseType == 1">出租</span>
             <span v-if="scope.row.houseType == 2">闲置</span>
@@ -110,85 +147,110 @@
             <span v-if="scope.row.houseType == 0">自住</span>
           </template>
         </el-table-column>
-        <el-table-column prop="totalResi"
-                         width="80"
-                         align="center"
-                         label="居住人数" />
-        <el-table-column prop="memberName"
-                         width="100"
-                         label="成员姓名"
-                         align="center"
-                         :show-overflow-tooltip="true" />
-        <el-table-column prop="memberIdNum"
-                         width="180"
-                         align="center"
-                         label="成员证件号"
-                         :show-overflow-tooltip="true" />
-        <el-table-column prop="memberMobile"
-                         width="140"
-                         align="center"
-                         label="成员手机号"
-                         :show-overflow-tooltip="true" />
-        <el-table-column prop="relationship"
-                         min-width="120"
-                         align="center"
-                         label="与户主关系"
-                         :show-overflow-tooltip="true">
+        <el-table-column
+          prop="totalResi"
+          width="80"
+          align="center"
+          label="居住人数"
+        />
+        <el-table-column
+          prop="memberName"
+          width="100"
+          label="成员姓名"
+          align="center"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          prop="memberIdNum"
+          width="180"
+          align="center"
+          label="成员证件号"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          prop="memberMobile"
+          width="140"
+          align="center"
+          label="成员手机号"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          prop="relationship"
+          min-width="120"
+          align="center"
+          label="与户主关系"
+          :show-overflow-tooltip="true"
+        >
           <template slot-scope="scope">
-            <span>{{getRelationshipName(scope.row.relationship)}}</span>
+            <span>{{ getRelationshipName(scope.row.relationship) }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="heSuanCount"
-                         width="120"
-                         align="center"
-                         label="核酸检测次数" />
+        <el-table-column
+          prop="heSuanCount"
+          width="120"
+          align="center"
+          label="核酸检测次数"
+        />
 
-        <el-table-column prop="ymjz"
-                         width="140"
-                         align="center"
-                         label="疫苗接种情况">
+        <el-table-column
+          prop="ymjz"
+          width="140"
+          align="center"
+          label="疫苗接种情况"
+        >
           <template slot-scope="scope">
             <span v-if="scope.row.ymjz == 1">全程接种</span>
             <span v-if="scope.row.ymjz == 2">未全程接种</span>
             <span v-if="scope.row.ymjz == 0">未接种</span>
           </template>
         </el-table-column>
-        <el-table-column prop="domicilePlace"
-                         min-width="140"
-                         align="center"
-                         label="户籍地址"
-                         :show-overflow-tooltip="true" />
-        <el-table-column prop="workPlace"
-                         min-width="120"
-                         align="center"
-                         label="单位名称"
-                         :show-overflow-tooltip="true" />
-        <el-table-column prop="remark"
-                         align="center"
-                         label="备注"
-                         :show-overflow-tooltip="true">
+        <el-table-column
+          prop="domicilePlace"
+          min-width="140"
+          align="center"
+          label="户籍地址"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          prop="workPlace"
+          min-width="120"
+          align="center"
+          label="单位名称"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          prop="remark"
+          align="center"
+          label="备注"
+          :show-overflow-tooltip="true"
+        >
         </el-table-column>
-        <el-table-column prop="faceImg"
-                         min-width="120"
-                         align="center"
-                         label="人脸">
+        <el-table-column
+          prop="faceImg"
+          min-width="120"
+          align="center"
+          label="人脸"
+        >
           <template slot-scope="scope">
-            <el-image style="max-height: 50px; max-width: 50px;"
-                      :src="scope.row.faceImg"
-                      :preview-src-list="[scope.row.faceImg]">
-              <div slot="error"
-                   class="image-slot">
+            <el-image
+              style="max-height: 50px; max-width: 50px"
+              :src="scope.row.faceImg"
+              :preview-src-list="[scope.row.faceImg]"
+            >
+              <div slot="error" class="image-slot">
                 <!-- <i class="el-icon-picture-outline"></i> -->
               </div>
             </el-image>
           </template>
         </el-table-column>
-        <el-table-column prop="checkState"
-                         min-width="120"
-                         align="center"
-                         label="状态"
-                         :show-overflow-tooltip="true"
-                         fixed="right">
+        <el-table-column
+          prop="checkState"
+          min-width="120"
+          align="center"
+          label="状态"
+          :show-overflow-tooltip="true"
+          fixed="right"
+        >
           <template slot-scope="scope">
             <span v-if="scope.row.checkState === '0'">未审核</span>
             <span v-else-if="scope.row.checkState === '1'">未通过</span>
@@ -196,81 +258,96 @@
             <span v-else></span>
           </template>
         </el-table-column>
-        <el-table-column label="操作"
-                         align="center"
-                         width="100"
-                         fixed="right">
+        <el-table-column label="操作" align="center" width="100" fixed="right">
           <template slot-scope="scope">
-            <el-button type="text"
-                       class="div-table-button--detail"
-                       size="small"
-                       @click="handleWatch('look', scope.row)">查看</el-button>
+            <el-button
+              type="text"
+              class="div-table-button--detail"
+              size="small"
+              @click="handleWatch('look', scope.row)"
+              >查看</el-button
+            >
             <!-- <el-button type="text"
                        class="div-table-button--detail"
                        size="small"
                        @click="handleWatch('check', scope.row)">审核</el-button> -->
-            <el-button type="text"
-                       class="div-table-button--detail"
-                       size="small"
-                       v-if="scope.row.agencyId == agencyId && scope.row.checkState === '0'"
-                       @click="handleWatch('check', scope.row)">审核</el-button>
+            <el-button
+              type="text"
+              class="div-table-button--detail"
+              size="small"
+              v-if="
+                scope.row.agencyId == agencyId && scope.row.checkState === '0'
+              "
+              @click="handleWatch('check', scope.row)"
+              >审核</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
       <div>
-        <el-pagination @size-change="handleSizeChange"
-                       @current-change="handleCurrentChange"
-                       :current-page.sync="pageNo"
-                       :page-sizes="[20, 50, 100, 200]"
-                       :page-size="parseInt(pageSize)"
-                       layout="sizes, prev, pager, next, total"
-                       :total="total">
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page.sync="pageNo"
+          :page-sizes="[20, 50, 100, 200]"
+          :page-size="parseInt(pageSize)"
+          layout="sizes, prev, pager, next, total"
+          :total="total"
+        >
         </el-pagination>
       </div>
     </el-card>
 
     <!-- 修改弹出框 -->
-    <el-dialog :visible.sync="formShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               title="信息详情"
-               width="1100px"
-               top="5vh"
-               class="dialog-h"
-               @closed="handleClose">
+    <el-dialog
+      :visible.sync="formShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      title="信息详情"
+      width="1100px"
+      top="5vh"
+      class="dialog-h"
+      @closed="handleClose"
+    >
       <div class="scroll-h">
-        <el-form ref="ref_form"
-                 :inline="true"
-                 :model="dataForm"
-                 :disabled="true"
-                 class="form">
-          <el-form-item label="户主姓名:"
-                        prop="houseHolderName"
-                        label-width="150px">
+        <el-form
+          ref="ref_form"
+          :inline="true"
+          :model="dataForm"
+          :disabled="true"
+          class="form"
+        >
+          <el-form-item
+            label="户主姓名:"
+            prop="houseHolderName"
+            label-width="150px"
+          >
             <!-- <el-input class="item_width_1"
                         v-model="dataForm.houseHolderName">
               </el-input> -->
             <div class="wd50">{{ dataForm.houseHolderName }}</div>
           </el-form-item>
-          <el-form-item label="居住地址:"
-                        prop="address"
-                        label-width="150px">
+          <el-form-item label="居住地址:" prop="address" label-width="150px">
             <!-- <el-input class="wd50" v-model="dataForm.address">
               </el-input> -->
             <div class="wd50">{{ dataForm.address }}</div>
           </el-form-item>
           <div>
-            <el-form-item label="房屋状态:"
-                          prop="houseType"
-                          label-width="150px">
+            <el-form-item
+              label="房屋状态:"
+              prop="houseType"
+              label-width="150px"
+            >
               <!-- <el-input class="item_width_1"
                           v-model="dataForm.houseType">
                 </el-input> -->
               <div class="wd50">{{ dataForm.houseType }}</div>
             </el-form-item>
-            <el-form-item label="居住人数:"
-                          prop="totalResi"
-                          label-width="150px">
+            <el-form-item
+              label="居住人数:"
+              prop="totalResi"
+              label-width="150px"
+            >
               <!-- <el-input class="item_width_1"
                           v-model="dataForm.totalResi">
                 </el-input> -->
@@ -278,70 +355,98 @@
             </el-form-item>
           </div>
         </el-form>
-        <el-table :data="dataForm.list"
-                  border
-                  style="width: 1060px; margin: 20px"
-                  class="resi-table"
-                  :height="dialogTableHeight">
-          <el-table-column label="序号"
-                           type="index"
-                           align="center"
-                           width="50" />
-          <el-table-column prop="memberName"
-                           width="100"
-                           label="成员姓名"
-                           align="center"
-                           :show-overflow-tooltip="true" />
-          <el-table-column prop="memberIdNum"
-                           width="180"
-                           align="center"
-                           label="成员证件号"
-                           :show-overflow-tooltip="true" />
-          <el-table-column prop="memberMobile"
-                           width="140"
-                           align="center"
-                           label="成员手机号"
-                           :show-overflow-tooltip="true" />
-          <el-table-column prop="heSuanCount"
-                           width="120"
-                           align="center"
-                           label="核酸检测次数" />
-
-          <el-table-column prop="ymjz"
-                           width="140"
-                           align="center"
-                           label="疫苗接种情况">
+        <el-table
+          :data="dataForm.list"
+          border
+          style="width: 1060px; margin: 20px"
+          class="resi-table"
+          :height="dialogTableHeight"
+        >
+          <el-table-column
+            label="序号"
+            type="index"
+            align="center"
+            width="50"
+          />
+          <el-table-column
+            prop="memberName"
+            width="100"
+            label="成员姓名"
+            align="center"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            prop="memberIdNum"
+            width="180"
+            align="center"
+            label="成员证件号"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            prop="memberMobile"
+            width="140"
+            align="center"
+            label="成员手机号"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            prop="heSuanCount"
+            width="120"
+            align="center"
+            label="核酸检测次数"
+          />
+          <el-table-column
+            prop="ymjz"
+            width="140"
+            align="center"
+            label="疫苗接种情况"
+          >
             <template slot-scope="scope">
               <span v-if="scope.row.ymjz == 1">全程接种</span>
               <span v-if="scope.row.ymjz == 2">未全程接种</span>
               <span v-if="scope.row.ymjz == 0">未接种</span>
             </template>
           </el-table-column>
-          <el-table-column prop="domicilePlace"
-                           min-width="140"
-                           align="center"
-                           label="户籍所在地 "
-                           :show-overflow-tooltip="true" />
-          <el-table-column prop="workPlace"
-                           min-width="120"
-                           align="center"
-                           label="单位或学校 "
-                           :show-overflow-tooltip="true" />
-          <el-table-column prop="remark"
-                           align="center"
-                           label="备注"
-                           :show-overflow-tooltip="true">
+          <el-table-column
+            prop="relationShipName"
+            width="120"
+            align="center"
+            label="与户主关系"
+          />
+          <el-table-column
+            prop="domicilePlace"
+            min-width="140"
+            align="center"
+            label="户籍所在地 "
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            prop="workPlace"
+            min-width="120"
+            align="center"
+            label="单位或学校 "
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            prop="remark"
+            align="center"
+            label="备注"
+            :show-overflow-tooltip="true"
+          >
           </el-table-column>
-          <el-table-column prop="faceImg"
-                           min-width="120"
-                           align="center"
-                           label="人脸">
+          <el-table-column
+            prop="faceImg"
+            min-width="120"
+            align="center"
+            label="人脸"
+          >
             <template slot-scope="scope">
-              <el-image style="max-height: 50px; max-width: 50px;"
-                        :src="scope.row.faceImg"
-                        :preview-src-list="[scope.row.faceImg]">
-                <div slot="error"
-                     class="image-slot">
+              <el-image
+                style="max-height: 50px; max-width: 50px"
+                :src="scope.row.faceImg"
+                :preview-src-list="[scope.row.faceImg]"
+              >
+                <div slot="error" class="image-slot">
                   <!-- <i class="el-icon-picture-outline"></i> -->
                 </div>
               </el-image>
@@ -349,28 +454,38 @@
           </el-table-column>
         </el-table>
         <div class="resi-btns">
-          <el-button @click="formShow = false">{{ $t('cancel') }}</el-button>
-          <el-button v-if="dialogType == 'check'"
-                     type="danger"
-                     @click="checkHandle('1')">{{ $t('checkBTGBtn') }}</el-button>
-          <el-button v-if="dialogType == 'check'"
-                     type="danger"
-                     @click="showAddHouse">{{ $t('checkTGBtn') }}</el-button>
+          <el-button @click="formShow = false">{{ $t("cancel") }}</el-button>
+          <el-button
+            v-if="dialogType == 'check'"
+            type="danger"
+            @click="checkHandle('1')"
+            >{{ $t("checkBTGBtn") }}</el-button
+          >
+          <el-button
+            v-if="dialogType == 'check'"
+            type="danger"
+            @click="showAddHouse"
+            >{{ $t("checkTGBtn") }}</el-button
+          >
         </div>
       </div>
     </el-dialog>
     <!-- 新增房屋弹出框 -->
-    <el-dialog :visible.sync="addHouseShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               title="新增房屋"
-               width="900px"
-               top="5vh"
-               class="dialog-h"
-               @closed="addHouseShow = false">
-      <room-form ref="ref_form"
-                 @dialogCancle="addHouseShow = false"
-                 @dialogOk="roomFormOk"></room-form>
+    <el-dialog
+      :visible.sync="addHouseShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      title="新增房屋"
+      width="900px"
+      top="5vh"
+      class="dialog-h"
+      @closed="addHouseShow = false"
+    >
+      <room-form
+        ref="ref_form"
+        @dialogCancle="addHouseShow = false"
+        @dialogOk="roomFormOk"
+      ></room-form>
     </el-dialog>
   </div>
 </template>
@@ -380,12 +495,12 @@ import { requestPost } from "@/js/dai/request";
 import nextTick from "dai-js/tools/nextTick";
 import { mapGetters } from "vuex";
 import axios from "axios";
-import roomForm from './roomForm'
+import roomForm from "./roomForm";
 
 export default {
-  data () {
+  data() {
     return {
-      agencyId: '',
+      agencyId: "",
       openSearch: false,
 
       formShow: false,
@@ -403,6 +518,8 @@ export default {
         endTime: "",
         address: "",
         domicilePlace: "",
+        checkState: "",
+        houseHolderName: "",
       },
       dataForm: {},
       communityList: [],
@@ -410,28 +527,33 @@ export default {
       importBtnTitle: "导入",
       importLoading: false,
       addHouseShow: false,
-      dialogType: 'look', // 对话框是check审核还是look查看
-      relationshipOptions: []
-    }
+      dialogType: "look", // 对话框是check审核还是look查看
+      relationshipOptions: [],
+      checkStateList: [
+        { value: "0", label: "待审核" },
+        { value: "1", label: "审核不通过" },
+        { value: "2", label: "审核通过" },
+      ],
+    };
   },
   components: {
-    roomForm
+    roomForm,
   },
   computed: {
     ...mapGetters(["clientHeight", "iframeHeight"]),
-    tableHeight () {
+    tableHeight() {
       const h = this.clientHeight - 360 + this.iframeHeigh;
       const _h = this.clientHeight - 360;
       return this.$store.state.inIframe ? h : _h;
     },
-    dialogTableHeight () {
+    dialogTableHeight() {
       const h = this.clientHeight - 460 + this.iframeHeigh;
       const _h = this.clientHeight - 460;
       return this.$store.state.inIframe ? h : _h;
     },
   },
   watch: {
-    timeRange (val) {
+    timeRange(val) {
       if (Array.isArray(val) && val.length == 2) {
         this.fmData.startTime = val[0];
         this.fmData.endTime = val[1];
@@ -441,35 +563,37 @@ export default {
       }
     },
   },
-  created () {
-    this.agencyId = localStorage.getItem('agencyId')
+  created() {
+    this.agencyId = localStorage.getItem("agencyId");
   },
-  mounted () {
+  mounted() {
     // this.getcommunityList();
-    this.getDictList()
-    this.getTableData()
+    this.getDictList();
+    this.getTableData();
   },
   methods: {
-    async getDictList () {
-      const url = "/sys/dict/data/relationship"
-      const { data, code, msg } = await requestPost(url, { formCode: "resi_base_info" })
+    async getDictList() {
+      const url = "/sys/dict/data/relationship";
+      const { data, code, msg } = await requestPost(url, {
+        formCode: "resi_base_info",
+      });
 
       if (code === 0) {
-        this.relationshipOptions = [...data]
+        this.relationshipOptions = [...data];
       } else {
-        this.$message.success("操作失败！")
+        this.$message.success("操作失败！");
       }
     },
-    getRelationshipName (value) {
-      let label = ''
-      this.relationshipOptions.forEach(item => {
+    getRelationshipName(value) {
+      let label = "";
+      this.relationshipOptions.forEach((item) => {
         if (item.value == value) {
-          label = item.label
+          label = item.label;
         }
-      })
-      return label
+      });
+      return label;
     },
-    arraySpanMethod ({ row, column, rowIndex, columnIndex }) {
+    arraySpanMethod({ row, column, rowIndex, columnIndex }) {
       // console.log('row-----r', row)
       // console.log('column-----c', column)
       if (
@@ -497,7 +621,7 @@ export default {
         }
       }
     },
-    async handleChu () {
+    async handleChu() {
       const url = "/epmetuser/icresicollect/export";
       const { pageSize, pageNo, fmData } = this;
       axios({
@@ -531,34 +655,34 @@ export default {
           return this.$message.error("网络错误");
         });
     },
-    handleSizeChange (val) {
+    handleSizeChange(val) {
       console.log(`每页 ${val} 条`);
       this.pageSize = val;
       window.localStorage.setItem("pageSize", val);
       this.getTableData();
     },
-    handleCurrentChange (val) {
+    handleCurrentChange(val) {
       console.log(`当前页: ${val}`);
       this.pageNo = val;
       this.getTableData();
     },
 
-    handleClose () {
+    handleClose() {
       this.formShow = false;
     },
-    handleSearch (val) {
+    handleSearch(val) {
       console.log(this.fmData);
       this.pageNo = 1;
       this.getTableData();
     },
-    resetForm (formName) {
+    resetForm(formName) {
       this.$refs[formName].resetFields();
       this.timeRange = "";
       this.handleSearch();
     },
 
-    async handleWatch (type, row) {
-      this.dialogType = type
+    async handleWatch(type, row) {
+      this.dialogType = type;
       // this.formShow = true;
       await nextTick();
       const url = "/epmetuser/icresicollect/detail";
@@ -571,7 +695,14 @@ export default {
         console.log("data----de", data);
         this.dataForm = {
           ...data,
-          houseType: data.houseType == '1' ? '出租' : data.houseType == '2' ? '闲置' : data.houseType == '3' ? '未售出' : '自住' // 1：出租 0：自住  2：闲置 3：未售出
+          houseType:
+            data.houseType == "1"
+              ? "出租"
+              : data.houseType == "2"
+              ? "闲置"
+              : data.houseType == "3"
+              ? "未售出"
+              : "自住", // 1：出租 0：自住  2：闲置 3：未售出
         };
         // this.getTableData();
         this.formShow = true;
@@ -580,17 +711,17 @@ export default {
       }
     },
 
-    async handleEdit (rowIndex) {
+    async handleEdit(rowIndex) {
       this.formShow = true;
       await nextTick();
       this.$refs.eleEditForm.initForm("edit", this.tableData[rowIndex]);
     },
-    handleEditSuccess () {
+    handleEditSuccess() {
       this.handleClose();
       this.getTableData();
     },
 
-    async handleDel (rowData, rowIndex) {
+    async handleDel(rowData, rowIndex) {
       console.log(rowData, rowIndex);
       const url =
         "/heart/iccommunityselforganization/delcommunityselforganization";
@@ -607,7 +738,7 @@ export default {
         this.$message.success("操作失败！");
       }
     },
-    async getcommunityList () {
+    async getcommunityList() {
       const url = "/gov/org/agency/community-list";
       const { data, code, msg } = await requestPost(url);
       if (code === 0) {
@@ -616,39 +747,39 @@ export default {
       } else {
       }
     },
-    async getTableData () {
-      const url = "/epmetuser/icresicollect/list"
-      const { pageSize, pageNo, fmData } = this
+    async getTableData() {
+      const url = "/epmetuser/icresicollect/list";
+      const { pageSize, pageNo, fmData } = this;
       const { data, code, msg } = await requestPost(url, {
         pageSize,
         pageNo,
         ...fmData,
-      })
+      });
       if (code === 0) {
-        console.log("列表请求成功！！！！！！！！！！！！！！")
-        this.total = data.total || 0
-        let _i = 0
-        let arr = []
+        console.log("列表请求成功！！！！！！！！！！！！！！");
+        this.total = data.total || 0;
+        let _i = 0;
+        let arr = [];
         this.spanIndex =
           data.list &&
           data.list.map((item, index) => {
-            if (index == 0) _i = 0
+            if (index == 0) _i = 0;
             else _i = _i + data.list[index - 1].list.length;
-            arr.push(_i)
+            arr.push(_i);
             // console.log("_i-----", _i, arr)
             // if (index === data.list.length - 1) firstIndex = _i - item.list.length
             return {
               firstIndex: _i,
               len: item.list.length,
-            }
-          })
-        this.tableData = data.list && this.formatArr(data.list)
-        console.log("tableData----0", this.spanIndex)
+            };
+          });
+        this.tableData = data.list && this.formatArr(data.list);
+        console.log("tableData----0", this.spanIndex);
       } else {
       }
     },
     // 数组扁平化
-    formatArr (arr) {
+    formatArr(arr) {
       let res = [];
       let arr1 = arr.map((n, index) => {
         return {
@@ -656,13 +787,13 @@ export default {
           list:
             n.list.length > 0
               ? n.list.map((i) => {
-                return {
-                  ...n,
-                  ...i,
-                  desc: index + 1,
-                  list: [],
-                };
-              })
+                  return {
+                    ...n,
+                    ...i,
+                    desc: index + 1,
+                    list: [],
+                  };
+                })
               : [],
         };
       });
@@ -673,89 +804,104 @@ export default {
       });
       return res;
     },
-    showAddHouse () {
-      if (this.dataForm.homeId == 'other') {
-        this.addHouseShow = true
+    showAddHouse() {
+      if (this.dataForm.homeId == "other") {
+        this.addHouseShow = true;
         this.$nextTick(() => {
-          this.$refs.ref_form.initForm('add', null, this.dataForm.id)
-        })
+          this.$refs.ref_form.initForm("add", null, this.dataForm.id);
+        });
       } else {
-        this.checkHandle('2')
+        this.checkHandle("2");
       }
     },
     // 审核提交方法
-    checkHandle (type) {
+    checkHandle(type) {
       const params = {
         id: this.dataForm.id,
         checkState: type, // 0-未审核 1-未通过 2-已通过
-        checkReason: '',
-        buildingUnitId: this.dataForm.buildingUnitId || '',
-        doorName: this.dataForm.doorName || ''
-      }
-      if (type == '1') {
-        const h = this.$createElement
+        checkReason: "",
+        buildingUnitId: this.dataForm.buildingUnitId || "",
+        doorName: this.dataForm.doorName || "",
+      };
+      if (type == "1") {
+        const h = this.$createElement;
         this.$prompt(
-          h('p', null, [h('i', { style: 'color: red' }, '* '),
-          h('span', null, '请输入不通过的原因：')]),
-          '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          inputPattern: /^.+$/,
-          inputErrorMessage: '请输入原因'
-        }).then(({ value }) => {
-          // if (!value) {
-          //   return this.$message.error('请填写审核不通过原因')
-          // }
-          params.checkReason = value
-          this.$http.post('/epmetuser/icresicollect/collectCheck', params).then(({ data: res }) => {
+          h("p", null, [
+            h("i", { style: "color: red" }, "* "),
+            h("span", null, "请输入不通过的原因："),
+          ]),
+          "提示",
+          {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            inputPattern: /^.+$/,
+            inputErrorMessage: "请输入原因",
+          }
+        )
+          .then(({ value }) => {
+            // if (!value) {
+            //   return this.$message.error('请填写审核不通过原因')
+            // }
+            params.checkReason = value;
+            this.$http
+              .post("/epmetuser/icresicollect/collectCheck", params)
+              .then(({ data: res }) => {
+                if (res.code !== 0) {
+                  return this.$message.error(res.msg);
+                }
+                this.formShow = false;
+                this.getTableData();
+                // 调用文件下发权限接口
+                // this.fileJurisdiction(params)
+              })
+              .catch(() => {});
+          })
+          .catch(() => {
+            // 取消输入原因
+          });
+      } else {
+        this.$http
+          .post("/epmetuser/icresicollect/collectCheck", params)
+          .then(({ data: res }) => {
             if (res.code !== 0) {
-              return this.$message.error(res.msg)
+              return this.$message.error(res.msg);
             }
-            this.formShow = false
-            this.getTableData()
+            this.addHouseShow = false;
+            this.formShow = false;
+            this.getTableData();
             // 调用文件下发权限接口
             // this.fileJurisdiction(params)
-          }).catch(() => { })
-        }).catch(() => {
-          // 取消输入原因
-        })
-      } else {
-        this.$http.post('/epmetuser/icresicollect/collectCheck', params).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.addHouseShow = false
-          this.formShow = false
-          this.getTableData()
-          // 调用文件下发权限接口
-          // this.fileJurisdiction(params)
-        }).catch(() => { })
+          })
+          .catch(() => {});
       }
     },
     // 文件下发权限接口
-    fileJurisdiction (params) {
-      this.$http.post('/pli/power/rentContractInfo/send', params).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.$message({
-          message: this.$t('prompt.success'),
-          type: 'success',
-          duration: 500,
-          onClose: () => {
-            this.disabledBtn = false
-            this.checkVisible = false
-            this.visible = false
-            this.$emit('refreshDataList')
+    fileJurisdiction(params) {
+      this.$http
+        .post("/pli/power/rentContractInfo/send", params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
           }
+          this.$message({
+            message: this.$t("prompt.success"),
+            type: "success",
+            duration: 500,
+            onClose: () => {
+              this.disabledBtn = false;
+              this.checkVisible = false;
+              this.visible = false;
+              this.$emit("refreshDataList");
+            },
+          });
         })
-      }).catch(() => { })
+        .catch(() => {});
+    },
+    roomFormOk(e) {
+      this.dataForm.buildingUnitId = e.buildingUnitId;
+      this.dataForm.doorName = e.doorName;
+      this.checkHandle("2");
     },
-    roomFormOk (e) {
-      this.dataForm.buildingUnitId = e.buildingUnitId
-      this.dataForm.doorName = e.doorName
-      this.checkHandle('2')
-    }
   },
 };
 </script>
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index f5c02e7a6..820954868 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -142,7 +142,7 @@
                        type="text"
                        size="small"
                        class="btn-color-look">查看</el-button> -->
-            <!-- <el-button @click="handleTransfer(scope.row)" 
+            <!-- <el-button @click="handleTransfer(scope.row)"
                        type="text"
                        size="small"
                        class="div-table-button--detail">变动</el-button> -->
@@ -656,14 +656,9 @@ export default {
     handleSearchFrom () {
       let arr = [];
       this.searchList.forEach((item) => {
-        const arr1 =
-          this.$refs[`resiSearch${item.itemGroupId}`][0].handleSearch();
+        const arr1 = this.$refs[`resiSearch${item.itemGroupId}`][0].handleSearch();
         arr = arr.concat(arr1);
-        // console.log('search-----refs', this.$refs[`resiSearch${item.itemGroupId}`])
       });
-      console.log("search-----refs", this.$refs);
-
-      console.log("search-----arr", arr);
       this.currentPage = 1;
       this.conditions = arr;
       this.getTableData();
@@ -675,10 +670,6 @@ export default {
       this.getTableData();
     },
     resetSearchForm (formName) {
-      // for(const n in this.form) {
-      //   this.form[n] = ''
-      // }
-      // this.handleSearch()
       this.searchList.forEach((item) => {
         this.$refs[`resiSearch${item.itemGroupId}`][0].resetForm();
         // console.log('search-----refs', this.$refs[`resiSearch${item.itemGroupId}`])
@@ -1246,15 +1237,12 @@ export default {
           if (res.code !== 0) {
             return this.$message.error(res.msg);
           } else {
-            console.log("获取查询详情成功--sss", res);
-
             res.data.forEach((item) => {
               item.queryItemList.forEach((n) => {
                 if (n.optionSourceType === "remote") {
                   this.getOptionsList(n.optionSourceValue).then((res) => {
                     n.options = this.getTreeData(res);
                   });
-                  // console.log('')
                 } else if (n.itemType == "radio" && n.options.length == 0) {
                   n.options = [
                     {