diff --git a/supervise-crm-ui/.env.development b/supervise-crm-ui/.env.development
index d08634fb..eebfcf52 100644
--- a/supervise-crm-ui/.env.development
+++ b/supervise-crm-ui/.env.development
@@ -5,5 +5,5 @@ ENV = 'development'
 VUE_APP_BASE_API = '/api'
 
 ## 配置测试和本地开发时的 接口地址
-VUE_APP_URL = "http://192.168.1.193:8112"
+VUE_APP_URL = "http://192.168.1.107:8112"
 ##VUE_APP_URL = "http://8.130.39.13:8112"
diff --git a/supervise-crm-ui/src/api/projectStaff/index.js b/supervise-crm-ui/src/api/projectStaff/index.js
index d9894f03..b488c493 100644
--- a/supervise-crm-ui/src/api/projectStaff/index.js
+++ b/supervise-crm-ui/src/api/projectStaff/index.js
@@ -9,6 +9,13 @@ export default {
       method: 'get',
     });
   },
+  // 组织结构
+  sysorganization: function() {
+    return request({
+      url: '/portal/v1/sysorganization/userList',
+      method: 'get',
+    });
+  },
   getUserByType: function(id) {
     return request({
       url: '/crm/userproject/getUserByType/'+ id,
diff --git a/supervise-crm-ui/src/router/modules/codemenu.js b/supervise-crm-ui/src/router/modules/codemenu.js
index 621e6a2b..67aea947 100644
--- a/supervise-crm-ui/src/router/modules/codemenu.js
+++ b/supervise-crm-ui/src/router/modules/codemenu.js
@@ -67,17 +67,28 @@ const codemenu = [{
     }
   }]
 },{
-  path: 'projectStaff',
+  path: '/projectStaff',
   component: Layout,
-  redirect: '/projectStaff',
+  redirect: '/projectStaff/index',
+  meta: {
+    title: '项目设置'
+  },
   children: [{
     path: '/projectStaff/index',
     component: () => import('@/views/projectStaff/index.vue'),
     name: 'projectStaff',
     meta: {
-      title: '项目人员',
+      title: '关联人员',
+      noCache: true
+    }
+  },{
+    path: '/WechatPush/index',
+    component: () => import('@/views/WechatPush/index.vue'),
+    name: 'WechatPush',
+    meta: {
+      title: '微信推送',
       noCache: true
     }
   }]
-}]
+},]
 export default codemenu
