From 237a7c5171f63e50c4d09c8643e9700d090510c2 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 21 Jan 2022 14:13:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E8=B0=83=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/resiChangeRecord.vue     | 297 +++++++++++
 src/views/components/resiTransfer.vue         | 488 +++++++++++-------
 src/views/main.vue                            |  42 +-
 .../modules/base/category/addCategory.vue     |   3 +-
 src/views/modules/base/category/main.vue      |   4 +-
 src/views/modules/base/resi.vue               |  37 +-
 .../regionalParty/finishList.vue              |   8 +-
 7 files changed, 663 insertions(+), 216 deletions(-)
 create mode 100644 src/views/components/resiChangeRecord.vue

diff --git a/src/views/components/resiChangeRecord.vue b/src/views/components/resiChangeRecord.vue
new file mode 100644
index 000000000..200663865
--- /dev/null
+++ b/src/views/components/resiChangeRecord.vue
@@ -0,0 +1,297 @@
+<template>
+  <div class="div_main">
+
+    <el-table class="table"
+              :data="tableData"
+              border
+              :height="tableHeight"
+              v-loading="tableLoading"
+              :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+              style="width: 100%">
+
+      <el-table-column label="序号"
+                       header-align="center"
+                       align="center"
+                       type="index"
+                       width="50"></el-table-column>
+      <el-table-column prop="typeName"
+                       header-align="center"
+                       align="center"
+                       label="变更类型"
+                       width="80">
+      </el-table-column>
+      <el-table-column prop="beforeChangeName"
+                       header-align="center"
+                       align="center"
+                       label="变更前"
+                       width="230">
+      </el-table-column>
+      <el-table-column prop="afterChanegName"
+                       header-align="center"
+                       align="center"
+                       label="变更后"
+                       min-width="230">
+      </el-table-column>
+
+      <el-table-column prop="changeTime"
+                       header-align="center"
+                       align="center"
+                       label="调整时间"
+                       width="160">
+      </el-table-column>
+
+      <el-table-column prop="operatorName"
+                       header-align="center"
+                       align="center"
+                       label="操作人"
+                       width="80">
+      </el-table-column>
+
+      <el-table-column prop="remark"
+                       header-align="center"
+                       align="center"
+                       label="备注"
+                       width="120">
+      </el-table-column>
+
+    </el-table>
+    <div>
+      <el-pagination @size-change="handleSizeChange"
+                     @current-change="handleCurrentChange"
+                     :current-page.sync="pageNo"
+                     :page-sizes="[10, 20, 50]"
+                     :page-size="pageSize"
+                     layout="sizes, prev, pager, next, total"
+                     :total="total">
+      </el-pagination>
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+
+import util from '@js/util.js';
+import { requestPost } from "@/js/dai/request";
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      loading: false,
+      total: 0,
+      pageSize: 10,
+      pageNo: 0,
+      tableLoading: false,
+
+      tableData: [],
+      icUserId: '',
+
+
+    }
+  },
+
+
+  async mounted () {
+
+
+  },
+
+  methods: {
+    async initForm (row) {
+      this.icUserId = row.icResiUserId
+
+      //获取数据
+      await this.loadTable()
+    },
+
+    handleSearch () {
+      this.loadTable()
+    },
+
+
+    async loadTable () {
+      this.tableLoading = true
+
+      const url = "/epmetuser/icuserchangerecord/list"
+
+      let params = {
+        icUserId: this.icUserId,
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+
+        this.total = data.total
+        this.tableData = data.list
+      } else {
+        this.$message.error(msg)
+      }
+      this.tableLoading = false
+    },
+
+    //初始化时间
+    initDate () {
+      let yesterday = new Date((new Date).getTime() - 24 * 60 * 60 * 1000)
+
+      let year = yesterday.getFullYear()
+      let month = yesterday.getMonth() + 1 //月
+      let day = yesterday.getDate() //日
+
+      let days = new Date(year, month, 0);
+      days = days.getDate(); //获取当前月的天数
+      let year2 = year;
+      let month2 = parseInt(month) - 1;
+      if (month2 == 0) {
+        year2 = parseInt(year2) - 1;
+        month2 = 12;
+      }
+      let day2 = day;
+      let days2 = new Date(year2, month2, 0);
+      days2 = days2.getDate();
+      if (day2 > days2) {
+        day2 = days2;
+      }
+      if (month2 < 10) {
+        month2 = '0' + month2;
+      }
+      if (month < 10) {
+        month = '0' + month;
+      }
+      if (day < 10) {
+        day = '0' + day;
+      }
+      if (day2 < 10) {
+        day2 = '0' + day2;
+      }
+      let t2 = year2 + '-' + month2 + '-' + day2;
+      let t1 = year + '-' + month + '-' + day;
+      // let t3 = formate(t2, style);
+      this.formData.startTime = t2 + ' 00:00:00'
+      this.formData.endTime = t1 + ' 23:59:59'
+
+      this.timeRange = [t2, t1]
+    },
+
+
+    handleTimeChange (time) {
+      if (time) {
+        const startTimeArray = util.dateFormatter(time[0], 'date').split('-')
+        const endTimeArray = util.dateFormatter(time[1], 'date').split('-')
+
+        this.formData.startTime = startTimeArray[0] + '-' + startTimeArray[1] + '-' + startTimeArray[2] + ' 00:00:00'
+        this.formData.endTime = endTimeArray[0] + '-' + endTimeArray[1] + '-' + endTimeArray[2] + ' 23:59:59'
+
+        // this.startTimeShow = startTimeArray[0] + '年' + startTimeArray[1] + '月' + startTimeArray[2] + '日'
+        // this.endTimeShow = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日'
+      } else {
+        this.formData.startTime = ''
+        this.formData.endTime = ''
+        // this.startTimeShow = ''
+        // this.endTimeShow = ''
+      }
+
+      this.loadTable()
+
+    },
+
+    handleSizeChange (val) {
+      this.pageSize = val
+      this.pageNo = 1
+      this.loadTable()
+    },
+    handleCurrentChange (val) {
+      this.pageNo = val
+      this.loadTable()
+    },
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    tableHeight () {
+
+      return (this.clientHeight - 460)
+
+    },
+    rowHeight () {
+      return (this.clientHeight - 200) + 'px'
+    },
+    ...mapGetters(['clientHeight'])
+  },
+  watch: {
+
+  },
+  props: {
+    serviceType: {
+      type: String,
+      default: ''
+    }
+  }
+}
+</script>
+<style lang="scss" scoped >
+@import "@/assets/scss/buttonstyle.scss";
+
+.div_main {
+  background: #ffffff;
+  box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+  border-radius: 4px;
+  margin-top: 15px;
+  padding: 23px 30px 10px;
+}
+
+.div_search {
+  background: #ffffff;
+  border-radius: 4px;
+  padding: 30px 20px 5px;
+  box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+}
+
+.item_width_1 {
+  width: 260px;
+}
+.item_width_2 {
+  width: 495px;
+}
+
+.div_table {
+  background: #ffffff;
+  box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+  border-radius: 4px;
+  margin-top: 15px;
+  padding: 23px 30px 10px;
+
+  .table {
+    margin-top: 20px;
+  }
+}
+
+.el-row {
+  /* margin-bottom: 20px; */
+  display: flex;
+  flex-wrap: wrap;
+  margin-top: 10px;
+  margin-right: 50px;
+}
+</style>
diff --git a/src/views/components/resiTransfer.vue b/src/views/components/resiTransfer.vue
index 6d8c0232b..c942aa09b 100644
--- a/src/views/components/resiTransfer.vue
+++ b/src/views/components/resiTransfer.vue
@@ -5,97 +5,117 @@
                :inline="false"
                :model="dataForm"
                :rules="dataRule"
