From 2632da06216b8422d844e55877e7e2cbb3776d4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=86=9B?= <510423039@qq.com>
Date: Sat, 3 Sep 2022 08:56:17 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=91=20=E7=BB=84=E7=BB=87=E6=9C=BA?=
 =?UTF-8?q?=E6=9E=84=E6=B7=BB=E5=8A=A0=E8=A7=92=E8=89=B2=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E6=9C=AA=E6=B7=BB=E5=8A=A0=E6=9D=83=E9=99=90=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organizationUnits/AddRoleToOrganizationUnit.vue   |  5 ++---
 .../organizationUnits/AddUserToOrganizationUnit.vue   |  3 +--
 .../admin/organizationUnits/OrganizationUnit.vue      | 11 ++++++++---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/vben28/src/views/admin/organizationUnits/AddRoleToOrganizationUnit.vue b/vben28/src/views/admin/organizationUnits/AddRoleToOrganizationUnit.vue
index d81c4012..4611f3d8 100644
--- a/vben28/src/views/admin/organizationUnits/AddRoleToOrganizationUnit.vue
+++ b/vben28/src/views/admin/organizationUnits/AddRoleToOrganizationUnit.vue
@@ -35,8 +35,7 @@ export default defineComponent({
 
   setup(_, { emit }) {
     const { t } = useI18n();
-    const getTableAsync = async () => {
-      let request= new GetUnAddRoleInput();
+    const getTableAsync = async (request:GetUnAddRoleInput) => {
       request.organizationUnitId=organizationUnitId;
       return await getUnAddRolesAsync(request)
     };
@@ -59,7 +58,7 @@ export default defineComponent({
     let organizationUnitId = "";
     const [registerModal, { closeModal, changeOkLoading }] = useModalInner(async (data) => {
       organizationUnitId = data.organizationUnitId;
-      await reload();
+      await reload({ searchInfo: { organizationUnitId: organizationUnitId } });
     });
     //勾选事件
     let selectRoles:string[]=[];
diff --git a/vben28/src/views/admin/organizationUnits/AddUserToOrganizationUnit.vue b/vben28/src/views/admin/organizationUnits/AddUserToOrganizationUnit.vue
index 20a80fa9..f1a3dac8 100644
--- a/vben28/src/views/admin/organizationUnits/AddUserToOrganizationUnit.vue
+++ b/vben28/src/views/admin/organizationUnits/AddUserToOrganizationUnit.vue
@@ -35,8 +35,7 @@ export default defineComponent({
 
   setup(_, { emit }) {
     const { t } = useI18n();
-    const getTableAsync = async () => {
-      let request= new GetUnAddUserInput();
+    const getTableAsync = async (request:GetUnAddUserInput) => {
       request.organizationUnitId=organizationUnitId;
       request.filter=getForm().getFieldsValue().filter;
       return await GetUnAddUserAsync(request)
diff --git a/vben28/src/views/admin/organizationUnits/OrganizationUnit.vue b/vben28/src/views/admin/organizationUnits/OrganizationUnit.vue
index e39d6670..6cb3a2a9 100644
--- a/vben28/src/views/admin/organizationUnits/OrganizationUnit.vue
+++ b/vben28/src/views/admin/organizationUnits/OrganizationUnit.vue
@@ -120,7 +120,7 @@ import CreateOrganizationUnit from "./CreateOrganizationUnit.vue";
 import EditOrganizationUnit from "./EditOrganizationUnit.vue";
 import AddRoleToOrganizationUnit from "./AddRoleToOrganizationUnit.vue";
 import AddUserToOrganizationUnit from "./AddUserToOrganizationUnit.vue";
-
+import { usePermission } from '/@/hooks/web/usePermission';
 import { useModal } from "/@/components/Modal";
 import { useMessage } from "/@/hooks/web/useMessage";
 import { useI18n } from "/@/hooks/web/useI18n";
@@ -149,7 +149,7 @@ export default defineComponent({
     const [registerEditOrganizationUnit, { openModal: EditOrganizationUnitModal }] = useModal();
     const [registerAddRoleToOrganizationUnit, { openModal: AddRoleToOrganizationUnitModal }] = useModal();
     const [registerAddUserToOrganizationUnit, { openModal: AddUserToOrganizationUnitModal }] = useModal();
-
+    const { hasPermission } = usePermission();
     let organizationUnitId: string = "";
     const openAddUserToOrganizationUnitModal= ()=>{
       if(organizationUnitId)
@@ -180,10 +180,13 @@ export default defineComponent({
     }
 
     function getRightMenuList(node: any): ContextMenuItem[] {
-    
+      let create = hasPermission('AbpIdentity.OrganizationUnitManagement.Create');
+      let update = hasPermission('AbpIdentity.OrganizationUnitManagement.Update');
+      let deleted = hasPermission('AbpIdentity.OrganizationUnitManagement.Delete');
       return [
         {
           label: t("common.createText"),
+          hidden: !create,
           handler: () => {
             let record = {
               parentId: node.eventKey,
@@ -196,6 +199,7 @@ export default defineComponent({
         },
         {
           label: t("common.editText"),
+          hidden: !update,
           handler: () => {
             let record = {
               id: node.eventKey,
@@ -207,6 +211,7 @@ export default defineComponent({
         },
         {
           label: t("common.delText"),
+          hidden: !deleted,
           handler: () => {
             createConfirm({
               iconType: "warning",