diff --git a/supervise-crm-ui/src/views/WechatPush/index.vue b/supervise-crm-ui/src/views/WechatPush/index.vue
new file mode 100644
index 00000000..1ae5a597
--- /dev/null
+++ b/supervise-crm-ui/src/views/WechatPush/index.vue
@@ -0,0 +1,393 @@
+<template>
+  <div class="app-container">
+
+      <button-bar ref="btnbar" view-title="推送详情" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+      <div class="main-content">
+        <div class="mid">
+        <div class="left">
+         <div class="listtop" style="width: 400px">
+           <div class="tit" >项目列表</div>
+         </div>
+           <el-table :data="formobj" border ref="multipleTab" max-height="540px" style="width: 400px" highlight-current-row
+           @row-click="singleElection">
+           <el-table-column align="center" width="55" label="选择">
+               <template slot-scope="scope">
+                 <!-- 可以手动的修改label的值，从而控制选择哪一项 -->
+                 <el-radio class="radio" v-model="uploadData.projectSid" :label="scope.row.sid" style="margin-left:10px"
+                   >{{''}}</el-radio
+                 >
+               </template>
+             </el-table-column>
+             <el-table-column prop="entryName" label="项目名称" /> 
+          </el-table>
+        </div>
+        <div class="rigth">
+          <div class="rihthGl">
+           <div class="rigthJg">
+            <div class="listtop" style="width: 100%">
+              <span>项目关联人员</span>
+              <button class="Waiting" @click="getWaiting">设为待选</button>
+           </div>
+              <el-table ref="multipleTable" :data="dataListOne" border max-height="340px" style="width: 350px"
+               @selection-change="handlChange" tooltip-effect="dark" >
+               <el-table-column type="selection" width="55" align="center"/>
+               <el-table-column prop="name" label="ID" align="center" />
+               <el-table-column prop="orgName" label="单位" align="center" />
+             </el-table>
+           </div>
+
+           <div class="rigthYh">
+              <div class="listtop" style="width: 100%">
+                <span>待选人员</span>
+              <button class="relevance" @click="getRelevance">设为关联</button>
+             </div>
+             <div class="org-tree">
+                <el-tree
+                  :data="sysorganList"
+                  show-checkbox
+                   node-key="sid"
+                   :props="props"
+                   ref="tree"
+                   highlight-current
+                   check-strictly
+                   :default-checked-keys="uploadData.users"
+                  :default-expanded-keys="['fd6435f2-0005-11ec-a033-48452053aa33','3042d730-64e8-4e34-b08a-44adca4da3a5']" @check="handleNodeClick">
+                </el-tree>
+            </div>
+           </div>
+          </div>
+          <div class="Btn">
+            <el-button type="primary"  @click="getPurchaseList">保存</el-button>
+            <el-button type="primary" style="margin-left: 40px;"  @click="getCancel">取消</el-button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import req from '@/api/projectStaff/index'
+  import ButtonBar from '@/components/ButtonBar'
+  import Pagination from '@/components/pagination'
+  import pageye from '@/components/pagination/pageye'
+  export default {
+    name: 'SupplierBankInfoIndex',
+    components: {
+      ButtonBar,
+      Pagination,
+      pageye
+    },
+    data() {
+      return {
+        btndisabled: false,
+        viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+        isSearchShow: false,
+        searchxianshitit: '显示查询条件',
+        tableLoading: false,
+        formobj:[],
+        dataListOne: [],
+        props: {
+        label: 'name',
+        children: 'children'
+       },
+        btnList: [
+          {
+            type: 'info',
+            size: 'small',
+            icon: 'cross',
+            btnKey: 'doClose',
+            btnLabel: '关闭'
+          }
+        ],
+        queryParams: {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+            typeName: '',
+          }
+        },
+        sids: [],
+        templateSelection: "",
+        //   当前选择的行的数据
+        checkList: [],
+        uploadData:{
+          projectSid:'',
+          users:[],
+        },
+        ValSid:[],
+        ValSids:[],
+        sysorganList:[],
+      }
+    },
+    mounted() {
+     this.$refs['btnbar'].setButtonList(this.btnList)
+       },
+    created() {
+      this.loadList()
+    },
+    methods: {
+      // 搜索条件效果
+      clicksearchShow() {
+        this.isSearchShow = !this.isSearchShow
+        if (this.isSearchShow) {
+          this.searchxianshitit = '隐藏查询条件'
+        } else {
+          this.searchxianshitit = '显示查询条件'
+        }
+      },
+      btnHandle(btnKey) {
+        switch (btnKey) {
+          case 'doClose':
+            this.doClose()
+            break
+          default:
+            break
+        }
+      },
+      loadList() {
+        req.projectinformation().then(res=>{
+          if (res.success) {
+            this.formobj = res.data
+            this.uploadData.projectSid = res.data[0].sid
+            req.getUserProjectBySid(res.data[0].sid).then(res=>{
+              this.dataListOne=res.data
+              this.forList()
+              this.estimate()
+          })
+          }
+        })  
+        req.sysorganization().then(res=>{
+          if (res.success) {
+            this.sysorganList = res.data
+          }
+        }) 
+      },
+      clearList(){
+        this.ValSid=[]
+        this.ValSids=[]
+        this.dataListOne=[]
+        this.uploadData={
+          projectSid:'',
+          users:[],
+        }
+      },
+      singleElection(row) {
+          this.clearList()
+          this.uploadData.projectSid = row.sid
+          req.getUserProjectBySid(row.sid).then(res=>{
+            this.dataListOne=res.data
+            this.forList()
+            this.estimate()
+          })
+      },
+      // 序号
+      indexMethod(index) {
+        var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+        var pageindex = index + 1 + pagestart
+        return pageindex
+      },
+      dosearch() {
+        this.queryParams.current = 1
+        this.loadList()
+      },
+      resetQuery() {
+        this.queryParams = {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+            typeName: '',
+          }
+        }
+        this.loadList()
+      },
+      resetState() {
+        this.viewState = 1
+      },
+      // 点击待选
+      getWaiting(){
+        if(this.ValSid[0]){
+          for(var i=0;i<this.dataListOne.length;i++){
+          for(var j=0;j<this.ValSid.length;j++){
+           if(this.ValSid[j].userSid==this.dataListOne[i].userSid){
+            this.dataListOne.splice(i,1)
+            }
+          }
+         }
+         this.forList()
+         this.estimate()
+        }else{
+          this.$message({
+          message: '请选择待选的数据',
+          type: 'warning'
+         });
+        }
+      },
+      // 点击关联
+      getRelevance(){
+        if(this.ValSids[0]){
+          let arrLists=this.ValSids
+          let arr=[]
+          for(var i=0;i<arrLists.length;i++){
+            let orgnames=this.$refs.tree.getNode(arrLists[i]).parent.data.name
+            let bb={
+              name: arrLists[i].name,
+              orgName: orgnames,
+              userSid:arrLists[i].sid
+            }
+            arr.push(bb)
+          }
+          this.dataListOne=arr
+        }else{
+          this.$message({
+          message: '请选择要改变的关联在点击',
+          type: 'warning'
+         });
+        }
+      },
+      forList(){
+        let vals=this.dataListOne
+        let arrSids=[]
+        for(let i=0;i<vals.length;i++){
+          arrSids.push(vals[i].userSid)
+        }
+        this.uploadData.users=arrSids
+      },
+      getPurchaseList(){
+        this.forList()
+        req.userprojectSave(this.uploadData).then(res=>{
+          if (res.success) {
+            this.$message({
+                showClose: true,
+                type: 'success',
+                message: res.msg
+             })
+             this.clearList()
+             this.loadList()
+          }
+        })
+      },
+      getCancel(){
+        this.clearList()
+        this.loadList()
+        // this.$nextTick(()=>{
+        //  this.$refs.multipleTab.setCurrentRow(this.baseDataList[0])
+        // })
+      },
+      handlChange(val){
+        this.ValSid=val
+      },
+      handleNodeClick(val,num){
+        let checkdata=this.$refs.tree.getCheckedNodes()
+        let arr=[]
+        for(let i=0;i<checkdata.length;i++){
+          arr.push(checkdata[i])
+        }
+        this.removeByvalue(arr,undefined)
+        this.ValSids=arr
+      },
+      // 过滤多于数据
+      removeByvalue(arr,val){
+        for(var i=0;i<arr.length;i++){
+          if(arr[i]==val){
+            arr.splice(i,1)
+            break
+          }
+        }
+      },
+      estimate(){
+        let allParentId = []
+        this.sysorganList.forEach(ele => allParentId.push(ele.sid))
+        //要勾选的节点id列表，数据应该来自后台
+        let checkedKeyArray = this.uploadData.users
+        //只需要叶子节点的id
+        let children = checkedKeyArray.filter(menuId => ! allParentId.includes(menuId) );
+        this.$refs.tree.setCheckedKeys(children)
+      },
+       doClose() {
+         this.$store.dispatch('tagsView/delView', this.$route)
+         this.$router.go(-1)
+      }
+    }
+  }
+</script>
+<style scoped lang="scss">
+ ::v-deep .el-tree .el-tree-node .is-leaf + .el-checkbox .el-checkbox__inner{display: inline-block;}
+ ::v-deep .el-tree .el-tree-node .el-checkbox .el-checkbox__inner{display: none;}
+.main-content{
+  .mid{
+    width: 100%;
+    height: 540px;
+    margin-top: 30px;
+    .left{
+      float: left;
+  }
+  .rigth{
+    float: right;
+    width: 63%;
+    height: 540px;
+    border: 1px solid #dfe6ec;
+    position: relative;
+    .rihthGl{
+      width: 100%;
+      height: 100%;
+      display: flex;
+      justify-content: space-around;
+      .rigthJg{
+      margin-top: 50px;
+      width: 350px;
+      .listtop{
+       .Waiting{
+        width: 75px;
+        height: 32px;
+        border: 2px solid #018ad2;
+        color: #018ad2;
+        font-size: 14px;
+        border-radius: 5px;
+        margin-right: 10px;
+       }
+       .Waiting:hover{
+        background-color: #fff;
+       }
+      }
+    }
+    .rigthYh{
+      margin-top: 50px;
+      width: 350px;
+      .org-tree{
+        width:100%;
+        max-height: 340px;
+        box-sizing: border-box;
+        /*padding-right: 10px;*/
+        border: 1px solid #edf1f7;
+        overflow: scroll;
+        overflow-x:hidden;
+      }
+      .listtop{
+       .relevance{
+        width: 75px;
+        height: 32px;
+        border: 2px solid #018ad2;
+        color: #018ad2;
+        font-size: 14px;
+        border-radius: 5px;
+        margin-right: 10px;
+       }
+       .relevance:hover{
+        background-color: #fff;
+       }
+      }
+     }
+    }
+    .Btn{
+      position: absolute;
+      left: 40%;
+      top: 85%;
+    }
+   }
+  }
+
+}
+</style>
\ No newline at end of file
diff --git a/supervise-crm-ui/src/views/projectStaff/index.vue b/supervise-crm-ui/src/views/projectStaff/index.vue
index 8f7db4a9..e5078c21 100644
--- a/supervise-crm-ui/src/views/projectStaff/index.vue
+++ b/supervise-crm-ui/src/views/projectStaff/index.vue
@@ -1,31 +1,16 @@
 <template>