-               :disabled="formType === 'detail'"
                class="form">
 
         <el-form-item label="当前组织"
                       label-width="150px"
                       style="display: block">
-          <span>{{ agencyObj.communityName }}—{{agencyObj.label}}</span>
+          <span>{{ gridName }}</span>
         </el-form-item>
 
         <el-form-item label="迁出类型"
-                      prop="houseType"
+                      prop="type"
                       label-width="150px"
                       style="display: block">
-          <el-radio-group v-model="houseType">
+          <el-radio-group v-model="dataForm.type">
+
+            <el-radio :label="'in'">{{'迁往'+rootAgency.rootAgencyName+'内其他区域'}}</el-radio>
+            <el-radio :label="'out'">其他</el-radio>
 
-            <el-radio :label="'1'">楼房</el-radio>
-            <el-radio :label="'2'">平房</el-radio>
-            <el-radio :label="'3'">别墅</el-radio>
           </el-radio-group>
         </el-form-item>
 
-        <el-form-item label="所属家庭"
-                      required>
-          <div class="resi-cell-value">
+        <div v-if="dataForm.type==='in'">
+          <el-form-item label="迁出至"
+                        prop='newAgencyId'
+                        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="newNeighborHoodId"
+                        required>
+
             <div class="resi-cell-col">
