完善平台管理

2024-10-12 16:49:20 +08:00
parent 0d8f3a3eb8
commit cbb54cb407
20 changed files with 481 additions and 247 deletions
--- a/src/api/User/login.js
+++ b/src/api/User/login.js
@@ -1,5 +1,4 @@
 import request from '@/utils/request'
-const tokens = window.sessionStorage.getItem('token')
 // 获取省/portal/v1/regions/getProvince
 export function doLogin(data) {
  return request({
@@ -18,7 +17,6 @@ export function getrolemenus(data) {
    data: data,
    headers: {
      'Content-Type': 'application/json',
-      'token': tokens
    }
  })
 }
--- a/src/api/portal/Upload.js
+++ b/src/api/portal/Upload.js
@@ -4,7 +4,7 @@ import qs from 'qs'
 const base = process.env.VUE_APP_URL

 // 文件上传接口
-export const uploadFile = process.env.VUE_APP_BASE_API + '/wms/file/upload'
+export const uploadFile = process.env.VUE_APP_BASE_API + '/admin/file/upload'
 // export const uploadFile = process.env.VUE_APP_BASE_API + '/customer/file/upload'


@@ -21,10 +21,10 @@ export const uploadFile = process.env.VUE_APP_BASE_API + '/wms/file/upload'

 // 移除图片
 export function deleteFilesOss(data) {
-	return request({
-		url: '/base/v1/baseVehicleAppendixs/deleteFilesOss',
-		method: 'post',
+  return request({
+    url: '/base/v1/baseVehicleAppendixs/deleteFilesOss',
+    method: 'post',
    data: qs.stringify(data),
-		// headers: { 'Content-Type': 'multipart/form-data' }
-	})
+    // headers: { 'Content-Type': 'multipart/form-data' }
+  })
 }
--- a/src/api/system/dictType/dictCommon.js
+++ b/src/api/system/dictType/dictCommon.js
@@ -1,25 +1,25 @@
 import request from '@/utils/request'
-import qs from 'qs'
-let tokens = window.sessionStorage.getItem('token');
-
+//  数据字典
 //获取字典子集 分页列表
 export function dictCommonList(data) {
  return request({
-    url: '/wms/apiadmin/dictcommons/pageList',
+    url: '/admin/apiadmin/dictcommons/pageList',
    method: 'post',
    data: data,
-    headers: {'Content-Type': 'application/json'}
+    headers: {
+      'Content-Type': 'application/json'
+    }
  })
 }

 //保存 字典子级
 export function savedictCommon(data) {
  return request({
-    url: '/wms/apiadmin/dictcommons/save',
+    url: '/admin/apiadmin/dictcommons/save',
    method: 'POST',
-    data:  data ,
-    headers: {'Content-Type': 'application/json',
-    'token':tokens
+    data: data,
+    headers: {
+      'Content-Type': 'application/json',
    }
  })
 }
@@ -29,18 +29,18 @@ export function getRoleInfo(data) {
  return request({
    url: '/system/v1/menus/' + data.sid,
    method: 'GET',
-    data: qs.stringify(data)
+    data: data
  })
 }

 //根据sid 修改 数据字典
 export function putdictCommon(data) {
  return request({
-    url: '/wms/apiadmin/dictcommons/update/' + data.sid,
+    url: '/admin/apiadmin/dictcommons/update/' + data.sid,
    method: 'POST',
-    data:  data ,
-    headers: {'Content-Type': 'application/json',
-      'token':tokens
+    data: data,
+    headers: {
+      'Content-Type': 'application/json',
    }
  })
 }
@@ -48,11 +48,11 @@ export function putdictCommon(data) {
 //根据sid 删除菜单 信息
 export function deldictCommon(data) {
  return request({
-    url: '/wms/apiadmin/dictcommons/delete/' + data.sid,
+    url: '/admin/apiadmin/dictcommons/delete/' + data.sid,
    method: 'DELETE',
-    data:  data,
-    headers: {'Content-Type': 'application/json',
-      'token':tokens
+    data: data,
+    headers: {
+      'Content-Type': 'application/json',
    }
  })
 }
--- a/src/api/system/dictType/index.js
+++ b/src/api/system/dictType/index.js
@@ -1,16 +1,13 @@
 import request from '@/utils/request'
-import qs from 'qs'
-let tokens = window.sessionStorage.getItem('token')

 // 获取菜单 分页列表
 export function pageList(data) {
  return request({
-    url: '/wms/apiadmin/dicttypes/pageList',
+    url: '/admin/apiadmin/dicttypes/pageList',
    method: 'POST',
    data: data,
    headers: {
      'Content-Type': 'application/json',
-      'token': tokens
    }
  })
 }
@@ -18,12 +15,11 @@ export function pageList(data) {
 // 根据sid 修改
 export function putDictType(data) {
  return request({
-    url: '/wms/apiadmin/dicttypes/update/' + data.sid,
+    url: '/admin/apiadmin/dicttypes/update/' + data.sid,
    method: 'POST',
    data: data,
    headers: {
      'Content-Type': 'application/json',
-      'token': tokens
    }
  })
 }
@@ -31,12 +27,11 @@ export function putDictType(data) {
 // 保存 角色信息
 export function saveDictType(data) {
  return request({
-    url: '/wms/apiadmin/dicttypes/save',
+    url: '/admin/apiadmin/dicttypes/save',
    method: 'POST',
    data: data,
    headers: {
      'Content-Type': 'application/json',
-      'token': tokens
    }
  })
 }
@@ -46,19 +41,18 @@ export function getRoleInfo(data) {
  return request({
    url: '/system/v1/menus/' + data.sid,
    method: 'GET',
-    data: qs.stringify(data)
+    data: data
  })
 }

 // 数据字段--映射管理保存
 export function saveMappingList(data) {
  return request({
-    url: '/wms/apiadmin/sysmapping/saveMappingList',
+    url: '/admin/apiadmin/sysmapping/saveMappingList',
    method: 'POST',
    data: data,
    headers: {
      'Content-Type': 'application/json',
-      'token': tokens
    }
  })
 }
@@ -66,12 +60,11 @@ export function saveMappingList(data) {
 // 数据字段--映射管理保存
 export function selectMappingListInfo(data) {
  return request({
-    url: '/wms/apiadmin/sysmapping/selectMappingListInfo',
+    url: '/admin/apiadmin/sysmapping/selectMappingListInfo',
    method: 'post',
    data: data,
    headers: {
      'Content-Type': 'application/json',
-      'token': tokens
    }
  })
 }
@@ -79,12 +72,11 @@ export function selectMappingListInfo(data) {
 // 根据sid 删除菜单 信息
 export function delDictType(data) {
  return request({
-    url: '/wms/apiadmin/dicttypes/delete/' + data.sid,
+    url: '/admin/apiadmin/dicttypes/delete/' + data.sid,
    method: 'DELETE',
    data: data,
    headers: {
      'Content-Type': 'application/json',
-      'token': tokens
    }
  })
 }
--- a/src/api/system/log/index.js
+++ b/src/api/system/log/index.js
@@ -1,16 +1,12 @@
 import request from '@/utils/request'
-import qs from 'qs'
-//let tokens = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI2IiwiaXNzIjoiV0JLIiwiZXhwIjoxNjMwMDI3MDA3fQ.9bEgBzFW2g1CUT7s5VXxhNCa10cyU_WTCFeqpQje0iY'
-let tokens = window.sessionStorage.getItem('token');
-//获取菜单 分页列表
+//获取日志 分页列表
 export function logPageList(data) {
  return request({
-    url: '/wms/apiadmin/systemlog/listPage',
+    url: '/admin/apiadmin/systemlog/listPage',
    method: 'POST',
    data: data,
-    headers: {'Content-Type': 'application/json',
-    'token':tokens
+    headers: {
+      'Content-Type': 'application/json',
    }
  })
 }
-
--- a/src/api/system/menu/index.js
+++ b/src/api/system/menu/index.js
@@ -1,8 +1,4 @@
 import request from '@/utils/request'
-import qs from 'qs'
-//let tokens = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI2IiwiaXNzIjoiV0JLIiwiZXhwIjoxNjMwMDI3MDA3fQ.9bEgBzFW2g1CUT7s5VXxhNCa10cyU_WTCFeqpQje0iY'
-
-let tokens = window.sessionStorage.getItem('token');

 //获取菜单 分页列表
 export function pageList(data) {
@@ -12,7 +8,6 @@ export function pageList(data) {
    data: data,
    headers: {
      'Content-Type': 'application/json',
-      'token': tokens
    }
  })
 }
@@ -46,10 +41,9 @@ export function delMenus(data) {
  return request({
    url: '/admin/apiadmin/sysmenu/delBySids/' + data.sid,
    method: 'get',
-    data: qs.stringify(data),
+    data: data,
    headers: {
      'Content-Type': 'application/json',
-      'token': tokens
    }
  })
 }
@@ -62,7 +56,6 @@ export function IsEnable(data) {
    /* data: qs.stringify(data),*/
    headers: {
      'Content-Type': 'application/json',
-      'token': tokens
    }
  })
 }
@@ -110,6 +103,6 @@ export function getRoleInfo(data) {
  return request({
    url: '/system/v1/menus/' + data.sid,
    method: 'GET',
-    data: qs.stringify(data)
+    data: data
  })
 }
--- a/src/api/system/organization/organization.js
+++ b/src/api/system/organization/organization.js
@@ -1,33 +1,33 @@
 import request from '@/utils/request'
-import qs from 'qs'
-let tokens = window.sessionStorage.getItem('token');
-class user{
-  verifyList(data){ // 获取列表
+class user {
+  verifyList(data) { // 获取列表
    return request({
      url: '/system/organization/verifyList',
      method: 'post',
      data: data,
-      headers: {'Content-Type': 'application/json'}
+      headers: {
+        'Content-Type': 'application/json'
+      }
    })
  }
-  orgRegisterDetails(data){ // 单位注册信息详情
+  orgRegisterDetails(data) { // 单位注册信息详情
    return request({
-      url: '/system/organization/organizationRegisterDetails/'+data.organizationSid,
+      url: '/system/organization/organizationRegisterDetails/' + data.organizationSid,
      method: 'get',
      params: data
    })
  }
-  verify(data){ // 审核
+  verify(data) { // 审核
    return request({
      url: '/system/organization/verify',
      method: 'post',
-      data: qs.stringify(data)
+      data: data
    })
  }
  // 删除机构信息
  del(data) {
    return request({
-      url: '/system/organization/delete/'+data.sid,
+      url: '/system/organization/delete/' + data.sid,
      method: 'DELETE',
      data
    })
--- a/src/api/system/organizationManage/organizationManage.js
+++ b/src/api/system/organizationManage/organizationManage.js
@@ -0,0 +1,113 @@
+import request from '@/utils/request'
+
+// 获取菜单 分页列表
+export function pageList(data) {
+  return request({
+    url: '/admin/apiadmin/sysorganization/listPage',
+    method: 'POST',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json',
+    }
+  })
+}
+// 查询左侧部门列表
+export function orgList(data) {
+  return request({
+    url: '/admin/apiadmin/sysorganization/list/' + data,
+    method: 'get',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json',
+    }
+  })
+}
+// 编辑部门信息
+export function postOrgtree(data) {
+  return request({
+    url: '/admin/apiadmin/sysorganization/update/' + data.sid,
+    method: 'POST',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json',
+    }
+  })
+}
+// 获取 机构分页列表（编辑部门信息）
+export function putOrgtree(data) {
+  return request({
+    url: '/admin/apiadmin/sysorganization/update/' + data.sid,
+    method: 'POST',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json',
+    }
+  })
+}
+
+// 新增部门信息
+export function addOrgTree(data) {
+  return request({
+    url: '/admin/apiadmin/sysorganization/save',
+    method: 'POST',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json',
+    }
+  })
+}
+// 回显
+export function selectBySid(data) {
+  return request({
+    url: '/admin/apiadmin/sysorganization/fetchBySid/' + data,
+    method: 'get',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json',
+    }
+  })
+}
+// 树 节点名称 删除
+export function delOrgtree(data) {
+  return request({
+    url: `/admin/apiadmin/sysorganization/delBySid/` + data.sid,
+    method: 'get',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json',
+    }
+  })
+}
+// 查询主管人员 旧的:/admin/apiadmin/sysstafforg/staffinfoList
+export function getStaff(data) {
+  return request({
+    url: '/admin/apiadmin/sysstaffinfo/getStaffNameByDeptSid',
+    method: 'get',
+    params: data,
+    headers: {
+      'Content-Type': 'application/json',
+    }
+  })
+}
+// 查询分管人员
+export function getStaffName(params) {
+  return request({
+    url: '/admin/apiadmin/sysstaffinfo/getStaffName',
+    method: 'get',
+    params: params,
+    headers: {
+      'Content-Type': 'application/json',
+    }
+  })
+}
+// 查看二维码
+export function getQrCode(data) {
+  return request({
+    url: '/admin/apiadmin/sysorganization/getQrCode/' + data.sid,
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
--- a/src/api/system/purviewManage/purviewManage.js
+++ b/src/api/system/purviewManage/purviewManage.js
@@ -5,7 +5,7 @@ export default {
  listPage: function(data) {
    return request({
      // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
-      url: '/admin/apiadmin/purviewManage/pageList',
+      url: '/admin/apiadmin/sysauthorizegroup/listPage',
      method: 'POST',
      data: data,
      headers: {
@@ -18,7 +18,7 @@ export default {
  savePurviewManage: function(data) {
    return request({
      // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
-      url: '/base/apiadmin/purviewManage/saveOrUpdate',
+      url: '/admin/apiadmin/sysauthorizegroup/saveOrUpdate',
      method: 'post',
      data: data,
      headers: {
@@ -32,8 +32,12 @@ export default {
  deleteBySid: function(data) {
    return request({
      // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
-      url: '/admin/apiadmin/purviewManage/delete/' + data,
+      url: '/admin/apiadmin/sysauthorizegroup/delBySids',
      method: 'DELETE',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json',
+      }
    })
  },

@@ -41,9 +45,8 @@ export default {
  getPurviewManageListAll: function(params) {
    return request({
      // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
-      url: '/admin/apiadmin/purviewManage/listAll',
-      method: 'post',
-      data: params,
+      url: '/admin/apiadmin/sysauthorizegroup/listAll',
+      method: 'get',
    })
  },

--- a/src/api/system/resourcesManage/resourcesManage.js
+++ b/src/api/system/resourcesManage/resourcesManage.js
@@ -5,7 +5,7 @@ export default {
  listPage: function(data) {
    return request({
      // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
-      url: '/admin/apiadmin/resourcesManage/pageList',
+      url: '/admin/apiadmin/syssource/listPage',
      method: 'POST',
      data: data,
      headers: {
@@ -18,7 +18,7 @@ export default {
  savereSourcesManage: function(data) {
    return request({
      // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
-      url: '/base/apiadmin/resourcesManage/saveOrUpdate',
+      url: '/admin/apiadmin/syssource/save',
      method: 'post',
      data: data,
      headers: {
@@ -27,12 +27,11 @@ export default {
    });
  },

-
  //  删除
  deleteBySid: function(data) {
    return request({
      // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
-      url: '/admin/apiadmin/resourcesManage/delete/' + data,
+      url: '/admin/apiadmin/syssource/delBySids/' + data,
      method: 'DELETE',
    })
  },
@@ -41,9 +40,8 @@ export default {
  getresourcesManageListAll: function(params) {
    return request({
      // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
-      url: '/admin/apiadmin/resourcesManage/listAll',
-      method: 'post',
-      data: params,
+      url: '/admin/apiadmin/syssource/list',
+      method: 'get',
    })
  },

--- a/src/api/system/roleAdminister/index.js
+++ b/src/api/system/roleAdminister/index.js
@@ -1,7 +1,4 @@
 import request from '@/utils/request'
-import qs from 'qs'
-//let tokens = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI2IiwiaXNzIjoiV0JLIiwiZXhwIjoxNjI5OTQxNjI1fQ.aOFOz0h7c8YQs-ti2GLpqeWu4AE9mifx_043hLJQf8g'
-let tokens = window.sessionStorage.getItem('token');
 // 业务角色 列表
 export function roleOrgList(data) {
  return request({
@@ -10,7 +7,6 @@ export function roleOrgList(data) {
    data: data,
    headers: {
      'Content-Type': 'application/json',
-      'token': tokens
    }
  })
 }
@@ -60,7 +56,6 @@ export function saveOrgroles(data) {
    data: data,
    headers: {
      'Content-Type': 'application/json',
-      'token': tokens
    }
  })
 }
@@ -78,7 +73,6 @@ export function putOrgroles(data) {
    data: data,
    headers: {
      'Content-Type': 'application/json',
-      'token': tokens
    }
  })
 }
@@ -94,7 +88,6 @@ export function delOrgroles(data) {
    data: data,
    headers: {
      'Content-Type': 'application/json',
-      'token': tokens
    }
  })
 }
@@ -117,20 +110,30 @@ export function saveRoleMenuList(data) {
    data: data,
    headers: {
      'Content-Type': 'application/json',
-      'token': tokens
    }
  })
 }

+// 菜单授权
+// export function roleMenuTree(data) {
+//   return request({
+//     url: `/admin/apiadmin/sysmenu/listAllByRoleSidG`,
+//     method: 'POST',
+//     data: data,
+//     headers: {
+//       'Content-Type': 'application/json',
+//     }
+//   })
+// }
+
 // 菜单授权
 export function roleMenuTree(data) {
  return request({
-    url: `/admin/apiadmin/sysmenu/listAllByRoleSidG`,
+    url: `/admin/apiadmin/sysmenu/listAllByRoleSid`,
    method: 'POST',
    data: data,
    headers: {
      'Content-Type': 'application/json',
-      'token': tokens
    }
  })
 }
@@ -143,7 +146,6 @@ export function saveorgrolemenus(data) {
    data: data,
    headers: {
      'Content-Type': 'application/json',
-      'token': tokens
    }
  })
 }
@@ -155,7 +157,6 @@ export function sourceMenuTree(data) {
    data: data,
    headers: {
      'Content-Type': 'application/json',
-      'token': tokens
    }
  })
 }
@@ -167,7 +168,6 @@ export function saveSource(data) {
    data: data,
    headers: {
      'Content-Type': 'application/json',
-      'token': tokens
    }
  })
 }
@@ -186,7 +186,6 @@ export function savefunMenu(data) {
    data: data,
    headers: {
      'Content-Type': 'application/json',
-      'token': tokens
    }
  })
 }
@@ -199,7 +198,6 @@ export function selMenuByRole(data) {
    data: data,
    headers: {
      'Content-Type': 'application/json',
-      'token': tokens
    }
  })
 }
@@ -212,7 +210,6 @@ export function updateDataByRoleMenu(data) {
    data: data,
    headers: {
      'Content-Type': 'application/json',
-      'token': tokens
    }
  })
 }
--- a/src/api/system/unitAuthorizeManage/unitAuthorizeManage.js
+++ b/src/api/system/unitAuthorizeManage/unitAuthorizeManage.js
@@ -5,7 +5,7 @@ export default {
  listPage: function(data) {
    return request({
      // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
-      url: '/admin/apiadmin/unitAuthorizeManage/pageList',
+      url: '/admin/apiadmin/sysorgauthorize/listPage',
      method: 'POST',
      data: data,
      headers: {
@@ -18,7 +18,7 @@ export default {
  savePurviewManage: function(data) {
    return request({
      // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
-      url: '/admin/apiadmin/unitAuthorizeManage/savePurviewManage',
+      url: '/admin/apiadmin/sysorgauthorize/saveOrUpdate',
      method: 'post',
      data: data,
      headers: {
--- a/src/api/system/userManage/index.js
+++ b/src/api/system/userManage/index.js
@@ -1,7 +1,5 @@
 import request from '@/utils/request'
-import qs from 'qs'
 // 用户列表
-//let tokens = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI2IiwiaXNzIjoiV0JLIiwiZXhwIjoxNjI5OTQxNjI1fQ.aOFOz0h7c8YQs-ti2GLpqeWu4AE9mifx_043hLJQf8g'
 let tokens = window.sessionStorage.getItem('token');
 export function userList(data) {
  return request({
@@ -10,7 +8,6 @@ export function userList(data) {
    data: data,
    headers: {
      'Content-Type': 'application/json',
-      'token': tokens
    }
  })
 }
@@ -22,7 +19,6 @@ export function userAdd(data) {
    data: data,
    headers: {
      'Content-Type': 'application/json',
-      'token': tokens
    }
  })
 }
@@ -35,7 +31,6 @@ export function initUserInfo(data) {
    data: data,
    headers: {
      'Content-Type': 'application/json',
-      'token': tokens
    }
  })
 }
@@ -48,7 +43,6 @@ export function userUpdata(data) {
    data: data,
    headers: {
      'Content-Type': 'application/json',
-      'token': tokens
    }
  })
 }
@@ -61,7 +55,6 @@ export function delUser(data) {
    data: data,
    headers: {
      'Content-Type': 'application/json',
-      'token': tokens
    }
  })
 }
@@ -73,7 +66,6 @@ export function initPwd(data) {
    data: data,
    headers: {
      'Content-Type': 'application/json',
-      'token': tokens
    }
  })
 }
@@ -85,7 +77,6 @@ export function userSingle(data) {
    data: data,
    headers: {
      'Content-Type': 'application/json',
-      'token': tokens
    }
  })
 }
@@ -97,7 +88,6 @@ export function setRole(data) {
    data: data,
    headers: {
      'Content-Type': 'application/json',
-      'token': tokens
    }
  })
 }
@@ -109,7 +99,6 @@ export function saveOrgRole(data) {
    data: data,
    headers: {
      'Content-Type': 'application/json',
-      'token': tokens
    }
  })
 }
@@ -121,7 +110,6 @@ export function roleList(data) {
    data: data,
    headers: {
      'Content-Type': 'application/json',
-      'token': tokens
    }
  })
 }
@@ -133,7 +121,6 @@ export function orgList(data) {
    data: data,
    headers: {
      'Content-Type': 'application/json',
-      'token': tokens
    }
  })
 }
@@ -145,7 +132,6 @@ export function postList(data) {
    data: data,
    headers: {
      'Content-Type': 'application/json',
-      'token': tokens
    }
  })
 }
