From 3407696b6b845e6a9f6b910327e7fa800534a1c2 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 7 Dec 2022 16:59:15 +0800
Subject: [PATCH 1/2] 11

---
 .../scss/modules/management/detail-main.scss  |   2 +-
 .../modules/base/huji/immigration/index.vue   | 731 +++++++++---------
 2 files changed, 365 insertions(+), 368 deletions(-)

diff --git a/src/assets/scss/modules/management/detail-main.scss b/src/assets/scss/modules/management/detail-main.scss
index a0a88386e..309bfe353 100644
--- a/src/assets/scss/modules/management/detail-main.scss
+++ b/src/assets/scss/modules/management/detail-main.scss
@@ -354,7 +354,7 @@
     }
 
     .div_map {
-      width:500px;
+      width:300px;
       padding-top:10px
     }
     .div_map2 {
diff --git a/src/views/modules/base/huji/immigration/index.vue b/src/views/modules/base/huji/immigration/index.vue
index 04207b847..278053587 100644
--- a/src/views/modules/base/huji/immigration/index.vue
+++ b/src/views/modules/base/huji/immigration/index.vue
@@ -1,351 +1,348 @@
 <template>
-  <div class="resi-container">
-    <el-card ref="searchCard"
-             class="search-card">
-      <el-form ref="searchForm"
-               :inline="true"
+  <div class="div_main">
+    <div ref="searchForm"
+         class="div_search">
+
+      <el-form :inline="true"
                :model="fmData"
-               :label-width="'100px'"
-               class="demo-form-inline">
-        <div>
-          <el-form-item prop="gridId"
-                        label="所属网格">
-            <div class="resi-cell-value">
-              <el-select v-model.trim="fmData.gridId"
-                         placeholder="请选择网格"
-                         size="small"
-                         clearable
-                         class="resi-cell-select"
-                         @change="handleChangeGrid">
-                <el-option v-for="item in optionsG"
-                           :key="item.value"
-                           :label="item.label"
-                           :value="item.value">
-                </el-option>
-              </el-select>
-            </div>
-          </el-form-item>
-          <el-form-item label="所属房屋">
-            <div class="resi-cell-value">
-              <div class="resi-cell-col">
-                <el-form-item prop="villageId">
-                  <el-select v-model.trim="fmData.villageId"
-                             placeholder="请选择小区"
-                             size="small"
-                             clearable
-                             class="resi-cell-select"
-                             @change="handleChangeV">
-                    <el-option v-for="item in optionsV"
-                               :key="item.value"
-                               :label="item.label"
-                               :value="item.value">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item prop="buildId">
-                  <el-select v-model.trim="fmData.buildId"
-                             placeholder="楼号"
-                             size="small"
-                             clearable
-                             :disabled="changeVDisabled"
-                             class="resi-cell-select resi-cell-select-middle"
-                             @change="handleChangeB">
-                    <el-option v-for="item in optionsB"
-                               :key="item.value"
-                               :label="item.label"
-                               :value="item.value">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item prop="unitId">
-                  <el-select v-model.trim="fmData.unitId"
-                             placeholder="单元"
-                             size="small"
-                             clearable
-                             :disabled="changeBDisabled"
-                             class="resi-cell-select resi-cell-select-middle"
-                             @change="handleChangeD">
-                    <el-option v-for="item in optionsD"
-                               :key="item.value"
-                               :label="item.label"
-                               :value="item.value">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item prop="homeId">
-                  <el-select v-model.trim="fmData.homeId"
-                             placeholder="房号"
-                             size="small"
-                             clearable
-                             :disabled="changeDDisabled"
-                             class="resi-cell-select resi-cell-select-middle">
-                    <el-option v-for="item in optionsH"
-                               :key="item.value"
-                               :label="item.label"
-                               :value="item.value">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </div>
-            </div>
-          </el-form-item>
-        </div>
+               :label-width="'100px'">
+
+        <el-form-item prop="gridId"
+                      label="所属网格">
+
+          <el-select v-model.trim="fmData.gridId"
+                     placeholder="请选择网格"
+                     size="small"
+                     clearable
+                     class="item_width_normal"
+                     @change="handleChangeGrid">
+            <el-option v-for="item in optionsG"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+
+        </el-form-item>
+        <el-form-item label="所属房屋">
+
+          <el-select v-model.trim="fmData.villageId"
+                     placeholder="请选择小区"
+                     size="small"
+                     clearable
+                     class="item_width_communitycascader"
+                     @change="handleChangeV">
+            <el-option v-for="item in optionsV"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+
+          <el-select v-model.trim="fmData.buildId"
+                     placeholder="楼号"
+                     size="small"
+                     clearable
+                     :disabled="changeVDisabled"
+                     class="item_width_buildcascader"
+                     style="margin-left:5px"
+                     @change="handleChangeB">
+            <el-option v-for="item in optionsB"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+
+          <el-select v-model.trim="fmData.unitId"
+                     placeholder="单元"
+                     size="small"
+                     clearable
+                     :disabled="changeBDisabled"
+                     class="item_width_buildcascader"
+                     style="margin-left:5px"
+                     @change="handleChangeD">
+            <el-option v-for="item in optionsD"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+
+          <el-select v-model.trim="fmData.homeId"
+                     placeholder="房号"
+                     size="small"
+                     clearable
+                     :disabled="changeDDisabled"
+                     class="item_width_buildcascader"
+                     style="margin-left:5px">
+            <el-option v-for="item in optionsH"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+
+        </el-form-item>
+
+        <el-form-item label="姓名"
+                      prop="name">
+          <el-input v-model="fmData.name"
+                    class="item_width_normal"
+                    size="small"
+                    clearable
+                    placeholder="请输入">
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="手机号"
+                      prop="mobile">
+          <el-input v-model="fmData.mobile"
+                    class="item_width_normal"
+                    size="small"
+                    clearable
+                    placeholder="请输入">
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="证件号"
+                      prop="idCard">
+          <el-input v-model="fmData.idCard"
+                    class="item_width_normal"
+                    size="small"
+                    clearable
+                    placeholder="请输入">
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="迁入时间"
+                      prop="startTime">
+          <el-date-picker v-model="rangeTime"
+                          type="daterange"
+                          range-separator="至"
+                          start-placeholder="开始日期"
+                          end-placeholder="结束日期"
+                          value-format="yyyy-MM-dd"
+                          class="item_width_daterange2">
+          </el-date-picker>
+        </el-form-item>
+
+        <el-form-item label="享受福利"
+                      prop="remark">
+          <el-select v-model.trim="fmData.isWeifare"
+                     placeholder="享受福利"
+                     size="small"
+                     clearable
+                     class="item_width_normal">
+            <el-option v-for="item in optionsWelfare"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <div class="div_search_btn">
+          <el-button class="diy-button--white"
+                     size="small"
+                     @click="resetForm('searchForm')">重置</el-button>
+          <el-button style="margin-left:10px"
+                     size="small"
+                     class="diy-button--blue"
+                     @click="handleSearch">查询</el-button>
 
-        <div>
-          <el-form-item label="姓名"
-                        prop="name">
-            <el-input v-model="fmData.name"
-                      class="resi-cell-input"
-                      size="small"
-                      clearable
-                      placeholder="请输入">
-            </el-input>
-          </el-form-item>
-
-          <el-form-item label="手机号"
-                        prop="mobile">
-            <el-input v-model="fmData.mobile"
-                      class="resi-cell-input"
-                      size="small"
-                      clearable
-                      placeholder="请输入">
-            </el-input>
-          </el-form-item>
-
-          <el-form-item label="证件号"
-                        prop="idCard">
-            <el-input v-model="fmData.idCard"
-                      class="resi-cell-input"
-                      size="small"
-                      clearable
-                      placeholder="请输入">
-            </el-input>
-          </el-form-item>
-        </div>
-        <div>
-          <el-form-item label="迁入时间"
-                        prop="startTime">
-            <el-date-picker v-model="rangeTime"
-                            type="daterange"
-                            range-separator="至"
-                            start-placeholder="开始日期"
-                            end-placeholder="结束日期"
-                            value-format="yyyy-MM-dd">
-            </el-date-picker>
-          </el-form-item>
-
-          <el-form-item label="享受福利"
-                        prop="remark">
-            <el-select v-model.trim="fmData.isWeifare"
-                       placeholder="享受福利"
-                       size="small"
-                       clearable
-                       style="width: 120px"
-                       class="resi-cell-select">
-              <el-option v-for="item in optionsWelfare"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select>
-          </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-form-item>
         </div>
+
       </el-form>
-    </el-card>
-    <el-card class="resi-card-table">
-      <div class="resi-row-btn">
-        <el-button class="diy-button--add"
-                   size="small"
-                   @click="handleAdd">迁入登记</el-button>
-        <el-button v-if="false"
-                   class="diy-button--export"
-                   size="small"
-                   @click="handleExportModule('room')">下载模板</el-button>
-        <el-upload :headers="$getElUploadHeaders()"
-                   v-if="false"
-                   ref="upload"
-                   class="upload-btn"
-                   action="uploadUlr"
-                   :limit="1"
-                   :accept="'.xls,.xlsx'"
-                   :with-credentials="true"
-                   :show-file-list="false"
-                   :auto-upload="true"
-                   :on-progress="handleProgress"
-                   :on-success="handleExcelSuccess"
-                   :before-upload="beforeExcelUpload"
-                   :http-request="uploadHttpRequest">
-          <el-button size="small"
-                     class="diy-button--delete"
-                     :loading="importLoading">{{ importBtnTitle }}</el-button>
-        </el-upload>
-
-        <el-button @click="handleChu"
-                   class="diy-button--reset"
-                   size="small">导出</el-button>
+    </div>
+    <div class="div_table">
+      <div class="div_btn">
+        <div class="div_btn_left">
+          <el-button class="diy-button--add"
+                     size="small"
+                     @click="handleAdd">迁入登记</el-button>
+          <el-button v-if="false"
+                     class="diy-button--export"
+                     size="small"
+                     @click="handleExportModule('room')">下载模板</el-button>
+          <el-upload :headers="$getElUploadHeaders()"
+                     v-if="false"
+                     ref="upload"
+                     class="upload-btn"
+                     action="uploadUlr"
+                     :limit="1"
+                     :accept="'.xls,.xlsx'"
+                     :with-credentials="true"
+                     :show-file-list="false"
+                     :auto-upload="true"
+                     :on-progress="handleProgress"
+                     :on-success="handleExcelSuccess"
+                     :before-upload="beforeExcelUpload"
+                     :http-request="uploadHttpRequest">
+            <el-button size="small"
+                       class="diy-button--delete"
+                       :loading="importLoading">{{ importBtnTitle }}</el-button>
+          </el-upload>
+
+          <el-button @click="handleChu"
+                     class="diy-button--reset"
+                     size="small">导出</el-button>
+        </div>
       </div>
-      <el-table :data="tableData"
-                border
-                style="width: 100%"
-                class="resi-table"
-                :height="tableHeight">
-        <el-table-column label="序号"
-                         fixed="left"
-                         type="index"
-                         align="center"
-                         width="50" />
-
-        <el-table-column prop="name"
-                         width="100"
-                         fixed="left"
-                         label="姓名"
-                         align="center">
-          <template slot-scope="scope">
-            <a class="name-a"
-               @click="handleWatch(scope.$index)">
-              {{ scope.row.name }}
-            </a>
-          </template>
-        </el-table-column>
-
-        <el-table-column prop="gridName"
-                         align="center"
-                         label="所属网格"
-                         min-width="160"
-                         :show-overflow-tooltip="true">
-        </el-table-column>
-
-        <el-table-column prop="allName"
-                         label="所属房屋"
-                         align="center"
-                         min-width="160"
-                         :show-overflow-tooltip="true" />
-
-        <el-table-column prop="mobile"
-                         width="140"
-                         align="center"
-                         label="手机号">
-        </el-table-column>
-
-        <el-table-column prop="idCard"
-                         align="center"
-                         min-width="160"
-                         label="证件号">
-        </el-table-column>
-
-        <el-table-column prop="genderName"
-                         align="center"
-                         width="60"
-                         label="性别">
-        </el-table-column>
-
-        <el-table-column prop="age"
-                         align="center"
-                         width="60"
-                         label="年龄">
-        </el-table-column>
-
-        <el-table-column prop="inTime"
-                         align="center"
-                         min-width="140"
-                         label="迁入时间">
-        </el-table-column>
-
-        <el-table-column prop="inReason"
-                         align="center"
-                         label="迁入原因"
-                         min-width="160"
-                         show-overflow-tooltip>
-        </el-table-column>
-
-        <el-table-column prop="sourceAddress"
-                         min-width="160"
-                         align="center"
-                         label="由何地迁入">
-        </el-table-column>
-
-        <el-table-column prop="moveNumber"
-                         min-width="160"
-                         align="center"
-                         label="迁移证号码">
-        </el-table-column>
-
-        <el-table-column prop="householderName"
-                         min-width="100"
-                         align="center"
-                         label="户主姓名">
-        </el-table-column>
-
-        <el-table-column prop="householderRelationName"
-                         align="center"
-                         min-width="100"
-                         label="与户主关系">
-        </el-table-column>
-
-        <el-table-column fixed="right"
-                         label="操作"
-                         align="center"
-                         width="150">
-          <template slot-scope="scope">
-            <el-button v-if="false"
-                       @click="handleWatch(scope.$index)"
-                       type="text"
-                       size="small">查看</el-button>
-
-            <el-button @click="handleEdit(scope.$index)"
-                       type="text"
-                       size="small"
-                       class="div-table-button--edit">修改</el-button>
-
-            <el-button @click="handleChangeRecord(scope.row)"
-                       type="text"
-                       size="small"
-                       class="div-table-button--detail">变更记录</el-button>
-
-            <el-popconfirm v-if="false"
-                           title="删除之后无法回复，确认删除？"
-                           @onConfirm="handleDel(scope.row, scope.$index)"
-                           @confirm="handleDel(scope.row, scope.$index)">
-              <el-button slot="reference"
+      <div class="div_table_item">
+        <el-table :data="tableData"
+                  border
+                  style="width: 100%"
+                  :height="tableHeight">
+          <el-table-column label="序号"
+                           fixed="left"
+                           type="index"
+                           align="center"
+                           width="50" />
+
+          <el-table-column prop="name"
+                           width="100"
+                           fixed="left"
+                           label="姓名"
+                           align="center">
+            <template slot-scope="scope">
+              <a class="name-a"
+                 @click="handleWatch(scope.$index)">
+                {{ scope.row.name }}
+              </a>
+            </template>
+          </el-table-column>
+
+          <el-table-column prop="gridName"
+                           align="center"
+                           label="所属网格"
+                           min-width="160"
+                           :show-overflow-tooltip="true">
+          </el-table-column>
+
+          <el-table-column prop="allName"
+                           label="所属房屋"
+                           align="center"
+                           min-width="160"
+                           :show-overflow-tooltip="true" />
+
+          <el-table-column prop="mobile"
+                           width="140"
+                           align="center"
+                           label="手机号">
+          </el-table-column>
+
+          <el-table-column prop="idCard"
+                           align="center"
+                           min-width="160"
+                           label="证件号">
+          </el-table-column>
+
+          <el-table-column prop="genderName"
+                           align="center"
+                           width="60"
+                           label="性别">
+          </el-table-column>
+
+          <el-table-column prop="age"
+                           align="center"
+                           width="60"
+                           label="年龄">
+          </el-table-column>
+
+          <el-table-column prop="inTime"
+                           align="center"
+                           min-width="140"
+                           label="迁入时间">
+          </el-table-column>
+
+          <el-table-column prop="inReason"
+                           align="center"
+                           label="迁入原因"
+                           min-width="160"
+                           show-overflow-tooltip>
+          </el-table-column>
+
+          <el-table-column prop="sourceAddress"
+                           min-width="160"
+                           align="center"
+                           label="由何地迁入">
+          </el-table-column>
+
+          <el-table-column prop="moveNumber"
+                           min-width="160"
+                           align="center"
+                           label="迁移证号码">
+          </el-table-column>
+
+          <el-table-column prop="householderName"
+                           min-width="100"
+                           align="center"
+                           label="户主姓名">
+          </el-table-column>
+
+          <el-table-column prop="householderRelationName"
+                           align="center"
+                           min-width="100"
+                           label="与户主关系">
+          </el-table-column>
+
+          <el-table-column fixed="right"
+                           label="操作"
+                           align="center"
+                           width="150">
+            <template slot-scope="scope">
+              <el-button v-if="false"
+                         @click="handleWatch(scope.$index)"
+                         type="text"
+                         size="small">查看</el-button>
+
+              <el-button @click="handleEdit(scope.$index)"
                          type="text"
                          size="small"
-                         class="div-table-button--delete"
-                         style="margin-left: 10px">删除</el-button>
-            </el-popconfirm>
-            <el-popconfirm v-if="true"
-                           title="删除之后无法回复，确认删除？"
-                           @onConfirm="handleDelNew(scope.row)"
-                           @confirm="handleDelNew(scope.row)">
-              <el-button slot="reference"
+                         class="div-table-button--edit">修改</el-button>
+
+              <el-button @click="handleChangeRecord(scope.row)"
                          type="text"
                          size="small"
-                         class="div-table-button--delete"
-                         style="margin-left: 10px">删除</el-button>
-            </el-popconfirm>
-          </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>
+                         class="div-table-button--detail">变更记录</el-button>
+
+              <el-popconfirm v-if="false"
+                             title="删除之后无法回复，确认删除？"
+                             @onConfirm="handleDel(scope.row, scope.$index)"
+                             @confirm="handleDel(scope.row, scope.$index)">
+                <el-button slot="reference"
+                           type="text"
+                           size="small"
+                           class="div-table-button--delete"
+                           style="margin-left: 10px">删除</el-button>
+              </el-popconfirm>
+              <el-popconfirm v-if="true"
+                             title="删除之后无法回复，确认删除？"
+                             @onConfirm="handleDelNew(scope.row)"
+                             @confirm="handleDelNew(scope.row)">
+                <el-button slot="reference"
+                           type="text"
+                           size="small"
+                           class="div-table-button--delete"
+                           style="margin-left: 10px">删除</el-button>
+              </el-popconfirm>
+            </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>
+        </div>
       </div>
-    </el-card>
+    </div>
 
     <!-- 修改弹出框 -->
     <el-dialog :visible.sync="formShow"
@@ -399,7 +396,7 @@ import detailForm from './detail'
 import axios from 'axios'
 
 export default {
-  components: { editForm, detailForm, resiChangeRecord},
+  components: { editForm, detailForm, resiChangeRecord },
   data () {
     return {
       openSearch: false,
@@ -451,7 +448,7 @@ export default {
 
       searchH: 0,
       tableHeight: 0,
-        changeRecordShow: false,
+      changeRecordShow: false,
     }
   },
   computed: {
@@ -500,21 +497,21 @@ export default {
     this.getGridList()
     this.getValiheList()
     this.getTableData()
-    this.searchH = this.$refs.searchCard.$el.offsetHeight + 270
-    console.log('searchH----', this.$refs.searchCard.$el.offsetHeight)
+    this.searchH = this.$refs.searchForm.$el.offsetHeight + 270
+    console.log('searchH----', this.$refs.searchForm.$el.offsetHeight)
   },
   methods: {
-      diaClose () {
-          this.changeRecordShow = false
-      },
-      //变更记录
-      async handleChangeRecord (row) {
-          this.changeRecordShow = true
+    diaClose () {
+      this.changeRecordShow = false
+    },
+    //变更记录
+    async handleChangeRecord (row) {
+      this.changeRecordShow = true
 
-          await nextTick(200)
+      await nextTick(200)
 
-          this.$refs.ref_changerecord.initForm(row)
-      },
+      this.$refs.ref_changerecord.initForm(row)
+    },
     handleClearVillage () {
       this.fmData.buildId = ''
       this.fmData.homeId = ''
@@ -938,19 +935,19 @@ export default {
       }
     },
 
-      async handleDelNew (rowData) {
-          const url = "/epmetuser/icMoveIn/deleteById";
-          let params = {
-              id: rowData.moveInId
-          }
-          const { data, code, msg } = await requestPost(url,params);
-          if (code === 0) {
-              this.$message.success("删除成功！");
-              this.getTableData();
-          } else {
-              this.$message.success("操作失败！");
-          }
-      },
+    async handleDelNew (rowData) {
+      const url = "/epmetuser/icMoveIn/deleteById";
+      let params = {
+        id: rowData.moveInId
+      }
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        this.$message.success("删除成功！");
+        this.getTableData();
+      } else {
+        this.$message.success("操作失败！");
+      }
+    },
 
     async getTableData () {
       const url = '/epmetuser/icMoveIn/list'
@@ -976,7 +973,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "@/assets/scss/buttonstyle.scss";
+@import "@/assets/scss/modules/management/list-main.scss";
 
 .resi-container .resi-card-table {
   ::v-deep .el-table th {
@@ -1032,13 +1029,13 @@ export default {
     align-items: center;
     min-height: 32px;
   }
-  .resi-cell-input {
+  .item_width_normal {
     width: 200px;
   }
   .resi-cell--daterange {
     max-width: 260px;
   }
-  .resi-cell-select {
+  .item_width_normal {
     width: 200px;
     box-sizing: border-box;
     margin-right: 10px;
@@ -1049,7 +1046,7 @@ export default {
       width: 88px;
     }
   }
-  .resi-cell-select:last-child {
+  .item_width_normal:last-child {
     margin-right: 0;
   }
 }

From af89a07f3078863e0fdcd3a76aa6b79abb63f7f8 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 7 Dec 2022 17:24:29 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=BF=81=E5=87=BA=E8=AE=B0=E5=BD=95=20=20?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scss/modules/management/edit-main.scss    |   4 +
 .../scss/modules/management/list-main.scss    |   2 +-
 .../modules/base/community/buildForm.vue      |   3 +-
 .../modules/base/community/communityForm.vue  |   3 +-
 src/views/modules/base/community/roomForm.vue |   3 +-
 .../modules/base/huji/immigration/edit.vue    | 635 +++++++-----------
 .../modules/base/huji/immigration/index.vue   | 107 +--
 7 files changed, 267 insertions(+), 490 deletions(-)

diff --git a/src/assets/scss/modules/management/edit-main.scss b/src/assets/scss/modules/management/edit-main.scss
index 758b34d85..f181050a6 100644
--- a/src/assets/scss/modules/management/edit-main.scss
+++ b/src/assets/scss/modules/management/edit-main.scss
@@ -22,6 +22,10 @@
 .edit_item_width_normal{
   width:320px;
 }
+//编辑框-房屋级联选择  楼号-单元-放号宽度
+.edit_item_width_build{
+  width:100px;
+}
 
 .edit_map{
 
diff --git a/src/assets/scss/modules/management/list-main.scss b/src/assets/scss/modules/management/list-main.scss
index 5b5dd0525..944ca823f 100644
--- a/src/assets/scss/modules/management/list-main.scss
+++ b/src/assets/scss/modules/management/list-main.scss
@@ -65,7 +65,7 @@
     background: #FFFFFF;
     box-shadow: 0px 6px 16px 0px rgba(0,0,0,0.08), 0px 3px 6px -4px rgba(0,0,0,0.12);
     position: relative;
-    padding:24px 16px 0;
+    padding:24px 16px 10px;
 
     .div_btn {
       display: flex;
diff --git a/src/views/modules/base/community/buildForm.vue b/src/views/modules/base/community/buildForm.vue
index 15ab54e26..c3dd653d5 100644
--- a/src/views/modules/base/community/buildForm.vue
+++ b/src/views/modules/base/community/buildForm.vue
@@ -148,13 +148,12 @@
     </div>
     <div class="div_btn">
       <el-button size="small"
-                 class="diy-button--white"
                  @click="handleCancle">取 消</el-button>
       <el-button size="small"
                  type="primary"
                  class="diy-button--blue"
                  :disabled="btnDisable"
-                 @click="handleComfirm">确 定</el-button>
+                 @click="handleComfirm">保 存</el-button>
     </div>
   </div>
 </template>
diff --git a/src/views/modules/base/community/communityForm.vue b/src/views/modules/base/community/communityForm.vue
index 7b51922db..816936a39 100644
--- a/src/views/modules/base/community/communityForm.vue
+++ b/src/views/modules/base/community/communityForm.vue
@@ -179,12 +179,11 @@
     </div>
     <div class="div_btn">
       <el-button size="small"
-                 class="diy-button--white"
                  @click="handleCancle">取 消</el-button>
       <el-button size="small"
                  class="diy-button--blue"
                  :disabled="btnDisable"
-                 @click="handleComfirm">确 定</el-button>
+                 @click="handleComfirm">保 存</el-button>
     </div>
   </div>
 </template>
diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue
index 00a0e1635..9e3b8470e 100644
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@@ -179,13 +179,12 @@
     </div>
     <div class="div_btn">
       <el-button size="small"
-                 class="diy-button--white"
                  @click="handleCancle">取 消</el-button>
       <el-button size="small"
                  type="primary"
                  class="diy-button--blue"
                  :disabled="btnDisable"
-                 @click="handleComfirm">确 定</el-button>
+                 @click="handleComfirm">保 存</el-button>
     </div>
   </div>
 </template>
diff --git a/src/views/modules/base/huji/immigration/edit.vue b/src/views/modules/base/huji/immigration/edit.vue
index f90baa11b..815168082 100644
--- a/src/views/modules/base/huji/immigration/edit.vue
+++ b/src/views/modules/base/huji/immigration/edit.vue
@@ -1,366 +1,265 @@
 <template>
   <div>
     <div class="dialog-h-content scroll-h">
-      <el-form
-        ref="ref_form"
-        :inline="true"
-        :model="fmData"
-        :rules="dataRule"
-        :disabled="formType === 'detail'"
-        class="form"
-      >
-        <el-form-item
-          label="所属网格	"
-          prop="gridId"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-select
-            v-model.trim="fmData.gridId"
-            placeholder="请选择"
-            size="small"
-            clearable
-            class="item_width_1"
-            :disabled="formType === 'edit'"
-            @change="handleChangeGrid"
-          >
-            <el-option
-              v-for="item in optionsG"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
+      <el-form ref="ref_form"
+               :inline="true"
+               :model="fmData"
+               :rules="dataRule"
+               label-width="150px"
+               class="edit_form">
+        <el-form-item label="所属网格	"
+                      prop="gridId"
+                      style="display: block">
+          <el-select v-model.trim="fmData.gridId"
+                     placeholder="请选择"
+                     size="small"
+                     clearable
+                     class="edit_item_width_normal"
+                     :disabled="formType === 'edit'"
+                     @change="handleChangeGrid">
+            <el-option v-for="item in optionsG"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
             </el-option>
           </el-select>
         </el-form-item>
 
-        <el-form-item
-          label="所属房屋	"
-          prop="homeId"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            v-if="formType == 'detail'"
-            class="item_width_2"
-            placeholder="请输入来源地"
-            disabled
-            v-model="fmData.allName"
-          />
-          <template v-else>
-            <el-select
-              v-model.trim="fmData.villageId"
-              placeholder="请选择小区"
-              size="small"
-              clearable
-              class="resi-cell-select"
-              @clear="handleClearVillage"
-              @change="handleChangeV"
-              :disabled="formType === 'edit'"
-              style="margin-right: 8px; width: 120px"
-            >
-              <el-option
-                v-for="item in optionsV"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
+        <el-form-item label="所属房屋	"
+                      prop="homeId"
+                      style="display: block">
+
+          <div>
+            <el-select v-model.trim="fmData.villageId"
+                       placeholder="请选择小区"
+                       size="small"
+                       clearable
+                       class="edit_item_width_normal"
+                       @clear="handleClearVillage"
+                       @change="handleChangeV"
+                       :disabled="formType === 'edit'">
+              <el-option v-for="item in optionsV"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
               </el-option>
             </el-select>
-            <el-select
-              v-model.trim="fmData.buildId"
-              placeholder="楼号"
-              size="small"
-              clearable
-              style="margin-right: 8px; width: 120px"
-              class="resi-cell-select"
-              :disabled="changeVDisabled || formType === 'edit'"
-              @clear="handleClearBuild"
-              @change="handleChangeB"
-            >
-              <el-option
-                v-for="item in optionsB"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
+          </div>
+          <div>
+            <el-select v-model.trim="fmData.buildId"
+                       placeholder="楼号"
+                       size="small"
+                       clearable
+                       class="edit_item_width_build"
+                       :disabled="changeVDisabled || formType === 'edit'"
+                       @clear="handleClearBuild"
+                       @change="handleChangeB">
+              <el-option v-for="item in optionsB"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
               </el-option>
             </el-select>
-            <el-select
-              v-model.trim="fmData.unitId"
-              :disabled="changeBDisabled || formType === 'edit'"
-              placeholder="单元"
-              size="small"
-              clearable
-              style="margin-right: 8px; width: 120px"
-              class="resi-cell-select"
-              @click="handleClearDan"
-              @change="handleChangeD"
-            >
-              <el-option
-                v-for="item in optionsD"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
+            <el-select v-model.trim="fmData.unitId"
+                       :disabled="changeBDisabled || formType === 'edit'"
+                       placeholder="单元"
+                       size="small"
+                       clearable
+                       style="margin-left: 10px;"
+                       class="edit_item_width_build"
+                       @click="handleClearDan"
+                       @change="handleChangeD">
+              <el-option v-for="item in optionsD"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
               </el-option>
             </el-select>
-            <el-select
-              v-model.trim="fmData.homeId"
-              :disabled="changeDDisabled || formType === 'edit'"
-              placeholder="房号"
-              size="small"
-              clearable
-              @change="handleChangeH"
-              style="width: 120px"
-              class="resi-cell-select"
-            >
-              <el-option
-                v-for="item in optionsH"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
+            <el-select v-model.trim="fmData.homeId"
+                       :disabled="changeDDisabled || formType === 'edit'"
+                       placeholder="房号"
+                       size="small"
+                       clearable
+                       @change="handleChangeH"
+                       style="margin-left: 10px;"
+                       class="edit_item_width_build">
+              <el-option v-for="item in optionsH"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
               </el-option>
             </el-select>
-          </template>
+          </div>
+
         </el-form-item>
 
-        <el-form-item
-          label="姓名"
-          prop="name"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            style="margin-right: 20px"
-            placeholder="请输入姓名	"
-            v-model="fmData.name"
-            :disabled="formType === 'edit'"
-            maxlength="30"
-          >
+        <el-form-item label="姓名"
+                      prop="name"
+                      style="display: block">
+          <el-input class="edit_item_width_normal"
+                    style="margin-right: 20px"
+                    placeholder="请输入姓名	"
+                    v-model="fmData.name"
+                    :disabled="formType === 'edit'"
+                    maxlength="30">
           </el-input>
-
-          <el-checkbox v-model="fmData.isWelfare" true-label="1" false-label="0">享受福利</el-checkbox>
-          <template v-if="formType === 'edit'">
-            <el-checkbox
-              v-model="fmData.isCheck"
-              true-label="1"
-              false-label="0"
-              :disabled="initCheck == 1"
-              @change="checkResiAvailable"
-              >补充居民信息</el-checkbox
-            >
-          </template>
-
-          <el-checkbox
-            v-else
-            v-model="fmData.isCheck"
-            true-label="1"
-            false-label="0"
-            @change="checkResiAvailable"
-            >补充居民信息</el-checkbox
-          >
+          <div>
+            <el-checkbox v-model="fmData.isWelfare"
+                         true-label="1"
+                         false-label="0">享受福利</el-checkbox>
+
+            <template v-if="formType === 'edit'">
+              <el-checkbox v-model="fmData.isCheck"
+                           true-label="1"
+                           false-label="0"
+                           :disabled="initCheck == 1"
+                           @change="checkResiAvailable">补充居民信息</el-checkbox>
+            </template>
+
+            <el-checkbox v-else
+                         v-model="fmData.isCheck"
+                         true-label="1"
+                         false-label="0"
+                         @change="checkResiAvailable">补充居民信息</el-checkbox>
+          </div>
         </el-form-item>
 
-        <el-form-item
-          label="手机号"
-          prop="mobile"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            type="number"
-            maxlength="11"
-            show-word-limit
-            placeholder="请输入手机号	"
-            :disabled="formType === 'edit'"
-            v-model="fmData.mobile"
-          >
+        <el-form-item label="手机号"
+                      prop="mobile"
+                      style="display: block">
+          <el-input class="edit_item_width_normal"
+                    type="number"
+                    maxlength="11"
+                    show-word-limit
+                    placeholder="请输入手机号	"
+                    :disabled="formType === 'edit'"
+                    v-model="fmData.mobile">
           </el-input>
         </el-form-item>
 
-        <el-form-item
-          label="证件号"
-          prop="idCard"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            placeholder="请输入身份证号或护照号"
-            v-model="fmData.idCard"
-            :disabled="formType === 'edit'"
-            @blur="handleBlurId"
-          ></el-input>
+        <el-form-item label="证件号"
+                      prop="idCard"
+                      style="display: block">
+          <el-input class="edit_item_width_normal"
+                    placeholder="请输入身份证号或护照号"
+                    v-model="fmData.idCard"
+                    :disabled="formType === 'edit'"
+                    @blur="handleBlurId"></el-input>
         </el-form-item>
 
-        <el-form-item
-          label="性别"
-          prop="principalName"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-select
-            v-model.trim="fmData.gender"
-            placeholder="性别"
-            size="small"
-            clearable
-            class="item_width_1"
-            :disabled="true"
-          >
-            <el-option
-              v-for="item in optionsGender"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
+        <el-form-item label="性别"
+                      prop="principalName"
+                      style="display: block">
+          <el-select v-model.trim="fmData.gender"
+                     placeholder="性别"
+                     size="small"
+                     clearable
+                     class="edit_item_width_normal"
+                     :disabled="true">
+            <el-option v-for="item in optionsGender"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item
-          label="年龄"
-          prop="age"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            type="number"
-            show-word-limit
-            placeholder="请输入"
-            v-model="fmData.age"
-            :disabled="true"
-          >
+        <el-form-item label="年龄"
+                      prop="age"
+                      style="display: block">
+          <el-input class="edit_item_width_normal"
+                    type="number"
+                    show-word-limit
+                    placeholder="请输入"
+                    v-model="fmData.age"
+                    :disabled="true">
           </el-input>
         </el-form-item>
 
-        <el-form-item
-          label="迁入日期"
-          prop="inTime"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-date-picker
-            v-model="fmData.inTime"
-            type="date"
-            placeholder="迁入时间"
-            value-format="yyyy-MM-dd"
-            class="item_width_1"
-            :disabled="formType === 'edit'"
-          >
+        <el-form-item label="迁入日期"
+                      prop="inTime"
+                      style="display: block">
+          <el-date-picker v-model="fmData.inTime"
+                          type="date"
+                          placeholder="迁入时间"
+                          value-format="yyyy-MM-dd"
+                          class="edit_item_width_normal"
+                          :disabled="formType === 'edit'">
           </el-date-picker>
         </el-form-item>
 
-        <el-form-item
-          label="迁入原因"
-          prop="inReason"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            type="textarea"
-            class="item_width_2"
-            placeholder="请输入迁入原因"
-            v-model="fmData.inReason"
-          >
+        <el-form-item label="迁入原因"
+                      prop="inReason"
+                      style="display: block">
+          <el-input type="textarea"
+                    class="edit_item_width_normal"
+                    placeholder="请输入迁入原因"
+                    v-model="fmData.inReason">
           </el-input>
         </el-form-item>
 
-        <el-form-item
-          label="来源地"
-          prop="sourceAddress"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            v-if="formType == 'detail'"
-            class="item_width_2"
-            placeholder="请输入来源地"
-            disabled
-            v-model="fmData.sourceAddress"
-          />
-          <el-cascader v-else ref="nowArea" class="item_width_1" :props="areaProps"
-            v-model="nowAllCode" clearable @change="handleNowArea"></el-cascader>
+        <el-form-item label="来源地"
+                      prop="sourceAddress"
+                      style="display: block">
+
+          <el-cascader ref="nowArea"
+                       class="edit_item_width_normal"
+                       :props="areaProps"
+                       v-model="nowAllCode"
+                       clearable
+                       @change="handleNowArea"></el-cascader>
 
         </el-form-item>
-        <el-form-item
-          label="详细地址"
-          prop="address"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            placeholder="请输入详细地址"
-            v-model="fmData.address"
-          >
+        <el-form-item label="详细地址"
+                      prop="address"
+                      style="display: block">
+          <el-input class="edit_item_width_normal"
+                    placeholder="请输入详细地址"
+                    v-model="fmData.address">
           </el-input>
         </el-form-item>
-        <el-form-item
-          label="迁移证号码"
-          prop="moveNumber"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            placeholder="请输入迁移证号码"
-            v-model="fmData.moveNumber"
-          >
+        <el-form-item label="迁移证号码"
+                      prop="moveNumber"
+                      style="display: block">
+          <el-input class="edit_item_width_normal"
+                    placeholder="请输入迁移证号码"
+                    v-model="fmData.moveNumber">
           </el-input>
         </el-form-item>
 
-        <el-form-item
-          label="户主姓名"
-          prop="householderName"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            placeholder="请输入户主姓名"
-            v-model="fmData.householderName"
-          >
+        <el-form-item label="户主姓名"
+                      prop="householderName"
+                      style="display: block">
+          <el-input class="edit_item_width_normal"
+                    placeholder="请输入户主姓名"
+                    v-model="fmData.householderName">
           </el-input>
         </el-form-item>
 
-        <el-form-item
-          label="与户主关系"
-          prop="householderRelation"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-select
-            v-model.trim="fmData.householderRelation"
-            placeholder="与户主关系"
-            size="small"
-            clearable
-            class="item_width_1"
-          >
-            <el-option
-              v-for="item in optionsRelation"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
+        <el-form-item label="与户主关系"
+                      prop="householderRelation"
+                      style="display: block">
+          <el-select v-model.trim="fmData.householderRelation"
+                     placeholder="与户主关系"
+                     size="small"
+                     clearable
+                     class="edit_item_width_normal">
+            <el-option v-for="item in optionsRelation"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
             </el-option>
           </el-select>
         </el-form-item>
       </el-form>
     </div>
-    <div class="div_btn resi-btns">
-      <el-button size="small" @click="handleCancle">取 消</el-button>
-      <el-button
-        v-if="formType != 'detail'"
-        type="primary"
-        size="small"
-        :disabled="btnDisable"
-        @click="handleComfirm"
-        >确 定</el-button
-      >
+    <div class="div_btn">
+      <el-button size="small"
+                 @click="handleCancle">取 消</el-button>
+      <el-button type="primary"
+                 size="small"
+                 class="diy-button--blue"
+                 :disabled="btnDisable"
+                 @click="handleComfirm">保 存</el-button>
     </div>
   </div>
 </template>
@@ -371,7 +270,7 @@ import formVltHelper from 'dai-js/tools/formVltHelper'
 import { computedCard } from '@/utils/index'
 import { isCard, isMobile } from '@/utils/validate'
 
-function iniFmData() {
+function iniFmData () {
   return {
     gridId: '',
     villageId: '',
@@ -400,7 +299,7 @@ function iniFmData() {
 }
 
 export default {
-  data() {
+  data () {
     return {
       formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
 
@@ -436,7 +335,7 @@ export default {
   },
   components: {},
   computed: {
-    dataRule() {
+    dataRule () {
       let checkIdCard = (rule, value, callback) => {
         if (value === '') {
           callback(new Error('请输入证件号'))
@@ -475,20 +374,20 @@ export default {
       }
     },
 
-    changeVDisabled() {
+    changeVDisabled () {
       return !this.fmData.villageId
     },
-    changeBDisabled() {
+    changeBDisabled () {
       return !this.fmData.buildId
     },
-    changeDDisabled() {
+    changeDDisabled () {
       return !this.fmData.unitId
     }
   },
   props: {},
   watch: {},
 
-  async mounted() {
+  async mounted () {
     console.log('mounted-----我执行了')
     await this.getGridList()
 
@@ -496,13 +395,13 @@ export default {
   },
 
   methods: {
-    lzayLoadArea(node, resolve) {
+    lzayLoadArea (node, resolve) {
       // this.getArea(node, resolve)
       setTimeout(() => {
         this.getArea(node, resolve)
       }, 200)
     },
-    async checkResiAvailable() {
+    async checkResiAvailable () {
       const {
         fmData: { idCard, isResiUser }
       } = this
@@ -528,7 +427,7 @@ export default {
         }
       }
     },
-    handleNowArea(val) {
+    handleNowArea (val) {
       console.log('val-----', val)
       console.log('label-----', this.$refs.nowArea.getCheckedNodes())
       if (val.length > 0) {
@@ -544,7 +443,7 @@ export default {
         this.fmData.sourceAddressPathCode = ''
       }
     },
-    handleBlurId(val) {
+    handleBlurId (val) {
       const { sex, age } = computedCard(this.fmData.idCard)
       if (val) {
         this.fmData.age = age
@@ -553,20 +452,20 @@ export default {
       }
     },
 
-    handleClearVillage() {
+    handleClearVillage () {
       this.fmData.buildId = ''
       this.fmData.homeId = ''
     },
-    handleClearBuild() {
+    handleClearBuild () {
       this.fmData.buildId = ''
       this.fmData.unitId = ''
       this.fmData.homeId = ''
     },
-    handleClearDan() {
+    handleClearDan () {
       this.fmData.unitId = ''
       this.fmData.homeId = ''
     },
-    handleChangeGrid(val) {
+    handleChangeGrid (val) {
       console.log('val', val)
       this.fmData.villageId = ''
       this.fmData.buildId = ''
@@ -576,7 +475,7 @@ export default {
       this.fmData.householderRelation = ''
       this.getValiheList()
     },
-    handleChangeV(val) {
+    handleChangeV (val) {
       console.log('val', val)
       this.fmData.buildId = ''
       this.fmData.unitId = ''
@@ -585,7 +484,7 @@ export default {
       this.fmData.householderRelation = ''
       this.getBuildList()
     },
-    handleChangeB(val) {
+    handleChangeB (val) {
       console.log('val', val)
       this.fmData.unitId = ''
       this.fmData.homeId = ''
@@ -593,14 +492,14 @@ export default {
       this.fmData.householderRelation = ''
       this.getUniList()
     },
-    handleChangeD(val) {
+    handleChangeD (val) {
       console.log('val', val)
       this.fmData.homeId = ''
       this.fmData.householderName = ''
       this.fmData.householderRelation = ''
       this.getHouseList()
     },
-    handleChangeH(val) {
+    handleChangeH (val) {
       console.log('val', val)
       this.getHouseMaster()
     },
@@ -629,7 +528,7 @@ export default {
       }
 
     },
-    getRelationList() {
+    getRelationList () {
       const { user } = this.$store.state
       this.$http
         .post('/sys/dict/data/relationship', {
@@ -648,7 +547,7 @@ export default {
         })
     },
 
-    getGridList() {
+    getGridList () {
       const { user } = this.$store.state
       this.$http
         .post('/gov/org/customergrid/gridoption', {
@@ -667,7 +566,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    getValiheList() {
+    getValiheList () {
       const { user } = this.$store.state
       this.$http
         .post('/gov/org/icneighborhood/neighborhoodoption', {
@@ -687,7 +586,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    getBuildList() {
+    getBuildList () {
       this.$http
         .post('/gov/org/icbuilding/buildingoption', {
           neighborHoodId: this.fmData.villageId
@@ -704,7 +603,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    getUniList() {
+    getUniList () {
       this.$http
         .post('/gov/org/icbuildingunit/unitoption', {
           buildingId: this.fmData.buildId
@@ -721,7 +620,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    getHouseList() {
+    getHouseList () {
       this.$http
         .post('/gov/org/ichouse/houseoption', { unitId: this.fmData.unitId })
         .then(({ data: res }) => {
@@ -737,7 +636,7 @@ export default {
         })
     },
 
-    getHouseMaster() {
+    getHouseMaster () {
       const { homeId } = this.fmData
       if (!homeId) return (this.alreadyHaveMaster = false)
 
@@ -763,7 +662,7 @@ export default {
         })
     },
 
-    async initForm(type, id) {
+    async initForm (type, id) {
       this.$refs.ref_form.resetFields()
 
       this.formType = type
@@ -778,7 +677,7 @@ export default {
         this.getHouseList()
       }
     },
-    async getDatail(moveInId) {
+    async getDatail (moveInId) {
       let url = '/epmetuser/icMoveIn/detail'
 
       const params = {
@@ -792,7 +691,7 @@ export default {
       } else this.$message.error(msg)
     },
 
-    async handleComfirm() {
+    async handleComfirm () {
 
       // setTimeout(() => {
       //   this.btnDisable = false
@@ -834,7 +733,7 @@ export default {
       })
     },
 
-    async submit() {
+    async submit () {
 
       let url = ''
       if (this.formType === 'add') {
@@ -861,11 +760,11 @@ export default {
       }
     },
 
-    handleCancle() {
+    handleCancle () {
       this.resetData()
       this.$emit('dialogCancle')
     },
-    resetData() {
+    resetData () {
       this.orgId = ''
       this.nowAllCode = []
       this.btnDisable = false
@@ -877,53 +776,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.item_width_1 {
-  width: 220px;
-}
-.item_width_2 {
-  width: 400px;
-}
-.item_width_3 {
-  margin-left: 10px;
-  width: 200px;
-}
-.item_width_4 {
-  width: 200px;
-}
-
-.div_map {
-  margin-top: 10px;
-}
-
-.div_btn {
-  // display: flex;
-  // justify-content: flex-end;
-}
-.el-tabs {
-  margin: 0 20px;
-}
-.el-upload__tip {
-  color: rgb(155, 155, 155);
-  margin: 0;
-}
-.form {
-  margin-top: 30px;
-}
-
-.m-staffs {
-  width: 468px;
-  .item {
-    display: flex;
-    justify-content: space-around;
-    margin-bottom: 7px;
-  }
-  .item-add {
-  }
-}
+@import "@/assets/scss/modules/management/edit-main.scss";
 </style>
 
-<style>
-.el-dialog__body {
-  padding: 0 10px 20px !important;
-}
-</style>
+
diff --git a/src/views/modules/base/huji/immigration/index.vue b/src/views/modules/base/huji/immigration/index.vue
index 278053587..219406c11 100644
--- a/src/views/modules/base/huji/immigration/index.vue
+++ b/src/views/modules/base/huji/immigration/index.vue
@@ -158,11 +158,12 @@
     <div class="div_table">
       <div class="div_btn">
         <div class="div_btn_left">
-          <el-button class="diy-button--add"
+          <el-button class="diy-button--blue"
+                     icon="el-icon-plus"
                      size="small"
                      @click="handleAdd">迁入登记</el-button>
           <el-button v-if="false"
-                     class="diy-button--export"
+                     class="diy-button--white"
                      size="small"
                      @click="handleExportModule('room')">下载模板</el-button>
           <el-upload :headers="$getElUploadHeaders()"
@@ -180,12 +181,12 @@
                      :before-upload="beforeExcelUpload"
                      :http-request="uploadHttpRequest">
             <el-button size="small"
-                       class="diy-button--delete"
+                       class="diy-button--white"
                        :loading="importLoading">{{ importBtnTitle }}</el-button>
           </el-upload>
 
           <el-button @click="handleChu"
-                     class="diy-button--reset"
+                     class="diy-button--white"
                      size="small">导出</el-button>
         </div>
       </div>
@@ -290,22 +291,23 @@
           <el-table-column fixed="right"
                            label="操作"
                            align="center"
-                           width="150">
+                           width="190">
             <template slot-scope="scope">
               <el-button v-if="false"
                          @click="handleWatch(scope.$index)"
                          type="text"
+                         class="div-table-button--blue"
                          size="small">查看</el-button>
 
               <el-button @click="handleEdit(scope.$index)"
                          type="text"
                          size="small"
-                         class="div-table-button--edit">修改</el-button>
+                         class="div-table-button--blue">修改</el-button>
 
               <el-button @click="handleChangeRecord(scope.row)"
                          type="text"
                          size="small"
-                         class="div-table-button--detail">变更记录</el-button>
+                         class="div-table-button--blue">变更记录</el-button>
 
               <el-popconfirm v-if="false"
                              title="删除之后无法回复，确认删除？"
@@ -324,7 +326,7 @@
                 <el-button slot="reference"
                            type="text"
                            size="small"
-                           class="div-table-button--delete"
+                           class="div-table-button--blue"
                            style="margin-left: 10px">删除</el-button>
               </el-popconfirm>
             </template>
@@ -349,7 +351,7 @@
                :close-on-click-modal="false"
                :close-on-press-escape="false"
                :title="formTitle"
-               width="850px"
+               width="670px"
                top="5vh"
                class="dialog-h"
                @closed="handleClose">
@@ -364,7 +366,7 @@
                :close-on-click-modal="false"
                :close-on-press-escape="false"
                :title="'迁入详情'"
-               width="850px"
+               width="670px"
                top="5vh"
                class="dialog-h"
                @closed="detailFormCancle">
@@ -497,8 +499,9 @@ export default {
     this.getGridList()
     this.getValiheList()
     this.getTableData()
-    this.searchH = this.$refs.searchForm.$el.offsetHeight + 270
-    console.log('searchH----', this.$refs.searchForm.$el.offsetHeight)
+
+    this.searchH = this.$refs.searchForm.offsetHeight + 300
+    console.log('searchH----', this.$refs.searchForm.offsetHeight)
   },
   methods: {
     diaClose () {
@@ -974,84 +977,4 @@ export default {
 
 <style lang="scss" scoped>
 @import "@/assets/scss/modules/management/list-main.scss";
-
-.resi-container .resi-card-table {
-  ::v-deep .el-table th {
-    color: #fff;
-    background-color: rgba(33, 149, 254, 1);
-    // border-right: 1px solid rgba(33, 149, 254, 1);
-  }
-}
-.resi-table {
-  ::v-deep .el-button--text {
-    text-decoration: underline;
-  }
-}
-.resi-card-table {
-  margin-top: 20px;
-}
-.resi-row-btn {
-  margin-bottom: 13px;
-  .upload-btn {
-    display: inline-block;
-    margin: 0 10px;
-  }
-}
-
-.resi-btns {
-  margin-top: 20px;
-  text-align: center;
-}
-
-.resi-container .resi-card {
-  position: relative;
-  overflow: visible;
-}
-
-.demo-form-inline {
-  // display: flex;
-  // align-items: center;
-  // margin-bottom: 20px;
-
-  .resi-cell-label {
-    flex-shrink: 0;
-    min-width: 0;
-    box-sizing: border-box;
-    margin-right: 15px;
-    // text-align: right;
-    // line-height: 32;
-  }
-  .resi-cell-label1 {
-    width: max-content;
-  }
-  .resi-cell-value-radio {
-    display: flex;
-    align-items: center;
-    min-height: 32px;
-  }
-  .item_width_normal {
-    width: 200px;
-  }
-  .resi-cell--daterange {
-    max-width: 260px;
-  }
-  .item_width_normal {
-    width: 200px;
-    box-sizing: border-box;
-    margin-right: 10px;
-    &-middle {
-      width: 120px;
-    }
-    &-small {
-      width: 88px;
-    }
-  }
-  .item_width_normal:last-child {
-    margin-right: 0;
-  }
-}
-
-.mt10 {
-  margin-top: 10px;
-}
 </style>