-    <div class="app-container">
+  <div class="app-container">
 
-        <button-bar ref="btnbar" view-title="项目人员" :btndisabled="btndisabled" @btnhandle="btnHandle" />
-        <div class="main-content">
-          <div class="searchcon">
-            <el-button size="small" class="searchbtn" @click="clicksearchShow">
-              {{ searchxianshitit }}
-            </el-button>
-            <div v-show="isSearchShow" class="search">
-              <el-form :inline="true" class="tab-header">
-                <el-form-item label="项目人员">
-                  <el-input v-model="queryParams.params.typeName" placeholder="" clearable />
-                </el-form-item>
-              </el-form>
-              <div class="btn" style="text-align: center;">
-                <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
-                <el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-              </div>
-            </div>
-          </div>
-          <div class="left">
-           <div class="listtop" style="width: 500px">
-             <div class="tit" >项目列表</div>
-           </div>
-             <el-table :data="formobj" border ref="multipleTab" max-height="380px" style="width: 500px" highlight-current-row
-             @row-click="singleElection">
-             <el-table-column align="center" width="55" label="选择">
+      <button-bar ref="btnbar" view-title="设置关联人员" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+      <div class="main-content">
+        <div class="mid">
+        <div class="left">
+         <div class="listtop" style="width: 400px">
+           <div class="tit" >项目列表</div>
+         </div>
+           <el-table :data="formobj" border ref="multipleTab" max-height="540px" style="width: 400px" highlight-current-row
+           @row-click="singleElection">
+           <el-table-column align="center" width="55" label="选择">
                <template slot-scope="scope">
                  <!-- 可以手动的修改label的值，从而控制选择哪一项 -->
                  <el-radio class="radio" v-model="uploadData.projectSid" :label="scope.row.sid" style="margin-left:10px"
