From 9c972450ac7e4aee8368ba50157858c4a236dd1a Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 20 Jan 2022 13:42:54 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E5=88=86=E7=B1=BB=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/img/add.png                        | Bin 0 -> 618 bytes
 .../scss/modules/management/categoryMain.scss |  81 ++++
 src/views/modules/base/category/main.vue      | 382 ++++++++++++++++++
 3 files changed, 463 insertions(+)
 create mode 100644 src/assets/img/add.png
 create mode 100644 src/assets/scss/modules/management/categoryMain.scss
 create mode 100644 src/views/modules/base/category/main.vue

diff --git a/src/assets/img/add.png b/src/assets/img/add.png
new file mode 100644
index 0000000000000000000000000000000000000000..59a8922f7e7532587230d7b994ed15283af9dcc0
GIT binary patch
literal 618
zcmV-w0+s!VP)<h;3K|Lk000e1NJLTq001ih001ip1^@s6;azdS00001b5ch_0Itp)
z=>Px%BuPX;R9Hvtncr*EP!z|{x%shlYiev6!YT}{WxBoj1H=dafC;jv;s4>Ye}eu8
z;+u#}P+^Qc`5*Ww+O6A5GpdNBsomD><{n9H!G}=p4bgV?-iHLj_vU=^z2}~g9E9Qc
z<OerR!gWBb0nps&`sB`Z0%#m?ig#A4-p7Oklfzys*d)Y_$$^cJj6`qim%Z1xf7H7r
zh(DfI&=D6y^C>o3ohN{BW7=T};4?P-@WpiG=y<z`Ai{><c{%N_j`%d}-&!f{tadhe
zgUxg`U;uE@b*`R9Jm~fLk33T%cW2A4bEV?icZrA}eC@sw0z_WGxx-dmr(SmL+W<g^
z?Vnp*2(DrCa6mgdbn*Ys*@A6&rfJw|X;XBJYSFQ-CmXCCoPJ2oX}Xh$2b_yYCH0h@
z^@{fLV#&Fu5+qG41RXcq-FGVYQHCweTT7R`!u`?rn@X@hwOmkm*zRtt%vXj@Zf==u
z-eSy33*;8e<<f$^mMnkkdv6y3Q(p@Gv$z)%Db?Uiu;bj&rE6wNmretTvM}2ltX#CO
zRZ7ks01(Zia7zHh5~fK>a(9+7#wrVTtsjd{cpQC`qL38j4l5ZqlT5>AvQ1)=c2>fq
zOcL#ECfg(?;hrBpC!m6acA}Esf4<LCPvN|DYeY=X27RzEe&-PaJe=q{j|oly?^mi9
zUJYQAG3YQd;{nB@h6t&j+5hrk203c5CW?5wKI}050@XEh52AL^-~a#s07*qoM6N<$
Ef^EzxD*ylh

literal 0
HcmV?d00001

diff --git a/src/assets/scss/modules/management/categoryMain.scss b/src/assets/scss/modules/management/categoryMain.scss
new file mode 100644
index 00000000..9bda62e4
--- /dev/null
+++ b/src/assets/scss/modules/management/categoryMain.scss
@@ -0,0 +1,81 @@
+.div_main {
+  box-sizing: border-box;
+  height: 100%;
+  width: 100%;
+  background: #ffffff;
+  border-radius: 5px;
+  padding: 35px 0;
+
+  .div_tip {
+    font-size: 24px;
+    font-family: PingFang SC;
+    font-weight: bold;
+    color: #333333;
+    margin-left: 42px;
+  }
+  .div_room_bar {
+    box-sizing: border-box;
+    margin-top: 5px;
+    height: calc(100vh - 230px);
+  }
+
+  .div_room {
+    // height: calc(88vh - 40px);
+    // margin-top: 9px;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+    margin-left: 42px;
+    // margin: 0 21px 0 21px;
+
+    .item {
+      width: 340px;
+      height: 120px;
+      background: #ffffff;
+      box-shadow: 0px 0px 17px 3px #eaeaea;
+      border-radius: 6px;
+      margin-top: 30px;
+      display: flex;
+
+      .item_category {
+        display: flex;
+        align-items: center;
+        padding: 17px 16px;
+        > img {
+          width: 86px;
+          height: 86px;
+        }
+      }
+
+      .item_add {
+        font-size: 24px;
+        font-family: PingFang SC;
+        font-weight: 500;
+        color: #333333;
+        line-height: 350px;
+        display: flex;
+        align-items: center;
+        padding: 17px 16px;
+
+        > img {
+          width: 86px;
+          height: 86px;
+        }
+
+        > span {
+          font-size: 24px;
+          font-family: PingFang SC;
+          font-weight: 500;
+          color: #333333;
+          line-height: 350px;
+          margin-left: 16px;
+        }
+      }
+    }
+  }
+
+  .div_room::after {
+    content: '';
+    flex: 1;
+  }
+}
diff --git a/src/views/modules/base/category/main.vue b/src/views/modules/base/category/main.vue
new file mode 100644
index 00000000..7e8900de
--- /dev/null
+++ b/src/views/modules/base/category/main.vue
@@ -0,0 +1,382 @@
+<template>
+
+  <div class="div_main">
+    <div class="div_tip">
+      类别信息
+    </div>
+    <div class="div_room_bar">
+      <el-scrollbar style="height:100%">
+        <div class="div_room">
+
+          <div v-for="(item,index) in categoryList"
+               :key="index"
+               class="item"
+               @click="handleClickRoom(index)">
+            <div v-if="index==(categoryList.length-1)"
+                 class="item_add">
+
+              <img :src="item.managementIcon"
+                   alt />
+              <span>{{item.columnName}}</span>
+
+            </div>
+            <div v-else
+                 class="item_category">
+              <img :src="item.managementIcon"
+                   alt />
+
+              <div class="item_content">
+                <span class="item_count">{{item.count}}</span>
+                <span class="item_name">{{item.columnName}}</span>
+              </div>
+              <span>{{item.columnName}}</span>
+            </div>
+
+          </div>
+
+        </div>
+      </el-scrollbar>
+    </div>
+  </div>
+
+</template>
+
+<script>
+import { mapGetters } from "vuex";
+import { Loading } from 'element-ui'; //引入Loading服务
+import { requestPost } from "@/js/dai/request";
+
+let loading;//加载动画
+
+export default {
+
+  data () {
+    return {
+      //父组件传过来的小区id
+      neighborHoodId: '',
+      neighborHoodName: '',
+      buildingArray: [],//楼栋下拉框数据
+      selBuildingId: '',
+      selBuildingName: '',
+
+
+      roomArray: [],
+      selHouseId: '',
+      selHouseName: '',
+      selHouseIndex: 0,
+
+      userArray: [],
+      selUserName: '',
+      selUserId: '',
+
+      orgData: {},//当前组织对象
+      orgId: '',
+      orgLevel: '',
+
+      //下钻层级记录
+      runNum: 0,
+      runAgencyArray: [],
+
+      categoryList: []
+
+    }
+  },
+  async mounted () {
+    this.getCategoryList()
+
+  },
+  methods: {
+    //获取分类信息
+    async getCategoryList () {
+      const url = "/oper/customize/icindividualcategorymanage/individualcategorylist"
+
+      let params = {}
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.categoryList = data
+        let obj = {
+          managementIcon: require('@/assets/img/add.png'),
+          columnName: '新建分类'
+        }
+        this.categoryList.push(obj)
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    //选择房间
+    handleClickRoom (index) {
+      this.selHouseIndex = index
+      this.selHouseId = this.roomArray[index].houseId
+      this.selHouseName = this.roomArray[index].houseName
+
+      // this.$emit('refreshInfoList', this.selHouseId, 'room')
+    },
+
+
+    //点击用户
+    handleClickUser (userId) {
+      this.$emit('toSubAgency', 'people', userId, "")
+    },
+    //获取右侧infolist数据
+    async loadList () {
+
+    },
+
+    //加载楼栋数据
+    async loadBuilding () {
+      const url = "/gov/org/agency/baseinfofamilybuilding"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/agency/baseinfofamilybuilding"
+      let params = {
+        neighborHoodId: this.neighborHoodId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.buildingArray = data
+        this.buildingArray.forEach(item => {
+          if (!this.buildingArray[0].buildingName) {
+            item.buildingName = '楼'
+          }
+
+        });
+        if (this.buildingArray.length > 0) {
+          this.selBuildingId = this.buildingArray[0].buildingId
+          this.selBuildingName = this.buildingArray[0].buildingName
+
+        } else {
+          this.selBuildingId = ''
+          this.selBuildingName = ''
+        }
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    //加载房间数据
+    async loadRoom () {
+      const url = "/gov/org/ichouse/houselist"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/ichouse/houselist"
+      let params = {
+        buildingId: this.selBuildingId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.roomArray = data
+
+        if (this.roomArray.length > 0) {
+
+          this.roomArray.forEach(roomItem => {
+            let iconArrayShow = JSON.parse(JSON.stringify(roomItem.categoryList))
+            let iconArray = []
+
+            if (iconArrayShow.length > 0) {
+              if (iconArrayShow[0].isSpecial === '1') {//第一个图标是党员
+                roomItem.isParty = true
+                roomItem.partyUrl = iconArrayShow[0].iconUrl
+                iconArrayShow.shift();//删除第一个数据
+              } else {
+                roomItem.isParty = false
+              }
+            }
+            if (iconArrayShow.length > 4) {//去前四个
+              for (let i = 0; i < 4; i++) {
+                iconArray.push(iconArrayShow[i])
+              }
+            } else {
+              iconArray = iconArrayShow
+            }
+            this.$nextTick(() => {
+              // ref_tree 元素的ref   value 绑定的node-key
+              roomItem.iconArrayShow = iconArray
+            });
+
+            roomItem.showAllUser = false
+
+          });
+
+        }
+
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    //加载成员数据
+    async loadUser (houseId, index) {
+      const url = "/epmetuser/icresiuser/getpeoplebyroom"
+      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icresiuser/getpeoplebyroom"
+      let params = {
+        homeId: houseId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.userArray = data
+        if (this.userArray.length === 0) {
+          this.$message.warning('该房间下没有住户')
+        }
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+
+    //开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, //是否锁定
+        text: '正在加载……', //加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' //背景颜色
+      });
+
+    },
+
+    //结束加载动画
+    endLoading () {
+      //clearTimeout(timer);
+      if (loading) {
+        loading.close();
+      }
+    },
+  },
+  props: {
+
+  },
+  computed: {
+    // selectWidth () {
+    //   let width = this.selHouseName.length * 200
+    //   console.log(width)
+    //   return width + 'px';
+    // },
+
+    mapHeight () {
+
+      return this.clientHeight - 120;
+
+    },
+    // zoom: {
+    //   get () {
+    //     //根据不同屏幕分辨率，控制zoom大小
+    //     if (this.clientHeight < 900) {
+    //       return 2.3
+    //     } else {
+    //       return 2.8
+    //     }
+    //   },
+    //   set (value) {
+    //   }
+    // },
+    ...mapGetters(["clientHeight"])
+
+  },
+  components: {},
+}
+
+</script>
+
+<style
+  lang="scss"
+  src="@/assets/scss/modules/management/categoryMain.scss"
+  scoped
+></style>
+
+<style lang=scss scoped>
+.customer_select {
+  /* 未选中任何选项的时候 placeholder的样式 需要先选中父元素 增加权重 */
+  /deep/ input::-webkit-input-placeholder {
+    color: #fff;
+  }
+  /deep/ input::-moz-input-placeholder {
+    color: #fff;
+  }
+  /deep/ input::-ms-input-placeholder {
+    color: #fff;
+  }
+
+  /* 修改的是el-input的样式 */
+  /* 一种方法是设置最里层el-input__inner的背景色 外层的两级父元素设置为透明色 */
+  /* 另一种方法是从el-select到el-input__inenr的背景色都设置为需要的颜色 */
+  /deep/ .el-select,
+  /deep/ .el-input,
+  /deep/ .el-input__inner {
+    background-color: #08164d00;
+    color: #fff;
+    border: 0px;
+    border-radius: 0px;
+    text-align: left;
+    font-size: 22px;
+    font-family: PingFang SC;
+    font-weight: 800;
+    color: #ffffff;
+    display: flex;
+  }
+
+  /* el-input聚焦的时候 外层的border会有一个样式 */
+  /deep/ .el-select .el-input.is-focus .el-input__inner {
+    border: 0px;
+  }
+
+  /* 修改的是el-input上下的小图标的颜色 */
+  /deep/ .el-select .el-input .el-select__caret::before {
+    color: #fff;
+    content: "";
+    background: url("../../../../assets/img/xiala.png") center center no-repeat;
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+  }
+
+  /* 修改总体选项的样式 最外层 */
+  /deep/ .el-select-dropdown {
+    background-color: #08164d;
+    margin: 0px;
+    border: 0px;
+    border-radius: 0px;
+  }
+
+  /* 修改选项整体的样式 */
+  /deep/ .el-select-dropdown__list {
+    padding: 6px 0 20px 0;
+  }
+  /* 修改单个的选项的样式 */
+  /deep/ .el-select-dropdown__item {
+    background-color: transparent;
+    color: #fff;
+  }
+
+  /* item选项的hover样式 */
+  /deep/ .el-select-dropdown__item.hover,
+  /deep/ .el-select-dropdown__item:hover {
+    color: #409eff;
+  }
+
+  /* 修改的是下拉框选项内容上方的尖角 */
+  /deep/ .el-popper .popper__arrow,
+  .el-popper .popper__arrow::after {
+    display: none;
+  }
+}
+</style> 
+
+<style lang=scss >
+.el-scrollbar__wrap {
+  overflow-x: hidden !important;
+}
+</style>
\ No newline at end of file

From 323f6e8b940f135f5e276274f162439e76044b7c Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 20 Jan 2022 13:59:02 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E4=BA=8B=E9=A1=B9api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/modules/management/categoryMain.scss | 12 ++++++++++++
 src/views/modules/base/category/main.vue             | 10 +++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/assets/scss/modules/management/categoryMain.scss b/src/assets/scss/modules/management/categoryMain.scss
index 9bda62e4..0335afef 100644
--- a/src/assets/scss/modules/management/categoryMain.scss
+++ b/src/assets/scss/modules/management/categoryMain.scss
@@ -45,6 +45,18 @@
           width: 86px;
           height: 86px;
         }
+        .item_content {
+          margin-left: 16px;
+          text-align: left;
+
+          .item_count {
+            margin-top: 29px;
+            font-size: 28px;
+            font-family: PingFang SC;
+            font-weight: bold;
+            color: #333333;
+          }
+        }
       }
 
       .item_add {
diff --git a/src/views/modules/base/category/main.vue b/src/views/modules/base/category/main.vue
index 7e8900de..b647612e 100644
--- a/src/views/modules/base/category/main.vue
+++ b/src/views/modules/base/category/main.vue
@@ -17,7 +17,7 @@
 
               <img :src="item.managementIcon"
                    alt />
-              <span>{{item.columnName}}</span>
+              <span>{{item.label}}</span>
 
             </div>
             <div v-else
@@ -26,10 +26,10 @@
                    alt />
 
               <div class="item_content">
-                <span class="item_count">{{item.count}}</span>
-                <span class="item_name">{{item.columnName}}</span>
+                <div class="item_count">{{item.count}}</div>
+                <div class="item_name">{{item.columnName}}</div>
               </div>
-              <span>{{item.columnName}}</span>
+              <span>{{item.label}}</span>
             </div>
 
           </div>
@@ -98,7 +98,7 @@ export default {
         this.categoryList = data
         let obj = {
           managementIcon: require('@/assets/img/add.png'),
-          columnName: '新建分类'
+          label: '新建分类'
         }
         this.categoryList.push(obj)
 

From 54b3d0838cb56111220515dd98c6f48365442dc8 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 20 Jan 2022 13:59:11 +0800
Subject: [PATCH 3/9] 11

---
 .../modules/communityParty/regionalParty/activitys.vue      | 6 +++---
 src/views/modules/communityParty/regionalParty/units.vue    | 2 +-
 src/views/modules/visual/communityParty/community.vue       | 5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/communityParty/regionalParty/activitys.vue b/src/views/modules/communityParty/regionalParty/activitys.vue
index 18f9d315..7b85862d 100644
--- a/src/views/modules/communityParty/regionalParty/activitys.vue
+++ b/src/views/modules/communityParty/regionalParty/activitys.vue
@@ -337,11 +337,11 @@ export default {
 
     //获取服务事项下拉框
     async loadService () {
-      const url = "/heart/icresidemanddict/subcodelist"
-      // const url = "http://yapi.elinkservice.cn/mock/245/heart/icresidemanddict/subcodelist"
+      const url = "/heart/serviceitem/dict-list"
+
 
       let params = {
-        parentCategoryCode: '1010'
+        // parentCategoryCode: '1010'
       }
 
       const { data, code, msg } = await requestPost(url, params)
diff --git a/src/views/modules/communityParty/regionalParty/units.vue b/src/views/modules/communityParty/regionalParty/units.vue
index 5dc1df91..2119e59f 100644
--- a/src/views/modules/communityParty/regionalParty/units.vue
+++ b/src/views/modules/communityParty/regionalParty/units.vue
@@ -375,7 +375,7 @@ export default {
     //获取服务事项下拉框
     async loadService () {
       const url = "/heart/serviceitem/dict-list"
-      // const url = "http://yapi.elinkservice.cn/mock/245/heart/icresidemanddict/subcodelist"
+
 
       let params = {
         // parentCategoryCode: '1010'
diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue
index 77342bb7..01da97c1 100644
--- a/src/views/modules/visual/communityParty/community.vue
+++ b/src/views/modules/visual/communityParty/community.vue
@@ -424,11 +424,10 @@ export default {
       return y + '-' + m + '-' + d + ' 00:00:00'
     },
     async loadUnit () {
-      const url = "/heart/icresidemanddict/subcodelist"
-      // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/option"
+      const url = "/heart/serviceitem/dict-list"
 
       let params = {
-        parentCategoryCode: '1010'
+
       }
 
       const { data, code, msg } = await requestPost(url, params)

From 756abbbe004dad4952e7f2a313a94e430308150b Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 20 Jan 2022 16:23:17 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E5=88=86=E7=B1=BB=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scss/modules/management/categoryMain.scss | 194 +++++---
 .../modules/base/category/addCategory.vue     | 202 ++++++++
 src/views/modules/base/category/main.vue      | 326 +++----------
 src/views/modules/base/resi.vue               | 443 +++++++++---------
 4 files changed, 611 insertions(+), 554 deletions(-)
 create mode 100644 src/views/modules/base/category/addCategory.vue

diff --git a/src/assets/scss/modules/management/categoryMain.scss b/src/assets/scss/modules/management/categoryMain.scss
index 0335afef..e5135aad 100644
--- a/src/assets/scss/modules/management/categoryMain.scss
+++ b/src/assets/scss/modules/management/categoryMain.scss
@@ -4,90 +4,154 @@
   width: 100%;
   background: #ffffff;
   border-radius: 5px;
-  padding: 35px 0;
-
-  .div_tip {
-    font-size: 24px;
-    font-family: PingFang SC;
-    font-weight: bold;
-    color: #333333;
-    margin-left: 42px;
-  }
-  .div_room_bar {
-    box-sizing: border-box;
-    margin-top: 5px;
-    height: calc(100vh - 230px);
-  }
+  padding: 35px 0 15px;
+}
+.div_tip {
+  font-size: 24px;
+  font-family: PingFang SC;
+  font-weight: bold;
+  color: #333333;
+  margin-left: 42px;
+}
+.div_list {
+  box-sizing: border-box;
+  margin-top: 5px;
+  height: calc(100vh - 210px);
+}
 
-  .div_room {
-    // height: calc(88vh - 40px);
-    // margin-top: 9px;
+.div_all_list {
+  height: calc(100vh - 260px);
+}
+
+.div_room {
+  // height: calc(88vh - 40px);
+  // margin-top: 9px;
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  margin-left: 42px;
+  // margin: 0 21px 0 21px;
+
+  .item {
+    width: 340px;
+    height: 120px;
+    background: #ffffff;
+    box-shadow: 0px 0px 17px 3px #eaeaea;
+    border-radius: 6px;
+    margin: 15px 25px 15px 0;
     display: flex;
-    flex-wrap: wrap;
-    justify-content: flex-start;
-    margin-left: 42px;
-    // margin: 0 21px 0 21px;
-
-    .item {
-      width: 340px;
-      height: 120px;
-      background: #ffffff;
-      box-shadow: 0px 0px 17px 3px #eaeaea;
-      border-radius: 6px;
-      margin-top: 30px;
-      display: flex;
+    position: relative;
 
-      .item_category {
+    .item_category {
+      width: 100%;
+      display: flex;
+      align-items: center;
+      padding: 17px 16px;
+      > img {
+        width: 86px;
+        height: 86px;
+      }
+      .item_content {
+        margin-left: 16px;
+        width: 100%;
+        text-align: left;
         display: flex;
-        align-items: center;
-        padding: 17px 16px;
-        > img {
-          width: 86px;
-          height: 86px;
+        flex-direction: column;
+        justify-content: flex-start;
+
+        .item_count {
+          font-size: 28px;
+          font-family: PingFang SC;
+          font-weight: bold;
+          color: #333333;
         }
-        .item_content {
-          margin-left: 16px;
-          text-align: left;
+        .item_row2 {
+          margin-top: 21px;
+          display: flex;
+          justify-content: space-between;
+
+          .row_left {
+            font-size: 20px;
+            font-family: PingFang SC;
+            font-weight: 500;
+            color: #202020;
+          }
 
-          .item_count {
-            margin-top: 29px;
-            font-size: 28px;
+          .row_right {
+            margin: 5px 10px 0 0;
+            font-size: 16px;
             font-family: PingFang SC;
-            font-weight: bold;
-            color: #333333;
+            font-weight: 500;
+            text-decoration: underline;
+            color: #00a7a9;
+            cursor: pointer;
           }
         }
       }
 
-      .item_add {
+      > span {
+        margin-left: 16px;
+        font-size: 24px;
+      }
+    }
+
+    .item_add {
+      cursor: pointer;
+      font-size: 24px;
+      font-family: PingFang SC;
+      font-weight: 500;
+      color: #333333;
+      display: flex;
+      align-items: center;
+      padding: 17px 16px;
+
+      > img {
+        width: 86px;
+        height: 86px;
+      }
+
+      > span {
         font-size: 24px;
         font-family: PingFang SC;
         font-weight: 500;
         color: #333333;
-        line-height: 350px;
-        display: flex;
-        align-items: center;
-        padding: 17px 16px;
-
-        > img {
-          width: 86px;
-          height: 86px;
-        }
 
-        > span {
-          font-size: 24px;
-          font-family: PingFang SC;
-          font-weight: 500;
-          color: #333333;
-          line-height: 350px;
-          margin-left: 16px;
-        }
+        margin-left: 16px;
       }
     }
+
+    .icon_circle {
+      cursor: pointer;
+      position: absolute;
+      top: -10px;
+      right: -10px;
+      height: 23px;
+      width: 23px;
+      background-color: #ffffff;
+      border-radius: 50%;
+      border: 1px solid #a5a5a5;
+    }
+
+    .icon_sel {
+      cursor: pointer;
+      background-color: #6bb9f8;
+      border: 1px solid #6bb9f8;
+    }
   }
+}
+
+.div_room::after {
+  content: '';
+  flex: 1;
+}
+
+.div_btn {
+  margin-top: 15px;
+  display: flex;
+  width: 100%;
+  justify-content: center;
 
-  .div_room::after {
-    content: '';
-    flex: 1;
+  .btn_right {
+    margin-left: 50px;
   }
 }
diff --git a/src/views/modules/base/category/addCategory.vue b/src/views/modules/base/category/addCategory.vue
new file mode 100644
index 00000000..f84c1a51
--- /dev/null
+++ b/src/views/modules/base/category/addCategory.vue
@@ -0,0 +1,202 @@
+<template>
+  <div>
+    <div class="div_tip">
+      全部类别
+    </div>
+
+    <div class="div_list div_all_list">
+      <el-scrollbar style="height:100%">
+        <div class="div_room">
+
+          <div v-for="(item,index) in defaultList"
+               :key="index"
+               class="item"
+               @click="handelSelCategory(index)">
+            <div v-if="item.selected"
+                 class="icon_circle icon_sel">
+              <!-- <icon name="el-icon-check"
+                    scale="20"></icon> -->
+              <i class="el-icon-check"
+                 style="font-size: 17px; color: #5d5d5d ;margin-left:1px;margin-top:2px" />
+            </div>
+            <div v-if="!item.selected"
+                 class="icon_circle"></div>
+
+            <div class="item_category">
+              <img :src="item.managementIcon"
+                   alt />
+              <span>{{item.label}}</span>
+            </div>
+
+          </div>
+
+        </div>
+      </el-scrollbar>
+
+    </div>
+    <div class="div_btn">
+      <el-button type="warning"
+                 @click="handleCancle">取消</el-button>
+      <el-button type="primary"
+                 class="btn_right"
+                 @click="handleConfirm">确定</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from "vuex";
+import { Loading } from 'element-ui'; //引入Loading服务
+import { requestPost } from "@/js/dai/request";
+
+
+let loading;//加载动画
+
+export default {
+
+  data () {
+    return {
+      defaultList: [],
+      addList: []
+
+    }
+  },
+  async mounted () {
+
+
+  },
+  methods: {
+    async initData () {
+      await this.getDefaultCategoryList()
+
+      this.addList = [...this.categoryList]
+      this.addList.pop()
+    },
+    //获取默认分类信息
+    async getDefaultCategoryList () {
+      const url = "/oper/customize/icindividualcategorymanage/individualcategoryalllist"
+      // const url = "http://yapi.elinkservice.cn/mock/245/oper/customize/icindividualcategorymanage/individualcategoryalllist"
+
+      let params = {}
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        // this.defaultList = []
+        this.defaultList = [...data]
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    handelSelCategory (index) {
+      let obj = JSON.parse(JSON.stringify(this.defaultList[index]))
+
+      if (!obj.selected) {//原状态不是选中状态，在数组最后添加
+        this.addList.push(obj)
+      } else {//原状态是选中状态，从数组里找到并去除
+        for (let itemIndex in this.addList) {
+          // debugger
+          let tempObj = this.addList[itemIndex]
+          if (obj.columnName === tempObj.columnName) {
+            this.addList.splice(itemIndex, 1);
+            break
+
+          }
+        }
+
+        this.addList.forEach(element => {
+          console.log(element.label)
+        });
+
+      }
+
+      obj.selected = !obj.selected
+      this.$set(this.defaultList, index, obj)
+
+    },
+
+    async handleConfirm () {
+      this.addList.forEach((element, index) => {
+        element.sort = index
+        element.columnId = element.id
+      });
+
+      const url = "/oper/customize/icindividualcategorymanage/editindividualcategory"
+
+
+      const { data, code, msg } = await requestPost(url, this.addList)
+
+      if (code === 0) {
+        this.$emit('handleConfirm')
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    handleCancle () {
+      this.$emit('handleCancle')
+    },
+
+
+
+    //开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, //是否锁定
+        text: '正在加载……', //加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' //背景颜色
+      });
+
+    },
+
+    //结束加载动画
+    endLoading () {
+      //clearTimeout(timer);
+      if (loading) {
+        loading.close();
+      }
+    },
+  },
+  props: {
+    categoryList: {
+      type: Array,
+      default () {
+        return []
+      }
+    }
+  },
+  computed: {
+    // selectWidth () {
+    //   let width = this.selHouseName.length * 200
+    //   console.log(width)
+    //   return width + 'px';
+    // },
+
+    mapHeight () {
+
+      return this.clientHeight - 120;
+
+    },
+
+    ...mapGetters(["clientHeight"])
+
+  },
+  components: {},
+}
+
+</script>
+
+<style
+  lang="scss"
+  src="@/assets/scss/modules/management/categoryMain.scss"
+  scoped
+></style>
+
+<style lang=scss >
+.el-scrollbar__wrap {
+  overflow-x: hidden !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/modules/base/category/main.vue b/src/views/modules/base/category/main.vue
index b647612e..10a35729 100644
--- a/src/views/modules/base/category/main.vue
+++ b/src/views/modules/base/category/main.vue
@@ -1,50 +1,64 @@
 <template>
 
   <div class="div_main">
-    <div class="div_tip">
-      类别信息
-    </div>
-    <div class="div_room_bar">
-      <el-scrollbar style="height:100%">
-        <div class="div_room">
+    <div v-if="!showAddForm">
+      <div class="div_tip">
+        类别信息
+      </div>
+      <div class="div_list">
+        <el-scrollbar style="height:100%">
+          <div class="div_room">
+
+            <div v-for="(item,index) in categoryList"
+                 :key="index"
+                 class="item">
+              <div v-if="index==(categoryList.length-1)"
+                   class="item_add"
+                   @click="handleAddCategory">
+
+                <img :src="item.managementIcon"
+                     alt />
+                <span>{{item.label}}</span>
+
+              </div>
+              <div v-else
+                   class="item_category">
+                <img :src="item.managementIcon"
+                     alt />
 
-          <div v-for="(item,index) in categoryList"
-               :key="index"
-               class="item"
-               @click="handleClickRoom(index)">
-            <div v-if="index==(categoryList.length-1)"
-                 class="item_add">
+                <div class="item_content">
+                  <div class="item_count">{{item.count}}</div>
 
-              <img :src="item.managementIcon"
-                   alt />
-              <span>{{item.label}}</span>
+                  <div class="item_row2">
+                    <div class="row_left">{{item.label}}</div>
+                    <div class="row_right"
+                         @click="toPersonList(item)">管理</div>
+                  </div>
+                </div>
 
-            </div>
-            <div v-else
-                 class="item_category">
-              <img :src="item.managementIcon"
-                   alt />
-
-              <div class="item_content">
-                <div class="item_count">{{item.count}}</div>
-                <div class="item_name">{{item.columnName}}</div>
               </div>
-              <span>{{item.label}}</span>
+
             </div>
 
           </div>
-
-        </div>
-      </el-scrollbar>
+        </el-scrollbar>
+      </div>
     </div>
+    <add-category v-if="showAddForm"
+                  ref="ref_add"
+                  :categoryList="categoryList"
+                  @handleCancle="handleCancle"
+                  @handleConfirm="handleConfirm"></add-category>
   </div>
 
 </template>
 
 <script>
 import { mapGetters } from "vuex";
+import nextTick from 'dai-js/tools/nextTick'
 import { Loading } from 'element-ui'; //引入Loading服务
 import { requestPost } from "@/js/dai/request";
+import addCategory from "./addCategory";
 
 let loading;//加载动画
 
@@ -52,33 +66,8 @@ export default {
 
   data () {
     return {
-      //父组件传过来的小区id
-      neighborHoodId: '',
-      neighborHoodName: '',
-      buildingArray: [],//楼栋下拉框数据
-      selBuildingId: '',
-      selBuildingName: '',
-
-
-      roomArray: [],
-      selHouseId: '',
-      selHouseName: '',
-      selHouseIndex: 0,
-
-      userArray: [],
-      selUserName: '',
-      selUserId: '',
-
-      orgData: {},//当前组织对象
-      orgId: '',
-      orgLevel: '',
-
-      //下钻层级记录
-      runNum: 0,
-      runAgencyArray: [],
-
-      categoryList: []
-
+      categoryList: [],
+      showAddForm: false,
     }
   },
   async mounted () {
@@ -107,134 +96,33 @@ export default {
       }
     },
 
-    //选择房间
-    handleClickRoom (index) {
-      this.selHouseIndex = index
-      this.selHouseId = this.roomArray[index].houseId
-      this.selHouseName = this.roomArray[index].houseName
+    async handleAddCategory () {
+      this.showAddForm = true
+      await nextTick(200)
 
-      // this.$emit('refreshInfoList', this.selHouseId, 'room')
+      this.$refs['ref_add'].initData()
     },
 
+    handleConfirm () {
+      this.showAddForm = false
 
-    //点击用户
-    handleClickUser (userId) {
-      this.$emit('toSubAgency', 'people', userId, "")
+      this.getCategoryList()
     },
-    //获取右侧infolist数据
-    async loadList () {
 
+    handleCancle () {
+      this.showAddForm = false
     },
 
-    //加载楼栋数据
-    async loadBuilding () {
-      const url = "/gov/org/agency/baseinfofamilybuilding"
-      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/agency/baseinfofamilybuilding"
-      let params = {
-        neighborHoodId: this.neighborHoodId
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.buildingArray = data
-        this.buildingArray.forEach(item => {
-          if (!this.buildingArray[0].buildingName) {
-            item.buildingName = '楼'
-          }
-
-        });
-        if (this.buildingArray.length > 0) {
-          this.selBuildingId = this.buildingArray[0].buildingId
-          this.selBuildingName = this.buildingArray[0].buildingName
-
-        } else {
-          this.selBuildingId = ''
-          this.selBuildingName = ''
+    toPersonList (item) {
+      this.$router.push({
+        path: "/main/base-resi",
+        query: {
+          columnName: item.columnName
         }
-
-      } else {
-        this.$message.error(msg)
-      }
+      })
 
     },
 
-    //加载房间数据
-    async loadRoom () {
-      const url = "/gov/org/ichouse/houselist"
-      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/ichouse/houselist"
-      let params = {
-        buildingId: this.selBuildingId
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.roomArray = data
-
-        if (this.roomArray.length > 0) {
-
-          this.roomArray.forEach(roomItem => {
-            let iconArrayShow = JSON.parse(JSON.stringify(roomItem.categoryList))
-            let iconArray = []
-
-            if (iconArrayShow.length > 0) {
-              if (iconArrayShow[0].isSpecial === '1') {//第一个图标是党员
-                roomItem.isParty = true
-                roomItem.partyUrl = iconArrayShow[0].iconUrl
-                iconArrayShow.shift();//删除第一个数据
-              } else {
-                roomItem.isParty = false
-              }
-            }
-            if (iconArrayShow.length > 4) {//去前四个
-              for (let i = 0; i < 4; i++) {
-                iconArray.push(iconArrayShow[i])
-              }
-            } else {
-              iconArray = iconArrayShow
-            }
-            this.$nextTick(() => {
-              // ref_tree 元素的ref   value 绑定的node-key
-              roomItem.iconArrayShow = iconArray
-            });
-
-            roomItem.showAllUser = false
-
-          });
-
-        }
-
-
-      } else {
-        this.$message.error(msg)
-      }
-
-    },
-
-    //加载成员数据
-    async loadUser (houseId, index) {
-      const url = "/epmetuser/icresiuser/getpeoplebyroom"
-      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icresiuser/getpeoplebyroom"
-      let params = {
-        homeId: houseId
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.userArray = data
-        if (this.userArray.length === 0) {
-          this.$message.warning('该房间下没有住户')
-        }
-
-      } else {
-        this.$message.error(msg)
-      }
-
-    },
-
-
     //开启加载动画
     startLoading () {
       loading = Loading.service({
@@ -268,22 +156,11 @@ export default {
       return this.clientHeight - 120;
 
     },
-    // zoom: {
-    //   get () {
-    //     //根据不同屏幕分辨率，控制zoom大小
-    //     if (this.clientHeight < 900) {
-    //       return 2.3
-    //     } else {
-    //       return 2.8
-    //     }
-    //   },
-    //   set (value) {
-    //   }
-    // },
+
     ...mapGetters(["clientHeight"])
 
   },
-  components: {},
+  components: { addCategory },
 }
 
 </script>
@@ -294,87 +171,6 @@ export default {
   scoped
 ></style>
 
-<style lang=scss scoped>
-.customer_select {
-  /* 未选中任何选项的时候 placeholder的样式 需要先选中父元素 增加权重 */
-  /deep/ input::-webkit-input-placeholder {
-    color: #fff;
-  }
-  /deep/ input::-moz-input-placeholder {
-    color: #fff;
-  }
-  /deep/ input::-ms-input-placeholder {
-    color: #fff;
-  }
-
-  /* 修改的是el-input的样式 */
-  /* 一种方法是设置最里层el-input__inner的背景色 外层的两级父元素设置为透明色 */
-  /* 另一种方法是从el-select到el-input__inenr的背景色都设置为需要的颜色 */
-  /deep/ .el-select,
-  /deep/ .el-input,
-  /deep/ .el-input__inner {
-    background-color: #08164d00;
-    color: #fff;
-    border: 0px;
-    border-radius: 0px;
-    text-align: left;
-    font-size: 22px;
-    font-family: PingFang SC;
-    font-weight: 800;
-    color: #ffffff;
-    display: flex;
-  }
-
-  /* el-input聚焦的时候 外层的border会有一个样式 */
-  /deep/ .el-select .el-input.is-focus .el-input__inner {
-    border: 0px;
-  }
-
-  /* 修改的是el-input上下的小图标的颜色 */
-  /deep/ .el-select .el-input .el-select__caret::before {
-    color: #fff;
-    content: "";
-    background: url("../../../../assets/img/xiala.png") center center no-repeat;
-    position: absolute;
-    width: 100%;
-    height: 100%;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-  }
-
-  /* 修改总体选项的样式 最外层 */
-  /deep/ .el-select-dropdown {
-    background-color: #08164d;
-    margin: 0px;
-    border: 0px;
-    border-radius: 0px;
-  }
-
-  /* 修改选项整体的样式 */
-  /deep/ .el-select-dropdown__list {
-    padding: 6px 0 20px 0;
-  }
-  /* 修改单个的选项的样式 */
-  /deep/ .el-select-dropdown__item {
-    background-color: transparent;
-    color: #fff;
-  }
-
-  /* item选项的hover样式 */
-  /deep/ .el-select-dropdown__item.hover,
-  /deep/ .el-select-dropdown__item:hover {
-    color: #409eff;
-  }
-
-  /* 修改的是下拉框选项内容上方的尖角 */
-  /deep/ .el-popper .popper__arrow,
-  .el-popper .popper__arrow::after {
-    display: none;
-  }
-}
-</style> 
-
 <style lang=scss >
 .el-scrollbar__wrap {
   overflow-x: hidden !important;
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 6a4af200..9c1404ef 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -1,203 +1,180 @@
 <template>
-  <div v-if="pageLoading" class="resi-container">
-    <resi-search
-      v-if="searchList.length > 0"
-      ref="resiSearch"
-      :form-list="searchList"
-      @search="handleSearch"
-    />
+  <div v-if="pageLoading"
+       class="resi-container">
+    <resi-search v-if="searchList.length > 0"
+                 ref="resiSearch"
+                 :form-list="searchList"
+                 @search="handleSearch" />
     <el-card class="resi-card-table">
       <div class="resi-row-btn">
-        <el-button type="success" size="small" @click="handleAdd">新增</el-button>
-        <el-button type="warning" size="small" :loading="exportBtn" @click="handleExport">{{exportBtnTitle}}</el-button>
+        <el-button type="success"
+                   size="small"
+                   @click="handleAdd">新增</el-button>
+        <el-button type="warning"
+                   size="small"
+                   :loading="exportBtn"
+                   @click="handleExport">{{exportBtnTitle}}</el-button>
         <!-- <el-button type="primary" size="small">下载人口模板</el-button> -->
-        <el-upload
-          ref="upload"
-          class="upload-demo"
-          action="uploadUlr"
-          :limit="1"
-          :with-credentials="true"
-          :show-file-list="false"
-          :auto-upload="true"
-          :on-progress="handleProgress"
-          :on-success="handleExcelSuccess"
-          :before-upload="beforeExcelUpload"
-          :http-request="uploadHttpRequest"
-          >
-          <el-button type="danger" size="small" :loading="importLoading">{{importBtnTitle}}</el-button>
+        <el-upload ref="upload"
+                   class="upload-demo"
+                   action="uploadUlr"
+                   :limit="1"
+                   :with-credentials="true"
+                   :show-file-list="false"
+                   :auto-upload="true"
+                   :on-progress="handleProgress"
+                   :on-success="handleExcelSuccess"
+                   :before-upload="beforeExcelUpload"
+                   :http-request="uploadHttpRequest">
+          <el-button type="danger"
+                     size="small"
+                     :loading="importLoading">{{importBtnTitle}}</el-button>
         </el-upload>
-        
+
       </div>
-      <el-table
-        :data="tableData"
-        v-loading="tableLoading"
-        border
-        style="width: 100%"
-        class="resi-table"
-      >
-        <el-table-column label="序号" type="index" align="center" width="50">
+      <el-table :data="tableData"
+                v-loading="tableLoading"
+                border
+                style="width: 100%"
+                class="resi-table">
+        <el-table-column label="序号"
+                         type="index"
+                         align="center"
+                         width="50">
         </el-table-column>
-        <el-table-column
-          v-for="item in tableHeader"
-          :key="item.columnName"
-          :prop="item.columnName"
-          :label="item.label"
-          align="center"
-          :show-overflow-tooltip="true"
-          :width="item.itemType === 'radio' ? computedWidth(item.label) : 180"
-        >
+        <el-table-column v-for="item in tableHeader"
+                         :key="item.columnName"
+                         :prop="item.columnName"
+                         :label="item.label"
+                         align="center"
+                         :show-overflow-tooltip="true"
+                         :width="item.itemType === 'radio' ? computedWidth(item.label) : 180">
           <template slot-scope="scope">
             <span>{{ handleFilterSpan(scope.row, item) }}</span>
           </template>
         </el-table-column>
-        <el-table-column fixed="right" label="操作" align="center" width="120">
+        <el-table-column fixed="right"
+                         label="操作"
+                         align="center"
+                         width="120">
           <template slot-scope="scope">
-            <el-button
-              @click="handleLook(scope.row)"
-              type="text"
-              size="small"
-              class="btn-color-look"
-              >查看</el-button
-            >
+            <el-button @click="handleLook(scope.row)"
+                       type="text"
+                       size="small"
+                       class="btn-color-look">查看</el-button>
             <template v-if="filterEdit(scope.row.ORG_ID)">
-              <el-button
-                @click="handleEdit(scope.row)"
-                type="text"
-                size="small"
-                class="btn-color-edit"
-                >编辑</el-button
-              >
-              <el-popconfirm
-                title="删除之后无法回复，确认删除？"
-                @onConfirm="handleDel(scope.row)"
-              >
-                <el-button
-                  slot="reference"
-                  type="text"
-                  size="small"
-                  class="btn-color-del"
-                  >删除</el-button
-                >
+              <el-button @click="handleEdit(scope.row)"
+                         type="text"
+                         size="small"
+                         class="btn-color-edit">编辑</el-button>
+              <el-popconfirm title="删除之后无法回复，确认删除？"
+                             @onConfirm="handleDel(scope.row)">
+                <el-button slot="reference"
+                           type="text"
+                           size="small"
+                           class="btn-color-del">删除</el-button>
               </el-popconfirm>
             </template>
           </template>
         </el-table-column>
       </el-table>
       <div>
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page.sync="currentPage"
-          :page-sizes="[20, 50, 100, 200]"
-          :page-size="pageSize"
-          layout="sizes, prev, pager, next"
-          :total="total"
-        >
+        <el-pagination @size-change="handleSizeChange"
+                       @current-change="handleCurrentChange"
+                       :current-page.sync="currentPage"
+                       :page-sizes="[20, 50, 100, 200]"
+                       :page-size="pageSize"
+                       layout="sizes, prev, pager, next"
+                       :total="total">
         </el-pagination>
       </div>
     </el-card>
 
-    <el-dialog
-      :title="formName"
-      :visible.sync="dialogVisible"
-      width="80%"
-      append-to-body
-      :close-on-click-modal="false"
-      :before-close="handlerCancle"
-    >
-      <resi-form
-        v-if="dialogVisible"
-        ref="baseForm"
-        :fixed="true"
-        :form-list="formList"
-        @changegroup="handleChangeGroup"
-      />
-      <div v-if="dialogVisible" class="resi-other">
+    <el-dialog :title="formName"
+               :visible.sync="dialogVisible"
+               width="80%"
+               append-to-body
+               :close-on-click-modal="false"
+               :before-close="handlerCancle">
+      <resi-form v-if="dialogVisible"
+                 ref="baseForm"
+                 :fixed="true"
+                 :form-list="formList"
+                 @changegroup="handleChangeGroup" />
+      <div v-if="dialogVisible"
+           class="resi-other">
         <div class="resi-other-title">其他</div>
         <div class="tabs-other-info">
-          <el-tabs v-model="activeName" @tab-click="handleClick">
-            <el-tab-pane
-              v-for="item in tabsList"
-              :key="item.columnName"
-              :label="item.label"
-              :name="'group' + item.groupId"
-            >
-              <resi-form
-                :ref="'group' + item.groupId"
-                :columns="3"
-                :support-add="item.supportAdd"
-                :form-id="item.columnName"
-                :form-list="item.itemList"
-              />
+          <el-tabs v-model="activeName"
+                   @tab-click="handleClick">
+            <el-tab-pane v-for="item in tabsList"
+                         :key="item.columnName"
+                         :label="item.label"
+                         :name="'group' + item.groupId">
+              <resi-form :ref="'group' + item.groupId"
+                         :columns="3"
+                         :support-add="item.supportAdd"
+                         :form-id="item.columnName"
+                         :form-list="item.itemList" />
             </el-tab-pane>
           </el-tabs>
         </div>
       </div>
       <div class="resi-btns">
-        <el-button size="small" @click="handlerCancle">取消</el-button>
-        <el-button
-          type="primary"
-          size="small"
-          :loading="btnLoading"
-          @click="handleSUbmit"
-          >提交</el-button
-        >
+        <el-button size="small"
+                   @click="handlerCancle">取消</el-button>
+        <el-button type="primary"
+                   size="small"
+                   :loading="btnLoading"
+                   @click="handleSUbmit">提交</el-button>
       </div>
     </el-dialog>
 
-    <el-dialog
-      :title="formName"
-      :visible.sync="dialogEditVisible"
-      width="80%"
-      append-to-body
-      :close-on-click-modal="false"
-      :before-close="handlerEditCancle"
-    >
-      <edit-resi
-        v-if="dialogEditVisible"
-        ref="baseForm"
-        :disabled="disabled"
-        :form-info="editForm"
-        :fixed="true"
-        :form-list="formList"
-        :agency-id="editAgencyId"
-        @changegroup="handleChangeGroup"
-      />
-      <div v-if="dialogEditVisible" class="resi-other">
+    <el-dialog :title="formName"
+               :visible.sync="dialogEditVisible"
+               width="80%"
+               append-to-body
+               :close-on-click-modal="false"
+               :before-close="handlerEditCancle">
+      <edit-resi v-if="dialogEditVisible"
+                 ref="baseForm"
+                 :disabled="disabled"
+                 :form-info="editForm"
+                 :fixed="true"
+                 :form-list="formList"
+                 :agency-id="editAgencyId"
+                 @changegroup="handleChangeGroup" />
+      <div v-if="dialogEditVisible"
+           class="resi-other">
         <div class="resi-other-title">其他</div>
         <div class="tabs-other-info">
-          <el-tabs v-model="activeName" @tab-click="handleClick">
-            <el-tab-pane
-              v-for="item in tabsList"
-              :key="item.columnName"
-              :label="item.label"
-              :name="'group' + item.groupId"
-            >
-              <edit-resi
-                :ref="'group' + item.groupId"
-                :columns="3"
-                :support-add="item.supportAdd"
-                :form-id="item.columnName"
-                :muti-list="item.mutiList"
-                :form-list="item.itemList"
-                :disabled="disabled"
-                :label-width="'140px'"
-                :agency-id="editAgencyId"
-              />
+          <el-tabs v-model="activeName"
+                   @tab-click="handleClick">
+            <el-tab-pane v-for="item in tabsList"
+                         :key="item.columnName"
+                         :label="item.label"
+                         :name="'group' + item.groupId">
+              <edit-resi :ref="'group' + item.groupId"
+                         :columns="3"
+                         :support-add="item.supportAdd"
+                         :form-id="item.columnName"
+                         :muti-list="item.mutiList"
+                         :form-list="item.itemList"
+                         :disabled="disabled"
+                         :label-width="'140px'"
+                         :agency-id="editAgencyId" />
             </el-tab-pane>
           </el-tabs>
         </div>
       </div>
       <div class="resi-btns">
-        <el-button size="small" @click="handlerEditCancle">取消</el-button>
-        <el-button
-          v-if="!disabled"
-          type="primary"
-          size="small"
-          :loading="btnLoading"
-          @click="handleEditSUbmit"
-          >提交</el-button
-        >
+        <el-button size="small"
+                   @click="handlerEditCancle">取消</el-button>
+        <el-button v-if="!disabled"
+                   type="primary"
+                   size="small"
+                   :loading="btnLoading"
+                   @click="handleEditSUbmit">提交</el-button>
       </div>
     </el-dialog>
   </div>
@@ -214,7 +191,7 @@ export default {
     resiForm,
     editResi
   },
-  data() {
+  data () {
     return {
       exportBtn: false,
       exportBtnTitle: '导出',
@@ -246,10 +223,28 @@ export default {
       formName: '',
       formList: [],
       tableHeader: [],
-      tabsList: []
+      tabsList: [],
+
+      defaultCategotyKey: ''
+    }
+  },
+  props: {
+
+  },
+  activated () {
+    if (this.$route.query) {
+      let query = this.$route.query
+      this.defaultCategotyKey = query.columnName
     }
+
   },
-  async created() {
+  async created () {
+    if (this.$route.query) {
+      let query = this.$route.query
+      this.defaultCategotyKey = query.columnName
+    }
+
+
     await this.getSearchList()
     // await this.getFormList()
     await this.getTableHeader()
@@ -258,25 +253,25 @@ export default {
     console.log('storeoooo----0000', this.$store)
   },
   methods: {
-    computedWidth(label) {
+    computedWidth (label) {
       const wd = 20 * label.length
       return wd > 80 ? wd : 80
     },
-    filterEdit(id) {
+    filterEdit (id) {
       const { user } = this.$store.state
       return id === user.agencyId
     },
-    handleSizeChange(val) {
+    handleSizeChange (val) {
       console.log(`每页 ${val} 条`)
       this.pageSize = val
       this.getTableData()
     },
-    handleCurrentChange(val) {
+    handleCurrentChange (val) {
       console.log(`当前页: ${val}`)
       this.currentPage = val
       this.getTableData()
     },
-    handleFilterSpan(row, item) {
+    handleFilterSpan (row, item) {
       let _val = ''
       if (item.itemType === 'radio' && item.options.length > 0) {
         item.options.forEach((n) => {
@@ -285,14 +280,14 @@ export default {
       }
       return _val || row[item.columnName]
     },
-    handleSearch(val) {
+    handleSearch (val) {
       console.log('searchhh--', val)
       this.currentPage = 1
       this.conditions = val
       this.getTableData()
     },
     // 下载文件
-    download(data, fileName) {
+    download (data, fileName) {
       console.log('data', data)
       if (!data) {
         return
@@ -316,7 +311,7 @@ export default {
         window.URL.revokeObjectURL(url)
       }
     },
-    async handleExport() {
+    async handleExport () {
       this.exportBtn = true
       this.exportBtnTitle = '正在导出...'
       let params = {
@@ -333,7 +328,7 @@ export default {
         responseType: 'blob'
       })
         .then(res => {
-          
+
           console.log('resllll', res)
           let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
           console.log('filename', fileName)
@@ -352,8 +347,8 @@ export default {
           console.log('获取导出情失败', err)
           this.$message.error('获取导出失败')
         })
-        this.exportBtnTitle = '导出'
-        this.exportBtn = false
+      this.exportBtnTitle = '导出'
+      this.exportBtn = false
     },
     // 上传大图标成功
     handleExcelSuccess (res, file) {
@@ -365,7 +360,7 @@ export default {
         this.$message.error(res.msg)
       }
     },
-    handleProgress(event, file, fileList) {
+    handleProgress (event, file, fileList) {
       console.log('percentage', file.percentage)
     },
 
@@ -375,16 +370,16 @@ export default {
       const isTypeComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
       const fileType = isType || isTypeComputer
       const isLt1M = (file.size / 1024 / 1024) < 10
-      if(!fileType) {
-          this.$message.error('上传文件只能是xls/xlsx格式！')
+      if (!fileType) {
+        this.$message.error('上传文件只能是xls/xlsx格式！')
       }
-      
+
       if (!isLt1M) {
         this.$message.error('上传文件大小不能超过 10MB!')
       }
       return fileType && isLt1M
     },
-    async uploadHttpRequest(file) {
+    async uploadHttpRequest (file) {
       this.importLoading = true
       this.importBtnTitle = '正在上传中...'
       const formData = new FormData() //FormData对象，添加参数只能通过append('key', value)的形式添加
@@ -395,53 +390,53 @@ export default {
         data: formData,
         responseType: 'blob'
       })
-      .then((res) => {
-        if (res.headers["content-disposition"]) {
-          let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
-          console.log('filename', fileName)
-          let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
-          var url = window.URL.createObjectURL(blob)
-          var aLink = document.createElement('a')
-          aLink.style.display = 'none'
-          aLink.href = url
-          aLink.setAttribute('download', fileName)
-          document.body.appendChild(aLink)
-          aLink.click()
-          document.body.removeChild(aLink) //下载完成移除元素
-          window.URL.revokeObjectURL(url) //释放掉blob对象
-        }
-        
-        this.getTableData()
-      })
-      .catch( err => {
+        .then((res) => {
+          if (res.headers["content-disposition"]) {
+            let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
+            console.log('filename', fileName)
+            let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
+            var url = window.URL.createObjectURL(blob)
+            var aLink = document.createElement('a')
+            aLink.style.display = 'none'
+            aLink.href = url
+            aLink.setAttribute('download', fileName)
+            document.body.appendChild(aLink)
+            aLink.click()
+            document.body.removeChild(aLink) //下载完成移除元素
+            window.URL.revokeObjectURL(url) //释放掉blob对象
+          }
+
+          this.getTableData()
+        })
+        .catch(err => {
           console.log('失败', err)
           file.onError() //上传失败的文件会从文件列表中删除
           this.$message.error('导入失败')
-      })
+        })
       this.importLoading = false
       this.importBtnTitle = '导入人员数据'
       this.$refs.upload.clearFiles()
     },
-    handleClick(tab, event) {
+    handleClick (tab, event) {
       console.log(tab, event)
     },
-    async handleLook(row) {
+    async handleLook (row) {
       this.disabled = true
       this.editAgencyId = row.ORG_ID
       await this.getFormList('edit')
       this.getrowInfo(row.icResiUserId)
     },
-    async handleEdit(row) {
+    async handleEdit (row) {
       this.disabled = false
       this.editAgencyId = row.ORG_ID
       await this.getFormList('edit')
       await this.getrowInfo(row.icResiUserId)
     },
-    async handleAdd() {
+    async handleAdd () {
       await this.getFormList()
       this.dialogVisible = true
     },
-    async handleChangeGroup(val) {
+    async handleChangeGroup (val) {
       console.log('changeguoprrrrr----', val)
       let { childGroup, value } = val
       let hasT = false
@@ -471,7 +466,7 @@ export default {
         if (hasT) this.tabsList.splice(i, 1)
       }
     },
-    formetForm() {
+    formetForm () {
       const _baseForm = this.$refs.baseForm.handleForm()
       let arr = []
       if (_baseForm.length === 0) return false
@@ -527,15 +522,15 @@ export default {
       console.log('finalArr', finalArr)
       return finalArr
     },
-    async handleEditSUbmit() {
+    async handleEditSUbmit () {
       const arr = await this.formetForm()
       if (arr) this.submitEdit(arr)
     },
-    async handleSUbmit() {
+    async handleSUbmit () {
       const arr = await this.formetForm()
       if (arr) this.submitAdd(arr)
     },
-    handleDel(row) {
+    handleDel (row) {
       let params = {
         formCode: 'resi_base_info',
         icResiUserId: row.icResiUserId
@@ -558,24 +553,24 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    handleFormatUrl(url) {
+    handleFormatUrl (url) {
       return url.includes('?')
     },
-    handlerEditCancle() {
+    handlerEditCancle () {
       this.$refs.baseForm.resetForm()
       this.tabsList.forEach((item) => {
         this.$refs['group' + item.groupId][0].resetForm()
       })
       this.dialogEditVisible = false
     },
-    handlerCancle() {
+    handlerCancle () {
       this.$refs.baseForm.resetForm()
       this.tabsList.forEach((item) => {
         this.$refs['group' + item.groupId][0].resetForm()
       })
       this.dialogVisible = false
     },
-    async submitAdd(arr) {
+    async submitAdd (arr) {
       this.btnLoading = true
       await this.$http
         .post('/epmetuser/icresiuser/add', arr)
@@ -598,13 +593,13 @@ export default {
         })
       this.btnLoading = false
     },
-    async submitEdit(arr) {
+    async submitEdit (arr) {
       this.btnLoading = true
       await this.$http
         .post('/epmetuser/icresiuser/edit', arr)
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            
+
             return this.$message.error(res.msg)
           } else {
             this.$message.success('提交成功')
@@ -622,7 +617,7 @@ export default {
         })
       this.btnLoading = false
     },
-    getTableHeader() {
+    getTableHeader () {
       this.$http
         .post('/oper/customize/icform/tableheaders', {
           formCode: 'resi_base_info'
@@ -638,7 +633,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    async getTableData() {
+    async getTableData () {
       this.tableLoading = true
       let params = {
         formCode: 'resi_base_info',
@@ -661,7 +656,7 @@ export default {
         })
       this.tableLoading = false
     },
-    getrowInfo(id) {
+    getrowInfo (id) {
       let params = {
         formCode: 'resi_base_info',
         icResiUserId: id
@@ -737,7 +732,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    async getOptionsList(url) {
+    async getOptionsList (url) {
       let options = []
       // console.log('getOptionsList----', url)
       await this.$http
@@ -754,7 +749,7 @@ export default {
         })
       return options
     },
-    getSearchList() {
+    getSearchList () {
       this.$http
         .post('/oper/customize/icform/conditionlist', {
           formCode: 'resi_base_info',
@@ -780,13 +775,13 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    getTreeData(data){
+    getTreeData (data) {
       if (!Array.isArray(data)) return []
       let arr = data.map(item => {
         let _item = {}
         if (item.children) {
           if (item.children.length === 0) _item = { ...item, children: undefined }
-          else _item = { ...item, children: this.getTreeData(item.children)}
+          else _item = { ...item, children: this.getTreeData(item.children) }
         } else {
           _item = { ...item }
         }
@@ -794,7 +789,7 @@ export default {
       })
       return arr
     },
-    async getFormList(type) {
+    async getFormList (type) {
       await this.$http
         .post('/oper/customize/icform/getcustomerform', {
           formCode: 'resi_base_info',
@@ -867,12 +862,12 @@ export default {
     // height: 12px;
     color: rgba(30, 122, 254, 1);
     line-height: 20px;
-    background: rgba(30, 122, 254, .2);
+    background: rgba(30, 122, 254, 0.2);
     // border-radius: 50%;
   }
   ::v-deep .el-tabs__item.is-active {
     color: #fff;
-    background: linear-gradient(90deg, #1A5AFD, #26C4FF);
+    background: linear-gradient(90deg, #1a5afd, #26c4ff);
   }
 }
 .resi-container .resi-card-table {

From 22d7c1d90cdd1008907e15d9910db30e6ff1e0d9 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 20 Jan 2022 17:05:45 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/resiSearch.vue | 20 ++++++++++++++++----
 src/views/modules/base/resi.vue     | 16 ++++++++++------
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index 53fc6314..2e31ee63 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -207,10 +207,14 @@ export default {
     formList: {
       type: Array,
       default: () => []
+    },
+    columnName: {
+      type: String,
+      default: ''
     }
   },
   data() {
-    let initForm = (arr) => {
+    let initForm = (arr, columnName) => {
       let _form = {}
       // console.log('formInfo', obj)
       // if (Object.keys(obj).length > 0) {
@@ -218,12 +222,19 @@ export default {
       //   return _form
       // }
       arr.forEach((item) => {
-        _form[item.columnName] = ''
+        if (columnName && columnName === item.columnName) _form[item.columnName] = '1'
+        else _form[item.columnName] = ''
       })
       return _form
     }
-    let form = initForm(this.formList)
-    let tempFormList = [...this.formList]
+    let form = initForm(this.formList, this.columnName)
+    let tempFormList = this.formList.map(item => {
+      
+      return {
+        ...item,
+        isChange: this.columnName && this.columnName === item.columnName ? true : false
+      }
+    })
     let constForm = {
       ...form,
       GRID_ID: '',
@@ -339,6 +350,7 @@ export default {
     // console.log('formcccc---', this.form)
     this.getGridList()
     this.getValiheList()
+    if (this.columnName) this.handleChangeForm(this.columnName)
   },
   methods: {
     initForm() {
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 9c1404ef..c07f90f6 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -1,9 +1,10 @@
 <template>
-  <div v-if="pageLoading"
+  <div 
        class="resi-container">
     <resi-search v-if="searchList.length > 0"
                  ref="resiSearch"
                  :form-list="searchList"
+                 :column-name="defaultCategotyKey"
                  @search="handleSearch" />
     <el-card class="resi-card-table">
       <div class="resi-row-btn">
@@ -248,7 +249,10 @@ export default {
     await this.getSearchList()
     // await this.getFormList()
     await this.getTableHeader()
-    this.getTableData()
+    // console.log('this.$refs.resiSearch', this)
+    this.$refs.resiSearch.handleSearch()
+    // this.handleSearch()
+    // this.getTableData()
     this.pageLoading = true
     console.log('storeoooo----0000', this.$store)
   },
@@ -617,8 +621,8 @@ export default {
         })
       this.btnLoading = false
     },
-    getTableHeader () {
-      this.$http
+    async getTableHeader () {
+      await this.$http
         .post('/oper/customize/icform/tableheaders', {
           formCode: 'resi_base_info'
         })
@@ -749,8 +753,8 @@ export default {
         })
       return options
     },
-    getSearchList () {
-      this.$http
+    async getSearchList () {
+      await this.$http
         .post('/oper/customize/icform/conditionlist', {
           formCode: 'resi_base_info',
           dynamic: true

From 0026e338de38facba165c4ae7da81b95c1490e52 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 20 Jan 2022 17:08:24 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2111?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/resi.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index c07f90f6..c7aee92b 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -232,10 +232,12 @@ export default {
   props: {
 
   },
-  activated () {
+  async activated () {
     if (this.$route.query) {
       let query = this.$route.query
       this.defaultCategotyKey = query.columnName
+      await this.getSearchList()
+      this.$refs.resiSearch.handleSearch()
     }
 
   },

From 2d80921754b1770d32e856c058f4e3b9363def4b Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 21 Jan 2022 10:38:23 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E5=9F=BA?=
 =?UTF-8?q?=E7=A1=80=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/resi.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index c7aee92b..a26aa197 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -234,6 +234,7 @@ export default {
   },
   async activated () {
     if (this.$route.query) {
+      this.searchList = []
       let query = this.$route.query
       this.defaultCategotyKey = query.columnName
       await this.getSearchList()

From caec4f034fc15f03e8c164f31158d9c1709e3510 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 21 Jan 2022 10:39:50 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E8=B0=83=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/resiTransfer.vue | 359 ++++++++++++++++++++++++++
 src/views/modules/base/resi.vue       |  49 +++-
 2 files changed, 404 insertions(+), 4 deletions(-)
 create mode 100644 src/views/components/resiTransfer.vue

diff --git a/src/views/components/resiTransfer.vue b/src/views/components/resiTransfer.vue
new file mode 100644
index 00000000..6d8c0232
--- /dev/null
+++ b/src/views/components/resiTransfer.vue
@@ -0,0 +1,359 @@
+<template>
+  <div>
+    <div>
+      <el-form ref="ref_form"
+               :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>
+        </el-form-item>
+
+        <el-form-item label="迁出类型"
+                      prop="houseType"
+                      label-width="150px"
+                      style="display: block">
+          <el-radio-group v-model="houseType">
+
+            <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 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>
+            </div>
+
+          </div>
+        </el-form-item>
+      </el-form>
+
+    </div>
+    <div class="div_btn">
+      <el-button @click="handleCancle">取 消</el-button>
+      <el-button v-if="formType != 'detail'"
+                 type="primary"
+                 :disabled="btnDisable"
+                 @click="handleComfirm">确 定</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+
+      btnDisable: false,
+
+      dataForm: {
+        icUserId: '', // 被调动人ID	
+        type: '',//操作类型【客户外out,客户内in】	
+        newAgencyId: '',//调动到的组织Id		
+        newGridId: '',//调动到的网格Id		
+        newNeighborHoodId: '',//调动到的小区ID			
+        newBuildingId: '',//调动到的楼宇Id			
+        newBuildingUnitId: 1,//调动到的单元Id			
+        newHouseId: '', //调动到的房屋Id		
+        transferTime: '', //调动时间【日期类型】			
+        remark: '' //备注		
+      },
+
+      staffId: '',//人员id
+      rootAgency: {}
+
+    }
+  },
+  components: {},
+  mounted () {
+
+  },
+
+  methods: {
+    async initForm (row, agencyObj) {
+
+      this.$refs.ref_form.resetFields();
+
+      this.staffId = row.staffId
+
+      await this.loadRootAgency()
+
+    },
+
+    //根据人员id获取根组织信息
+    async loadRootAgency () {
+      const url = '/gov/org/customeragency/root-orglist-by-staffid'
+
+      let params = {
+        staffId: this.staffId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        if (data && data.length > 0) {
+          this.rootAgency = data[0]
+        }
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    async handleComfirm () {
+      this.btnDisable = true
+      setTimeout(() => {
+        this.btnDisable = false
+      }, 10000)
+
+      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()
+        }
+
+      })
+    },
+
+    getValiheList () {
+
+      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('网络错误')
+        })
+    },
+    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()
+      this.$emit('dialogCancle')
+
+    },
+
+    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: '' //房主身份证	
+      }
+
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  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' }
+        ],
+        rentFlag: [
+          { required: true, message: '是否出租不能为空', trigger: 'blur' }
+        ],
+        ownerPhone: [
+          { required: true, message: '房主电话不能为空', trigger: 'blur' }
+        ],
+        ownerName: [
+          { required: true, message: '房主姓名不能为空', trigger: 'blur' }
+        ],
+        ownerIdCard: [
+          { required: true, message: '房主身份证号不能为空', trigger: 'blur' }
+        ],
+      }
+    },
+
+  },
+  props: {}
+}
+</script>
+<style lang="scss" scoped>
+.item_width_1 {
+  width: 500px;
+}
+.item_width_2 {
+  width: 400px;
+}
+.item_width_3 {
+  margin-left: 10px;
+  width: 200px;
+}
+
+.div_btn {
+  display: flex;
+  justify-content: flex-end;
+}
+.el-tabs {
+  margin: 0 20px;
+}
+.el-upload__tip {
+  color: rgb(155, 155, 155);
+  margin: 0;
+}
+.form {
+  margin-top: 30px;
+}
+</style>
+<style>
+.el-dialog__body {
+  padding: 0 10px 20px !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index c7aee92b..15a09df5 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -1,6 +1,5 @@
 <template>
-  <div 
-       class="resi-container">
+  <div class="resi-container">
     <resi-search v-if="searchList.length > 0"
                  ref="resiSearch"
                  :form-list="searchList"
@@ -63,6 +62,14 @@
                        type="text"
                        size="small"
                        class="btn-color-look">查看</el-button>
+            <el-button @click="handleTransfer(scope.row)"
+                       type="text"
+                       size="small"
+                       class="btn-color-look">调动</el-button>
+            <el-button @click="handleChangeRecord(scope.row)"
+                       type="text"
+                       size="small"
+                       class="btn-color-look">调动记录</el-button>
             <template v-if="filterEdit(scope.row.ORG_ID)">
               <el-button @click="handleEdit(scope.row)"
                          type="text"
@@ -178,6 +185,18 @@
                    @click="handleEditSUbmit">提交</el-button>
       </div>
     </el-dialog>
+
+    <!-- 调动 -->
+    <el-dialog :visible.sync="tranferShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'人员调动'"
+               width="950px"
+               top="5vh"
+               @closed="diaClose">
+      <resi-transfer ref="ref_transfer"></resi-transfer>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -186,11 +205,14 @@ 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'
+
 export default {
   components: {
     resiSearch,
     resiForm,
-    editResi
+    editResi,
+    resiTransfer
   },
   data () {
     return {
@@ -226,7 +248,10 @@ export default {
       tableHeader: [],
       tabsList: [],
 
-      defaultCategotyKey: ''
+      defaultCategotyKey: '',
+
+      tranferShow: false,
+      changeRecordShow: false,
     }
   },
   props: {
@@ -236,6 +261,7 @@ export default {
     if (this.$route.query) {
       let query = this.$route.query
       this.defaultCategotyKey = query.columnName
+      console.log(this.defaultCategotyKey)
       await this.getSearchList()
       this.$refs.resiSearch.handleSearch()
     }
@@ -259,6 +285,21 @@ export default {
     console.log('storeoooo----0000', this.$store)
   },
   methods: {
+
+    //调动
+    handleTransfer (row) {
+      this.tranferShow = true
+    },
+    //变更记录
+    handleChangeRecord (row) {
+      this.changeRecordShow = true
+    },
+
+    diaClose () {
+      this.tranferShow = false
+      this.changeRecordShow = false
+    },
+
     computedWidth (label) {
       const wd = 20 * label.length
       return wd > 80 ? wd : 80

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 9/9] =?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 00000000..20066386
--- /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 6d8c0232..c942aa09 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 5129af68..f452d699 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 f84c1a51..181c32fe 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 10a35729..a1d3fcf9 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 9b2ec893..ef67f6b6 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 49cf233e..1a142037 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)
     },