From cc83fe8745112d9230c23f4e367bcd423261b34b Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 8 Dec 2022 14:36:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=81=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scss/modules/management/list-main.scss    |  18 +-
 src/views/components/resiChangeTransfer.vue   |  94 +-
 .../modules/base/community/community.vue      |   4 +-
 .../modules/plugins/change/resichange.vue     |   2 +-
 src/views/modules/plugins/change/verify.vue   | 121 +--
 .../plugins/change/verifyForm copy.vue        | 857 ++++++++++++++++++
 .../modules/plugins/change/verifyForm.vue     | 565 +++++-------
 7 files changed, 1158 insertions(+), 503 deletions(-)
 create mode 100644 src/views/modules/plugins/change/verifyForm copy.vue

diff --git a/src/assets/scss/modules/management/list-main.scss b/src/assets/scss/modules/management/list-main.scss
index c73b0d0d7..6c77e8ffd 100644
--- a/src/assets/scss/modules/management/list-main.scss
+++ b/src/assets/scss/modules/management/list-main.scss
@@ -96,6 +96,15 @@
     }
   }
 
+  // 搜索栏高度控制显示隐藏
+.setFormBoxHeight{
+  max-height: 99px;
+  overflow: hidden;
+}
+.setFormBoxHeightAuto{
+  height: auto;
+}
+
 
   //---------旧版
 
@@ -172,12 +181,5 @@
   -webkit-line-clamp: 2;
   overflow: hidden;
 }
-// 搜索栏高度控制显示隐藏
-.setFormBoxHeight{
-  max-height: 99px;
-  overflow: hidden;
-}
-.setFormBoxHeightAuto{
-  height: auto;
-}
+
 
diff --git a/src/views/components/resiChangeTransfer.vue b/src/views/components/resiChangeTransfer.vue
index f4079c944..a940c9648 100644
--- a/src/views/components/resiChangeTransfer.vue
+++ b/src/views/components/resiChangeTransfer.vue
@@ -1,12 +1,12 @@
 <template>
   <div>
-    <div class="dialog-h-content scroll-h  m-edit">
+    <div class="dialog-h-content scroll-h">
       <el-form ref="ref_form"
-               :inline="true"
+               :inline="false"
                :model="dataForm"
-               label-width="90px"
                :rules="dataRule"
-               class="m-form">
+               label-width="150px"
+               class="edit_form">
 
         <el-form-item label="当前组织"
                       style="display: block">
@@ -19,14 +19,13 @@
         </el-form-item>
 
         <el-form-item label="迁出时间"
-                      style="display: block"
                       prop="outOfTime">
           <el-date-picker v-model="dataForm.outOfTime"
-                          class="edit_item_width_1"
                           type="date"
                           value-format="yyyy-MM-dd HH:mm:ss"
                           format="yyyy-MM-dd"
                           placeholder="选择日期"
+                          class="edit_item_width_normal"
                           :clearable="false">
           </el-date-picker>
         </el-form-item>
@@ -42,13 +41,12 @@
           </el-radio-group>
         </el-form-item>
 
-        <div v-if="dataForm.type==='in'">
+        <template v-if="dataForm.type==='in'">
           <el-form-item label="迁出至"
-                        style="display: block"
                         prop='agencyId'>
             <el-cascader ref="myCascader"
                          v-model="agencyIdArray"
-                         class="edit_item_width_1"
+                         class="edit_item_width_normal"
                          :key="iscascaderShow"
                          :options="casOptions"
                          :props="optionProps"
@@ -57,15 +55,14 @@
           </el-form-item>
 
           <el-form-item label="所属家庭"
-                        style="display: block"
                         prop="villageId">
 
-            <div class="resi-cell-col">
+            <div>
 
               <el-select v-model.trim="dataForm.villageId"
                          placeholder="请选择小区"
                          clearable
-                         class="edit_item_width_1"
+                         class="edit_item_width_normal"
                          @change="handleChangeCommunity($event)">
                 <el-option v-for="item in communityList"
                            :key="item.value"
@@ -73,11 +70,13 @@
                            :value="item.value">
                 </el-option>
               </el-select>
+            </div>
+            <div style="margin-top:5px">
 
               <el-select v-model.trim="dataForm.buildId"
-                         placeholder="请选择楼号"
+                         placeholder="楼号"
                          clearable
-                         class="edit_item_width_1 margin_left10"
+                         class="edit_item_width_build"
                          @change="handleChangeBuilding($event)">
                 <el-option v-for="item in buildingList"
                            :key="item.value"
@@ -87,9 +86,10 @@
               </el-select>
 
               <el-select v-model.trim="dataForm.unitId"
-                         placeholder="请选择单元"
+                         placeholder="单元"
                          clearable
-                         class="edit_item_width_1 margin_left10"
+                         style="margin-left: 10px;"
+                         class="edit_item_width_build"
                          @change="handleChangeUnit($event)">
                 <el-option v-for="item in unitList"
                            :key="item.value"
@@ -99,9 +99,10 @@
               </el-select>
 
               <el-select v-model.trim="dataForm.homeId"
-                         placeholder="请选择房号"
+                         placeholder="房号"
                          clearable
-                         class="edit_item_width_1 margin_left10"
+                         style="margin-left: 10px;"
+                         class="edit_item_width_build"
                          @change="handleChangeHome($event)">
                 <el-option v-for="item in roomList"
                            :key="item.value"
@@ -109,53 +110,50 @@
                            :value="item.value">
                 </el-option>
               </el-select>
-
             </div>
 
           </el-form-item>
 
-        </div>
-        <div v-if="dataForm.type==='out'"
-             class="item-textarea">
+        </template>
+        <div v-if="dataForm.type==='out'">
           <el-form-item label="外迁详细地址"
-                        style="display: block"
                         prop="address">
             <el-input type="textarea"
+                      :autosize="{ minRows: 2, maxRows: 7}"
+                      :rows="5"
                       resize="none"
-                      class="edit_item_width_1"
+                      class="edit_item_width_normal"
                       placeholder='请输入外迁详细地址'
                       v-model="dataForm.address">
             </el-input>
           </el-form-item>
         </div>
-        <div class="item-textarea">
-          <el-form-item label="迁出原因"
-                        style="display: block"
-                        prop="reason">
-            <el-input type="textarea"
-                      resize="none"
-                      class="edit_item_width_1"
-                      placeholder='请输入迁出原因'
-                      v-model="dataForm.reason">
-            </el-input>
-          </el-form-item>
-        </div>
-        <el-form-item label="享受福利"
-                      style="display: block"
+        <el-form-item label="迁出原因"
+                      prop="reason">
+          <el-input type="textarea"
+                    :autosize="{ minRows: 4, maxRows: 7}"
+                    :rows="5"
+                    resize="none"
+                    class="edit_item_width_normal"
+                    placeholder='请输入迁出原因'
+                    v-model="dataForm.reason">
+          </el-input>
+        </el-form-item>
+        <el-form-item label=""
                       prop="welfareFlag">
-          <el-checkbox v-model="dataForm.welfareFlag">享受</el-checkbox>
+          <el-checkbox v-model="dataForm.welfareFlag">享受福利</el-checkbox>
         </el-form-item>
       </el-form>
 
     </div>
     <div class="div_btn">
       <el-button size="small"
-                 class="diy-button--gray"
                  @click="handleCancle">取 消</el-button>
-      <el-button size="small"
+      <el-button type="primary"
+                 size="small"
                  class="diy-button--blue"