@@ -158,7 +144,6 @@ export function getCode(data) {
    data: data,
    headers: {
      'Content-Type': 'application/json',
-      'token': tokens
    }
  })
 }
--- a/src/views/system/organizationManage/organizationManage.vue
+++ b/src/views/system/organizationManage/organizationManage.vue
@@ -290,18 +290,18 @@
 </template>

 <script>
-  // import {
-  //   addOrgTree,
-  //   delOrgtree,
-  //   getQrCode,
-  //   getStaff,
-  //   getStaffName,
-  //   orgList,
-  //   pageList,
-  //   postOrgtree,
-  //   putOrgtree,
-  //   selectBySid
-  // } from '@/api/system/departments/departments.js'
+  import {
+    addOrgTree,
+    delOrgtree,
+    getQrCode,
+    getStaff,
+    getStaffName,
+    orgList,
+    pageList,
+    postOrgtree,
+    putOrgtree,
+    selectBySid
+  } from '@/api/system/organizationManage/organizationManage.js'
  import {
    typeValues
  } from '@/api/system/roleAdminister/index'
--- a/src/views/system/purviewManage/purviewManage.vue
+++ b/src/views/system/purviewManage/purviewManage.vue
@@ -8,7 +8,7 @@
            <el-row :gutter="20">
              <el-col :span="24">
                <el-form-item label="权限组名称">