@@ -33,266 +18,376 @@
                  >
                </template>
              </el-table-column>
-               <el-table-column prop="entryName" label="项目名称" align="center" />
-               <el-table-column prop="bankName" label="贷款银行" align="center" />
-            </el-table>
-          </div>
-          <div class="rigth">
-             <div class="listtop" style="width: 700px">
-               <div class="tit" > 项目名称：{{projectList.entryName }} {{"\xa0\xa0\xa0"}}{{"\xa0\xa0\xa0"}}{{"\xa0\xa0\xa0"}}{{"\xa0\xa0\xa0"}} 贷款银行：{{projectList.bankName }}</div>
-             </div>
-             <div style="float: left;">
-                <el-table ref="multipleTable" :data="dataListOne" border max-height="380px" style="width: 350px"
-                 @selection-change="handlChange" tooltip-effect="dark" >
-                 <el-table-column type="selection" width="55" align="center"/>
-                 <el-table-column prop="name" label="监管人员" align="center" />
-               </el-table>
-             </div>
-             <div style="float: left;">
-                <el-table ref="multipleTables" :data="dataListTwo" border max-height="380px" style="width: 350px"
-                 @selection-change="handleSelectionChange" tooltip-effect="dark">
-                 <el-table-column type="selection" width="55" align="center"/>
-                 <el-table-column prop="name" label="银行人员" align="center" />
-               </el-table>
+             <el-table-column prop="entryName" label="项目名称" /> 
+          </el-table>
+        </div>
+        <div class="rigth">
+          <div class="rihthGl">
+           <div class="rigthJg">
+            <div class="listtop" style="width: 100%">
+              <span>项目关联人员</span>
+              <button class="Waiting" @click="getWaiting">设为待选</button>
+           </div>
+              <el-table ref="multipleTable" :data="dataListOne" border max-height="340px" style="width: 350px"
+               @selection-change="handlChange" tooltip-effect="dark" >
+               <el-table-column type="selection" width="55" align="center"/>
+               <el-table-column prop="name" label="ID" align="center" />
+               <el-table-column prop="orgName" label="单位" align="center" />
+             </el-table>
+           </div>
+
+           <div class="rigthYh">
+              <div class="listtop" style="width: 100%">
+                <span>待选人员</span>
+              <button class="relevance" @click="getRelevance">设为关联</button>
              </div>
+             <div class="org-tree">
+                <el-tree
+                  :data="sysorganList"
+                  show-checkbox
+                   node-key="sid"
+                   :props="props"
+                   ref="tree"
+                   highlight-current
+                   check-strictly
+                   :default-checked-keys="uploadData.users"
+                  :default-expanded-keys="['fd6435f2-0005-11ec-a033-48452053aa33','3042d730-64e8-4e34-b08a-44adca4da3a5']" @check="handleNodeClick">
+                </el-tree>
+            </div>
+           </div>
+          </div>
+          <div class="Btn">
+            <el-button type="primary"  @click="getPurchaseList">保存</el-button>
+            <el-button type="primary" style="margin-left: 40px;"  @click="getCancel">取消</el-button>
           </div>
-          <el-button type="primary" style="width: 8%;margin-left: 85%;margin-top: 40px;" size="small"  @click="getPurchaseList">保存</el-button>
         </div>
+      </div>
     </div>
