From 0c0091d49f0a523911aa41115aa084f349305cc8 Mon Sep 17 00:00:00 2001
From: suguangxu <274928232@qq.com>
Date: Mon, 21 Jul 2025 16:02:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=AE=BE=E8=AE=A1-=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E4=BA=BA-=E6=B7=BB=E5=8A=A0=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=EF=BC=9A=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AE=E7=A7=9F=E6=88=B7?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E8=A7=92=E8=89=B2=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ModalPanel/src/SearchBox.vue   |  2 +
 .../SelectOrganizational/src/SelectRole.vue   | 21 ++++++++-
 .../SelectOrganizational/src/SelectTenant.vue | 47 +++++++++++++++++++
 .../SelectOrganizational/src/Selected.vue     |  1 +
 .../bpmn/components/member/MemberTable.vue    | 18 ++++++-
 .../design/bpmn/components/member/Roles.vue   |  1 +
 6 files changed, 87 insertions(+), 3 deletions(-)
 create mode 100644 src/components/SelectOrganizational/src/SelectTenant.vue

diff --git a/src/components/ModalPanel/src/SearchBox.vue b/src/components/ModalPanel/src/SearchBox.vue
index e587598..ad7b84a 100644
--- a/src/components/ModalPanel/src/SearchBox.vue
+++ b/src/components/ModalPanel/src/SearchBox.vue
@@ -19,6 +19,8 @@
     keyword.value = '';
     emits('search', keyword.value);
   }
+
+  defineExpose({ search });
 </script>
 
 <style scoped>
diff --git a/src/components/SelectOrganizational/src/SelectRole.vue b/src/components/SelectOrganizational/src/SelectRole.vue
index f21b1ab..59e814d 100644
--- a/src/components/SelectOrganizational/src/SelectRole.vue
+++ b/src/components/SelectOrganizational/src/SelectRole.vue
@@ -11,7 +11,11 @@
     >
       <!-- 已选 -->
       <Selected type="role" :list="data.selectedList" @abolish="abolishChecked" />
-      <SearchBox @search="search" />
+
+        <!-- 搜索栏 -->
+      <SearchBox @search="search" ref="searchBox" style="display: inline-block"/>
+      <SelectTenant @change="handleTenantChange" v-if="getAppEnvConfig().VITE_GLOB_TENANT_ENABLED" style="display:inline-block"/>
+
       <div class="list-page-box" v-if="data.list.length > 0">
         <RoleCard
           :class="data.selectedIds && data.selectedIds.includes(item.id) ? 'picked' : 'not-picked'"
@@ -34,9 +38,11 @@
 </template>
 
 <script setup lang="ts">
-  import { reactive } from 'vue';
+  import { ref,reactive } from 'vue';
   import RoleCard from './card/RoleCard.vue';
   import Selected from './Selected.vue';
+  import SelectTenant from './SelectTenant.vue';
+  import { getAppEnvConfig } from '/@/utils/env';
   import { ModalPanel, EmptyBox, SearchBox } from '/@/components/ModalPanel/index';
 
   import { getRoleList, getRoleMulti } from '/@/api/system/role';
@@ -78,6 +84,14 @@
     },
   });
 
+  const searchBox = ref();
+  const tenantId=ref();
+
+  function handleTenantChange(value:Number){
+      tenantId.value=value;
+      searchBox.value.search();
+  }
+
   async function show() {
     if (props.selectedIds && Array.isArray(props.selectedIds)) data.selectedIds = props.selectedIds;
     await getList();
@@ -123,6 +137,7 @@
     data.list = [];
     let params = {
       keyword: data.searchConfig.keyword,
+      tenantId:tenantId.value
     };
     let list = await getRoleList(params);
     if (list.length > 0) {
@@ -132,6 +147,7 @@
           id: ele.id,
           code: ele.code,
           count: ele.count, //角色人数
+          tenantName:ele.tenantName
         });
       });
     }
@@ -149,6 +165,7 @@
           id: ele.id,
           code: ele.code,
           count: ele.count, //角色人数
+          tenantName:ele.tenantName
         });
       });
     }