-                 :loading="btnDisable"
-                 @click="handleComfirm">提 交</el-button>
+                 :disabled="btnDisable"
+                 @click="handleComfirm">保 存</el-button>
     </div>
 
   </div>
@@ -603,14 +601,4 @@ export default {
 </script>
 <style lang="scss" scoped>
 @import "@/assets/scss/modules/management/edit-main.scss";
-
-.resi-cell-col {
-  width: 750px;
-  display: flex;
-  justify-content: flex-start;
-}
-
-.margin_left10 {
-  margin-left: 10px;
-}
 </style>
diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index cdc6c10cf..80a6960f4 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -39,6 +39,7 @@
 
         <el-form :inline="true"
                  ref="ref_searchform"
+                 :class="boxHeight ? 'setFormBoxHeightAuto' : 'setFormBoxHeight'"
                  :label-width="'100px'">
           <!-- <div class="search_form"> -->
           <el-form-item label="房主姓名"
@@ -196,7 +197,7 @@
                        size="small"
                        class="div-table-button--blue"
                        type="text"
-                       @click="handleSearch">展开<i class="el-icon-arrow-down el-icon--right"></i></el-button>
+                       @click="boxHeight = !boxHeight">{{ boxHeight ? '收起' : '展开' }}<i :class="boxHeight ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"></i></el-button>
 
           </div>
         </el-form>
@@ -281,6 +282,7 @@ export default {
       return time.getTime() > nowData
     }
     return {
+      boxHeight: true,
       filterText: '',
       treeLoading: true,
       treeData: [],
diff --git a/src/views/modules/plugins/change/resichange.vue b/src/views/modules/plugins/change/resichange.vue
index abc9a0951..5e9cf21c3 100644
--- a/src/views/modules/plugins/change/resichange.vue
+++ b/src/views/modules/plugins/change/resichange.vue
@@ -242,7 +242,7 @@
                :close-on-click-modal="false"
                :close-on-press-escape="false"
                :title="'迁出管理'"
-               width="950px"
+               width="670px"
                top="5vh"
                class="dialog-h"
                @closed="diaClose">
diff --git a/src/views/modules/plugins/change/verify.vue b/src/views/modules/plugins/change/verify.vue
index 941ef9956..8372234be 100644
--- a/src/views/modules/plugins/change/verify.vue
+++ b/src/views/modules/plugins/change/verify.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="div_main">
-    <div ref="searchForm"
+    <div ref="searchDiv"
          class="div_search">
       <el-form ref="searchForm"
                :inline="true"
@@ -156,11 +156,11 @@
       </el-form>
     </div>
 
-    <el-card class="resi-card-table">
+    <div class="div_table">
+
       <el-table :data="tableData"
                 border
-                style="width: 100%"
-                class="resi-table"
+                class="div_table_item"
                 :height="maxTableHeight">
         <el-table-column label="序号"
                          fixed="left"
@@ -232,14 +232,15 @@
           <template slot-scope="scope">
             <el-button @click="handleWatch(scope.row)"
                        type="text"
+                       class="div-table-button--blue"
                        size="small">查看</el-button>
 
             <template v-if="filterEdit(scope.row.agencyId)">
               <el-button v-if="scope.row.confirmResult == '未审核'"
                          @click="handleEdit(scope.row)"
                          type="text"
-                         size="small"
-                         class="div-table-button--edit">审核</el-button>
+                         class="div-table-button--blue"
+                         size="small">审核</el-button>
             </template>
 
           </template>
@@ -256,14 +257,14 @@
                        :total="total">
         </el-pagination>
       </div>
-    </el-card>
+    </div>
 
     <!-- 修改弹出框 -->
     <el-dialog :visible.sync="formShow"
                :close-on-click-modal="false"
                :close-on-press-escape="false"
                :title="formTitle"
-               width="1000px"
+               width="670px"
                top="5vh"
                class="dialog-h"
                @close="handleClose(false)">
@@ -341,8 +342,8 @@ export default {
     ...mapGetters(['clientHeight', 'iframeHeight']),
     maxTableHeight () {
       console.log('computed-searchH---', this.searchH)
-      const h = this.clientHeight - this.searchH - 440 + this.iframeHeight
-      const _h = this.clientHeight - this.searchH - 440
+      const h = this.clientHeight - this.searchH - 370 + this.iframeHeight
+      const _h = this.clientHeight - this.searchH - 370
       console.log('computed-searchH---_h', _h)
       return this.$store.state.inIframe ? h : _h
 
@@ -383,8 +384,8 @@ 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.searchDiv.offsetHeight + 270
+    console.log('searchH----', this.$refs.searchDiv.offsetHeight)
   },
   methods: {
     filterEdit (id) {
@@ -545,7 +546,21 @@ export default {
       this.getTableData()
     },
     resetForm (formName) {
-      this.$refs[formName].resetFields()
+      this.fmData = {
+        gridId: '',
+        villageId: '',
+        buildId: '',
+        unitId: '',
+        homeId: '',
+        name: '',
+        mobile: '',
+        idCard: '',
+        // isWeifare: '', //福利0否，1是
+        // startTime: '',
+        // endTime: '',
+        submitType: '',
+        confirmResult: ''
+      }
       this.handleSearch()
     },
     async handleAdd () {
@@ -615,84 +630,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;
-  }
-  .resi-cell-input {
-    width: 200px;
-  }
-  .resi-cell--daterange {
-    max-width: 260px;
-  }
-  .resi-cell-select {
-    width: 200px;
-    box-sizing: border-box;
-    margin-right: 10px;
-    &-middle {
-      width: 120px;
-    }
-    &-small {
-      width: 88px;
-    }
-  }
-  .resi-cell-select:last-child {
-    margin-right: 0;
-  }
-}
-
-.mt10 {
-  margin-top: 10px;
-}
 </style>
diff --git a/src/views/modules/plugins/change/verifyForm copy.vue b/src/views/modules/plugins/change/verifyForm copy.vue
new file mode 100644
index 000000000..125822d30
--- /dev/null
+++ b/src/views/modules/plugins/change/verifyForm copy.vue	
@@ -0,0 +1,857 @@
+<template>
+  <div>
+    <div v-loading="loadingForm" class="dialog-h-content scroll-h">
+      <el-form :model="detailInfo" :disabled="btnType == 'detail'">
+        <el-form-item
+          label="移除人姓名:"
+          label-width="150px"
+        >
+          <span>{{ detailInfo.name }}</span>
+        </el-form-item>
+        <el-form-item
+          label="手机号:"
+          label-width="150px"
+        >
+          <span>{{ detailInfo.mobile }}</span>
+        </el-form-item>
+        <el-form-item
+          label="证件号:"
+          label-width="150px"
+        >
+          <span>{{ detailInfo.idCard }}</span>
+        </el-form-item>
+        <el-form-item
+          label="所在网格:"
+          label-width="150px"
+        >
+          <span>{{ detailInfo.gridName }}</span>
+        </el-form-item>
+        <el-form-item
+          label="所在房屋:"
+          label-width="150px"
+        >
+          <span>
+            {{ detailInfo.villageName + detailInfo.buildName +  detailInfo.unitName + detailInfo.homeName }}
+          </span>
+        </el-form-item>
+        <!-- <el-divider></el-divider> -->
+         <!-- <el-form-item
+          label="迁出类型:"
+          label-width="150px"
+        >
+          <span v-if="detailInfo.outType == 'in'">{{'迁往' + rootAgency.organizationName + '内其他区域' }}</span>
+          <span v-else>其他</span>
+        </el-form-item>
+        <template v-if="detailInfo.outType == 'in'">
+          <el-form-item
+            label="迁往区域:"
+            label-width="150px"
+          >
+            <span>{{ detailInfo.newGridName }}</span>
+          </el-form-item>
+          <el-form-item
+            label="迁至房屋:"
+            label-width="150px"
+          >
+            <span>{{ detailInfo.newHomeName }}</span>
+          </el-form-item>
+        </template>
+        <el-form-item
+          v-else
+            label="迁至地址:"
+            label-width="150px"
+          >
+            <span>{{ detailInfo.xxdz }}</span>
+          </el-form-item> -->
+        <!-- <el-form-item
+          label="移除时间:"
+          label-width="150px"
+        >
+          <span>{{ detailInfo.moveOutDate }}</span>
+        </el-form-item> -->
+        <el-form-item
+          label="移除原因:"
+          label-width="150px"
+        >
+          <span>
+            {{ detailInfo.deleteReason }}
+          </span>
+        </el-form-item>
+        <el-divider></el-divider>
+        <el-form-item
+          label="审核结果:"
+          label-width="150px"
+          :rules="[
+            { required: true, message: '请选择审核结果', trigger: 'blur' },
+          ]"
+        >
+          <el-input v-if="btnType == 'detail' && confirmResult == ''" value="未审核" style="width: 200px;"></el-input>
+          <el-select
+            v-else
+              v-model.trim="confirmResult"
+              placeholder="请选择结果"
+              clearable
+              :disabled="!detailInfo.isInHome"
+              class="item_width_1"
+            >
+              <el-option label="通过" value="1" />
+              <el-option label="驳回" value="2" />
+            </el-select>
+        </el-form-item>
+        <el-form-item
+          v-if="detailInfo && !detailInfo.isInHome"
+          label-width="150px"
+        >
+          <span style="color: red; font-size: 12px;">当前人员已不在该房屋</span>
+        </el-form-item>
+        <el-form-item
+          v-if="confirmResult == 1"
+          label="同时迁至其他房屋:"
+          label-width="150px"
+        >
+          <el-radio-group v-model="isMoveOut">
+            <el-radio :label="1">需要</el-radio>
+            <el-radio :label="0">不需要</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item
+          v-if="confirmResult == 2"
+          label="驳回原因:"
+          label-width="150px"
+          :rules="[
+            { required: true, message: '请填写驳回原因', trigger: 'blur' },
+          ]"
+        >
+          <el-input type="textarea" v-model="reason" style="width: 300px;"></el-input>
+        </el-form-item>
+        <!-- <template v-if="btnType == 'detail' && confirmResult == '1'">
+          <el-form-item
+            label="迁往区域:"
+            label-width="150px"
+          >
+            <span>{{ detailInfo.newGridName }}</span>
+          </el-form-item>
+          <el-form-item
+            label="迁至房屋:"
+            label-width="150px"
+          >
+            <span>{{ detailInfo.newHomeName }}</span>
+          </el-form-item>
+        </template> -->
+      </el-form>
+      <el-form v-if="btnType == 'detail' && isMoveOut == 1" :model="detailInfo">
+
+        <template>
+          <el-form-item
+            label="迁往区域:"
+            label-width="150px"
+          >
+            <span>{{ detailInfo.newGridName }}</span>
+          </el-form-item>
+          <el-form-item
+            label="迁至房屋:"
+            label-width="150px"
+          >
+            <span>{{ detailInfo.newHomeName }}</span>
+          </el-form-item>
+        </template>
+
+        <el-form-item
+          label="迁出时间:"
+          label-width="150px"
+        >
+          <span>{{ detailInfo.moveOutDate }}</span>
+        </el-form-item>
+
+      </el-form>
+
+
+      <el-form
+        v-if="isMoveOut == 1 && btnType == 'edit' && detailInfo.isInHome"
+        ref="ref_form"
+        :inline="false"
+        :model="dataForm"
+        :rules="dataRule"
+        class="form"
+      >
+        <el-form-item
+          label="当前组织:"
+          label-width="150px"
+          style="display: block"
+        >
+          <span>{{ gridName }}</span>
+        </el-form-item>
+
+        <el-form-item label="姓名" label-width="150px" style="display: block">
+          <span>{{ dataForm.name }}</span>
+        </el-form-item>
+
+        <el-form-item label="迁出时间:" prop="outOfTime" label-width="150px">
+          <el-date-picker
+            v-model="dataForm.outOfTime"
+            type="date"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            format="yyyy-MM-dd"
+            placeholder="选择日期"
+            style="width: 200px"
+            :clearable="false"
+          >
+          </el-date-picker>
+        </el-form-item>
+
+        <!-- <el-form-item
+          label="迁出类型:"
+          prop="type"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-radio-group v-model="dataForm.type">
+            <el-radio :label="'in'">{{
+              '迁往' + rootAgency.organizationName + '内其他区域'
+            }}</el-radio>
+            <el-radio :label="'out'">其他</el-radio>
+          </el-radio-group>
+        </el-form-item> -->
+
+        <div v-if="isMoveOut == 1">
+          <el-form-item label="迁出至" prop="agencyId" label-width="150px">
+            <el-cascader
+              ref="myCascader"
+              v-model="agencyIdArray"
+              style="width: 480px"
+              :key="iscascaderShow"
+              :options="casOptions"
+              :props="optionProps"
+              @change="handleChangeAgency"
+              clearable
+            ></el-cascader>
+          </el-form-item>
+
+          <el-form-item label="所属家庭:" label-width="150px" prop="villageId">
+            <div class="resi-cell-col">
+              <el-select
+                v-model.trim="dataForm.villageId"
+                placeholder="请选择小区"
+                clearable
+                class="item_width_1"
+                @change="handleChangeCommunity($event)"
+              >
+                <el-option
+                  v-for="item in communityList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+
+              <el-select
+                v-model.trim="dataForm.buildId"
+                placeholder="请选择楼号"
+                clearable
+                class="item_width_1 margin_left10"
+                @change="handleChangeBuilding($event)"
+              >
+                <el-option
+                  v-for="item in buildingList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+
+              <el-select
+                v-model.trim="dataForm.unitId"
+                placeholder="请选择单元"
+                clearable
+                class="item_width_1 margin_left10"
+                @change="handleChangeUnit($event)"
+              >
+                <el-option
+                  v-for="item in unitList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+
+              <el-select
+                v-model.trim="dataForm.homeId"
+                placeholder="请选择房号"
+                clearable
+                class="item_width_1 margin_left10"
+                @change="handleChangeHome($event)"
+              >
+                <el-option
+                  v-for="item in roomList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </div>
+          </el-form-item>
+        </div>
+        <!-- <div v-if="dataForm.type === 'out'">
+          <el-form-item label="外迁详细地址:" prop="address" label-width="150px">
+            <el-input
+              type="textarea"
+              :autosize="{ minRows: 2, maxRows: 7 }"
+              :rows="5"
+              resize="none"
+              style="width: 600px"
+              placeholder="请输入外迁详细地址"
+              v-model="dataForm.address"
+            >
+            </el-input>
+          </el-form-item>
+        </div> -->
+        <el-form-item label="迁出原因:" prop="reason" label-width="150px">
+          <el-input
+            type="textarea"
+            :autosize="{ minRows: 4, maxRows: 7 }"
+            :rows="5"
+            resize="none"
+            style="width: 600px"
+            placeholder="请输入迁出原因"
+            v-model="dataForm.reason"
+          >
+          </el-input>
+        </el-form-item>
+        <el-form-item label="" prop="welfareFlag" label-width="150px">
+          <el-checkbox v-model="dataForm.welfareFlag">享受福利</el-checkbox>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div v-if="confirmResult == ''" class="resi-btns">
+      <el-button size="small" @click="handleCancle(false)">取消</el-button>
+    </div>
+    <div v-if="confirmResult == 1" class="resi-btns">
+      <el-button size="small" @click="handleCancle(false)">取消</el-button>
+      <el-button
+        v-if="btnType != 'detail' && !detailInfo.isInHome"
+        type="primary"
+        size="small"
+        :loading="btnDisable"
+        @click="handleVerify"
+        >提交</el-button
+      >
+      <el-button
+        v-else-if="btnType != 'detail'"
+        type="primary"
+        size="small"
+        :loading="btnDisable"
+        @click="handleComfirm"
+        >提交</el-button
+      >
+    </div>
+    <div v-if="confirmResult == 2" class="resi-btns">
+      <el-button size="small" @click="handleCancle(false)">取消</el-button>
+      <el-button
+        v-if="btnType != 'detail'"
+        type="primary"
+        size="small"
+        :loading="btnDisable"
+        @click="handleVerify"
+        >提交</el-button
+      >
+    </div>
+  </div>
+</template>
+
+<script>
+import util from '@js/util.js'
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost, requestGet } from '@/js/dai/request'
+
+let loading // 加载动画
+export default {
+  data() {
+    return {
+      btnDisable: false,
+      loadingForm: true,
+      communityList: [],
+      buildingList: [],
+      unitList: [],
+      roomList: [],
+      confirmResult: '',
+      isMoveOut: 0,
+      reason: '',
+      dataForm: {
+        icUserId: '', // 被调动人ID
+        type: 'in', //操作类型【客户外out,客户内in】
+        agencyId: '', //调动到的组织Id
+        gridId: '', //调动到的网格Id
+        gridName: '',
+        villageId: '', //调动到的小区ID
+        villageName: '',
+        buildId: '', //调动到的楼宇Id
+        buildName: '',
+        unitId: '', //调动到的单元Id
+        unitName: '',
+        homeId: '', //调动到的房屋Id
+        homeName: '',
+        transferTime: '', //调动时间【日期类型】
+        reason: '', //备注
+        customerId: '',
+        oldHome: '',
+        oldDept: '',
+        oldAddress: '',
+        ownerName: '',
+        name: '',
+        gender: '',
+        age: '',
+        address: '',
+        outOfTime: '',
+        welfareFlag: false
+      },
+
+      customerId: '', //客户id
+      userId: '', //操作人员id
+      gridName: '',
+      rootAgency: {},
+
+      casOptions: [],
+      agencyIdArray: [],
+      customerList: [],
+      iscascaderShow: 0,
+      btnType: '',
+      optionProps: {
+        multiple: false,
+        value: 'agencyId',
+        label: 'agencyName',
+        children: 'subAgencyList'
+        // checkStrictly: true
+      },
+
+      selGrid: {},
+      detailInfo: {}
+    }
+  },
+  components: {},
+  mounted() {},
+  computed: {
+    dataRule() {
+      return {
+        // type: [
+        //   { required: true, message: '操作类型不能为空', trigger: 'blur' }
+        // ],
+        agencyId: [
+          { required: true, message: '所选组织不能为空', trigger: 'blur' }
+        ],
+        villageId: [
+          { required: true, message: '所属家庭不能为空', trigger: 'blur' }
+        ],
+        // address: [
+        //   { required: true, message: '外迁详细地址不能为空', trigger: 'blur' }
+        // ],
+        outOfTime: [
+          { required: true, message: '迁出时间不能为空', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    async initForm(row) {
+      console.log('store----', this.$store.state)
+      this.customerId = localStorage.getItem('customerId')
+
+      // this.$refs.ref_form.resetFields()
+
+      // this.icUserId = row.icResiUserId
+      this.gridName = row.gridName
+      this.dataForm.icUserId = row.icResiUserId
+
+      // 添加参数
+      if (
+        row.DOOR_NAME !== null &&
+        row.DOOR_NAME !== '' &&
+        row.DOOR_NAME !== undefined
+      ) {
+        this.dataForm.oldHome = row.DOOR_NAME
+      } else {
+        this.dataForm.oldHome = ''
+      }
+      this.dataForm.customerId = this.customerId
+      this.dataForm.idCard = row.idCard
+      this.dataForm.mobile = row.mobile
+      // this.dataForm.type = row.outType
+      // this.dataForm.outOfTime = row.moveOutDate
+      this.dataForm.reason = row.deleteReason
+      // this.dataForm.address = row.xxdz
+      // await this.loadHouseInfo(row.HOME_ID_VALUE)
+
+      this.dataForm.name = row.name
+      // this.dataForm.gender = row.GENDER
+      // this.dataForm.age = ''
+      if (row.isInHome) {
+        this.confirmResult = (row.confirmResult == '1' || row.confirmResult == '2') ? row.confirmResult : ''
+      } else this.confirmResult = '1'
+      if (row.newGridName) this.isMoveOut = 1
+
+      this.reason = row.reason
+
+      // await this.loadRootAgency()
+      await this.getAgencylist()
+      setTimeout(() => {
+        this.loadingForm = false
+      }, 500)
+    },
+    async getDatail(type, id) {
+      let url = '/epmetuser/myHome/moveOutConfirmDetail'
+      this.btnType = type
+      const params = {
+        id: id || ''
+      }
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        this.detailInfo = { ...data }
+        this.initForm(data)
+      } else this.$message.error(msg)
+    },
+    async loadHouseInfo(homeIdValue) {
+      const url = '/gov/org/ichouse/' + homeIdValue
+      const { data, code, msg } = await requestGet(url)
+      if (code === 0) {
+        this.dataForm.oldDept = ''
+        this.dataForm.oldAddress = data.houseName
+        this.dataForm.ownerName = data.ownerName
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    //根据人员id获取根组织信息
+    async loadRootAgency() {
+      await this.$http
+        .post('/gov/org/agency/customerrootagency/' + this.customerId)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+
+          if (res.data) {
+            this.rootAgency = res.data
+          }
+        })
+        .catch(() => {})
+    },
+
+    async getAgencylist() {
+      const url = '/gov/org/customeragency/rootagencygridtree'
+      const { agencyId } = this.$store.state.user
+      const params = {
+        agencyId: agencyId
+      }
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        ++this.iscascaderShow
+        this.casOptions = []
+        this.agencyIdArray.length = []
+
+        if (data) {
+          let treeData = [data]
+          this.resolveAgencyTree(treeData)
+          this.casOptions.push(data)
+        }
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    resolveAgencyTree(treeData) {
+      treeData.forEach((element) => {
+        if (!element.subAgencyList || element.subAgencyList.length === 0) {
+          //不存在下级，且level=grid的是true
+
+          if (element.level === 'grid') {
+            element.disabled = false
+          } else {
+            element.disabled = true
+          }
+        } else {
+          this.resolveAgencyTree(element.subAgencyList)
+        }
+      })
+    },
+
+    handleChangeAgency() {
+      console.log(this.$refs['myCascader'].getCheckedNodes()[0].data)
+      this.selGrid = this.$refs['myCascader'].getCheckedNodes()[0].data
+      this.dataForm.agencyId = this.selGrid.pid
+      this.dataForm.gridId = this.selGrid.agencyId
+      this.dataForm.gridName = this.selGrid.agencyName
+      this.loadCommunityList()
+      this.dataForm.villageId = '' //调动到的小区ID
+      this.dataForm.villageName = ''
+      this.dataForm.buildId = '' //调动到的楼宇Id
+      this.dataForm.buildName = ''
+      this.dataForm.unitId = '' //调动到的单元Id
+      this.dataForm.unitName = ''
+      this.dataForm.homeId = '' //调动到的房屋Id
+      this.dataForm.homeName = ''
+    },
+
+    async loadCommunityList() {
+      const url = '/gov/org/icneighborhood/neighborhoodoption'
+
+      let params = {
+        gridId: this.dataForm.gridId,
+        agencyId: this.dataForm.agencyId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.communityList = []
+        this.communityList = [...data]
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    async handleChangeCommunity(id) {
+      // 小区
+      this.communityList.find((item) => {
+        if (item.value === id) {
+          this.dataForm.villageName = item.label
+        }
+      })
+
+      const url = '/gov/org/icbuilding/buildingoption'
+
+      let params = {
+        neighborHoodId: this.dataForm.villageId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.buildingList = []
+        this.buildingList = [...data]
+        this.dataForm.buildId = '' //调动到的楼宇Id
+        this.dataForm.unitId = '' //调动到的单元Id
+        this.dataForm.homeId = '' //调动到的房屋Id
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    async handleChangeBuilding(id) {
+      // 楼号
+      this.buildingList.find((item) => {
+        if (item.value === id) {
+          this.dataForm.buildName = item.label
+        }
+      })
+
+      const url = '/gov/org/icbuildingunit/unitoption'
+
+      let params = {
+        buildingId: this.dataForm.buildId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.unitList = []
+        this.unitList = [...data]
+        this.dataForm.unitId = '' //调动到的单元Id
+        this.dataForm.homeId = '' //调动到的房屋Id
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    async handleChangeUnit(id) {
+      // 单元号
+      this.unitList.find((item) => {
+        if (item.value === id) {
+          this.dataForm.unitName = item.label
+        }
+      })
+
+      const url = '/gov/org/ichouse/houseoption'
+
+      let params = {
+        unitId: this.dataForm.unitId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.roomList = []
+        this.roomList = [...data]
+        this.dataForm.homeId = '' //调动到的房屋Id
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    async handleChangeHome(id) {
+      // 房屋号
+      this.roomList.find((item) => {
+        if (item.value === id) {
+          this.dataForm.homeName = item.label
+        }
+      })
+    },
+
+    async handleComfirm() {
+      this.btnDisable = true
+      setTimeout(() => {
+        this.btnDisable = false
+      }, 2000)
+      if (this.isMoveOut == 0) {
+        this.saveForm()
+        return
+      }
+      this.$refs['ref_form'].validate((valid, messageObj) => {
+        if (!valid) {
+          // app.util.validateRule(messageObj)
+          console.log('submit error')
+        } else {
+          if (this.dataForm.type === 'in') {
+            if (!this.dataForm.buildId) {
+              this.$message.warning('楼栋')
+              return false
+            }
+            if (!this.dataForm.unitId) {
+              this.$message.warning('请选择单元')
+              return false
+            }
+            if (!this.dataForm.homeId) {
+              this.$message.warning('请选择房间')
+              return false
+            }
+          }
+          this.saveForm()
+        }
+      })
+    },
+    async handleVerify() {
+      let params = {
+        id: this.detailInfo.id,
+        confirmResult: this.confirmResult,
+        isMoveOut: this.isMoveOut,
+        reason: this.reason
+      }
+      if (this.confirmResult == 1 && this.detailInfo.isInHome) {
+        params = {
+          ...params,
+          gridName: this.dataForm.gridName,
+          villageName: this.dataForm.villageName,
+          buildName: this.dataForm.buildName,
+          unitName: this.dataForm.unitName,
+          homeName: this.dataForm.homeName,
+          xxdz: this.dataForm.address,
+          moveOutDate: this.dataForm.outOfTime
+        }
+      }
+
+
+      const { data, code, msg } = await requestPost('/epmetuser/myHome/moveOutConfirm', params)
+
+      if (code === 0) {
+        this.$message.success('提交成功')
+        this.handleCancle(true)
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    async saveForm() {
+      const url = '/epmetuser/changeRelocation/moveOutHomeConfirm'
+      let noData = new Date()
+      noData = util.dateFormatter(noData, 'time')
+      this.dataForm.transferTime = noData
+      const _data = {
+        ...this.dataForm,
+        isMoveOut: this.isMoveOut
+      }
+      const { data, code, msg } = await requestPost(url, _data)
+
+      if (code === 0) {
+        // this.$message.success('调动成功')
+        // this.handleCancle()
+        this.handleVerify()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    handleCancle(val) {
+      this.resetData()
+      this.$emit('dialogCancle', val)
+    },
+
+    resetData() {
+      this.dataForm = {
+        icUserId: '', // 被调动人ID
+        type: 'in', //操作类型【客户外out,客户内in】
+        agencyId: '', //调动到的组织Id
+        gridId: '', //调动到的网格Id
+        villageId: '', //调动到的小区ID
+        buildId: '', //调动到的楼宇Id
+        unitId: '', //调动到的单元Id
+        homeId: '', //调动到的房屋Id
+        transferTime: '', //调动时间【日期类型】
+        reason: '', //备注
+        outOfTime: '',
+        welfareFlag: false
+      }
+
+      this.customerId = '' //客户id
+      this.userId = '' //操作人员id
+      this.gridName = ''
+      this.rootAgency = {}
+
+      this.selGrid = {}
+    },
+    // 开启加载动画
+    startLoading() {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading() {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  props: {}
+}
+</script>
+<style lang="scss" scoped>
+.item_width_1 {
+  width: 150px;
+}
+.item_width_2 {
+  width: 400px;
+}
+.item_width_3 {
+  margin-left: 10px;
+  width: 200px;
+}
+
+.div_btn {
+  display: flex;
+  justify-content: flex-end;
+}
+.resi-cell-col {
+  width: 750px;
+  display: flex;
+  justify-content: flex-start;
+}
+
+.margin_left10 {
+  margin-left: 10px;
+}
+</style>
diff --git a/src/views/modules/plugins/change/verifyForm.vue b/src/views/modules/plugins/change/verifyForm.vue
index 125822d30..6fa041888 100644
--- a/src/views/modules/plugins/change/verifyForm.vue
+++ b/src/views/modules/plugins/change/verifyForm.vue
@@ -1,363 +1,256 @@
 <template>
   <div>
-    <div v-loading="loadingForm" class="dialog-h-content scroll-h">
-      <el-form :model="detailInfo" :disabled="btnType == 'detail'">
-        <el-form-item
-          label="移除人姓名:"
-          label-width="150px"
-        >
-          <span>{{ detailInfo.name }}</span>
-        </el-form-item>
-        <el-form-item
-          label="手机号:"
-          label-width="150px"
-        >
-          <span>{{ detailInfo.mobile }}</span>
-        </el-form-item>
-        <el-form-item
-          label="证件号:"
-          label-width="150px"
-        >
-          <span>{{ detailInfo.idCard }}</span>
-        </el-form-item>
-        <el-form-item
-          label="所在网格:"
-          label-width="150px"
-        >
-          <span>{{ detailInfo.gridName }}</span>
-        </el-form-item>
-        <el-form-item
-          label="所在房屋:"
-          label-width="150px"
-        >
-          <span>
-            {{ detailInfo.villageName + detailInfo.buildName +  detailInfo.unitName + detailInfo.homeName }}
-          </span>
-        </el-form-item>
-        <!-- <el-divider></el-divider> -->
-         <!-- <el-form-item
-          label="迁出类型:"
-          label-width="150px"
-        >
-          <span v-if="detailInfo.outType == 'in'">{{'迁往' + rootAgency.organizationName + '内其他区域' }}</span>
-          <span v-else>其他</span>
-        </el-form-item>
-        <template v-if="detailInfo.outType == 'in'">
-          <el-form-item
-            label="迁往区域:"
-            label-width="150px"
-          >
-            <span>{{ detailInfo.newGridName }}</span>
-          </el-form-item>
-          <el-form-item
-            label="迁至房屋:"
-            label-width="150px"
-          >
-            <span>{{ detailInfo.newHomeName }}</span>
-          </el-form-item>
-        </template>
-        <el-form-item
-          v-else
-            label="迁至地址:"
-            label-width="150px"
-          >
-            <span>{{ detailInfo.xxdz }}</span>
-          </el-form-item> -->
-        <!-- <el-form-item
-          label="移除时间:"
-          label-width="150px"
-        >
-          <span>{{ detailInfo.moveOutDate }}</span>
-        </el-form-item> -->
-        <el-form-item
-          label="移除原因:"
-          label-width="150px"
-        >
-          <span>
-            {{ detailInfo.deleteReason }}
-          </span>
-        </el-form-item>
-        <el-divider></el-divider>
-        <el-form-item
-          label="审核结果:"
-          label-width="150px"
-          :rules="[
+    <div v-loading="loadingForm"
+         class="dialog-h-content scroll-h">
+      <div class="m-row">
+
+        <div class="info-prop">
+          <span class="info-title info-title-100">移除人姓名：</span>
+          <span>{{detailInfo.name||'--' }}</span>
+        </div>
+        <div class="info-prop">
+          <span class="info-title info-title-100">手机号：</span>
+          <span>{{detailInfo.mobile||'--' }}</span>
+        </div>
+        <div class="info-prop">
+          <span class="info-title info-title-100">证件号：</span>
+          <span>{{detailInfo.idCard||'--' }}</span>
+        </div>
+        <div class="info-prop">
+          <span class="info-title info-title-100">所在网格：</span>
+          <span>{{detailInfo.gridName||'--' }}</span>
+        </div>
+        <div class="info-prop">
+          <span class="info-title info-title-100">所在房屋：</span>
+          <span>{{ detailInfo.villageName + detailInfo.buildName +  detailInfo.unitName + detailInfo.homeName }}</span>
+        </div>
+        <div class="info-prop">
+          <span class="info-title info-title-100">移除原因：</span>
+          <span>{{detailInfo.deleteReason||'--' }}</span>
+        </div>
+
+      </div>
+      <el-divider></el-divider>
+
+      <el-form :model="detailInfo"
+               style="margin-left:35px;"
+               :disabled="btnType == 'detail'"
+               class="edit_form"
+               label-width="150px">
+
+        <el-form-item label="审核结果"
+                      :rules="[
             { required: true, message: '请选择审核结果', trigger: 'blur' },
-          ]"
-        >
-          <el-input v-if="btnType == 'detail' && confirmResult == ''" value="未审核" style="width: 200px;"></el-input>
-          <el-select
-            v-else
-              v-model.trim="confirmResult"
-              placeholder="请选择结果"
-              clearable
-              :disabled="!detailInfo.isInHome"
-              class="item_width_1"
-            >
-              <el-option label="通过" value="1" />
-              <el-option label="驳回" value="2" />
-            </el-select>
+          ]">
+          <!-- <el-input v-if="btnType == 'detail' && confirmResult == ''"
+                    value="未审核"
+                    style="width: 200px;"></el-input> -->
+          <span v-if="btnType == 'detail' && confirmResult == ''">未审核</span>
+          <el-select v-else
+                     v-model.trim="confirmResult"
+                     placeholder="请选择结果"
+                     clearable
+                     :disabled="!detailInfo.isInHome"
+                     class="edit_item_width_normal">
+            <el-option label="通过"
+                       value="1" />
+            <el-option label="驳回"
+                       value="2" />
+          </el-select>
         </el-form-item>
-        <el-form-item
-          v-if="detailInfo && !detailInfo.isInHome"
-          label-width="150px"
-        >
+        <el-form-item v-if="detailInfo && !detailInfo.isInHome">
           <span style="color: red; font-size: 12px;">当前人员已不在该房屋</span>
         </el-form-item>
-        <el-form-item
-          v-if="confirmResult == 1"
-          label="同时迁至其他房屋:"
-          label-width="150px"
-        >
+        <el-form-item v-if="confirmResult == 1"
+                      label="同时迁至其他房屋">
           <el-radio-group v-model="isMoveOut">
             <el-radio :label="1">需要</el-radio>
             <el-radio :label="0">不需要</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item
-          v-if="confirmResult == 2"
-          label="驳回原因:"
-          label-width="150px"
-          :rules="[
+        <el-form-item v-if="confirmResult == 2"
+                      label="驳回原因"
+                      :rules="[
             { required: true, message: '请填写驳回原因', trigger: 'blur' },
-          ]"
-        >
-          <el-input type="textarea" v-model="reason" style="width: 300px;"></el-input>
+          ]">
+          <el-input type="textarea"
+                    v-model="reason"
+                    class="edit_item_width_normal"></el-input>
         </el-form-item>
-        <!-- <template v-if="btnType == 'detail' && confirmResult == '1'">
-          <el-form-item
-            label="迁往区域:"
-            label-width="150px"
-          >
-            <span>{{ detailInfo.newGridName }}</span>
-          </el-form-item>
-          <el-form-item
-            label="迁至房屋:"
-            label-width="150px"
-          >
-            <span>{{ detailInfo.newHomeName }}</span>
-          </el-form-item>
-        </template> -->
+
       </el-form>
-      <el-form v-if="btnType == 'detail' && isMoveOut == 1" :model="detailInfo">
+      <el-form v-if="btnType == 'detail' && isMoveOut == 1"
+               style="margin-left:35px;"
+               label-width="150px"
+               class="edit_form"
+               :model="detailInfo">
 
         <template>
-          <el-form-item
-            label="迁往区域:"
-            label-width="150px"
-          >
+          <el-form-item label="迁往区域">
             <span>{{ detailInfo.newGridName }}</span>
           </el-form-item>
-          <el-form-item
-            label="迁至房屋:"
-            label-width="150px"
-          >
+          <el-form-item label="迁至房屋:">
             <span>{{ detailInfo.newHomeName }}</span>
           </el-form-item>
         </template>
 
-        <el-form-item
-          label="迁出时间:"
-          label-width="150px"
-        >
+        <el-form-item label="迁出时间">
           <span>{{ detailInfo.moveOutDate }}</span>
         </el-form-item>
 
       </el-form>
 
-
-      <el-form
-        v-if="isMoveOut == 1 && btnType == 'edit' && detailInfo.isInHome"
-        ref="ref_form"
-        :inline="false"
-        :model="dataForm"
-        :rules="dataRule"
-        class="form"
-      >
-        <el-form-item
-          label="当前组织:"
-          label-width="150px"
-          style="display: block"
-        >
+      <el-form v-if="isMoveOut == 1 && btnType == 'edit' && detailInfo.isInHome &&confirmResult == 1"
+               ref="ref_form"
+               style="margin-left:35px;"
+               :inline="false"
+               :model="dataForm"
+               label-width="150px"
+               :rules="dataRule"
+               class="edit_form">
+        <el-form-item label="当前组织"
+                      style="display: block">
           <span>{{ gridName }}</span>
         </el-form-item>
 
-        <el-form-item label="姓名" label-width="150px" style="display: block">
+        <el-form-item label="姓名"
+                      style="display: block">
           <span>{{ dataForm.name }}</span>
         </el-form-item>
 
-        <el-form-item label="迁出时间:" prop="outOfTime" label-width="150px">
-          <el-date-picker
-            v-model="dataForm.outOfTime"
-            type="date"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            format="yyyy-MM-dd"
-            placeholder="选择日期"
-            style="width: 200px"
-            :clearable="false"
-          >
+        <el-form-item label="迁出时间"
+                      prop="outOfTime">
+          <el-date-picker v-model="dataForm.outOfTime"
+                          type="date"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期"
+                          class="edit_item_width_normal"
+                          :clearable="false">
           </el-date-picker>
         </el-form-item>
 
-        <!-- <el-form-item
-          label="迁出类型:"
-          prop="type"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-radio-group v-model="dataForm.type">
-            <el-radio :label="'in'">{{
-              '迁往' + rootAgency.organizationName + '内其他区域'
-            }}</el-radio>
-            <el-radio :label="'out'">其他</el-radio>
-          </el-radio-group>
-        </el-form-item> -->
-
         <div v-if="isMoveOut == 1">
-          <el-form-item label="迁出至" prop="agencyId" label-width="150px">
-            <el-cascader
-              ref="myCascader"
-              v-model="agencyIdArray"
-              style="width: 480px"
-              :key="iscascaderShow"
-              :options="casOptions"
-              :props="optionProps"
-              @change="handleChangeAgency"
-              clearable
-            ></el-cascader>
+          <el-form-item label="迁出至"
+                        prop="agencyId">
+            <el-cascader ref="myCascader"
+                         v-model="agencyIdArray"
+                         class="edit_item_width_normal"
+                         :key="iscascaderShow"
+                         :options="casOptions"
+                         :props="optionProps"
+                         @change="handleChangeAgency"
+                         clearable></el-cascader>
           </el-form-item>
 
-          <el-form-item label="所属家庭:" label-width="150px" prop="villageId">
-            <div class="resi-cell-col">
-              <el-select
-                v-model.trim="dataForm.villageId"
-                placeholder="请选择小区"
-                clearable
-                class="item_width_1"
-                @change="handleChangeCommunity($event)"
-              >
-                <el-option
-                  v-for="item in communityList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
+          <el-form-item label="所属家庭"
+                        prop="villageId">
+            <div>
+              <el-select v-model.trim="dataForm.villageId"
+                         placeholder="请选择小区"
+                         clearable
+                         class="edit_item_width_normal"
+                         @change="handleChangeCommunity($event)">
+                <el-option v-for="item in communityList"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
                 </el-option>
               </el-select>
-
-              <el-select
-                v-model.trim="dataForm.buildId"
-                placeholder="请选择楼号"
-                clearable
-                class="item_width_1 margin_left10"
-                @change="handleChangeBuilding($event)"
-              >
-                <el-option
-                  v-for="item in buildingList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
+            </div>
+            <div style="margin-top:5px">
+              <el-select v-model.trim="dataForm.buildId"
+                         placeholder="楼号"
+                         clearable
+                         class="edit_item_width_build"
+                         @change="handleChangeBuilding($event)">
+                <el-option v-for="item in buildingList"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
                 </el-option>
               </el-select>
 
-              <el-select
-                v-model.trim="dataForm.unitId"
-                placeholder="请选择单元"
-                clearable
-                class="item_width_1 margin_left10"
-                @change="handleChangeUnit($event)"
-              >
-                <el-option
-                  v-for="item in unitList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
+              <el-select v-model.trim="dataForm.unitId"
+                         placeholder="单元"
+                         clearable
+                         class="edit_item_width_build"
+                         style="margin-left: 10px;"
+                         @change="handleChangeUnit($event)">
+                <el-option v-for="item in unitList"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
                 </el-option>
               </el-select>
 
-              <el-select
-                v-model.trim="dataForm.homeId"
-                placeholder="请选择房号"
-                clearable
-                class="item_width_1 margin_left10"
-                @change="handleChangeHome($event)"
-              >
-                <el-option
-                  v-for="item in roomList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
+              <el-select v-model.trim="dataForm.homeId"
+                         placeholder="房号"
+                         clearable
+                         class="edit_item_width_build"
+                         style="margin-left: 10px;"
+                         @change="handleChangeHome($event)">
+                <el-option v-for="item in roomList"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
                 </el-option>
               </el-select>
             </div>
+
           </el-form-item>
         </div>
-        <!-- <div v-if="dataForm.type === 'out'">
-          <el-form-item label="外迁详细地址:" prop="address" label-width="150px">
-            <el-input
-              type="textarea"
-              :autosize="{ minRows: 2, maxRows: 7 }"
-              :rows="5"
-              resize="none"
-              style="width: 600px"
-              placeholder="请输入外迁详细地址"
-              v-model="dataForm.address"
-            >
-            </el-input>
-          </el-form-item>
-        </div> -->
-        <el-form-item label="迁出原因:" prop="reason" label-width="150px">
-          <el-input
-            type="textarea"
-            :autosize="{ minRows: 4, maxRows: 7 }"
-            :rows="5"
-            resize="none"
-            style="width: 600px"
-            placeholder="请输入迁出原因"
-            v-model="dataForm.reason"
-          >
+
+        <el-form-item label="迁出原因"
+                      prop="reason">
+          <el-input type="textarea"
+                    :autosize="{ minRows: 4, maxRows: 7 }"
+                    :rows="5"
+                    class="edit_item_width_normal"
+                    resize="none"
+                    placeholder="请输入迁出原因"
+                    v-model="dataForm.reason">
           </el-input>
         </el-form-item>
-        <el-form-item label="" prop="welfareFlag" label-width="150px">
+        <el-form-item label=""
+                      prop="welfareFlag">
           <el-checkbox v-model="dataForm.welfareFlag">享受福利</el-checkbox>
         </el-form-item>
       </el-form>
     </div>
-    <div v-if="confirmResult == ''" class="resi-btns">
-      <el-button size="small" @click="handleCancle(false)">取消</el-button>
+
+    <div v-if="confirmResult == ''"
+         class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle(false)">取消</el-button>
     </div>
-    <div v-if="confirmResult == 1" class="resi-btns">
-      <el-button size="small" @click="handleCancle(false)">取消</el-button>
-      <el-button
-        v-if="btnType != 'detail' && !detailInfo.isInHome"
-        type="primary"
-        size="small"
-        :loading="btnDisable"
-        @click="handleVerify"
-        >提交</el-button
-      >
-      <el-button
-        v-else-if="btnType != 'detail'"
-        type="primary"
-        size="small"
-        :loading="btnDisable"
-        @click="handleComfirm"
-        >提交</el-button
-      >
+    <div v-if="confirmResult == 1"
+         class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle(false)">取消</el-button>
+      <el-button v-if="btnType != 'detail' && !detailInfo.isInHome"
+                 type="primary"
+                 size="small"
+                 :loading="btnDisable"
+                 class="diy-button--blue"
+                 @click="handleVerify">提交</el-button>
+      <el-button v-else-if="btnType != 'detail'"
+                 type="primary"
+                 size="small"
+                 class="diy-button--blue"
+                 :loading="btnDisable"
+                 @click="handleComfirm">提交</el-button>
     </div>
-    <div v-if="confirmResult == 2" class="resi-btns">
-      <el-button size="small" @click="handleCancle(false)">取消</el-button>
-      <el-button
-        v-if="btnType != 'detail'"
-        type="primary"
-        size="small"
-        :loading="btnDisable"
-        @click="handleVerify"
-        >提交</el-button
-      >
+    <div v-if="confirmResult == 2"
+         class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle(false)">取消</el-button>
+      <el-button v-if="btnType != 'detail'"
+                 class="diy-button--blue"
+                 type="primary"
+                 size="small"
+                 :loading="btnDisable"
+                 @click="handleVerify">提交</el-button>
     </div>
   </div>
 </template>
@@ -369,7 +262,7 @@ import { requestPost, requestGet } from '@/js/dai/request'
 
 let loading // 加载动画
 export default {
-  data() {
+  data () {
     return {
       btnDisable: false,
       loadingForm: true,
@@ -432,9 +325,9 @@ export default {
     }
   },
   components: {},
-  mounted() {},
+  mounted () { },
   computed: {
-    dataRule() {
+    dataRule () {
       return {
         // type: [
         //   { required: true, message: '操作类型不能为空', trigger: 'blur' }
@@ -455,7 +348,7 @@ export default {
     }
   },
   methods: {
-    async initForm(row) {
+    async initForm (row) {
       console.log('store----', this.$store.state)
       this.customerId = localStorage.getItem('customerId')
 
@@ -500,7 +393,7 @@ export default {
         this.loadingForm = false
       }, 500)
     },
-    async getDatail(type, id) {
+    async getDatail (type, id) {
       let url = '/epmetuser/myHome/moveOutConfirmDetail'
       this.btnType = type
       const params = {
@@ -512,7 +405,7 @@ export default {
         this.initForm(data)
       } else this.$message.error(msg)
     },
-    async loadHouseInfo(homeIdValue) {
+    async loadHouseInfo (homeIdValue) {
       const url = '/gov/org/ichouse/' + homeIdValue
       const { data, code, msg } = await requestGet(url)
       if (code === 0) {
@@ -525,7 +418,7 @@ export default {
     },
 
     //根据人员id获取根组织信息
-    async loadRootAgency() {
+    async loadRootAgency () {
       await this.$http
         .post('/gov/org/agency/customerrootagency/' + this.customerId)
         .then(({ data: res }) => {
@@ -537,10 +430,10 @@ export default {
             this.rootAgency = res.data
           }
         })
-        .catch(() => {})
+        .catch(() => { })
     },
 
-    async getAgencylist() {
+    async getAgencylist () {
       const url = '/gov/org/customeragency/rootagencygridtree'
       const { agencyId } = this.$store.state.user
       const params = {
@@ -562,7 +455,7 @@ export default {
       }
     },
 
-    resolveAgencyTree(treeData) {
+    resolveAgencyTree (treeData) {
       treeData.forEach((element) => {
         if (!element.subAgencyList || element.subAgencyList.length === 0) {
           //不存在下级，且level=grid的是true
@@ -578,7 +471,7 @@ export default {
       })
     },
 
-    handleChangeAgency() {
+    handleChangeAgency () {
       console.log(this.$refs['myCascader'].getCheckedNodes()[0].data)
       this.selGrid = this.$refs['myCascader'].getCheckedNodes()[0].data
       this.dataForm.agencyId = this.selGrid.pid
@@ -595,7 +488,7 @@ export default {
       this.dataForm.homeName = ''
     },
 
-    async loadCommunityList() {
+    async loadCommunityList () {
       const url = '/gov/org/icneighborhood/neighborhoodoption'
 
       let params = {
@@ -613,7 +506,7 @@ export default {
       }
     },
 
-    async handleChangeCommunity(id) {
+    async handleChangeCommunity (id) {
       // 小区
       this.communityList.find((item) => {
         if (item.value === id) {
@@ -640,7 +533,7 @@ export default {
       }
     },
 
-    async handleChangeBuilding(id) {
+    async handleChangeBuilding (id) {
       // 楼号
       this.buildingList.find((item) => {
         if (item.value === id) {
@@ -666,7 +559,7 @@ export default {
       }
     },
 
-    async handleChangeUnit(id) {
+    async handleChangeUnit (id) {
       // 单元号
       this.unitList.find((item) => {
         if (item.value === id) {
@@ -691,7 +584,7 @@ export default {
       }
     },
 
-    async handleChangeHome(id) {
+    async handleChangeHome (id) {
       // 房屋号
       this.roomList.find((item) => {
         if (item.value === id) {
@@ -700,7 +593,7 @@ export default {
       })
     },
 
-    async handleComfirm() {
+    async handleComfirm () {
       this.btnDisable = true
       setTimeout(() => {
         this.btnDisable = false
@@ -732,7 +625,7 @@ export default {
         }
       })
     },
-    async handleVerify() {
+    async handleVerify () {
       let params = {
         id: this.detailInfo.id,
         confirmResult: this.confirmResult,
@@ -762,7 +655,7 @@ export default {
         this.$message.error(msg)
       }
     },
-    async saveForm() {
+    async saveForm () {
       const url = '/epmetuser/changeRelocation/moveOutHomeConfirm'
       let noData = new Date()
       noData = util.dateFormatter(noData, 'time')
@@ -782,12 +675,12 @@ export default {
       }
     },
 
-    handleCancle(val) {
+    handleCancle (val) {
       this.resetData()
       this.$emit('dialogCancle', val)
     },
 
-    resetData() {
+    resetData () {
       this.dataForm = {
         icUserId: '', // 被调动人ID
         type: 'in', //操作类型【客户外out,客户内in】
@@ -811,7 +704,7 @@ export default {
       this.selGrid = {}
     },
     // 开启加载动画
-    startLoading() {
+    startLoading () {
       loading = Loading.service({
         lock: true, // 是否锁定
         text: '正在加载……', // 加载中需要显示的文字
@@ -819,7 +712,7 @@ export default {
       })
     },
     // 结束加载动画
-    endLoading() {
+    endLoading () {
       // clearTimeout(timer);
       if (loading) {
         loading.close()
@@ -830,28 +723,6 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.item_width_1 {
-  width: 150px;
-}
-.item_width_2 {
-  width: 400px;
-}
-.item_width_3 {
-  margin-left: 10px;
-  width: 200px;
-}
-
-.div_btn {
-  display: flex;
-  justify-content: flex-end;
-}
-.resi-cell-col {
-  width: 750px;
-  display: flex;
-  justify-content: flex-start;
-}
-
-.margin_left10 {
-  margin-left: 10px;
-}
+@import "@/assets/scss/modules/management/detail-main.scss";
+@import "@/assets/scss/modules/management/edit-main.scss";
 </style>