diff --git a/supervise-organizational-ui/.env.development b/supervise-organizational-ui/.env.development
index 76eccf00..d4d20ecb 100644
--- a/supervise-organizational-ui/.env.development
+++ b/supervise-organizational-ui/.env.development
@@ -5,5 +5,5 @@ ENV = 'development'
 VUE_APP_BASE_API = '/api'
 
 ## 配置测试和本地开发时的 接口地址
-##VUE_APP_URL = "http://192.168.3.108:8112"
-VUE_APP_URL = "http://122.14.222.186:8112"
+##VUE_APP_URL = "http://192.168.3.173:8112"
+VUE_APP_URL = "http://8.130.39.13:8112"
diff --git a/supervise-organizational-ui/src/api/system/userManage/index.js b/supervise-organizational-ui/src/api/system/userManage/index.js
index c6503722..b80505e2 100644
--- a/supervise-organizational-ui/src/api/system/userManage/index.js
+++ b/supervise-organizational-ui/src/api/system/userManage/index.js
@@ -5,7 +5,8 @@ import qs from 'qs'
 let tokens = window.sessionStorage.getItem('token');
 export function userList(data){
   return request({
-    url: '/portal/v1/sysuser/listPage',
+    // url: '/portal/v1/sysuser/listPage',
+    url: '/portal/v1/sysstaffinfo/listPageNew',
     method: 'post',
     data: data,
     headers: {'Content-Type': 'application/json',
@@ -16,7 +17,8 @@ export function userList(data){
 // 新增
 export function userAdd(data){
   return request({
-    url: '/portal/v1/sysuser/save',
+    // url: '/portal/v1/sysuser/save',
+    url: '/portal/v1/sysstaffinfo/saveNew',
     method: 'post',
     data: data,
     headers: {'Content-Type': 'application/json',
@@ -27,7 +29,8 @@ export function userAdd(data){
 // 更新
 export function userUpdata(data){
   return request({
-    url: '/portal/v1/sysuser/update/' +data.sid,
+    // url: '/portal/v1/sysuser/update/' +data.sid,
+    url: '/portal/v1/sysstaffinfo/updateNew/' +data.sid,
     method: 'post',
     data: data,
     headers: {'Content-Type': 'application/json',
@@ -37,14 +40,11 @@ export function userUpdata(data){
 }
 
 // 删除
-export function delUser(data){
+export function delUser(sid){
   return request({
-    url: '/portal/v1/sysuser/delBySid/' +data.sid,
-    method: 'get',
-    data: data,
-    headers: {'Content-Type': 'application/json',
-    'token':tokens
-    }
+    // url: '/portal/v1/sysuser/delBySid/' +data.sid,
+    url: '/portal/v1/sysstaffinfo/delBySid/' +sid,
+    method: 'delete'
   })
 }
 // 初始化密码
diff --git a/supervise-organizational-ui/src/layout/components/Navbar.vue b/supervise-organizational-ui/src/layout/components/Navbar.vue
index aa22fb14..dbdc45d6 100644
--- a/supervise-organizational-ui/src/layout/components/Navbar.vue
+++ b/supervise-organizational-ui/src/layout/components/Navbar.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="navbar">
-      <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png" style="width: 45px;height: 45px;margin-right: 10px;"/>汇融供应链贷后监管平台p>
+      <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png" style="width: 45px;height: 45px;margin-right: 10px;"/>汇融供应链贷后监管平台>
       <!-- <h3 class="breadcrumb-container">汇融供应链贷后监管平台h3> -->
       <div class="right-menu">
 <!--        <p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p>-->
diff --git a/supervise-organizational-ui/src/router/modules/codemenu.js b/supervise-organizational-ui/src/router/modules/codemenu.js
index 61143618..001f8dd3 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/settings.js b/supervise-organizational-ui/src/settings.js
index 0dc7efda..9f78bf67 100644
--- a/supervise-organizational-ui/src/settings.js
+++ b/supervise-organizational-ui/src/settings.js
@@ -1,6 +1,6 @@
 module.exports = {
 
-  title: '汇融供应链贷后监管平台
+  title: '汇融供应链贷后监管平台',
 
   /**
    * @type {boolean} true | false
diff --git a/supervise-organizational-ui/src/views/organizational/userManageAdd.vue b/supervise-organizational-ui/src/views/organizational/userManageAdd.vue
index 27a27f4b..81de3c5a 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
@@ -43,7 +43,7 @@
              </el-select>-->
           </td>
         </tr>
-        <tr>
+       <!-- <tr>
           <td>岗位</td>
           <td>
             <el-select v-model="form.postSid" @change="$forceUpdate()" style="width:300px">
@@ -54,25 +54,31 @@
                 :value="item.sid">
               </el-option>
             </el-select>
-            <!--<el-input v-model="form.postSid"></el-input>-->
+           <el-input v-model="form.postSid"></el-input>
           </td>
-        </tr>
+        </tr> -->
         <tr>
           <td>手机号码</td>
           <td>
-            <el-input v-model="form.mobile" style="width:300px"></el-input>
+            <el-input v-model="form.mobile"  maxlength="11"style="width:300px"></el-input>
           </td>
         </tr>
         <tr>
+          <td>微信号</td>
+          <td>
+            <el-input v-model="form.openId" style="width:300px"></el-input>
+          </td>
+        </tr>
+       <!-- <tr>
           <td>手机验证码</td>
           <td>
             <el-input v-model="form.verificationCode" placeholder="请输入验证码" style="width:300px">
               <el-button v-show="showCode" slot="append" @click.native="getIdentifying">获取验证码</el-button>
               <el-button v-show="!showCode" slot="append">{{phoneCodeCount}} s</el-button>
             </el-input>
-            <!--<el-input v-model="form.verificationCode"></el-input>-->
+            <el-input v-model="form.verificationCode"></el-input>
           </td>
-        </tr>
+        </tr> -->
       </table>
       <div style="margin-top: 20px; text-align: center;">
         <el-button type="primary" @click="save()">保 存</el-button>
@@ -95,21 +101,23 @@
           deptSid: '',
           postSid: '',
           mobile: '',
+          openId: '',
           verificationCode: ''
         },
         form1: {
           sid: '',
         },
         userTypeData: [{
-          value: '1',
-          name: '员工'
-        }, {
-          value: '2',
-          name: '客户'
-        }, {
-          value: '3',
-          name: '供应商'
-        }],
+            value: '1',
+            name: '监管'
+          }, {
+            value: '2',
+            name: '客户'
+          },
+          {
+            value: '3',
+            name: '银行'
+          },],
         treedata: [],
         checkedId: [],
         orgName: '',
@@ -148,6 +156,7 @@
             this.orgName = res.data.departmentName
             this.form.postSid = res.data.postSid
             this.form.mobile = res.data.mobile
+            this.form.openId = res.data.openId
           }
         })
       },
@@ -172,7 +181,17 @@
           arr = [data.sid];
           this.$refs.Tree.setCheckedKeys(arr);
           this.form.postSid = ''
-          this.getPost(data.sid)
+          // this.getPost(data.sid)
+          
+          this.form.sysStaffOrg ={
+            orgSid: data.sid,
+            orgName:data.name,
+            orgSidPath:data.orgSidPath,
+            orgNamePath:"",
+            orgCode:data.orgCode,
+            manageType:"",
+          }
+          
           return;
         }
       },
diff --git a/supervise-organizational-ui/src/views/organizational/userManageList.vue b/supervise-organizational-ui/src/views/organizational/userManageList.vue
index 519205d6..d31b16df 100644
--- a/supervise-organizational-ui/src/views/organizational/userManageList.vue
+++ b/supervise-organizational-ui/src/views/organizational/userManageList.vue
@@ -10,16 +10,19 @@
             <el-form-item label="姓名">
               <el-input v-model="search.name" clearable></el-input>
             </el-form-item>
-            <el-form-item label="角色">
+            <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> -->
             <el-form-item label="部门">
               <el-input v-model="search.orgName" clearable></el-input>
-<!--              <el-select v-model="search.roleSid" clearable placeholder="请选择">-->
-<!--                <el-option v-for="(item,i) in roleListAll" :key="i" :label="item.name" :value="item.sid"></el-option>-->
-<!--              </el-select>-->
+              <!--              <el-select v-model="search.roleSid" clearable placeholder="请选择">-->
+              <!--                <el-option v-for="(item,i) in roleListAll" :key="i" :label="item.name" :value="item.sid"></el-option>-->
+              <!--              </el-select>-->
             </el-form-item>
             <el-button @click="getOrgUserList(1)">查询</el-button>
           </el-col>
@@ -27,10 +30,10 @@
       </el-form>
     </div>
     <!-- table -->
-    <el-table :data="userTable" border style="width: 100%;">
+    <el-table :data="userTable" border style="width: 98%; margin-left: 15px;">
       <el-table-column label="序号" width="60px" type="index" align="center">
       </el-table-column>
-      <el-table-column label="操作" width="300px" align="center">
+      <el-table-column label="操作" width="380px" align="center">
         <template slot-scope="scope">
           <el-button @click="setRole(scope.row)" type="primary" size="mini">
             设置角色
@@ -38,21 +41,26 @@
           <el-button @click="initPwd(scope.row)" type="danger" size="mini">
             初始化密码
           </el-button>
-          <!-- <el-button @click="del(scope.row)" type="danger" size="mini">
-             删除
-           </el-button>-->
+          <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>
         </template>
       </el-table-column>
-      <el-table-column prop="userName" label="用户名" align="center">
+      <el-table-column prop="userName" label="用户名" width="150" align="center">
         <template slot-scope="scope">
           <!-- <span class="tablerow-click" @click="userinfoChange(scope.row)">-->{{ scope.row.userName }}<!--</span>-->
         </template>
       </el-table-column>
-      <el-table-column prop="userType" label="用户类型" align="center"></el-table-column>
-      <el-table-column prop="name" label="姓名" width="120px" 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>
-      <el-table-column prop="postName" label="岗位" align="center"></el-table-column>
-      <el-table-column prop="isEnable" label="是否可用" align="center">
+      <!-- <el-table-column prop="position" label="岗位" align="center"></el-table-column> -->
+      <el-table-column prop="openId" label="微信号" width="150" align="center"></el-table-column>
+      <!-- <el-table-column prop="isEnable" label="是否可用" align="center">
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.isEnable"
@@ -63,9 +71,9 @@
             @change="enabledChange($event,scope.row)">
           </el-switch>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
-    <pagination :total="page.total" :page.sync="page.current" :limit.sync="page.size" @pagination="pagination"/>
+    <pagination :total="page.total" :page.sync="page.current" :limit.sync="page.size" @pagination="pagination" />
     <!-- 角色设置 -->
     <el-dialog title="设置角色" :visible.sync="roleDialog" width="30%">
       <el-form :model="roleForm" :rules="rules" ref="roleForm">
@@ -92,12 +100,9 @@
                :value="item.departmentSid"
              ></el-option>
            </el-select> -->
-          <el-cascader
-            v-model="bm_Form.departmentSid"
-            :options="treedata"
-            :props="props"></el-cascader>
+          <el-cascader v-model="bm_Form.departmentSid" :options="treedata" :props="props"></el-cascader>
           <el-button type="primary" size='mini' @click="toNav('deptManage')" style="margin-left: 10px;" circle
-                     icon="el-icon-plus"></el-button>
+            icon="el-icon-plus"></el-button>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -115,7 +120,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">
@@ -126,29 +131,37 @@
         <tr>
           <td>部门</td>
           <td>
-            <el-select v-model="form.deptSid" placeholder="请选择" @change="$forceUpdate()" style="width:300px">
-              <el-option hidden :key="form.deptSid" :label="orgName" :value="form.deptSid"></el-option>
-              <el-tree :data="treedata" ref="Tree" show-checkbox accordion node-key="sid" :default-checked-keys="checkedId" :default-expand-all='true' :check-strictly='true' :props="defaultProps" @check-change="checkchange">
+            <el-select v-model="form.departmentName" placeholder="请选择" @change="$forceUpdate()" style="width:300px">
+              <el-option hidden :key="form.departmentSid" :label="orgName" :value="form.departmentName"></el-option>
+              <el-tree :data="treedata" ref="Tree" show-checkbox accordion node-key="sid"
+                :default-checked-keys="checkedId" :default-expand-all='true' :check-strictly='true'
+                :props="defaultProps" @check-change="checkchange">
               </el-tree>
             </el-select>
           </td>
         </tr>
-        <tr>
+      <!--  <tr>
           <td>岗位</td>
           <td>
-            <el-select v-model="form.postSid" @change="$forceUpdate()" style="width:300px">
+            <el-select v-model="form.sysStaffPost" @change="$forceUpdate()" style="width:300px">
               <el-option v-for="(item, i) in postSidData" :key="i" :label="item.name" :value="item.sid"></el-option>
             </el-select>
-            <!--<el-input v-model="form.postSid"></el-input>-->
+           <el-input v-model="form.postSid"></el-input>
           </td>
-        </tr>
+        </tr> -->
         <tr>
           <td>手机号码</td>
           <td>
-            <el-input v-model="form.userName" style="width:300px"></el-input>
+            <el-input v-model="form.mobile" maxlength="11" style="width:300px"></el-input>
           </td>
         </tr>
         <tr>
+          <td>微信号</td>
+          <td>
+            <el-input v-model="form.openId" style="width:300px"></el-input>
+          </td>
+        </tr>
+        <!-- <tr>
           <td>手机验证码</td>
           <td>
             <el-input v-model="form.verificationCode" placeholder="请输入验证码" style="width:300px">
@@ -156,7 +169,7 @@
               <el-button v-show="!showCode" slot="append">{{ phoneCodeCount }} s</el-button>
             </el-input>
           </td>
-        </tr>
+        </tr> -->
       </table>
       <div style="margin-top: 20px; text-align: center;">
         <el-button type="primary" @click="save()">保 存</el-button>
@@ -167,317 +180,355 @@
 </template>
 
 <script>
-import {
-  userList,
-  delUser,
-  initPwd,
-  setRole,
-  orgList,
-  postList,
-  saveOrgRole,
-  roleList,
-  setRoleEnable,
-  userUpdata
-} from '@/api/system/userManage/index.js'
+  import {
+    userList,
+    delUser,
+    initPwd,
+    setRole,
+    orgList,
+    postList,
+    saveOrgRole,
+    roleList,
+    setRoleEnable,
+    userUpdata
+  } from '@/api/system/userManage/index.js'
 
-export default {
-  data() {
-    return {
-      editDialog: false,
-      form: {},
-      userTypeData: [{
-        value: '1',
-        name: '员工'
-      }, {
-        value: '2',
-        name: '客户'
-      }, {
-        value: '3',
-        name: '供应商'
-      }],
-      checkedId: [],
-      orgName: '',
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
-      showCode: true,
-      postSidData: [],
-      phoneCodeCount: '',
-      timer: null,
-      roleListAll: [],
-      search: {
-        name: '',
-        userName: '',
-        roleSid: ''
-      },
-      props: {
-        value: 'sid',
-        label: 'name',
-        children: 'orgDepartmentVoList'
-      },
-      treedata: null,
-      page: {
-        total: 0, // 默认数据总数
-        current: 1, // 默认开始页面
-        size: 10 // 每页的数据条数
-      },
-      userTable: [],
-      clientTable: [],
-      // 设置角色
-      formLabelWidth: '100',
-      roleDialog: false,
-      roleList: [],
-      roleForm: {
-        roleSid: '',
-        userSid: ''
-      },
-      // 部门
-      bm_Dialog: false,
-      postSid: '',
-      bm_Form: { departmentSid: '' },
-      bm_List: [],
-      rules: {
-        roleSid: [{ required: true, message: '请选择角色名称', trigger: 'blur' }],
-        departmentSid: [{ required: true, message: '请选择部门名称', trigger: 'blur' }]
-      }
-    }
-  },
-  props: ['dataObj'],
-  watch: {
-    dataObj: {
-      handler(val) {
-        this.getOrgUserList()
-      },
-      deep: true
-    }
-  },
-  mounted() {
-    this.getOrgUserList()
-    this.getRoleList()
-    this.getOrgTree()
-    this.getOrgList()
-  },
-  methods: {
-    // 列表 + 初始化
-    getOrgUserList(flag) {
-      if (flag === '1') {
-        this.page.current = 1
+  export default {
+    data() {
+      return {
+        editDialog: false,
+        form: {},
+        userTypeData: [{
+            value: '1',
+            name: '监管'
+          }, {
+            value: '2',
+            name: '客户'
+          },
+          {
+            value: '3',
+            name: '银行'
+          },
+        ],
+        checkedId: [],
+        orgName: '',
+        defaultProps: {
+          children: 'children',
+          label: 'name'
+        },
+        showCode: true,
+        postSidData: [],
+        phoneCodeCount: '',
+        timer: null,
+        roleListAll: [],
+        search: {
+          name: '',
+          userName: '',
+          mobile: '',
+          roleSid: ''
+        },
+        props: {
+          value: 'sid',
+          label: 'name',
+          children: 'orgDepartmentVoList'
+        },
+        treedata: null,
+        page: {
+          total: 0, // 默认数据总数
+          current: 1, // 默认开始页面
+          size: 10 // 每页的数据条数
+        },
+        userTable: [],
+        clientTable: [],
+        // 设置角色
+        formLabelWidth: '100',
+        roleDialog: false,
+        roleList: [],
+        roleForm: {
+          roleSid: '',
+          userSid: ''
+        },
+        // 部门
+        bm_Dialog: false,
+        sysStaffPost: '',
+        bm_Form: {
+          departmentSid: ''
+        },
+        bm_List: [],
+        rules: {
+          roleSid: [{
+            required: true,
+            message: '请选择角色名称',
+            trigger: 'blur'
+          }],
+          departmentSid: [{
+            required: true,
+            message: '请选择部门名称',
+            trigger: 'blur'
+          }]
+        }
       }
-      let params = this.page
-      params.params = this.search
-      userList(params).then(res => {
-        this.page.total = res.data.total
-        this.userTable = res.data.records
-      })
     },
-    getRoleList() {
-      var param = {}
-      roleList(param).then(res => {
-        if (res.code === '200') {
-          this.roleListAll = res.data
-        }
-      })
+    props: ['dataObj'],
+    watch: {
+      dataObj: {
+        handler(val) {
+          this.getOrgUserList()
+        },
+        deep: true
+      }
     },
-    // 分页
-    pagination(val) {
-      this.page.current = val.pageNum
-      this.page.size = val.pageSize
+    mounted() {
       this.getOrgUserList()
+      this.getRoleList()
+      this.getOrgTree()
+      this.getOrgList()
     },
-    getOrgTree() { // 获取部门树形列表
-      function treeArr(data) {
-        if (data.length > 0) {
-          for (var i = 0; i < data.length; i++) {
-            if (data[i].orgDepartmentVoList.length > 0) {
-              treeArr(data[i].orgDepartmentVoList)
-            } else {
-              delete data[i].orgDepartmentVoList
-            }
-          }
+    methods: {
+      // 列表 + 初始化
+      getOrgUserList(flag) {
+        if (flag === '1') {
+          this.page.current = 1
         }
-      }
-     // getOrgTree({organizationSid: this.$store.getters.userInfo.orgSid}).then(res => {
-     //   let tree = res.data[0].orgDepartmentVoList
-     //   treeArr(tree)
-     //   this.treedata = tree
-     // })
-    },
-    // 设置角色   设置 用户ID
-    setRole(row) {
-      this.roleForm.roleSid = []
-      this.roleDialog = true
-      this.roleForm.sid = row.sid
-      this.roleForm.userSid = row.sid
-      setRole(this.roleForm).then(res => {
-        this.roleList = res.data
-        for (let i = 0; i < res.data.length; i++) {
-          if (res.data[i].checked === '0') {
-            this.roleForm.roleSid.push(res.data[i].sid)
+        let params = this.page
+        params.params = this.search
+        userList(params).then(res => {
+          this.page.total = res.data.total
+          this.userTable = res.data.records
+        })
+      },
+      getRoleList() {
+        var param = {}
+        roleList(param).then(res => {
+          if (res.code === '200') {
+            this.roleListAll = res.data
           }
-        }
-     	// this.roleForm.roleSid = res.data.filter(item=> item.checked =='0')
-      })
-    },
-    // 设置角色  提交
-    saveRole(formName) {
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          this.roleForm.roleSid = this.roleForm.roleSid.toString()
-          saveOrgRole(this.roleForm).then(res => {
-            if (res.code === '200') {
-              this.roleDialog = false
-              this.getOrgUserList()
-              this.$message({
-                message: res.msg,
-                type: 'success'
-              })
+        })
+      },
+      // 分页
+      pagination(val) {
+        this.page.current = val.pageNum
+        this.page.size = val.pageSize
+        this.getOrgUserList()
+      },
+      getOrgTree() { // 获取部门树形列表
+        function treeArr(data) {
+          if (data.length > 0) {
+            for (var i = 0; i < data.length; i++) {
+              if (data[i].orgDepartmentVoList.length > 0) {
+                treeArr(data[i].orgDepartmentVoList)
+              } else {
+                delete data[i].orgDepartmentVoList
+              }
             }
-          })
-        } else {
-          return false
+          }
         }
-      })
-    },
-    // 设置部门  提交
-    saveOrg(formName) {
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          let params = { // 请求的参数
-            departmentSid: this.bm_Form.departmentSid[this.bm_Form.departmentSid.length - 1],
-            staffSid: this.bm_Form.staffSid
+        // getOrgTree({organizationSid: this.$store.getters.userInfo.orgSid}).then(res => {
+        //   let tree = res.data[0].orgDepartmentVoList
+        //   treeArr(tree)
+        //   this.treedata = tree
+        // })
+      },
+      // 设置角色   设置 用户ID
+      setRole(row) {
+        this.roleForm.roleSid = []
+        this.roleDialog = true
+        this.roleForm.sid = row.sid
+        this.roleForm.userSid = row.sid
+        setRole(this.roleForm).then(res => {
+          this.roleList = res.data
+          for (let i = 0; i < res.data.length; i++) {
+            if (res.data[i].checked === '0') {
+              this.roleForm.roleSid.push(res.data[i].sid)
+            }
+          }
+          // this.roleForm.roleSid = res.data.filter(item=> item.checked =='0')
+        })
+      },
+      // 设置角色  提交
+      saveRole(formName) {
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            this.roleForm.roleSid = this.roleForm.roleSid.toString()
+            saveOrgRole(this.roleForm).then(res => {
+              if (res.code === '200') {
+                this.roleDialog = false
+                this.getOrgUserList()
+                this.$message({
+                  message: res.msg,
+                  type: 'success'
+                })
+              }
+            })
+          } else {
+            return false
           }
-          saveDepartment(params).then(res => {
-            if (res.code === '200') {
-              this.getOrgUserList()
-              this.bm_Dialog = false
-              this.$message({
-                message: res.msg,
-                type: 'success'
-              })
+        })
+      },
+      // 设置部门  提交
+      saveOrg(formName) {
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            let params = { // 请求的参数
+              departmentSid: this.bm_Form.departmentSid[this.bm_Form.departmentSid.length - 1],
+              staffSid: this.bm_Form.staffSid
             }
+            saveDepartment(params).then(res => {
+              if (res.code === '200') {
+                this.getOrgUserList()
+                this.bm_Dialog = false
+                this.$message({
+                  message: res.msg,
+                  type: 'success'
+                })
+              }
+            })
+          } else {
+            return false
+          }
+        });
+      },
+
+      // 修改信息  提交
+      save(formName) {
+
+        console.log("form>>>>", this.form)
+
+        this.form.userType = this.form.userTypeKey;
+        userUpdata(this.form).then(res => {
+          if (res.code === '200') {
+            this.getOrgUserList()
+            this.bm_Dialog = false
+            this.$message({
+              message: res.msg,
+              type: 'success'
+            })
+            this.editDialog = false
+          }
+          this.reset()
+        })
+      },
+      initPwd(row) {
+        this.$confirm('此操作将初始化该用户密码, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          initPwd({
+            sid: row.sid
+          }).then(res => {
+            this.$message({
+              type: 'success',
+              message: res.msg
+            })
           })
-        } else {
-          return false
-        }
-      });
-    },
-    // 设置部门  提交
-    save(formName) {
-      this.form.userType = this.form.userTypeKey;
-      userUpdata(this.form).then(res => {
-        if (res.code === '200') {
-          this.getOrgUserList()
-          this.bm_Dialog = false
-          this.$message({
-            message: res.msg,
-            type: 'success'
+        })
+      },
+      // 修改用户信息
+      userinfoChange(row) {
+        console.log("row>>>>", row)
+        var sysStaffPost = row.sysStaffPost
+        this.editDialog = true
+        this.form = Object.assign({}, row)
+        this.sysStaffPost = sysStaffPost
+        this.$nextTick(() => {
+          this.$refs.Tree.setChecked(this.form.departmentSid, true, true)
+        })
+        // this.$emit('status',true)
+        // this.$emit('item',row)
+      },
+      // 删除
+      del(row) {
+          console.log("row.sid",row.sid)
+
+        this.$confirm('此操作将删除该用户, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          delUser(row.sid
+          ).then(res => {
+            this.$message({
+              type: 'success',
+              message: res.msg
+            });
+            this.getOrgUserList()
           })
-          this.editDialog = false
+        })
+      },
+      toNav(src) {
+        this.$router.push('/' + src)
+      },
+      // 获取部门树形
+      getOrgList(row) {
+        // this.roleDialog = true
+        this.checkedId = []
+        this.Thisrow = row
+        this.loading = true
+        let params = {}
+        orgList(params).then(res => {
+          console.log("res.data",res.data)
+          this.treedata = res.data
+        })
+
+      },
+      checkchange(data, checked, indeterminate) {
+
+           console.log("data",data)
+           console.log("checked",checked)
+           console.log("indeterminate",indeterminate)
+        if (checked) {
+          this.form.departmentSid = data.sid
+          this.form.departmentName = data.name
+          this.orgName = data.name
+          let arr = []
+          arr = [data.sid]
+          this.$refs.Tree.setCheckedKeys(arr)
+          // this.form.sysStaffPost = ''
+          // this.getPost(data.sid)
+           this.form.sysStaffOrg ={
+             orgSid: data.sid,
+             orgName:data.name,
+             orgSidPath:data.orgSidPath,
+             orgNamePath:"",
+             orgCode:data.orgCode,
+             manageType:"",
+           }
+
+
+          return
         }
-        this.reset()
-      })
-    },
-    initPwd(row) {
-      this.$confirm('此操作将初始化该用户密码, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        initPwd({sid: row.sid}).then(res => {
-          this.$message({
-            type: 'success',
-            message: res.msg
-          })
+      },
+      getPost(orgSid) {
+        let params = {
+          sid: orgSid
+        }
+        postList(params).then(res => {
+          this.postSidData = res.data
         })
-      })
-    },
-   // 修改用户信息
-    userinfoChange(row) {
-      var postSid = row.postSid
-      this.editDialog = true
-      this.form = Object.assign({}, row)
-      this.postSid = postSid
-      this.$nextTick(() => {
-        this.$refs.Tree.setChecked(this.form.departmentSid, true, true)
-      })
-   	// this.$emit('status',true)
-   	// this.$emit('item',row)
-    },
-    // 删除
-    del(row) {
-      this.$confirm('此操作将删除该用户, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        delUser({ sid: row.sid }).then(res => {
+        this.form.sysStaffPost = this.sysStaffPost
+      },
+      reset() {
+        this.form = {}
+      },
+      enabledChange(value, row) {
+        setRoleEnable({
+          sid: row.sid,
+          isEnable: value
+        }).then(res => {
           this.$message({
             type: 'success',
             message: res.msg
           });
-          this.getOrgUserList()
         })
-      })
-    },
-    toNav(src) {
-      this.$router.push('/' + src)
-    },
-    // 获取部门树形
-    getOrgList(row) {
-      // this.roleDialog = true
-      this.checkedId = []
-      this.Thisrow = row
-      this.loading = true
-      let params = {}
-      orgList(params).then(res => {
-        this.treedata = res.data
-      })
-
-    },
-    checkchange(data, checked, indeterminate) {
-      if (checked) {
-        this.form.deptSid = data.sid
-        this.orgName = data.name
-        let arr = []
-        arr = [data.sid]
-        this.$refs.Tree.setCheckedKeys(arr)
-        this.form.postSid = ''
-        this.getPost(data.sid)
-        return
-      }
-    },
-    getPost(orgSid) {
-      let params = {
-        sid: orgSid
       }
-      postList(params).then(res => {
-        this.postSidData = res.data
-      })
-      this.form.postSid = this.postSid
-    },
-    reset() {
-      this.form = {}
-    },
-    enabledChange(value, row) {
-      setRoleEnable({
-        sid: row.sid,
-        isEnable: value
-      }).then(res => {
-        this.$message({
-          type: 'success',
-          message: res.msg
-        });
-      })
     }
   }
-}
 </script>
 
 <style scoped="scoped">
-.el-select > .el-input {
-  display: block;
-  width: 300px;
-}
+  .el-select>.el-input {
+    display: block;
+    width: 300px;
+  }
 </style>
-
diff --git a/supervise-organizational-ui/src/views/organizational/yhgl.vue b/supervise-organizational-ui/src/views/organizational/yhgl.vue
index 37d826e2..ab0c51a3 100644
--- a/supervise-organizational-ui/src/views/organizational/yhgl.vue
+++ b/supervise-organizational-ui/src/views/organizational/yhgl.vue
@@ -4,9 +4,9 @@
       <el-tab-pane label="用户列表" name="roleList">
         <user-manage-list :dataObj='dataObj' @status='isShow' @item='listObj'></user-manage-list>
       </el-tab-pane>
-     <!-- <el-tab-pane label="新增用户" name="addrole">
+     <el-tab-pane label="新增用户" name="addrole">
         <user-manage-add @status='isShow' :dataObj='childObj'></user-manage-add>
-      </el-tab-pane>-->
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
diff --git a/supervise-organizational-ui/vue.config.js b/supervise-organizational-ui/vue.config.js
index 3a425647..58fc600f 100644
--- a/supervise-organizational-ui/vue.config.js
+++ b/supervise-organizational-ui/vue.config.js
@@ -6,7 +6,7 @@ function resolve(dir) {
   return path.join(__dirname, dir)
 }
 
-const name = defaultSettings.title || '汇融供应链贷后监管平台// page title
+const name = defaultSettings.title || '汇融供应链贷后监管平台'// page title
 
 // 如果端口设置为80，
 // 使用管理员权限执行命令行。