diff --git a/src/components/SelectOrganizational/src/SelectTenant.vue b/src/components/SelectOrganizational/src/SelectTenant.vue
new file mode 100644
index 0000000..3a46981
--- /dev/null
+++ b/src/components/SelectOrganizational/src/SelectTenant.vue
@@ -0,0 +1,47 @@
+<template>
+      <label>租户:</label>
+      <a-select
+          v-model:value="selectedId"
+          style="width:300px;heiht:32px;padding: 10px 0px;margin-left: 10px"
+          :options="tenantOptions"
+          @change="changeTenant"/>
+</template>
+
+<script setup lang="ts">
+  import { ref,reactive,unref,onMounted} from 'vue';
+  import { getTenantAllList} from '/@/api/system/tenant';
+  import { useUserStore } from '/@/store/modules/user';
+  import { storeToRefs } from 'pinia';
+
+  const userStore = useUserStore();
+  const { userInfo } = storeToRefs(userStore);
+
+  const emits = defineEmits(['change']);
+
+  let selectedId=userInfo.value.tenantId;
+
+  const tenantOptions = reactive([]);
+
+  onMounted(async () => {
+     /* let list=await getTenantAllList();
+      userInfo.te
+      if(list.length>0){
+          list.forEach((item)=>{
+              tenantOptions.push({
+                  value:item.id,
+                  label:item.name
+              })
+          });
+      }*/
+      userInfo.value.tenants.forEach((o) => {
+          tenantOptions.push({
+              value:o.id,
+              label:o.name
+          })
+      });
+
+  });
+  function changeTenant(value:Number) {
+    emits('change', value);
+  }
+</script>
diff --git a/src/components/SelectOrganizational/src/Selected.vue b/src/components/SelectOrganizational/src/Selected.vue
index 680f8ac..5796e88 100644
--- a/src/components/SelectOrganizational/src/Selected.vue
+++ b/src/components/SelectOrganizational/src/Selected.vue
@@ -22,6 +22,7 @@
           class="picked"
           :key="index"
           :item="item"
+          :showTenant="true"
           @click="abolish(item.id)"
           :disabled="props.disabledIds && props.disabledIds.includes(item.id) ? true : false"
         >
diff --git a/src/views/workflow/design/bpmn/components/member/MemberTable.vue b/src/views/workflow/design/bpmn/components/member/MemberTable.vue
index cc43ac9..bc94086 100644
--- a/src/views/workflow/design/bpmn/components/member/MemberTable.vue
+++ b/src/views/workflow/design/bpmn/components/member/MemberTable.vue
@@ -17,7 +17,7 @@
       </div>
     </div>
 
-    <a-table :dataSource="props.memberList" :columns="configColumns" :pagination="false">
+    <a-table :dataSource="props.memberList" :columns="getConfigColumns()" :pagination="false">
       <template #bodyCell="{ column, record, index }">
         <template v-if="column.key === 'memberType'">
           {{ getMemberType(record.memberType) }}
@@ -36,6 +36,7 @@
   import Posts from '/@bpmn/components/member/Posts.vue';
   import Roles from '/@bpmn/components/member/Roles.vue';
   // import Users from '/@bpmn/components/member/Users.vue';
+  import { getAppEnvConfig } from '/@/utils/env';
   
   import SelectUserV2 from './SelectUserV2.vue';
   import NodeApprover from '/@bpmn/components/member/NodeApprover.vue';
@@ -86,6 +87,21 @@
     },
   ];
 
+  function getConfigColumns(){
+      const arr=configColumns;
+      if(getAppEnvConfig().VITE_GLOB_TENANT_ENABLED){
+          arr.splice(2, 0,
+              {
+                  title: t('租户'),
+                  dataIndex: 'tenantName',
+                  key: 'tenantName',
+                  align: 'center',
+              }
+          );
+      }
+      return arr;
+  }
+
   const allComponentList = computed(() => {
     return [
       { name: t('添加岗位'), component: Posts, show: true },
diff --git a/src/views/workflow/design/bpmn/components/member/Roles.vue b/src/views/workflow/design/bpmn/components/member/Roles.vue
index ad4fd7c..822ff83 100644
--- a/src/views/workflow/design/bpmn/components/member/Roles.vue
+++ b/src/views/workflow/design/bpmn/components/member/Roles.vue
@@ -59,6 +59,7 @@
             name: ele.name,
             id: ele.id,
             memberType: MemberType.ROLE,
+            tenantName: ele.tenantName
           });
         });
       }