-  </template>
-  
-  <script>
-    import req from '@/api/projectStaff/index'
-    import ButtonBar from '@/components/ButtonBar'
-    import Pagination from '@/components/pagination'
-    import pageye from '@/components/pagination/pageye'
-    export default {
-      name: 'SupplierBankInfoIndex',
-      components: {
-        ButtonBar,
-        Pagination,
-        pageye
+  </div>
+</template>
+
+<script>
+  import req from '@/api/projectStaff/index'
+  import ButtonBar from '@/components/ButtonBar'
+  import Pagination from '@/components/pagination'
+  import pageye from '@/components/pagination/pageye'
+  export default {
+    name: 'SupplierBankInfoIndex',
+    components: {
+      ButtonBar,
+      Pagination,
+      pageye
+    },
+    data() {
+      return {
+        btndisabled: false,
+        viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+        isSearchShow: false,
+        searchxianshitit: '显示查询条件',
+        tableLoading: false,
+        formobj:[],
+        dataListOne: [],
+        props: {
+        label: 'name',
+        children: 'children'
+       },
+        btnList: [
+          {
+            type: 'info',
+            size: 'small',
+            icon: 'cross',
+            btnKey: 'doClose',
+            btnLabel: '关闭'
+          }
+        ],
+        queryParams: {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+            typeName: '',
+          }
+        },
+        sids: [],
+        templateSelection: "",
+        //   当前选择的行的数据
+        checkList: [],
+        uploadData:{
+          projectSid:'',
+          users:[],
+        },
+        ValSid:[],
+        ValSids:[],
+        sysorganList:[],
+      }
+    },
+    mounted() {
+     this.$refs['btnbar'].setButtonList(this.btnList)
+       },
+    created() {
+      this.loadList()
+    },
+    methods: {
+      // 搜索条件效果
+      clicksearchShow() {
+        this.isSearchShow = !this.isSearchShow
+        if (this.isSearchShow) {
+          this.searchxianshitit = '隐藏查询条件'
+        } else {
+          this.searchxianshitit = '显示查询条件'
+        }
       },
-      data() {
-        return {
-          btndisabled: false,
-          viewState: 1, // 1、列表 2、添加 3、修改 4、查看
-          isSearchShow: false,
-          searchxianshitit: '显示查询条件',
-          tableLoading: false,
-          formobj:[],
-          dataListOne: [],
-          dataListTwo: [],
-          btnList: [
-            {
-              type: 'info',
-              size: 'small',
-              icon: 'cross',
-              btnKey: 'doClose',
-              btnLabel: '关闭'
-            }
-          ],
-          queryParams: {
-            current: 1,
-            size: 10,
-            total: 0,
-            params: {
-              typeName: '',
-            }
-          },
-          sids: [],
-          templateSelection: "",
-          //   当前选择的行的数据
-          checkList: [],
-          projectList:{
-            entryName:'',
-            bankName:'',
-          },
-          uploadData:{
-            projectSid:'',
-            bankUsers:[],
-            users:[],
-          },
-          one:1,
-          two:3,
-          ValSid:[],
-          ValSids:[],
-          DataLists:[],
-          usersList:[],
+      btnHandle(btnKey) {
+        switch (btnKey) {
+          case 'doClose':
+            this.doClose()
+            break
+          default:
+            break
         }
       },
-      mounted() {
-       this.$refs['btnbar'].setButtonList(this.btnList)
-         },
-      created() {
+      loadList() {
+        req.projectinformation().then(res=>{
+          if (res.success) {
+            this.formobj = res.data
+            this.uploadData.projectSid = res.data[0].sid
+            req.getUserProjectBySid(res.data[0].sid).then(res=>{
+              this.dataListOne=res.data
+              this.forList()
+              this.estimate()
+          })
+          }
+        })  
+        req.sysorganization().then(res=>{
+          if (res.success) {
+            this.sysorganList = res.data
+          }
+        }) 
+      },
+      clearList(){
+        this.ValSid=[]
+        this.ValSids=[]
+        this.dataListOne=[]
+        this.uploadData={
+          projectSid:'',
+          users:[],
+        }
+      },
+      singleElection(row) {
+          this.clearList()
+          this.uploadData.projectSid = row.sid
+          req.getUserProjectBySid(row.sid).then(res=>{
+            this.dataListOne=res.data
+            this.forList()
+            this.estimate()
+          })
+      },
+      // 序号
+      indexMethod(index) {
+        var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+        var pageindex = index + 1 + pagestart
+        return pageindex
+      },
+      dosearch() {
+        this.queryParams.current = 1
         this.loadList()
       },
-      methods: {
-        // 搜索条件效果
-        clicksearchShow() {
-          this.isSearchShow = !this.isSearchShow
-          if (this.isSearchShow) {
-            this.searchxianshitit = '隐藏查询条件'
-          } else {
-            this.searchxianshitit = '显示查询条件'
+      resetQuery() {
+        this.queryParams = {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+            typeName: '',
           }
-        },
-        btnHandle(btnKey) {
-          switch (btnKey) {
-            case 'doClose':
-              this.doClose()
-              break
-            default:
-              break
-          }
-        },
-        loadList() {
-          req.projectinformation().then(res=>{
-            if (res.success) {
-              this.formobj = res.data
-              this.uploadData.projectSid = res.data[0].sid
-              this.projectList.entryName=res.data[0].entryName
-              this.projectList.bankName=res.data[0].bankName
-              req.getUserProjectBySid(res.data[0].sid).then(res=>{
-              this.DataLists=res.data.users
-              this.usersList=res.data.bankUsers
-              this.estimate()
-            })
-            }
-          }) 
-          req.getUserByType(this.one).then(res=>{
-            if (res.success) {
-              this.dataListOne = res.data
-            }
-          }) 
-          req.getUserByType(this.two).then(res=>{
-            if (res.success) {
-              this.dataListTwo = res.data
+        }
+        this.loadList()
+      },
+      resetState() {
+        this.viewState = 1
+      },
+      // 点击待选
+      getWaiting(){
+        if(this.ValSid[0]){
+          for(var i=0;i<this.dataListOne.length;i++){
+          for(var j=0;j<this.ValSid.length;j++){
+           if(this.ValSid[j].userSid==this.dataListOne[i].userSid){
+            this.dataListOne.splice(i,1)
             }
-          }) 
-        },
-        clearList(){
-          this.ValSid=[]
-          this.ValSids=[]
-          this.DataLists=[]
-          this.usersList=[]
-          this.uploadData={
-            projectSid:'',
-            bankUsers:[],
-            users:[],
           }
-        },
-        singleElection(row) {
-            this.uploadData.projectSid = row.sid
-            this.checkList = this.formobj.filter((item) => item.sid === row.sid)
-            console.log(`该行的编号为${row.id}`)
-            console.log(this.checkList[0].entryName)
-            this.projectList.entryName=this.checkList[0].entryName
-            this.projectList.bankName=this.checkList[0].bankName
-
-            req.getUserProjectBySid(row.sid).then(res=>{
-              this.DataLists=res.data.users
-              this.usersList=res.data.bankUsers
-              this.estimate()
-            })
-        },
-        // 序号
-        indexMethod(index) {
-          var pagestart = (this.queryParams.current - 1) * this.queryParams.size
-          var pageindex = index + 1 + pagestart
-          return pageindex
-        },
-        dosearch() {
-          this.queryParams.current = 1
-          this.loadList()
-        },
-        resetQuery() {
-          this.queryParams = {
-            current: 1,
-            size: 10,
-            total: 0,
-            params: {
-              typeName: '',
+         }
+         this.forList()
+         this.estimate()
+        }else{
+          this.$message({
+          message: '请选择待选的数据',
+          type: 'warning'
+         });
+        }
+      },
+      // 点击关联
+      getRelevance(){
+        if(this.ValSids[0]){
+          let arrLists=this.ValSids
+          let arr=[]
+          for(var i=0;i<arrLists.length;i++){
+            let orgnames=this.$refs.tree.getNode(arrLists[i]).parent.data.name
+            let bb={
+              name: arrLists[i].name,
+              orgName: orgnames,
+              userSid:arrLists[i].sid
             }
+            arr.push(bb)
           }
-          this.loadList()
-        },
-        resetState() {
-          this.viewState = 1
-        },
-        getPurchaseList(){
-          let val=this.ValSid
-
-          for(let i=0;i<val.length;i++){
-            this.uploadData.users.push(val[i].sid)
+          this.dataListOne=arr
+        }else{
+          this.$message({
+          message: '请选择要改变的关联在点击',
+          type: 'warning'
+         });
+        }
+      },
+      forList(){
+        let vals=this.dataListOne
+        let arrSids=[]
+        for(let i=0;i<vals.length;i++){
+          arrSids.push(vals[i].userSid)
+        }
+        this.uploadData.users=arrSids
+      },
+      getPurchaseList(){
+        this.forList()
+        req.userprojectSave(this.uploadData).then(res=>{
+          if (res.success) {
+            this.$message({
+                showClose: true,
+                type: 'success',
+                message: res.msg
+             })
+             this.clearList()
+             this.loadList()
           }
-
-          let vals=this.ValSids
-          for(let i=0;i<vals.length;i++){
-            this.uploadData.bankUsers.push(vals[i].sid)
+        })
+      },
+      getCancel(){
+        this.clearList()
+        this.loadList()
+        // this.$nextTick(()=>{
+        //  this.$refs.multipleTab.setCurrentRow(this.baseDataList[0])
+        // })
+      },
+      handlChange(val){
+        this.ValSid=val
+      },
+      handleNodeClick(val,num){
+        let checkdata=this.$refs.tree.getCheckedNodes()
+        let arr=[]
+        for(let i=0;i<checkdata.length;i++){
+          arr.push(checkdata[i])
+        }
+        this.removeByvalue(arr,undefined)
+        this.ValSids=arr
+      },
+      // 过滤多于数据
+      removeByvalue(arr,val){
+        for(var i=0;i<arr.length;i++){
+          if(arr[i]==val){
+            arr.splice(i,1)
+            break
           }
-          console.log(this.uploadData);
-          req.userprojectSave(this.uploadData).then(res=>{
-            if (res.success) {
-              this.$message({
-                  showClose: true,
-                  type: 'success',
-                  message: res.msg
-               })
-               this.$refs.multipleTable.clearSelection();
-               this.$refs.multipleTables.clearSelection();
-               this.clearList()
-            }
-          })
-        },
-        handlChange(val){
-          this.ValSid=val
-        },
-        handleSelectionChange(val){
-          this.ValSids=val
-        },
-        estimate(){
-          this.$refs.multipleTable.clearSelection();
-          this.$refs.multipleTables.clearSelection();
-          const { dataListOne,dataListTwo, DataLists,usersList } = this
-          console.log(this.usersList);
-          DataLists.forEach(key => {
-            dataListOne.forEach(row => {
-              if (row.sid == key.userSid) {
-                if(row.sid){
-                  this.$refs.multipleTable.toggleRowSelection(row, true);
-                }
-              }
-            })
-          })
-          usersList.forEach(key => {
-            dataListTwo.forEach(row => {
-              if (row.sid == key.userSid) {
-                if(row.sid){
-                  this.$refs.multipleTables.toggleRowSelection(row, true);
-                }else{
-                  this.$refs.multipleTables.clearSelection();
-                }
-              }
-            })
-          })
-        },
-        doClose() {
-        this.$store.dispatch('tagsView/delView', this.$route)
-        this.$router.go(-1)
-      }
+        }
+      },
+      estimate(){
+        let allParentId = []
+        this.sysorganList.forEach(ele => allParentId.push(ele.sid))
+        //要勾选的节点id列表，数据应该来自后台
+        let checkedKeyArray = this.uploadData.users
+        //只需要叶子节点的id
+        let children = checkedKeyArray.filter(menuId => ! allParentId.includes(menuId) );
+        this.$refs.tree.setCheckedKeys(children)
+      },
+       doClose() {
+         this.$store.dispatch('tagsView/delView', this.$route)
+         this.$router.go(-1)
       }
     }
-  </script>
-  <style scoped lang="scss">
-  .main-content{
-    max-height: 540px;
-    // overflow-y: hidden;
+  }
+</script>
+<style scoped lang="scss">
+ ::v-deep .el-tree .el-tree-node .is-leaf + .el-checkbox .el-checkbox__inner{display: inline-block;}
+ ::v-deep .el-tree .el-tree-node .el-checkbox .el-checkbox__inner{display: none;}
+.main-content{
+  .mid{
+    width: 100%;
+    height: 540px;
+    margin-top: 30px;
     .left{
-        float: left;
+      float: left;
+  }
+  .rigth{
+    float: right;
+    width: 63%;
+    height: 540px;
+    border: 1px solid #dfe6ec;
+    position: relative;
+    .rihthGl{
+      width: 100%;
+      height: 100%;
+      display: flex;
+      justify-content: space-around;
+      .rigthJg{
+      margin-top: 50px;
+      width: 350px;
+      .listtop{
+       .Waiting{
+        width: 75px;
+        height: 32px;
+        border: 2px solid #018ad2;
+        color: #018ad2;
+        font-size: 14px;
+        border-radius: 5px;
+        margin-right: 10px;
+       }
+       .Waiting:hover{
+        background-color: #fff;
+       }
+      }
     }
-    .rigth{
-        float: right;
+    .rigthYh{
+      margin-top: 50px;
+      width: 350px;
+      .org-tree{
+        width:100%;
+        max-height: 340px;
+        box-sizing: border-box;
+        /*padding-right: 10px;*/
+        border: 1px solid #edf1f7;
+        overflow: scroll;
+        overflow-x:hidden;
+      }
+      .listtop{
+       .relevance{
+        width: 75px;
+        height: 32px;
+        border: 2px solid #018ad2;
+        color: #018ad2;
+        font-size: 14px;
+        border-radius: 5px;
+        margin-right: 10px;
+       }
+       .relevance:hover{
+        background-color: #fff;
+       }
+      }
+     }
     }
+    .Btn{
+      position: absolute;
+      left: 40%;
+      top: 85%;
+    }
+   }
   }
-  </style>
\ No newline at end of file
+
+}
+</style>
\ No newline at end of file
diff --git a/supervise-organizational-ui/src/router/modules/codemenu.js b/supervise-organizational-ui/src/router/modules/codemenu.js
index d3edeacb..15af1c43 100644
--- a/supervise-organizational-ui/src/router/modules/codemenu.js
+++ b/supervise-organizational-ui/src/router/modules/codemenu.js
@@ -5,14 +5,14 @@ const codemenu = [{
   component: Layout,
   redirect: '/yhgl/index',
   meta: {
-    title: '员工管理'
+    title: '用户管理'
   },
   children: [{
     path: '/yhgl/index',
     component: () => import('@/views/organizational/yhgl.vue'),
     name: 'ZzjgYhgl',
     meta: {
-      title: '员工管理',
+      title: '用户管理',
       noCache: true
     }
   }]
diff --git a/supervise-organizational-ui/src/views/organizational/userManageAdd.vue b/supervise-organizational-ui/src/views/organizational/userManageAdd.vue
index 81de3c5a..a9fcc9c5 100644
--- a/supervise-organizational-ui/src/views/organizational/userManageAdd.vue
+++ b/supervise-organizational-ui/src/views/organizational/userManageAdd.vue
@@ -9,7 +9,7 @@
           </td>
         </tr>
         <tr>
-          <td>员工类型</td>
+          <td>用户类型</td>
           <td>
             <el-select v-model="form.userType" @change="$forceUpdate()" style="width:300px">
               <el-option
@@ -60,7 +60,7 @@
         <tr>
           <td>手机号码</td>
           <td>
-            <el-input v-model="form.mobile"  maxlength="11"style="width:300px"></el-input>
+            <el-input v-model="form.mobile"  maxlength="11" style="width:300px"></el-input>
           </td>
         </tr>
         <tr>
diff --git a/supervise-organizational-ui/src/views/organizational/userManageList.vue b/supervise-organizational-ui/src/views/organizational/userManageList.vue
index d31b16df..2754484d 100644
--- a/supervise-organizational-ui/src/views/organizational/userManageList.vue
+++ b/supervise-organizational-ui/src/views/organizational/userManageList.vue
@@ -13,11 +13,16 @@
             <el-form-item label="电话">
               <el-input v-model="search.mobile" clearable></el-input>
             </el-form-item>
-          <!--  <el-form-item label="角色">
-              <el-select v-model="search.roleSid" filterable clearable placeholder="请选择">
-                <el-option v-for="item in roleListAll" :key="item.sid" :label="item.name" :value="item.sid"></el-option>
-              </el-select>
-            </el-form-item> -->
+           <el-form-item label="用户类型">
+            <el-select v-model="search.personTypeKey" style="width:300px">
+              <el-option
+                v-for="(item, i) in userTypeData"
+                :key="i"
+                :label="item.name"
+                :value="item.value">
+              </el-option>
+            </el-select>
+            </el-form-item>
             <el-form-item label="部门">
               <el-input v-model="search.orgName" clearable></el-input>
               <!--              <el-select v-model="search.roleSid" clearable placeholder="请选择">-->
@@ -44,7 +49,7 @@
           <el-button @click="userinfoChange(scope.row)" :disabled="scope.row.sid=='e73f6e2c-1bda-4a4d-8390-ac7a2bf25854'" type="primary" size="mini">
             修改
           </el-button>
-          <el-button @click="del(scope.row)" :disabled="scope.row.sid=='e73f6e2c-1bda-4a4d-8390-ac7a2bf25854'"type="danger" size="mini">
+          <el-button @click="del(scope.row)" :disabled="scope.row.sid=='e73f6e2c-1bda-4a4d-8390-ac7a2bf25854'" type="danger" size="mini">
             删除
           </el-button>
         </template>
@@ -54,7 +59,7 @@
           <!-- <span class="tablerow-click" @click="userinfoChange(scope.row)">-->{{ scope.row.userName }}<!--</span>-->
         </template>
       </el-table-column>
-      <el-table-column prop="userType" label="员工类型" width="120" align="center"></el-table-column>
+      <el-table-column prop="userType" label="用户类型" width="120" align="center"></el-table-column>
       <el-table-column prop="name" label="姓名" width="150" align="center"></el-table-column>
       <el-table-column prop="mobile" label="联系电话" width="150" align="center"></el-table-column>
       <el-table-column prop="departmentName" label="部门" align="center"></el-table-column>
@@ -120,7 +125,7 @@
           </td>
         </tr>
         <tr>
-          <td>员工类型</td>
+          <td>用户类型</td>
           <td>
             <el-select v-model="form.userTypeKey" @change="$forceUpdate()" style="width:300px">
               <el-option v-for="(item, i) in userTypeData" :key="i" :label="item.name" :value="item.value">
@@ -225,7 +230,8 @@
           name: '',
           userName: '',
           mobile: '',
-          roleSid: ''
+          roleSid: '',
+          personTypeKey: ''
         },
         props: {
           value: 'sid',