-              <el-form-item prop="VILLAGE_ID">
-                <el-select v-model.trim="form.VILLAGE_ID"
-                           placeholder="请选择小区"
-                           size="small"
-                           clearable
-                           class="resi-cell-select"
-                           @change="handleChangeV">
-                  <el-option v-for="item in optionsV"
-                             :key="item.value"
-                             :label="item.label"
-                             :value="item.value">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item prop="BUILD_ID">
-                <el-select v-model.trim="form.BUILD_ID"
-                           placeholder="请选择楼号"
-                           size="small"
-                           clearable
-                           class="resi-cell-select resi-cell-select-middle"
-                           @change="handleChangeB">
-                  <el-option v-for="item in optionsB"
-                             :key="item.value"
-                             :label="item.label"
-                             :value="item.value">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item prop="UNIT_ID">
-                <el-select v-model.trim="form.UNIT_ID"
-                           placeholder="请选择单元"
-                           size="small"
-                           clearable
-                           class="resi-cell-select resi-cell-select-middle"
-                           @change="handleChangeD">
-                  <el-option v-for="item in optionsD"
-                             :key="item.value"
-                             :label="item.label"
-                             :value="item.value">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item prop="HOME_ID">
-                <el-select v-model.trim="form.HOME_ID"
-                           placeholder="请选择房号"
-                           size="small"
-                           clearable
-                           class="resi-cell-select resi-cell-select-middle">
-                  <el-option v-for="item in optionsH"
-                             :key="item.value"
-                             :label="item.label"
-                             :value="item.value">
-                  </el-option>
-                </el-select>
-              </el-form-item>
+
+              <el-select v-model.trim="dataForm.newNeighborHoodId"
+                         placeholder="请选择小区"
+                         clearable
+                         class="item_width_1"
+                         @change="handleChangeCommunity">
+                <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.newBuildingId"
+                         placeholder="请选择楼号"
+                         clearable
+                         class="item_width_1 margin_left10"
+                         @change="handleChangeBuilding">
+                <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.newBuildingUnitId"
+                         placeholder="请选择单元"
+                         clearable
+                         class="item_width_1 margin_left10"
+                         @change="handleChangeUnit">
+                <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.newHouseId"
+                         placeholder="请选择房号"
+                         clearable
+                         class="item_width_1 margin_left10">
+                <el-option v-for="item in roomList"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
+                </el-option>
+              </el-select>
+
             </div>
 
-          </div>
+          </el-form-item>
+
+        </div>
+        <el-form-item label="备注"
+                      prop="remark"
+                      label-width="150px">
+          <el-input type="textarea"
+                    :autosize="{ minRows: 4, maxRows: 7}"
+                    :rows="5"
+                    resize="none"
+                    style="width:600px"
+                    placeholder='请输入备注'
+                    v-model="dataForm.remark">
+          </el-input>
         </el-form-item>
       </el-form>
 
     </div>
     <div class="div_btn">
       <el-button @click="handleCancle">取 消</el-button>