-                  <el-input v-model="page.search.name" clearable></el-input>
+                  <el-input v-model="page.params.groupName" clearable></el-input>
                </el-form-item>
                <el-button @click="getList(1)">查询</el-button>
              </el-col>
@@ -25,8 +25,8 @@
              <el-button @click="delRow(scope.row)" type="danger" size="mini"> 删除</el-button>
            </template>
          </el-table-column>
-          <el-table-column prop="purviewManageName" label="权限组名称" align="center"></el-table-column>
-          <el-table-column prop="purviewManageCode" label="权限组编码" align="center"></el-table-column>
+          <el-table-column prop="groupName" label="权限组名称" align="center"></el-table-column>
+          <el-table-column prop="groupCode" label="权限组编码" align="center"></el-table-column>
          <el-table-column prop="remarks" label="说明" align="center"></el-table-column>
        </el-table>
        <pagination :total="page.total" :page.sync="page.current" :limit.sync="page.size" @pagination="pagination" />
@@ -37,13 +37,13 @@
            <tr>
              <td>权限组名称</td>
              <td>
-                <el-input v-model="roleForm.purviewManageName" style="width:300px"></el-input>
+                <el-input v-model="roleForm.groupName" style="width:300px"></el-input>
              </td>
            </tr>
            <tr>
              <td>权限组编码</td>
              <td>
