From 675d98ad1ade33502fa3b8d74d2e840b9f1fb955 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 22 Nov 2022 09:43:23 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/community/buildTable.vue     | 1 +
 src/views/modules/base/community/communityTable.vue | 3 ++-
 src/views/modules/base/community/roomTable.vue      | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index 845c25459..61ab859d7 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -941,6 +941,7 @@ export default {
 </script>
 <style lang="scss" scoped >
 @import "@/assets/scss/modules/visual/communityManage.scss";
+@import "@/assets/scss/modules/management/list-main.scss";
 
 .item_width_4 {
   width: 120px;
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index 3c2065200..b2f941fb9 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="div_table">
 
     <div class="div_btn">
 
@@ -1075,6 +1075,7 @@ export default {
 </script>
 <style lang="scss" scoped >
 @import "@/assets/scss/modules/visual/communityManage.scss";
+@import "@/assets/scss/modules/management/list-main.scss";
 </style>
 
 <style >
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index f447d3128..8eea19816 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -1022,6 +1022,7 @@ export default {
 </script>
 <style lang="scss" scoped >
 @import "@/assets/scss/modules/visual/communityManage.scss";
+@import "@/assets/scss/modules/management/list-main.scss";
 </style>
 <style lang="scss" scoped>
 .item_width_4 {

From 124b1913ae0bcce0b10379ede7fc3a3c4aef40d6 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 22 Nov 2022 11:00:06 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/buttonstyle.scss              |   7 +
 .../scss/modules/management/edit-main.scss    |  16 +-
 .../components/resiChangeTransfer copy.vue    | 634 ++++++++++++++++++
 src/views/components/resiSearch.vue           |   2 +-
 .../modules/base/community/buildForm.vue      |   1 -
 .../modules/base/community/buildTable.vue     |   4 +-
 .../modules/base/community/communityForm.vue  |  52 +-
 .../modules/base/community/communityTable.vue |   4 +-
 src/views/modules/base/community/roomForm.vue |   1 -
 .../modules/base/community/roomTable.vue      |   4 +-
 src/views/modules/base/resi.vue               |  63 +-
 11 files changed, 719 insertions(+), 69 deletions(-)
 create mode 100644 src/views/components/resiChangeTransfer copy.vue

diff --git a/src/assets/scss/buttonstyle.scss b/src/assets/scss/buttonstyle.scss
index 96fe931dc..4d1da7f1c 100644
--- a/src/assets/scss/buttonstyle.scss
+++ b/src/assets/scss/buttonstyle.scss
@@ -135,6 +135,13 @@
   font-weight: 600 !important;
   color: #BB0000 !important;
 
+}
+.div-table-button--green {
+  font-size: 14px !important;
+  font-family: Source Han Serif CN !important;
+  font-weight: 600 !important;
+  color: #0192A3 !important;
+
 }
 
 //旧版--------弃用
diff --git a/src/assets/scss/modules/management/edit-main.scss b/src/assets/scss/modules/management/edit-main.scss
index 10b616db9..68e07815d 100644
--- a/src/assets/scss/modules/management/edit-main.scss
+++ b/src/assets/scss/modules/management/edit-main.scss
@@ -24,10 +24,18 @@
     /deep/ .el-form-item{
       height:350px;
       // line-height: 40px;
+      
+    }
+
+    .map_line{
+      // height:5px;
+      // background-color: #ffffff;
     }
 
     .div_map{
       margin-top:10px;
+      height:280px;
+      padding-bottom:10px;
     }
   }
   .item-image{
@@ -80,7 +88,7 @@
     line-height: 40px;
   }
   /deep/ .el-form-item__content{
-    width:660px;
+    width:760px;
     margin:5px 6px;
     background: #F6F6F6;
     padding:0 16px;
@@ -113,11 +121,15 @@
 }
 //带着按钮
 .edit_item_btn_width_1{
-  width:550px;
+  width:650px;
 }
 
 .edit-btn-1{
   float:right;
   margin-right:10px;
 }
+.div_btn {
+  margin-top: 20px;
+  text-align: center;
+}
 
diff --git a/src/views/components/resiChangeTransfer copy.vue b/src/views/components/resiChangeTransfer copy.vue
new file mode 100644
index 000000000..f19da89b9
--- /dev/null
+++ b/src/views/components/resiChangeTransfer copy.vue	
@@ -0,0 +1,634 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+      <el-form 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="dataForm.type==='in'">
+          <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 class="div_btn">
+      <el-button @click="handleCancle">取 消</el-button>
+      <el-button type="primary"
+                 :disabled="btnDisable"
+                 @click="handleComfirm">确 定</el-button>
+    </div> -->
+    <div class="resi-btns">
+      <el-button size="small"
+                 @click="handleCancle">取消</el-button>
+      <el-button type="primary"
+                 size="small"
+                 :loading="btnDisable"
+                 @click="handleComfirm">提交</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,
+      communityList: [],
+      buildingList: [],
+      unitList: [],
+      roomList: [],
+
+      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,
+
+      optionProps: {
+        multiple: false,
+        value: 'agencyId',
+        label: 'agencyName',
+        children: 'subAgencyList',
+        // checkStrictly: true
+      },
+
+      selGrid: {},
+
+
+    }
+  },
+  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) {
+
+      this.customerId = localStorage.getItem("customerId");
+
+      this.$refs.ref_form.resetFields();
+
+      // this.icUserId = row.icResiUserId
+      this.gridName = row.GRID_ID
+      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.ID_CARD
+        this.dataForm.mobile = row.MOBILE
+
+        await this.loadHouseInfo(row.HOME_ID_VALUE)
+
+        this.dataForm.name = row.NAME
+        this.dataForm.gender = row.GENDER
+        this.dataForm.age = ''
+
+
+      await this.loadRootAgency()
+      await this.getAgencylist()
+
+    },
+      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 params = {
+        agencyId: this.rootAgency.id
+      }
+      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)
+      this.$refs['ref_form'].validate((valid, messageObj) => {
+        if (!valid) {
+          // app.util.validateRule(messageObj)
+          console.log('error submit!')
+
+        } 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 saveForm () {
+      
+      // saveOutOfInfo
+      const url = '/epmetuser/changeRelocation/moveOutHome'
+      let noData = new Date()
+      noData = util.dateFormatter(noData, 'time')
+      this.dataForm.transferTime = noData
+
+      const { data, code, msg } = await requestPost(url, this.dataForm)
+
+      if (code === 0) {
+        this.$message.success('操作成功')
+        this.handleCancle()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+      // async saveForm () {
+      //     const url = '/epmetuser/icusertransferrecord/add'
+      //     let noData = new Date()
+      //     noData = util.dateFormatter(noData, 'time')
+      //     this.dataForm.transferTime = noData
+      //
+      //     console.log('-----------3--------------')
+      //     console.log(this.dataForm)
+      //     const { data, code, msg } = await requestPost(url, this.dataForm)
+      //
+      //     if (code === 0) {
+      //         this.$message.success('调动成功')
+      //         this.handleCancle()
+      //     } else {
+      //         this.$message.error(msg)
+      //     }
+      // },
+
+    handleCancle () {
+      this.resetData()
+      this.$emit('dialogCancle')
+
+    },
+
+    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/components/resiSearch.vue b/src/views/components/resiSearch.vue
index 2e551e86c..c12a99ffc 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="resi-container">
     <!-- <el-card class="resi-card"> -->
-    <el-row :class="!isArrow && 'resi-row-more'">
+    <el-row>
       <el-row v-if="showGrid"
               class="resi-row">
         <el-col :span="6">
diff --git a/src/views/modules/base/community/buildForm.vue b/src/views/modules/base/community/buildForm.vue
index b5c3ade3f..da65235f3 100644
--- a/src/views/modules/base/community/buildForm.vue
+++ b/src/views/modules/base/community/buildForm.vue
@@ -505,6 +505,5 @@ export default {
 }
 </script>
 <style lang="scss" scoped >
-@import "@/assets/scss/modules/visual/communityManageForm.scss";
 @import "@/assets/scss/modules/management/edit-main.scss";
 </style>
\ No newline at end of file
diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index 61ab859d7..e99e4dd48 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -253,7 +253,7 @@
                :close-on-press-escape="false"
                :title="formTitle"
                top="5vh"
-               width="850px"
+               width="950px"
                class="dialog-h"
                @closed="diaClose">
       <build-form ref="ref_form"
@@ -266,7 +266,7 @@
                :close-on-press-escape="false"
                :title="'楼栋详情'"
                top="5vh"
-               width="850px"
+               width="950px"
                class="dialog-h"
                @closed="detailFormCancle">
       <build-detail ref="ref_form_detail"
diff --git a/src/views/modules/base/community/communityForm.vue b/src/views/modules/base/community/communityForm.vue
index 75baa553c..535f4f9d8 100644
--- a/src/views/modules/base/community/communityForm.vue
+++ b/src/views/modules/base/community/communityForm.vue
@@ -103,25 +103,27 @@
             <el-form-item label="地图位置"
                           prop="longitude"
                           style="display: block">
-              <div style="width: 500px">
-                <el-select v-model="searchValue"
-                           filterable
-                           style="width: 500px"
-                           remote
-                           :reserve-keyword="true"
-                           placeholder="请输入关键词"
-                           :remote-method="remoteMethod"
-                           :loading="loading">
-                  <el-option v-for="(item,index) in searchOptions"
-                             @click.native="handleClickKey(index)"
-                             :key="item.value"
-                             :label="item.label"
-                             :value="item.value">
-                  </el-option>
-                </el-select>
-                <div id="app_community"
-                     class="div_map"></div>
-              </div>
+
+              <el-select v-model="searchValue"
+                         filterable
+                         style="width: 500px"
+                         remote
+                         :reserve-keyword="true"
+                         placeholder="请输入关键词"
+                         :remote-method="remoteMethod"
+                         :loading="loading">
+                <el-option v-for="(item,index) in searchOptions"
+                           @click.native="handleClickKey(index)"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
+                </el-option>
+              </el-select>
+              <div class="map_line"></div>
+              <div id="app_community"
+                   style=""
+                   class="div_map"></div>
+
             </el-form-item>
 
           </div>
@@ -170,17 +172,6 @@
         </el-form-item>
       </el-form>
 
-      <!-- <el-form v-show="propertyFormShow"
-               :inline="false"
-               :model="propertyForm"
-               :rules="propertyRule"
-               class="m-form">
-
-      </el-form> -->
-
-      <!-- <div >
-       
-      </div> -->
     </div>
     <div class="div_btn">
       <el-button size="small"
@@ -582,7 +573,6 @@ export default {
 }
 </script>
 <style lang="scss" scoped >
-@import "@/assets/scss/modules/visual/communityManageForm.scss";
 @import "@/assets/scss/modules/management/edit-main.scss";
 </style>
 
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index b2f941fb9..d5d34e1ed 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -236,7 +236,7 @@
                :close-on-click-modal="false"
                :close-on-press-escape="false"
                :title="'小区详情'"
-               width="850px"
+               width="950px"
                top="5vh"
                class="dialog-h"
                @closed="detailFormCancle">
@@ -249,7 +249,7 @@
                :close-on-click-modal="false"
                :close-on-press-escape="false"
                :title="formTitle"
-               width="850px"
+               width="950px"
                top="5vh"
                class="dialog-h"
                @closed="diaClose">
diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue
index e02e084d7..3c0a7fd59 100644
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@@ -467,6 +467,5 @@ export default {
 }
 </script>
 <style lang="scss" scoped >
-@import "@/assets/scss/modules/visual/communityManageForm.scss";
 @import "@/assets/scss/modules/management/edit-main.scss";
 </style>
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 8eea19816..51535f2f6 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -245,7 +245,7 @@
                :close-on-click-modal="false"
                :close-on-press-escape="false"
                :title="formTitle"
-               width="850px"
+               width="950px"
                top="5vh"
                class="dialog-h"
                @closed="diaClose">
@@ -260,7 +260,7 @@
                :close-on-click-modal="false"
                :close-on-press-escape="false"
                :title="'查看房屋'"
-               width="850px"
+               width="950px"
                top="5vh"
                class="dialog-h"
                @closed="detailFormCancle">
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 746c75374..a611bcce2 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -142,21 +142,18 @@
         <el-table-column fixed="right"
                          label="操作"
                          align="center"
-                         width="150">
+                         width="200">
           <template slot-scope="scope">
             <!-- <el-button @click="handleLook(scope.row)"
                        type="text"
                        size="small"
                        class="btn-color-look">查看</el-button> -->
-            <!-- <el-button @click="handleTransfer(scope.row)" 
-                       type="text"
-                       size="small"
-                       class="div-table-button--detail">变动</el-button> -->
-            <el-button v-if="btnAuths.ic_resi_change_rec"
+
+            <!-- <el-button v-if="btnAuths.ic_resi_change_rec"
                        @click="handleChangeRecord(scope.row)"
                        type="text"
                        class="div-table-button--orange"
-                       size="small">变更记录</el-button>
+                       size="small">变更记录</el-button> -->
             <template v-if="filterEdit(scope.row.ORG_ID)">
               <el-button v-if="btnAuths.ic_resi_update"
                          @click="handleEdit(scope.row)"
@@ -172,6 +169,15 @@
                            class="btn-color-del">删除</el-button> -->
               </el-popconfirm>
             </template>
+
+            <el-button @click="handleChangeTransfer(scope.row)"
+                       type="text"
+                       class="div-table-button--green"
+                       size="small">迁出登记</el-button>
+            <el-button @click="handleChangeRecord(scope.row)"
+                       type="text"
+                       class="div-table-button--red"
+                       size="small">死亡登记</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -299,19 +305,6 @@
       </div>
     </el-dialog>
 
-    <!-- 调动 -->
-    <el-dialog :visible.sync="tranferShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="'人员变动'"
-               width="950px"
-               top="5vh"
-               class="dialog-h"
-               @closed="diaClose">
-      <resi-transfer ref="ref_transfer"
-                     @dialogCancle="transferClose"></resi-transfer>
-    </el-dialog>
-
     <!-- 变更记录 -->
     <el-dialog :visible.sync="changeRecordShow"
                :close-on-click-modal="false"
@@ -345,6 +338,19 @@
                  :gridName="lookInfo.gridName"
                  @close="handleCancleLook" />
     <baobiao ref="baobiao" />
+
+    <!-- 迁出 -->
+    <el-dialog :visible.sync="tranferShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'迁出管理'"
+               width="950px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <resi-change-transfer ref="ref_change_transfer"
+                            @dialogCancle="transferClose"></resi-change-transfer>
+    </el-dialog>
   </div>
 </template>
 
@@ -357,11 +363,14 @@ import axios from "axios";
 import { mapGetters } from "vuex";
 import resiTransfer from "../../components/resiTransfer.vue";
 import resiChangeRecord from "../../components/resiChangeRecord.vue";
+
 import peopleMore from "@/views/modules/shequ/cpts/people-more";
 import baobiao from "@/views/modules/cpts/baobiao";
 import diyInfo from "./diyInfo.vue";
 import { requestPost } from "@/js/dai/request";
 
+import resiChangeTransfer from "../../components/resiChangeTransfer.vue";
+
 export default {
   components: {
     baobiao,
@@ -372,6 +381,8 @@ export default {
     resiChangeRecord,
     peopleMore,
     diyInfo,
+
+    resiChangeTransfer,
   },
   data () {
     return {
@@ -530,20 +541,18 @@ export default {
     checkSelect (row, index) {
       return row.isChecked;
     },
-    //调动
-    async handleTransfer (row) {
-      this.tranferShow = true;
 
+    //迁出记录
+    async handleChangeTransfer (row) {
+      this.tranferShow = true;
       await nextTick(200);
-
-      this.$refs.ref_transfer.initForm(row);
+      this.$refs.ref_change_transfer.initForm(row)
     },
+
     //变更记录
     async handleChangeRecord (row) {
       this.changeRecordShow = true;
-
       await nextTick(200);
-
       this.$refs.ref_changerecord.initForm(row);
     },
 

From 91a7b883831de9a83d94740bc1fc1e431626b702 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 23 Nov 2022 14:35:07 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E8=BF=81=E5=87=BA=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/resiChangeTransfer.vue | 233 ++++++++++----------
 src/views/components/resiSearch.vue         |   2 +-
 2 files changed, 116 insertions(+), 119 deletions(-)

diff --git a/src/views/components/resiChangeTransfer.vue b/src/views/components/resiChangeTransfer.vue
index f19da89b9..12c7a9ae7 100644
--- a/src/views/components/resiChangeTransfer.vue
+++ b/src/views/components/resiChangeTransfer.vue
@@ -1,38 +1,38 @@
 <template>
   <div>
-    <div class="dialog-h-content scroll-h">
+    <div class="dialog-h-content scroll-h  m-edit">
       <el-form ref="ref_form"
                :inline="false"
                :model="dataForm"
+               label-width="90px"
                :rules="dataRule"
-               class="form">
+               class="m-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="outOfTime">
+          <el-date-picker v-model="dataForm.outOfTime"
+                          class="edit_edit_item_width_1"
+                          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">
 
@@ -44,11 +44,10 @@
 
         <div v-if="dataForm.type==='in'">
           <el-form-item label="迁出至"
-                        prop='agencyId'
-                        label-width="150px">
+                        prop='agencyId'>
             <el-cascader ref="myCascader"
                          v-model="agencyIdArray"
-                         style="width:480px"
+                         class="edit_edit_item_width_1"
                          :key="iscascaderShow"
                          :options="casOptions"
                          :props="optionProps"
@@ -57,7 +56,6 @@
           </el-form-item>
 
           <el-form-item label="所属家庭"
-                        label-width="150px"
                         prop="villageId">
 
             <div class="resi-cell-col">
@@ -65,7 +63,7 @@
               <el-select v-model.trim="dataForm.villageId"
                          placeholder="请选择小区"
                          clearable
-                         class="item_width_1"
+                         class="edit_item_width_1"
                          @change="handleChangeCommunity($event)">
                 <el-option v-for="item in communityList"
                            :key="item.value"
@@ -77,7 +75,7 @@
               <el-select v-model.trim="dataForm.buildId"
                          placeholder="请选择楼号"
                          clearable
-                         class="item_width_1 margin_left10"
+                         class="edit_item_width_1 margin_left10"
                          @change="handleChangeBuilding($event)">
                 <el-option v-for="item in buildingList"
                            :key="item.value"
@@ -89,7 +87,7 @@
               <el-select v-model.trim="dataForm.unitId"
                          placeholder="请选择单元"
                          clearable
-                         class="item_width_1 margin_left10"
+                         class="edit_item_width_1 margin_left10"
                          @change="handleChangeUnit($event)">
                 <el-option v-for="item in unitList"
                            :key="item.value"
@@ -101,7 +99,7 @@
               <el-select v-model.trim="dataForm.homeId"
                          placeholder="请选择房号"
                          clearable
-                         class="item_width_1 margin_left10"
+                         class="edit_item_width_1 margin_left10"
                          @change="handleChangeHome($event)">
                 <el-option v-for="item in roomList"
                            :key="item.value"
@@ -117,8 +115,7 @@
         </div>
         <div v-if="dataForm.type==='out'">
           <el-form-item label="外迁详细地址"
-                        prop="address"
-                        label-width="150px">
+                        prop="address">
             <el-input type="textarea"
                       :autosize="{ minRows: 2, maxRows: 7}"
                       :rows="5"
@@ -130,8 +127,7 @@
           </el-form-item>
         </div>
         <el-form-item label="迁出原因"
-                      prop="reason"
-                      label-width="150px">
+                      prop="reason">
           <el-input type="textarea"
                     :autosize="{ minRows: 4, maxRows: 7}"
                     :rows="5"
@@ -142,8 +138,7 @@
           </el-input>
         </el-form-item>
         <el-form-item label=""
-                      prop="welfareFlag"
-                      label-width="150px">
+                      prop="welfareFlag">
           <el-checkbox v-model="dataForm.welfareFlag">享受福利</el-checkbox>
         </el-form-item>
       </el-form>
@@ -239,29 +234,29 @@ export default {
   },
   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' }
-                ]
-
-            }
-        },
+  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) {
 
@@ -274,38 +269,38 @@ export default {
       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.ID_CARD
-        this.dataForm.mobile = row.MOBILE
+      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.ID_CARD
+      this.dataForm.mobile = row.MOBILE
 
-        await this.loadHouseInfo(row.HOME_ID_VALUE)
+      await this.loadHouseInfo(row.HOME_ID_VALUE)
 
-        this.dataForm.name = row.NAME
-        this.dataForm.gender = row.GENDER
-        this.dataForm.age = ''
+      this.dataForm.name = row.NAME
+      this.dataForm.gender = row.GENDER
+      this.dataForm.age = ''
 
 
       await this.loadRootAgency()
       await this.getAgencylist()
 
     },
-      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)
-          }
+    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 () {
@@ -401,12 +396,12 @@ export default {
     },
 
     async handleChangeCommunity (id) {
-        // 小区
-        this.communityList.find((item) => {
-            if (item.value === id) {
-                this.dataForm.villageName = item.label
-            }
-        })
+      // 小区
+      this.communityList.find((item) => {
+        if (item.value === id) {
+          this.dataForm.villageName = item.label
+        }
+      })
 
       const url = '/gov/org/icbuilding/buildingoption'
 
@@ -430,12 +425,12 @@ export default {
 
     async handleChangeBuilding (id) {
 
-        // 楼号
-        this.buildingList.find((item) => {
-            if (item.value === id) {
-                this.dataForm.buildName = item.label
-            }
-        })
+      // 楼号
+      this.buildingList.find((item) => {
+        if (item.value === id) {
+          this.dataForm.buildName = item.label
+        }
+      })
 
       const url = '/gov/org/icbuildingunit/unitoption'
 
@@ -458,12 +453,12 @@ export default {
     },
 
     async handleChangeUnit (id) {
-        // 单元号
-        this.unitList.find((item) => {
-            if (item.value === id) {
-                this.dataForm.unitName = item.label
-            }
-        })
+      // 单元号
+      this.unitList.find((item) => {
+        if (item.value === id) {
+          this.dataForm.unitName = item.label
+        }
+      })
 
       const url = '/gov/org/ichouse/houseoption'
 
@@ -482,14 +477,14 @@ export default {
       }
     },
 
-      async handleChangeHome (id) {
-          // 房屋号
-          this.roomList.find((item) => {
-              if (item.value === id) {
-                  this.dataForm.homeName = item.label
-              }
-          })
-      },
+    async handleChangeHome (id) {
+      // 房屋号
+      this.roomList.find((item) => {
+        if (item.value === id) {
+          this.dataForm.homeName = item.label
+        }
+      })
+    },
 
     async handleComfirm () {
       this.btnDisable = true
@@ -523,7 +518,7 @@ export default {
     },
 
     async saveForm () {
-      
+
       // saveOutOfInfo
       const url = '/epmetuser/changeRelocation/moveOutHome'
       let noData = new Date()
@@ -539,23 +534,23 @@ export default {
         this.$message.error(msg)
       }
     },
-      // async saveForm () {
-      //     const url = '/epmetuser/icusertransferrecord/add'
-      //     let noData = new Date()
-      //     noData = util.dateFormatter(noData, 'time')
-      //     this.dataForm.transferTime = noData
-      //
-      //     console.log('-----------3--------------')
-      //     console.log(this.dataForm)
-      //     const { data, code, msg } = await requestPost(url, this.dataForm)
-      //
-      //     if (code === 0) {
-      //         this.$message.success('调动成功')
-      //         this.handleCancle()
-      //     } else {
-      //         this.$message.error(msg)
-      //     }
-      // },
+    // async saveForm () {
+    //     const url = '/epmetuser/icusertransferrecord/add'
+    //     let noData = new Date()
+    //     noData = util.dateFormatter(noData, 'time')
+    //     this.dataForm.transferTime = noData
+    //
+    //     console.log('-----------3--------------')
+    //     console.log(this.dataForm)
+    //     const { data, code, msg } = await requestPost(url, this.dataForm)
+    //
+    //     if (code === 0) {
+    //         this.$message.success('调动成功')
+    //         this.handleCancle()
+    //     } else {
+    //         this.$message.error(msg)
+    //     }
+    // },
 
     handleCancle () {
       this.resetData()
@@ -607,7 +602,9 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.item_width_1 {
+@import "@/assets/scss/modules/management/edit-main.scss";
+
+.edit_item_width_1 {
   width: 150px;
 }
 .item_width_2 {
diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index c12a99ffc..091178fec 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -363,7 +363,7 @@ export default {
         'AGENCY_ID': 'like'
       },
 
-      showSmartSearchForm: true,
+      showSmartSearchForm: false,
       formType: 'add',
       selBtnIndex: 1,
       btnList: [

From b2264328543ac688c8b6b44a5146505679df3057 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 23 Nov 2022 14:54:28 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E8=BF=81=E5=87=BA=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scss/modules/management/edit-main.scss    |  3 ++
 src/views/components/resiChangeTransfer.vue   | 54 ++++++++-----------
 2 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/src/assets/scss/modules/management/edit-main.scss b/src/assets/scss/modules/management/edit-main.scss
index 68e07815d..f5911f83b 100644
--- a/src/assets/scss/modules/management/edit-main.scss
+++ b/src/assets/scss/modules/management/edit-main.scss
@@ -76,6 +76,9 @@
       height:89px;
       // line-height: 40px;
     }
+    /deep/ .el-form-item__content{
+     height:78px;
+    }
 
     /deep/ .el-input__countx {
       background:none;
diff --git a/src/views/components/resiChangeTransfer.vue b/src/views/components/resiChangeTransfer.vue
index 12c7a9ae7..646ca924a 100644
--- a/src/views/components/resiChangeTransfer.vue
+++ b/src/views/components/resiChangeTransfer.vue
@@ -2,7 +2,7 @@
   <div>
     <div class="dialog-h-content scroll-h  m-edit">
       <el-form ref="ref_form"
-               :inline="false"
+               :inline="true"
                :model="dataForm"
                label-width="90px"
                :rules="dataRule"
@@ -19,14 +19,14 @@
         </el-form-item>
 
         <el-form-item label="迁出时间"
+                      style="display: block"
                       prop="outOfTime">
           <el-date-picker v-model="dataForm.outOfTime"
-                          class="edit_edit_item_width_1"
+                          class="edit_item_width_1"
                           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>
@@ -44,10 +44,11 @@
 
         <div v-if="dataForm.type==='in'">
           <el-form-item label="迁出至"
+                        style="display: block"
                         prop='agencyId'>
             <el-cascader ref="myCascader"
                          v-model="agencyIdArray"
-                         class="edit_edit_item_width_1"
+                         class="edit_item_width_1"
                          :key="iscascaderShow"
                          :options="casOptions"
                          :props="optionProps"
@@ -56,6 +57,7 @@
           </el-form-item>
 
           <el-form-item label="所属家庭"
+                        style="display: block"
                         prop="villageId">
 
             <div class="resi-cell-col">
@@ -115,6 +117,7 @@
         </div>
         <div v-if="dataForm.type==='out'">
           <el-form-item label="外迁详细地址"
+                        style="display: block"
                         prop="address">
             <el-input type="textarea"
                       :autosize="{ minRows: 2, maxRows: 7}"
@@ -126,20 +129,22 @@
             </el-input>
           </el-form-item>
         </div>
-        <el-form-item label="迁出原因"
-                      prop="reason">
-          <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=""
+        <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"
                       prop="welfareFlag">
-          <el-checkbox v-model="dataForm.welfareFlag">享受福利</el-checkbox>
+          <el-checkbox v-model="dataForm.welfareFlag">享受</el-checkbox>
         </el-form-item>
       </el-form>
 
@@ -604,21 +609,6 @@ export default {
 <style lang="scss" scoped>
 @import "@/assets/scss/modules/management/edit-main.scss";
 
-.edit_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;

From 348287ed328e790900c3ccae0897687d064ca525 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 23 Nov 2022 16:43:10 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=AD=BB=E4=BA=A1=E7=99=BB=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scss/modules/management/edit-main.scss    |   6 +-
 src/views/components/resiChangeTransfer.vue   |  25 +--
 .../modules/base/community/buildForm.vue      |   2 +-
 .../modules/base/community/communityForm.vue  |   2 +-
 src/views/modules/base/community/roomForm.vue |   2 +-
 src/views/modules/base/resi.vue               |  33 ++-
 .../modules/plugins/change/resideath.vue      |  53 +++--
 .../modules/plugins/change/resideathAdd.vue   | 207 ++++++++++++++++++
 8 files changed, 285 insertions(+), 45 deletions(-)
 create mode 100644 src/views/modules/plugins/change/resideathAdd.vue

diff --git a/src/assets/scss/modules/management/edit-main.scss b/src/assets/scss/modules/management/edit-main.scss
index f5911f83b..4d507d7f0 100644
--- a/src/assets/scss/modules/management/edit-main.scss
+++ b/src/assets/scss/modules/management/edit-main.scss
@@ -98,7 +98,7 @@
     line-height: 36px
   }
   /deep/ .el-input__inner{
-    width:100%;
+    width:95%;
     background-color: #F6F6F6;
     border:0px;
     line-height: 26px;
@@ -117,6 +117,10 @@
     background:none;
   }
 
+  /deep/ .el-input__prefix{
+    left:700px;
+  }
+
 }
 
 .edit_item_width_1{
diff --git a/src/views/components/resiChangeTransfer.vue b/src/views/components/resiChangeTransfer.vue
index 646ca924a..f4079c944 100644
--- a/src/views/components/resiChangeTransfer.vue
+++ b/src/views/components/resiChangeTransfer.vue
@@ -115,15 +115,14 @@
           </el-form-item>
 
         </div>
-        <div v-if="dataForm.type==='out'">
+        <div v-if="dataForm.type==='out'"
+             class="item-textarea">
           <el-form-item label="外迁详细地址"
                         style="display: block"
                         prop="address">
             <el-input type="textarea"
-                      :autosize="{ minRows: 2, maxRows: 7}"
-                      :rows="5"
                       resize="none"
-                      style="width:600px"
+                      class="edit_item_width_1"
                       placeholder='请输入外迁详细地址'
                       v-model="dataForm.address">
             </el-input>
@@ -149,20 +148,16 @@
       </el-form>
 
     </div>
-    <!-- <div class="div_btn">
-      <el-button @click="handleCancle">取 消</el-button>
-      <el-button type="primary"
-                 :disabled="btnDisable"
-                 @click="handleComfirm">确 定</el-button>
-    </div> -->
-    <div class="resi-btns">
+    <div class="div_btn">
+      <el-button size="small"
+                 class="diy-button--gray"
+                 @click="handleCancle">取 消</el-button>
       <el-button size="small"
-                 @click="handleCancle">取消</el-button>
-      <el-button type="primary"
-                 size="small"
+                 class="diy-button--blue"
                  :loading="btnDisable"
-                 @click="handleComfirm">提交</el-button>
+                 @click="handleComfirm">提 交</el-button>
     </div>
+
   </div>
 </template>
 
diff --git a/src/views/modules/base/community/buildForm.vue b/src/views/modules/base/community/buildForm.vue
index da65235f3..fd914c3e8 100644
--- a/src/views/modules/base/community/buildForm.vue
+++ b/src/views/modules/base/community/buildForm.vue
@@ -173,7 +173,7 @@
     </div>
     <div class="div_btn">
       <el-button size="small"
-                 class="diy-button--other"
+                 class="diy-button--gray"
                  @click="handleCancle">取 消</el-button>
       <el-button size="small"
                  v-if="formType != 'detail'"
diff --git a/src/views/modules/base/community/communityForm.vue b/src/views/modules/base/community/communityForm.vue
index 535f4f9d8..2771187c9 100644
--- a/src/views/modules/base/community/communityForm.vue
+++ b/src/views/modules/base/community/communityForm.vue
@@ -175,7 +175,7 @@
     </div>
     <div class="div_btn">
       <el-button size="small"
-                 class="diy-button--other"
+                 class="diy-button--gray"
                  @click="handleCancle">取 消</el-button>
       <el-button size="small"
                  class="diy-button--blue"
diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue
index 3c0a7fd59..9d436fe15 100644
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@@ -175,7 +175,7 @@
     </div>
     <div class="div_btn">
       <el-button size="small"
-                 class="diy-button--other"
+                 class="diy-button--gray"
                  @click="handleCancle">取 消</el-button>
       <el-button size="small"
                  class="diy-button--blue"
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index a611bcce2..513d2f505 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -174,7 +174,7 @@
                        type="text"
                        class="div-table-button--green"
                        size="small">迁出登记</el-button>
-            <el-button @click="handleChangeRecord(scope.row)"
+            <el-button @click="handleDeath(scope.row)"
                        type="text"
                        class="div-table-button--red"
                        size="small">死亡登记</el-button>
@@ -339,11 +339,11 @@
                  @close="handleCancleLook" />
     <baobiao ref="baobiao" />
 
-    <!-- 迁出 -->
+    <!-- 迁出登记 -->
     <el-dialog :visible.sync="tranferShow"
                :close-on-click-modal="false"
                :close-on-press-escape="false"
-               :title="'迁出管理'"
+               :title="'迁出登记'"
                width="950px"
                top="5vh"
                class="dialog-h"
@@ -351,6 +351,18 @@
       <resi-change-transfer ref="ref_change_transfer"
                             @dialogCancle="transferClose"></resi-change-transfer>
     </el-dialog>
+    <!-- 死亡登记 -->
+    <el-dialog :visible.sync="deathShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'死亡登记'"
+               width="950px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <resideath-add ref="ref_death"
+                     @dialogCancle="deathClose"></resideath-add>
+    </el-dialog>
   </div>
 </template>
 
@@ -364,12 +376,14 @@ import { mapGetters } from "vuex";
 import resiTransfer from "../../components/resiTransfer.vue";
 import resiChangeRecord from "../../components/resiChangeRecord.vue";
 
+
 import peopleMore from "@/views/modules/shequ/cpts/people-more";
 import baobiao from "@/views/modules/cpts/baobiao";
 import diyInfo from "./diyInfo.vue";
 import { requestPost } from "@/js/dai/request";
 
 import resiChangeTransfer from "../../components/resiChangeTransfer.vue";
+import resideathAdd from "../plugins/change/resideathAdd.vue";
 
 export default {
   components: {
@@ -383,6 +397,7 @@ export default {
     diyInfo,
 
     resiChangeTransfer,
+    resideathAdd,
   },
   data () {
     return {
@@ -433,6 +448,7 @@ export default {
       defaultCategotyKey: "",
 
       tranferShow: false,
+      deathShow: false,
       changeRecordShow: false,
       lookInfo: {
         userId: "",
@@ -548,6 +564,12 @@ export default {
       await nextTick(200);
       this.$refs.ref_change_transfer.initForm(row)
     },
+    //迁出记录
+    async handleDeath (row) {
+      this.deathShow = true;
+      await nextTick(200);
+      this.$refs.ref_death.initForm(row)
+    },
 
     //变更记录
     async handleChangeRecord (row) {
@@ -558,6 +580,7 @@ export default {
 
     diaClose () {
       this.tranferShow = false;
+      this.deathShow = false;
       this.changeRecordShow = false;
     },
 
@@ -565,6 +588,10 @@ export default {
       this.tranferShow = false;
       this.getTableData();
     },
+    deathClose () {
+      this.deathShow = false;
+      this.getTableData();
+    },
     handleDiyClose () {
       this.diyDialog = false;
     },
diff --git a/src/views/modules/plugins/change/resideath.vue b/src/views/modules/plugins/change/resideath.vue
index 1edf4f7e4..22aa93043 100644
--- a/src/views/modules/plugins/change/resideath.vue
+++ b/src/views/modules/plugins/change/resideath.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="resi-container">
     <death-search v-if="searchList.length > 0"
-                 ref="deathSearch"
-                 :form-list="searchList"
-                 :column-name="defaultCategotyKey"
-                 @search="handleSearch" />
+                  ref="deathSearch"
+                  :form-list="searchList"
+                  :column-name="defaultCategotyKey"
+                  @search="handleSearch" />
     <el-card class="resi-card-table">
       <!-- <div class="resi-row-btn">
         <el-button size="small"
@@ -66,10 +66,9 @@
                          :label="item.label"
                          align="center"
                          :fixed="item.columnName == 'NAME' ? 'left' : false"
-                         :show-overflow-tooltip="true"
-                         >
-                         <!-- :width="item.width || computedWidth(item.label, item.itemType)" -->
-                         <!-- :width="item.itemType === 'radio' ? computedWidth(item.label) : 180" -->
+                         :show-overflow-tooltip="true">
+          <!-- :width="item.width || computedWidth(item.label, item.itemType)" -->
+          <!-- :width="item.itemType === 'radio' ? computedWidth(item.label) : 180" -->
           <template slot-scope="scope">
             <a v-if="item.columnName == 'NAME'"
                class="name-a"
@@ -83,7 +82,7 @@
                          align="center"
                          width="150">
           <template slot-scope="scope">
-              <el-button @click="joinBlacklist(scope.row)"
+            <el-button @click="joinBlacklist(scope.row)"
                        type="text"
                        size="small"
                        class="div-table-button--detail">新增死亡人口</el-button>
@@ -257,18 +256,24 @@
                @closed="diaClose">
       <resi-change-record ref="ref_changerecord"></resi-change-record>
     </el-dialog>
+
     <people-more v-if="showedPeopleMoreInfo && lookInfo.userId"
                  :userId="lookInfo.userId"
                  :gridName="lookInfo.gridName"
                  @close="handleCancleLook" />
-    <el-dialog title="新增死亡人口的原因" :visible.sync="blacklistVisible" width="40%">
-      <textarea v-model="blacklistReason" placeholder="请输入新增死亡人口的原因" class="blacklist-reason"></textarea>
+
+    <el-dialog title="新增死亡人口的原因"
+               :visible.sync="blacklistVisible"
+               width="40%">
+      <textarea v-model="blacklistReason"
+                placeholder="请输入新增死亡人口的原因"
+                class="blacklist-reason"></textarea>
       <div>
-        <br/>
+        <br />
       </div>
       <el-checkbox v-model="welfareFlag">享受福利</el-checkbox>
       <div>
-        <br/>
+        <br />
       </div>
       <el-date-picker v-model="deathDate"
                       type="date"
@@ -278,9 +283,11 @@
                       style="width:200px"
                       :clearable="false">
       </el-date-picker>
-      <span slot="footer" class="dialog-footer">
+      <span slot="footer"
+            class="dialog-footer">
         <el-button @click="blacklistVisible = false">取 消</el-button>
-        <el-button type="primary" @click="confirmJoinDeathlist">确 定</el-button>
+        <el-button type="primary"
+                   @click="confirmJoinDeathlist">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -299,7 +306,7 @@ import peopleMore from "@/views/modules/shequ/cpts/people-more";
 
 export default {
   components: {
-      deathSearch,
+    deathSearch,
     resiForm,
     editResi,
     resiTransfer,
@@ -359,7 +366,7 @@ export default {
       blacklistReason: '', // 加入黑名单原因
       welfareFlag: false,
       rowData: {}, // 加入黑名单的人员信息
-        deathDate: ''
+      deathDate: ''
     }
   },
   props: {
@@ -378,7 +385,7 @@ export default {
   },
   computed: {
     ...mapGetters(['clientHeight', 'iframeHeight']),
-    tableHeight() {
+    tableHeight () {
       const h = this.clientHeight - this.searchH - 280 + this.iframeHeigh
       const _h = this.clientHeight - 280 - this.searchH
       return this.$store.state.inIframe ? h : _h
@@ -414,13 +421,13 @@ export default {
   },
   methods: {
     searchFilter (columnName) {
-      const filterName = [ 'NAME', 'MOBILE', 'ID_CARD' ]
+      const filterName = ['NAME', 'MOBILE', 'ID_CARD']
       return filterName.some(item => {
         return item == columnName
       })
     },
     tableHeaderFilter (columnName) {
-      const filterName = [ 'NAME', 'GRID_ID', 'HOME_ID', 'MOBILE', 'ID_CARD', 'GENDER' ]
+      const filterName = ['NAME', 'GRID_ID', 'HOME_ID', 'MOBILE', 'ID_CARD', 'GENDER']
       return filterName.some(item => {
         return item == columnName
       })
@@ -447,7 +454,7 @@ export default {
       if (this.deathDate === '') {
         this.$message({
           message: '请选择死亡日期',
-          type:'warning'
+          type: 'warning'
         })
         return false
       }
@@ -502,7 +509,7 @@ export default {
 
       let wd = ''
       if (type == 'input' || type == 'select') wd = 40 * label.length
-      else if(type == 'radio') wd = 20 * label.length
+      else if (type == 'radio') wd = 20 * label.length
       console.log('type-----wd', wd)
       return wd > 80 ? wd : 80
     },
@@ -794,7 +801,7 @@ export default {
       // await this.getFormList('edit')
       // this.getrowInfo(row.icResiUserId)
     },
-    handleCancleLook() {
+    handleCancleLook () {
       this.lookInfo.userId = ''
       this.lookInfo.gridName = ''
       this.showedPeopleMoreInfo = false;
diff --git a/src/views/modules/plugins/change/resideathAdd.vue b/src/views/modules/plugins/change/resideathAdd.vue
new file mode 100644
index 000000000..388066d6c
--- /dev/null
+++ b/src/views/modules/plugins/change/resideathAdd.vue
@@ -0,0 +1,207 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h  m-edit">
+      <el-form ref="ref_form"
+               :inline="true"
+               :model="dataForm"
+               label-width="90px"
+               :rules="dataRule"
+               class="m-form">
+
+        <div class="item-textarea">
+          <el-form-item label="死亡原因"
+                        style="display: block"
+                        prop="blacklistReason">
+            <el-input type="textarea"
+                      resize="none"
+                      class="edit_item_width_1"
+                      placeholder='请输入迁出原因'
+                      v-model="dataForm.blacklistReason">
+            </el-input>
+          </el-form-item>
+        </div>
+        <el-form-item label="死亡日期"
+                      style="display: block"
+                      prop="deathDate">
+          <el-date-picker v-model="dataForm.deathDate"
+                          class="edit_item_width_1"
+                          type="date"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期"
+                          :clearable="false">
+          </el-date-picker>
+        </el-form-item>
+
+        <!-- <el-form-item label="享受福利"
+                      style="display: block"
+                      prop="welfareFlag">
+          <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"
+                 class="diy-button--blue"
+                 :loading="btnDisable"
+                 @click="handleComfirm">提 交</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,
+
+      dataForm: {
+        blacklistReason: '',
+        deathDate: '',
+      },
+
+
+
+
+    }
+  },
+  components: {
+
+  },
+  mounted () {
+  },
+  computed: {
+    dataRule () {
+      return {
+        blacklistReason: [
+          { required: true, message: '死亡原因不能为空', trigger: 'blur' },
+        ],
+        deathDate: [
+          { required: true, message: '死亡日期不能为空', trigger: 'blur' }
+        ],
+
+
+      }
+    },
+
+  },
+  methods: {
+    async initForm (row) {
+
+      this.customerId = localStorage.getItem("customerId");
+
+      this.$refs.ref_form.resetFields();
+
+      this.dataForm.idCard = row.ID_CARD
+      this.dataForm.name = row.NAME
+      this.dataForm.mobile = row.MOBILE
+      this.dataForm.gender = row.GENDER == '女' ? '0' : row.GENDER == '男' ? '1' : ''
+      this.dataForm.type = '1'
+      this.dataForm.userId = row.icResiUserId
+
+    },
+
+    async handleComfirm () {
+      this.btnDisable = true
+      setTimeout(() => {
+        this.btnDisable = false
+      }, 2000)
+      this.$refs['ref_form'].validate((valid, messageObj) => {
+        if (!valid) {
+          // app.util.validateRule(messageObj)
+          console.log('error submit!')
+
+        } else {
+
+          this.saveForm()
+        }
+
+      })
+    },
+
+    async saveForm () {
+
+
+      const url = '/epmetuser/rentDeath/save'
+
+
+      const { data, code, msg } = await requestPost(url, this.dataForm)
+
+      if (code === 0) {
+        this.$message.success('操作成功')
+        this.handleCancle()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+
+    handleCancle () {
+      this.resetData()
+      this.$emit('dialogCancle')
+
+    },
+
+    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
+      }
+
+
+
+
+    },
+    // 开启加载动画
+    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>
+@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>