-      <el-button v-if="formType != 'detail'"
-                 type="primary"
+      <el-button type="primary"
                  :disabled="btnDisable"
                  @click="handleComfirm">确 定</el-button>
     </div>
@@ -103,7 +123,7 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
+import util from '@js/util.js';
 import { Loading } from 'element-ui' // 引入Loading服务
 import { requestPost } from '@/js/dai/request'
 
@@ -113,22 +133,43 @@ export default {
     return {
 
       btnDisable: false,
+      communityList: [],
+      buildingList: [],
+      unitList: [],
+      roomList: [],
 
       dataForm: {
         icUserId: '', // 被调动人ID	
-        type: '',//操作类型【客户外out,客户内in】	
+        type: 'in',//操作类型【客户外out,客户内in】	
         newAgencyId: '',//调动到的组织Id		
         newGridId: '',//调动到的网格Id		
         newNeighborHoodId: '',//调动到的小区ID			
         newBuildingId: '',//调动到的楼宇Id			
-        newBuildingUnitId: 1,//调动到的单元Id			
+        newBuildingUnitId: '',//调动到的单元Id			
         newHouseId: '', //调动到的房屋Id		
         transferTime: '', //调动时间【日期类型】			
         remark: '' //备注		
       },
 
-      staffId: '',//人员id
-      rootAgency: {}
+      staffId: '',//工作人员id
+      userId: '',//操作人员id
+      gridName: '',
+      rootAgency: {},
+
+      casOptions: [],
+      agencyIdArray: [],
+      customerList: [],
+      iscascaderShow: 0,
+
+      optionProps: {
+        multiple: false,
+        value: 'agencyId',
+        label: 'agencyName',
+        children: 'subAgencyList',
+        checkStrictly: true
+      },
+
+      selGrid: {},
 
     }
   },