-                <el-input v-model="roleForm.purviewManageCode" style="width:300px"></el-input>
+                <el-input v-model="roleForm.groupCode" style="width:300px"></el-input>
              </td>
            </tr>
            <tr>
@@ -52,6 +52,16 @@
                <el-input v-model="roleForm.remarks" style="width:300px"></el-input>
              </td>
            </tr>
+            <tr>
+              <td>关联菜单列表</td>
+              <td>
+                <div style=" height: 300px;width:300px;overflow:auto;overflow-x:hidden;">
+                  <el-tree v-loading="loading" :data="treedata" ref="Tree" show-checkbox node-key="sid"
+                    :default-checked-keys="checkedId" :props="sourcedefaultProps" @check-change="checkchange">
+                  </el-tree>
+                </div>
+              </td>
+            </tr>
          </table>
          <div style="margin-top: 20px; text-align: center;">
            <el-button type="primary" @click="save()">保 存</el-button>
@@ -61,30 +71,40 @@
      </div>
    </el-tab-pane>
    <!-- 新增权限组信息 -->
-    <el-tab-pane label="新增权限组" name="addrole">
+    <el-tab-pane label="新增权限组" name="addrole" class="listconadd">
      <el-card class="box-card">
        <table class="e-table" cellspacing="0">
          <tr>
            <td>权限组名称</td>
            <td>