@@ -138,18 +179,23 @@ export default {
   },
 
   methods: {
-    async initForm (row, agencyObj) {
+    async initForm (row) {
+      this.staffId = localStorage.getItem("staffId");
 
       this.$refs.ref_form.resetFields();
 
-      this.staffId = row.staffId
+      // this.icUserId = row.icResiUserId
+      this.gridName = row.GRID_ID
+      this.dataForm.icUserId = row.icResiUserId
 
       await this.loadRootAgency()
+      await this.getAgencylist()
 
     },
 
     //根据人员id获取根组织信息
     async loadRootAgency () {
+
       const url = '/gov/org/customeragency/root-orglist-by-staffid'
 
       let params = {
@@ -168,87 +214,173 @@ export default {
       }
     },
 
+    async getAgencylist () {
+
+      const url = '/gov/org/customeragency/rootagencygridtree'
+
+
+      const params = {
+        agencyId: this.rootAgency.rootAgencyId
+      }
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        ++this.iscascaderShow
+        this.casOptions = []
+        this.agencyIdArray.length = []
+        // this.tableParams.agencyId = ''
+        if (data) {
+          this.casOptions.push(data)
+        }
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    handleChangeAgency () {
+      console.log(this.$refs["myCascader"].getCheckedNodes()[0].data)
+      this.selGrid = this.$refs["myCascader"].getCheckedNodes()[0].data
+      this.dataForm.newAgencyId = this.selGrid.pid
+      this.dataForm.newGridId = this.selGrid.agencyId
+      this.loadCommunityList()
+      this.dataForm.newNeighborHoodId = ''//调动到的小区ID			
+      this.dataForm.newBuildingId = ''//调动到的楼宇Id			
+      this.dataForm.newBuildingUnitId = ''//调动到的单元Id			
+      this.dataForm.newHouseId = '' //调动到的房屋Id		
+
+    },
+
+    async loadCommunityList () {
+      const url = '/gov/org/icneighborhood/neighborhoodoption'
+
+      let params = {
+        gridId: this.dataForm.newGridId,
+        agencyId: this.dataForm.newAgencyId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.communityList = []
+        this.communityList = [...data]
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    async handleChangeCommunity () {
+
+      const url = '/gov/org/icbuilding/buildingoption'
+
+      let params = {
+        neighborHoodId: this.dataForm.newNeighborHoodId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.buildingList = []
+        this.buildingList = [...data]
+        this.dataForm.newBuildingId = ''//调动到的楼宇Id			
+        this.dataForm.newBuildingUnitId = ''//调动到的单元Id			
+        this.dataForm.newHouseId = '' //调动到的房屋Id		
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    async handleChangeBuilding () {
+
+      const url = '/gov/org/icbuildingunit/unitoption'
+
+      let params = {
+        buildingId: this.dataForm.newBuildingId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.unitList = []
+        this.unitList = [...data]
+        this.dataForm.newBuildingUnitId = ''//调动到的单元Id			
+        this.dataForm.newHouseId = '' //调动到的房屋Id		
+
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    async handleChangeUnit () {
+
+      const url = '/gov/org/ichouse/houseoption'
+
+      let params = {
+        unitId: this.dataForm.newBuildingUnitId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.roomList = []
+        this.roomList = [...data]
+        this.dataForm.newHouseId = '' //调动到的房屋Id		
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
     async handleComfirm () {
       this.btnDisable = true
       setTimeout(() => {
         this.btnDisable = false
-      }, 10000)
+      }, 2000)
+
 
-      this.dataForm.houseType = this.houseType
-      this.dataForm.purpose = this.purpose
-      this.dataForm.rentFlag = this.rentFlag
       this.$refs['ref_form'].validate((valid, messageObj) => {
         if (!valid) {
-          this.btnDisable = false
           app.util.validateRule(messageObj)
+
         } else {
-          this.addRoom()
+          if (this.dataForm.type === 'in') {
+
+
+            if (!this.dataForm.newBuildingId) {
+              this.$message.warning('请选择楼宇')
+              return false
+            }
+            if (!this.dataForm.newBuildingUnitId) {
+              this.$message.warning('请选择单元')
+              return false
+            }
+            if (!this.dataForm.newHouseId) {
+              this.$message.warning('请选择房间')
+              return false
+            }
+          }
+          this.saveForm()
         }
 
       })
     },
 
-    getValiheList () {
+    async saveForm () {
+      const url = '/epmetuser/icusertransferrecord/add'
+      let noData = new Date()
+      noData = util.dateFormatter(noData, 'time')
+      this.dataForm.transferTime = noData
 
-      this.$http
-        .post('/gov/org/icneighborhood/neighborhoodoption', { gridId: this.form.GRID_ID, agencyId: this.agencyId })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            console.log('获取查询详情成功', res.data)
-            this.optionsV = res.data
-          }
-        })
-        .catch(() => {
-          return this.$message.error('网络错误')
-        })
-    },
-    getBuildList () {
-      this.$http
-        .post('/gov/org/icbuilding/buildingoption', { neighborHoodId: this.form.VILLAGE_ID })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            console.log('获取查询详情成功', res.data)
-            this.optionsB = res.data
-          }
-        })
-        .catch(() => {
-          return this.$message.error('网络错误')
-        })
-    },
-    getUniList () {
-      this.$http
-        .post('/gov/org/icbuildingunit/unitoption', { buildingId: this.form.BUILD_ID })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            console.log('获取查询详情成功', res.data)
-            this.optionsD = res.data
-          }
-        })
-        .catch(() => {
-          return this.$message.error('网络错误')
-        })
+      const { data, code, msg } = await requestPost(url, this.dataForm)
+
+      if (code === 0) {
+        this.$message.success('调动成功')
+        this.handleCancle()
+      } else {
+        this.$message.error(msg)
+      }
     },
-    getHouseList () {
-      this.$http
-        .post('/gov/org/ichouse/houseoption', { unitId: this.form.UNIT_ID })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            console.log('获取查询详情成功', res.data)
-            this.optionsH = res.data
-          }
-        })
-        .catch(() => {
-          return this.$message.error('网络错误')
-        })
-    }
 
     handleCancle () {
       this.resetData()
@@ -257,23 +389,26 @@ export default {
     },
 
     resetData () {
-      this.houseId = '' //房屋ID
-      this.houseType = '1'
-      this.purpose = '1'
-      this.rentFlag = 1
       this.dataForm = {
-        neighborHoodId: '', // 所属小区ID
-        buildingId: '',//所属楼栋ID
-        buildingUnitId: '',//所属单元ID	
-        doorName: '',//门牌号	
-        houseType: '1',//房屋类型【楼房，平房，别墅】		
-        purpose: '1',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】		
-        rentFlag: 1,//是否出租【是：1，否：0】		
-        ownerPhone: '', //房主电话	
-        ownerName: '', //房主名字		
-        ownerIdCard: '' //房主身份证	
+        icUserId: '', // 被调动人ID	
+        type: 'in',//操作类型【客户外out,客户内in】	
+        newAgencyId: '',//调动到的组织Id		
+        newGridId: '',//调动到的网格Id		
+        newNeighborHoodId: '',//调动到的小区ID			
+        newBuildingId: '',//调动到的楼宇Id			
+        newBuildingUnitId: '',//调动到的单元Id			
+        newHouseId: '', //调动到的房屋Id		
+        transferTime: '', //调动时间【日期类型】			
+        remark: '' //备注		
       }
 
+      this.staffId = ''//工作人员id
+      this.userId = ''//操作人员id
+      this.gridName = ''
+      this.rootAgency = {}
+
+      this.selGrid = {}
+
     },
     // 开启加载动画
     startLoading () {
@@ -294,30 +429,16 @@ export default {
   computed: {
     dataRule () {
       return {
-        buildingUnitId: [
-          { required: true, message: '所属单元不能为空', trigger: 'blur' },
-        ],
-        doorName: [
-          { required: true, message: '门牌号不能为空', trigger: 'blur' }
-        ],
-        houseType: [
-          { required: true, message: '房屋类型不能为空', trigger: 'blur' }
-        ],
-        purpose: [
-          { required: true, message: '房屋用途不能为空', trigger: 'blur' }
+        type: [
+          { required: true, message: '操作类型不能为空', trigger: 'blur' },
         ],
-        rentFlag: [
-          { required: true, message: '是否出租不能为空', trigger: 'blur' }
+        newAgencyId: [
+          { required: true, message: '所选组织不能为空', trigger: 'blur' }
         ],
-        ownerPhone: [
-          { required: true, message: '房主电话不能为空', trigger: 'blur' }
-        ],
-        ownerName: [
-          { required: true, message: '房主姓名不能为空', trigger: 'blur' }
-        ],
-        ownerIdCard: [
-          { required: true, message: '房主身份证号不能为空', trigger: 'blur' }
+        newNeighborHoodId: [
+          { required: true, message: '所属家庭不能为空', trigger: 'blur' }
         ],
+
       }
     },
 
@@ -327,7 +448,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .item_width_1 {
-  width: 500px;
+  width: 150px;
 }
 .item_width_2 {
   width: 400px;
@@ -341,15 +462,14 @@ export default {
   display: flex;
   justify-content: flex-end;
 }
-.el-tabs {
-  margin: 0 20px;
-}
-.el-upload__tip {
-  color: rgb(155, 155, 155);
-  margin: 0;
+.resi-cell-col {
+  width: 750px;
+  display: flex;
+  justify-content: start;
 }
-.form {
-  margin-top: 30px;
+
+.margin_left10 {
+  margin-left: 10px;
 }
 </style>
 <style>
diff --git a/src/views/main.vue b/src/views/main.vue
index 5129af680..f452d699d 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -1,8 +1,7 @@
 <template>
-  <div
-    v-loading.fullscreen.lock="loading"
-    :element-loading-text="$t('loading')"
-    :class="[
+  <div v-loading.fullscreen.lock="loading"
+       :element-loading-text="$t('loading')"
+       :class="[
       'aui-wrapper',
       { 'aui-sidebar--fold': $store.state.sidebarFold },
       {
@@ -10,16 +9,14 @@
           $store.state.sidebarActiveSubMenuList.length == 0,
       },
       { 'z-iframe': $store.state.inIframe },
-    ]"
-  >
+    ]">
     <template v-if="!loading">
-      <main-navbar ref="ref_navbar" v-if="!$store.state.inIframe" />
+      <main-navbar ref="ref_navbar"
+                   v-if="!$store.state.inIframe" />
       <main-sidebar v-if="!$store.state.inIframe" />
       <div class="aui-content__wrapper">
-        <main-content
-          v-if="!$store.state.contentIsNeedRefresh"
-          @changeCustomerName="changeCustomerName"
-        />
+        <main-content v-if="!$store.state.contentIsNeedRefresh"
+                      @changeCustomerName="changeCustomerName" />
       </div>
       <main-theme-tools v-if="!$store.state.inIframe" />
     </template>
@@ -36,10 +33,10 @@ import { mapGetters } from "vuex";
 import nextTick from "dai-js/tools/nextTick";
 
 export default {
-  provide() {
+  provide () {
     return {
       // 刷新
-      refresh() {
+      refresh () {
         this.$store.state.contentIsNeedRefresh = true;
         this.$nextTick(() => {
           this.$store.state.contentIsNeedRefresh = false;
@@ -47,7 +44,7 @@ export default {
       },
     };
   },
-  data() {
+  data () {
     return {
       loading: true,
       userType: localStorage.getItem("userType"),
@@ -63,7 +60,7 @@ export default {
   watch: {
     $route: "routeHandle",
   },
-  async created() {
+  async created () {
     this.windowResizeHandle();
     this.routeHandle(this.$route);
     if (localStorage.getItem("userType") === "work") {
@@ -78,11 +75,11 @@ export default {
   },
   computed: {},
   methods: {
-    changeCustomerName(customerName) {
+    changeCustomerName (customerName) {
       this.$refs["ref_navbar"].changeCustomerName(customerName);
     },
     // 窗口改变大小
-    windowResizeHandle() {
+    windowResizeHandle () {
       this.$store.state.sidebarFold =
         document.documentElement["clientWidth"] <= 992 || false;
       window.addEventListener(
@@ -94,7 +91,7 @@ export default {
       );
     },
     // 路由, 监听
-    routeHandle(route) {
+    routeHandle (route) {
       if (!route.meta.isTab) {
         return false;
       }
@@ -117,7 +114,7 @@ export default {
       this.$store.state.contentTabsActiveName = tab.name;
       this.syncLevelOneMenuActive(tab.menuId);
     },
-    async syncLevelOneMenuActive(menuId) {
+    async syncLevelOneMenuActive (menuId) {
       await nextTick();
       console.log(
         "*******************************",
@@ -140,7 +137,7 @@ export default {
         idx !== -1 ? this.$store.state.sidebarMenuList[idx].children : [];
     },
     // 获取当前管理员信息
-    getUserInfo() {
+    getUserInfo () {
       const url = "/epmetuser/operuser/queryOperUserDto";
 
       return this.$http
@@ -156,10 +153,10 @@ export default {
           this.$store.state.user.gender = data.gender;
           localStorage.setItem("customerId", "");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     // 获取当前管理员信息
-    getWorkUserInfo() {
+    getWorkUserInfo () {
       const url = "/epmetuser/customerstaff/staffbasicinfo";
       let params = {};
       window.app.ajax.post(
@@ -174,6 +171,7 @@ export default {
           // this.$store.state.user.gender = data.gender
           localStorage.setItem("roleList", data.roleList);
           localStorage.setItem("customerId", data.customerId);
+          localStorage.setItem("staffId", data.id);
           // this.$store.state.user.roleList = data.roleList
           // this.$store.state.user.customerId = data.customerId
         },
diff --git a/src/views/modules/base/category/addCategory.vue b/src/views/modules/base/category/addCategory.vue
index f84c1a517..181c32fe8 100644
--- a/src/views/modules/base/category/addCategory.vue
+++ b/src/views/modules/base/category/addCategory.vue
@@ -67,8 +67,9 @@ export default {
   },
   methods: {
     async initData () {
+      this.startLoading()
       await this.getDefaultCategoryList()
-
+      this.endLoading()
       this.addList = [...this.categoryList]
       this.addList.pop()
     },
diff --git a/src/views/modules/base/category/main.vue b/src/views/modules/base/category/main.vue
index 10a35729e..a1d3fcf97 100644
--- a/src/views/modules/base/category/main.vue
+++ b/src/views/modules/base/category/main.vue
@@ -71,7 +71,9 @@ export default {
     }
   },
   async mounted () {
-    this.getCategoryList()
+    this.startLoading()
+    await this.getCategoryList()
+    this.endLoading()
 
   },
   methods: {
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 9b2ec8934..ef67f6b68 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -56,7 +56,7 @@
         <el-table-column fixed="right"
                          label="操作"
                          align="center"
-                         width="120">
+                         width="150">
           <template slot-scope="scope">
             <el-button @click="handleLook(scope.row)"
                        type="text"
@@ -194,25 +194,40 @@
                width="950px"
                top="5vh"
                @closed="diaClose">
-      <resi-transfer ref="ref_transfer"></resi-transfer>
+      <resi-transfer ref="ref_transfer"
+                     @dialogCancle="transferClose"></resi-transfer>
+    </el-dialog>
+
+    <!-- 变更记录 -->
+    <el-dialog :visible.sync="changeRecordShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'变更记录'"
+               width="1150px"
+               top="5vh"
+               @closed="diaClose">
+      <resi-change-record ref="ref_changerecord"></resi-change-record>
     </el-dialog>
 
   </div>
 </template>
 
 <script>
+import nextTick from 'dai-js/tools/nextTick'
 import resiSearch from '../../components/resiSearch.vue'
 import resiForm from '../../components/resiForm.vue'
 import editResi from '../../components/editResi.vue'
 import axios from 'axios'
 import resiTransfer from '../../components/resiTransfer.vue'
+import resiChangeRecord from '../../components/resiChangeRecord.vue'
 
 export default {
   components: {
     resiSearch,
     resiForm,
     editResi,
-    resiTransfer
+    resiTransfer,
+    resiChangeRecord
   },
   data () {
     return {
@@ -288,12 +303,20 @@ export default {
   methods: {
 
     //调动
-    handleTransfer (row) {
+    async handleTransfer (row) {
       this.tranferShow = true
+
+      await nextTick(200)
+
+      this.$refs.ref_transfer.initForm(row)
     },
     //变更记录
-    handleChangeRecord (row) {
+    async handleChangeRecord (row) {
       this.changeRecordShow = true
+
+      await nextTick(200)
+
+      this.$refs.ref_changerecord.initForm(row)
     },
 
     diaClose () {
@@ -301,6 +324,10 @@ export default {
       this.changeRecordShow = false
     },
 
+    transferClose () {
+      this.tranferShow = false
+      this.getTableData()
+    },
     computedWidth (label) {
       const wd = 20 * label.length
       return wd > 80 ? wd : 80
diff --git a/src/views/modules/communityParty/regionalParty/finishList.vue b/src/views/modules/communityParty/regionalParty/finishList.vue
index 49cf233ed..1a142037d 100644
--- a/src/views/modules/communityParty/regionalParty/finishList.vue
+++ b/src/views/modules/communityParty/regionalParty/finishList.vue
@@ -122,11 +122,13 @@
                          min-width="150">
           <template slot-scope="scope">
             <div v-if="scope.row.isEdit">
-              <el-input-number class="item_width_1"
+              <el-input class="item_width_2"
+                        v-model.trim="scope.row.score"></el-input>
+              <!-- <el-input-number class="item_width_1"
                                v-model="scope.row.score"
                                :precision="1"
                                :step="0.1"
-                               :max="100"></el-input-number>
+                               :max="100"></el-input-number> -->
             </div>
             <span v-else>{{scope.row.score}}</span>
           </template>
@@ -338,7 +340,7 @@ export default {
         timeShow: '',
         status: '',
         unitId: '',
-        score: 0.0
+        score: null
       }
       this.tableData.push(obj)
     },