-              <el-input v-model="roleForm.purviewManageName" style="width:300px"></el-input>
+              <el-input v-model="formBackup.groupName" style="width:300px"></el-input>
            </td>
          </tr>
          <tr>
            <td>权限组编码</td>
            <td>
-              <el-input v-model="roleForm.purviewManageCode" style="width:300px"></el-input>
+              <el-input v-model="formBackup.groupCode" style="width:300px"></el-input>
            </td>
          </tr>
          <tr>
            <td>权限组说明</td>
            <td>
-              <el-input v-model="roleForm.remarks" style="width:300px"></el-input>
+              <el-input v-model="formBackup.remarks" style="width:300px"></el-input>
+            </td>
+          </tr>
+          <tr>
+            <td>关联菜单列表</td>
+            <td>
+              <div style=" height: 300px;width:300px;overflow:auto;overflow-x:hidden;">
+                <el-tree v-loading="loading" :data="treedata" ref="Tree2" show-checkbox node-key="sid"
+                  :props="sourcedefaultProps" @check-change="checkchange">
+                </el-tree>
+              </div>
            </td>
          </tr>
        </table>
        <div style="margin-top: 20px; text-align: center;">
-          <el-button type="primary" @click="save()">保 存</el-button>
+          <el-button type="primary" @click="add()">保 存</el-button>
        </div>
      </el-card>
    </el-tab-pane>
@@ -93,36 +113,73 @@

 <script>
  import req from '@/api/system/purviewManage/purviewManage.js'
-
+  import {
+    pageList,
+  } from '@/api/system/menu/index.js'
  export default {
    data() {
      return {
        dialogTitle: '',
        activeName: 'roleList',
+        menusPage: {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+            name: '',
+            psid: '',
+          }
+        },
+
        roleForm: {
          sid: "",
-          purviewManageName: "",
-          purviewManageCode: '',
+          groupName: "",
+          groupCode: '',
          remarks: '',
+          list: []
+        },
+        formBackup: {
+          sid: "",
+          groupName: "",
+          groupCode: '',
+          remarks: '',
+          list: []
        },
-        formBackup: {},
        page: {
          total: 0, // 默认数据总数
          current: 1, // 默认开始页面
          size: 10, // 每页的数据条数
-          search: {
-            name: '',
+          params: {
+            groupName: '',
          },
        },
        roleTable: [],
+        loading: false,
+        checkedId: [],
+        sourcedefaultProps: {
+          children: 'children',
+          label: 'name'
+        },
        editDialog: false,
+        checkStrictly: false,
+        treedata: [],
+        groupSid: ""
      };
    },
    mounted() {
      this.formBackup = Object.assign({}, this.roleForm),
        this.getList()
+      this.roleMenus()
    },
    methods: {
+      // 获取授权菜单树形
+      roleMenus() {
+        this.menusPage.params.orgSid = window.sessionStorage.getItem('orgSid')
+        pageList(this.menusPage).then((res) => {
+          this.treedata = res.data
+        })
+      },
+
      pagination(val) { // 分页函数
        this.page.current = val.pageNum
        this.page.size = val.pageSize
@@ -141,7 +198,6 @@
      handleClick(tab, event) {
        if (tab.name == 'addrole') {
          this.dialogTitle = '新增'
-          this.roleForm = Object.assign({}, this.formBackup)
        } else {
          this.getList()
        }
@@ -149,17 +205,53 @@
      editRow(row) {
        this.dialogTitle = '编辑'
        this.editDialog = true
-        console.log(row)
-        this.roleForm = Object.assign({}, row)
-        this.checkedId1 = [this.roleForm.orgSid]
+        this.roleForm = row
+        this.checkedId = []
+        this.groupSid = row.sid
+
+        for (var i = 0; i < row.list.length; i++) {
+          var item = row.list[i]
+          if (item.children == "1") {
+            this.checkedId.push(item.menuSid)
+          }
+
+        }
+
+        // this.checkedId = this.recursiveFilter(row.list)
      },
+
+      checkchange(data, checked, indeterminate) {
+        console.log("checkchange", data);
+      },
+
+
+      // /**
+      //  * 递归过滤嵌套数组（树形结构）
+      //  * @param arr {Array}要过滤的原始数据
+      //  * @param type {Boolean} 你要过滤的关键词
+      //  *
+      //  */
+      // recursiveFilter(arr, type) {
+      //   let data = arr.filter(item => item.checked == type).map((item) => {
+      //     item = Object.assign({}, item)
+      //     if (item.children) {
+      //       //递归循环
+      //       item.children = that.recursiveFilter(item.children, type)
+      //     }
+      //     return item.sid
+      //   })
+
+      //   console.log('recursiveFilter', data)
+
+      //   return data
+      // },
      delRow(row) {
        this.$confirm('确定要删除该权限组吗, 是否继续?', '提示', {
          confirmButtonText: '确定',
          cancelButtonText: '取消',
          type: 'warning'
        }).then(() => {
-          req.deleteBySid(row.sid).then(res => {
+          req.deleteBySid([row.sid]).then(res => {
            this.getList()
            this.$message({
              type: 'success',
@@ -171,7 +263,7 @@
      // 保存权限组
      save() {

-        if (this.roleForm.purviewManageName == '') {
+        if (this.roleForm.groupName == '') {
          this.$message({
            message: '权限组名称不能为空',
            type: 'warning'
@@ -179,7 +271,7 @@
          return
        }

-        if (this.roleForm.purviewManageCode == '') {
+        if (this.roleForm.groupCode == '') {
          this.$message({
            message: '权限组编码不能为空',
            type: 'warning'
@@ -187,6 +279,30 @@
          return
        }

+        let roleMenus = []
+        roleMenus = this.$refs.Tree.getCheckedNodes(false, true)
+        // roleMenus = this.$refs.Tree.getCheckedKeys()
+        console.log('已选节点、半选节点node', roleMenus)
+        this.roleForm.list = []
+        for (var i = 0; i < roleMenus.length; i++) {
+          var item = roleMenus[i]
+          this.roleForm.list.push({
+            groupSid: this.groupSid,
+            sourceSid: item.sourceSid,
+            menuSid: item.sid,
+            menuName: item.name,
+            children: item.children.length > 0 ? "0" : "1"
+          })
+        }
+        console.log('已选节点、半选节点sid', this.roleForm.list)
+
+        if (this.roleForm.list.length == 0) {
+          this.$message({
+            message: '关联菜单不能为空',
+            type: 'warning'
+          })
+          return
+        }

        req.savePurviewManage(this.roleForm).then(res => {
          if (res.code == '200') {
@@ -197,23 +313,93 @@
              message: res.msg,
              type: 'success'
            })
+
+            this.$refs.Tree.setCheckedKeys([])
          }
        })

      },
+
+      // 新增权限组
+      add() {
+
+        if (this.formBackup.groupName == '') {
+          this.$message({
+            message: '权限组名称不能为空',
+            type: 'warning'
+          })
+          return
+        }
+
+        if (this.formBackup.groupCode == '') {
+          this.$message({
+            message: '权限组编码不能为空',
+            type: 'warning'
+          })
+          return
+        }
+
+        let roleMenus = []
+        roleMenus = this.$refs.Tree2.getCheckedNodes(false, true)
+        // roleMenus = this.$refs.Tree.getCheckedKeys()
+        console.log('已选节点、半选节点node', roleMenus)
+        this.formBackup.list = []
+        for (var i = 0; i < roleMenus.length; i++) {
+          var item = roleMenus[i]
+          this.formBackup.list.push({
+            groupSid: "",
+            sourceSid: item.sourceSid,
+            menuSid: item.sid,
+            menuName: item.name,
+            children: item.children.length > 0 ? "0" : "1"
+          })
+        }
+        console.log('已选节点、半选节点sid', this.formBackup.list)
+
+        if (this.formBackup.list.length == 0) {
+          this.$message({
+            message: '关联菜单不能为空',
+            type: 'warning'
+          })
+          return
+        }
+
+        req.savePurviewManage(this.formBackup).then(res => {
+          if (res.code == '200') {
+            this.getList()
+            this.reset()
+            this.editDialog = false
+            this.$message({
+              message: res.msg,
+              type: 'success'
+            })
+            this.$refs.Tree2.setCheckedKeys([])
+          }
+        })
+
+      },
+
      reset() {
        this.roleForm = {
          sid: "",
-          purviewManageName: "",
-          purviewManageCode: '',
+          groupName: "",
+          groupCode: '',
          remarks: '',
+          list: []
+        };
+        this.formBackup = {
+          sid: "",
+          groupName: "",
+          groupCode: '',
+          remarks: '',
+          list: []
        };
        this.page = {
          total: 0, // 默认数据总数
          current: 1, // 默认开始页面
          size: 10, // 每页的数据条数
-          search: {
-            name: '',
+          params: {
+            groupName: '',
          },
        }
      },
--- a/src/views/system/resourcesManage/resourcesManage.vue
+++ b/src/views/system/resourcesManage/resourcesManage.vue
@@ -8,7 +8,7 @@
            <el-row :gutter="20">
              <el-col :span="24">
                <el-form-item label="资源名称">
-                  <el-input v-model="page.search.name" clearable></el-input>
+                  <el-input v-model="page.params.sourceName" clearable></el-input>
                </el-form-item>
                <el-button @click="getList(1)">查询</el-button>
              </el-col>
@@ -25,8 +25,8 @@
              <el-button @click="delRow(scope.row)" type="danger" size="mini"> 删除</el-button>
            </template>
          </el-table-column>
-          <el-table-column prop="resourcesManageName" label="资源名称" align="center"></el-table-column>
-          <el-table-column prop="resourcesManageCode" label="资源编码" align="center"></el-table-column>
+          <el-table-column prop="sourceName" label="资源名称" align="center"></el-table-column>
+          <el-table-column prop="sourceId" label="资源编码" align="center"></el-table-column>
          <el-table-column prop="remarks" label="说明" align="center"></el-table-column>
        </el-table>
        <pagination :total="page.total" :page.sync="page.current" :limit.sync="page.size" @pagination="pagination" />
@@ -37,13 +37,13 @@
            <tr>
              <td>资源名称</td>
              <td>
-                <el-input v-model="roleForm.resourcesManageName" style="width:300px"></el-input>
+                <el-input v-model="roleForm.sourceName" style="width:300px"></el-input>
              </td>
            </tr>
            <tr>
              <td>资源编码</td>
              <td>
-                <el-input v-model="roleForm.resourcesManageCode" style="width:300px"></el-input>
+                <el-input v-model="roleForm.sourceId" style="width:300px"></el-input>
              </td>
            </tr>
            <tr>
@@ -67,13 +67,13 @@
          <tr>
            <td>资源名称</td>
            <td>
-              <el-input v-model="roleForm.resourcesManageName" style="width:300px"></el-input>
+              <el-input v-model="roleForm.sourceName" style="width:300px"></el-input>
            </td>
          </tr>
          <tr>
            <td>资源编码</td>
            <td>
-              <el-input v-model="roleForm.resourcesManageCode" style="width:300px"></el-input>
+              <el-input v-model="roleForm.sourceId" style="width:300px"></el-input>
            </td>
          </tr>
          <tr>
@@ -101,8 +101,8 @@
        activeName: 'roleList',
        roleForm: {
          sid: "",
-          resourcesManageName: "",
-          resourcesManageCode: '',
+          sourceName: "",
+          sourceId: '',
          remarks: '',
        },
        formBackup: {},
@@ -110,8 +110,8 @@
          total: 0, // 默认数据总数
          current: 1, // 默认开始页面
          size: 10, // 每页的数据条数
-          search: {
-            name: '',
+          params: {
+            sourceName: '',
          },
        },
        roleTable: [],
@@ -171,7 +171,7 @@
      // 保存资源
      save() {

-        if (this.roleForm.resourcesManageName == '') {
+        if (this.roleForm.sourceName == '') {
          this.$message({
            message: '资源名称不能为空',
            type: 'warning'
@@ -179,7 +179,7 @@
          return
        }

-        if (this.roleForm.resourcesManageCode == '') {
+        if (this.roleForm.sourceId == '') {
          this.$message({
            message: '资源编码不能为空',
            type: 'warning'
@@ -204,16 +204,16 @@
      reset() {
        this.roleForm = {
          sid: "",
-          resourcesManageName: "",
-          resourcesManageCode: '',
+          sourceName: "",
+          sourceId: '',
          remarks: '',
        };
        this.page = {
          total: 0, // 默认数据总数
          current: 1, // 默认开始页面
          size: 10, // 每页的数据条数
-          search: {
-            name: '',
+          params: {
+            sourceName: '',
          },
        }
      },
--- a/src/views/system/roleAdminister/roleAdminister.vue
+++ b/src/views/system/roleAdminister/roleAdminister.vue
@@ -19,15 +19,15 @@
          <el-table :data="roleTable" border style="width: 100%;">
            <el-table-column label="序号" width="80px" type="index" align="center">
            </el-table-column>
-            <el-table-column label="操作" width="250px" align="center">
+            <el-table-column label="操作" width="150px" align="center">
              <template slot-scope="scope">
                <!-- <el-button @click="sourceMenus(scope.row)" type="primary" size="mini">资源授权</el-button> -->
                <!--                <el-button @click="funMenus(scope.row)" type="primary" size="mini">功能授权</el-button>-->
                <!--                <el-button @click="roleMenus(scope.row)" type="primary" size="mini">菜单授权</el-button>-->
                <el-button @click="charactarMenus(scope.row)" type="primary" size="mini">角色授权</el-button>
                <!-- <el-button @click="mobileMenus(scope.row)" type="primary" size="mini">移动端授权</el-button> -->
-                <el-button @click="editRow(scope.row)" type="primary" size="mini">编辑</el-button>
-                <el-button @click="delRow(scope.row)" type="danger" size="mini">删除</el-button>
+                <!-- <el-button @click="editRow(scope.row)" type="primary" size="mini">编辑</el-button> -->
+                <!-- <el-button @click="delRow(scope.row)" type="danger" size="mini">删除</el-button> -->
              </template>
            </el-table-column>
            <el-table-column prop="name" label="角色名称" width="220px" align="center">
@@ -40,6 +40,8 @@
            </el-table-column> -->
            <!--   <el-table-column prop="roleTypeValue" label="组织层级" width="200px" align="center">
            </el-table-column> -->
+            <el-table-column prop="orgName" label="所属组织" align="center">
+            </el-table-column>
            <el-table-column prop="remarks" label="备注" align="center">
            </el-table-column>
            <el-table-column prop="isEnableName" label="是否可用" align="center">
@@ -318,17 +320,9 @@
        </div>
      </el-tab-pane>
      <!-- 新增角色 -->
-      <el-tab-pane label="新增角色" name="addrole">
+      <!-- <el-tab-pane label="新增角色" name="addrole">
        <el-card class="box-card">
          <table class="e-table" cellspacing="0">
-            <!-- <tr>
-              <td>岗位</td>
-              <td>
-                <el-select v-model="roleForm.postSid" filterable style="width:300px" @change="changePost">
-                  <el-option v-for="item in postSidData" :key="item.sid" :label="item.name" :value="item.sid"></el-option>
-                </el-select>
-              </td>
-            </tr> -->
            <tr>
              <td>角色名称</td>
              <td>
@@ -350,14 +344,6 @@
                </el-select>
              </td>
            </tr>
-            <!-- <tr>
-              <td>组织层级</td>
-              <td>
-                <el-select v-model="roleForm.roleTypeValue" style="width:300px" @change="changeOrgName">
-                  <el-option v-for="item in roleTypeValue_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
-                </el-select>
-              </td>
-            </tr> -->
            <tr>
              <td>排序</td>
              <td>
@@ -375,30 +361,16 @@
            <el-button type="primary" @click="save()">保 存</el-button>
          </div>
        </el-card>
-      </el-tab-pane>
+      </el-tab-pane> -->
    </el-tabs>
  </div>
 </template>

 <script>
  import {
-    delOrgroles,
-    funMenuTree,
-    postList,
-    putOrgroles,
-    roleMenuTree,
    roleOrgList,
-    getRoleMenuList,
-    saveRoleMenuList,
-    savefunMenu,
-    saveorgrolemenus,
-    saveOrgroles,
-    saveSource,
-    setRoleEnable,
-    sourceMenuTree,
-    typeValues,
-    selMenuByRole,
-    updateDataByRoleMenu
+    roleMenuTree,
+    saveorgrolemenus
  } from '@/api/system/roleAdminister/index.js'

  export default {
@@ -421,7 +393,6 @@
        formBackup: {},
        search: {
          name: '',
-          orgSid: window.sessionStorage.getItem('orgSid')
        },
        page: {
          total: 0, // 默认数据总数
@@ -488,7 +459,7 @@
    mounted() {
      this.formBackup = Object.assign({}, this.roleForm)
      this.getroleOrgList()
-      this.getPostList()
+      // this.getPostList()
      // this.getType()
    },
    methods: {
@@ -524,6 +495,7 @@
        roleOrgList(params).then(res => {
          this.page.total = res.data.total
          this.roleTable = res.data.records
+
          for (let i = 0; i < this.roleTable.length; i++) {
            if (this.roleTable[i].isEnable == '1') {
              this.roleTable[i].isEnableName = '是'
@@ -670,7 +642,7 @@
        this.loading = true
        let params = {
          roleSid: row.sid,
-          sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa45'
+          // sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa45'
        }
        sourceMenuTree(params).then(res => {
          let data1 = res.data
@@ -758,8 +730,8 @@
        this.loading = true
        let params = {
          roleSid: row.sid,
-          sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa45',
-          orgSid: window.sessionStorage.getItem('orgSid')
+          // sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa45',
+          // orgSid: window.sessionStorage.getItem('orgSid')
        }
        roleMenuTree(params).then(res => {
          let data1 = res.data
--- a/src/views/system/unitAuthorizeManage/unitAuthorizeManage.vue
+++ b/src/views/system/unitAuthorizeManage/unitAuthorizeManage.vue
@@ -1,7 +1,7 @@
 <template>
  <div class="app-container">
    <div v-show="viewState == 1">
-      <button-bar ref="btnbar" view-title="单位授权管理" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+      <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">
@@ -10,12 +10,12 @@
          <div v-show="isSearchShow" class="search">
            <el-form :inline="true" class="tab-header">
              <el-form-item label="单位名称">
-                <el-input v-model="queryParams.params.unitName" placeholder="" clearable />
+                <el-input v-model="queryParams.params.orgName" placeholder="" clearable />
              </el-form-item>
              <el-form-item label="联系人">
-                <el-input v-model="queryParams.params.contacts" placeholder="" clearable />
+                <el-input v-model="queryParams.params.linkPerson" placeholder="" clearable />
              </el-form-item>
-              <el-form-item label="联系电话">
+              <!-- <el-form-item label="联系电话">
                <el-input v-model="queryParams.params.contactNumber" placeholder="" clearable />
              </el-form-item>
              <el-form-item label="注册日期">
@@ -25,7 +25,7 @@
                <el-date-picker v-model="queryParams.params.createDateEnd" type="date" placeholder="选择日期"
                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
                </el-date-picker>
-              </el-form-item>
+              </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>
@@ -35,7 +35,7 @@
        </div>
        <!-- Start 项目列表头部 -->
        <div class="listtop">
-          <div class="tit">单位列表</div>
+          <div class="tit">注册单位列表</div>
        </div>
        <!-- End 项目列表头部 -->
        <!-- Start 项目列表 -->
@@ -47,12 +47,12 @@
                <el-button type="primary" size="mini" @click="toRelevancy(scope.row)">授权</el-button>
              </template>
            </el-table-column>
-            <el-table-column prop="unitName" label="单位名称" align="center" />
-            <el-table-column prop="unitAddress" label="单位地址" align="center" />
-            <el-table-column prop="contacts" label="联系人" align="center" />
-            <el-table-column prop="contactNumber" label="联系电话" align="center" />
-            <el-table-column prop="registerDate" label="注册日期" align="center" />
-            <el-table-column prop="purviews" label="权限组" align="center" />
+            <el-table-column prop="orgName" label="单位名称" align="center" />
+            <!-- <el-table-column prop="unitAddress" label="单位地址" align="center" /> -->
+            <el-table-column prop="linkPerson" label="联系人" align="center" />
+            <!-- <el-table-column prop="contactNumber" label="联系电话" align="center" />
+            <el-table-column prop="registerDate" label="注册日期" align="center" /> -->
+            <el-table-column prop="authorizeGroupName" label="权限组" align="center" />
          </el-table>
        </div>
        <!-- End 项目列表 -->
@@ -66,12 +66,11 @@
    </div>

    <!-- 权限组设置 -->
-    <el-dialog title="权限授权" :visible.sync="roleDialog" width="20%">
+    <el-dialog title="权限组授权" :visible.sync="roleDialog" width="20%">
      <el-form :model="roleForm" ref="roleForm">
        <el-form-item label="权限组" label-width="100">
-          <el-select v-model="roleForm.roleSid" placeholder="请选择" filterable multiple>
-            <el-option v-for="(item,i) in roleList" :key="i" :label="item.purviewManageName"
-              :value="item.sid"></el-option>
+          <el-select v-model="roleForm.groupSids" placeholder="请选择" filterable multiple>
+            <el-option v-for="(item,i) in roleList" :key="i" :label="item.groupName" :value="item.sid"></el-option>
          </el-select>
          <!--<el-button type="primary" size='mini' @click="toNav('RoleAdminister')" style="margin-left: 10px;" circle icon="el-icon-plus"></el-button>-->
        </el-form-item>
@@ -117,13 +116,14 @@
          size: 10,
          total: 0,
          params: {
-            name: ''
+            orgName: '',
+            linkPerson: ''
          }
        },
        roleDialog: false,
        roleForm: {
-          roleSid: [],
-          unitSid: ''
+          groupSids: [],
+          orgSid: ''
        },
        roleList: []
      }
@@ -193,7 +193,8 @@
          size: 10,
          total: 0,
          params: {
-            name: ''
+            orgName: '',
+            linkPerson: ''
          }
        }
        this.loadList()
@@ -202,8 +203,8 @@

        this.roleDialog = true

-        this.roleForm.unitSid = row.sid
-        this.roleForm.roleSid = row.purviewsList
+        this.roleForm.orgSid = row.orgSid
+        this.roleForm.groupSids = row.groupSids

      },

@@ -220,8 +221,8 @@
      closeDialog() {
        this.roleDialog = false
        this.roleForm = {
-          roleSid: [],
-          unitSid: ''
+          groupSids: [],
+          orgSid: ''
        }
      }
    }
--- a/src/views/system/userManage/userManage.vue
+++ b/src/views/system/userManage/userManage.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>
--- a/src/views/system/userManage/userManageList.vue
+++ b/src/views/system/userManage/userManageList.vue
@@ -10,11 +10,11 @@
            <el-form-item label="姓名">
              <el-input v-model="page.params.name" clearable></el-input>
            </el-form-item>
-            <el-form-item label="角色">
+            <!-- <el-form-item label="角色">
              <el-select v-model="page.params.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="page.params.orgName" clearable></el-input> -->
            <!--              <el-select v-model="search.roleSid" clearable placeholder="请选择">-->
@@ -31,20 +31,20 @@
    <el-table :data="userTable" border style="width: 100%;">
      <el-table-column label="序号" width="80px" type="index" align="center">
      </el-table-column>
-      <el-table-column label="操作" width="350px" align="center">
+      <el-table-column label="操作" width="150px" align="center">
        <template slot-scope="scope">
-          <el-button @click="setRole(scope.row)" type="primary" size="mini" v-show="scope.row.accountType!='1'">
+          <!-- <el-button @click="setRole(scope.row)" type="primary" size="mini" v-show="scope.row.accountType!='1'">
            设置角色
-          </el-button>
+          </el-button> -->
          <el-button @click="initPwd(scope.row)" type="danger" size="mini">
            初始化密码
          </el-button>
-          <el-button @click="userinfoChange(scope.row)" type="primary" size="mini" v-show="scope.row.accountType!='1'">
+          <!-- <el-button @click="userinfoChange(scope.row)" type="primary" size="mini" v-show="scope.row.accountType!='1'">
            编辑
          </el-button>
          <el-button @click="del(scope.row)" type="danger" size="mini" v-show="scope.row.accountType!='1'">
            删除
-          </el-button>
+          </el-button> -->
        </template>
      </el-table-column>
      <el-table-column prop="userName" label="用户名" align="center">
@@ -294,8 +294,8 @@
    },
    mounted() {
      this.getOrgUserList()
-      this.getRoleList()
-      this.getOrgTree()
+      // this.getRoleList()
+      // this.getOrgTree()
      // this.getOrgList()

    },