serv\web- 多租户修改

schoolNewsWeb/src/views/admin/manage/system/RoleManageView.vue

@@ -97,61 +97,19 @@
     </el-dialog>
 
     <!-- 绑定权限对话框 -->
-    <el-dialog v-model="bindPermissionDialogVisible" title="绑定权限" width="800px" @close="resetBindList">
-      <div class="permission-binding-container">
-        <!-- 角色信息显示 -->
-        <div class="role-info" v-if="currentRole">
-          <h4>角色信息：{{ currentRole.name }}</h4>
-          <p>角色ID：{{ currentRole.roleID }}</p>
-        </div>
-        
-        <!-- 权限绑定状态表格 -->
-        <el-table :data="permissionList" style="width: 100%" border stripe>
-          <el-table-column width="80" label="绑定状态">
-            <template #default="{ row }">
-              <el-tag 
-                :type="isPermissionSelected(row.permissionID) ? 'success' : 'info'"
-                size="small"
-              >
-                {{ isPermissionSelected(row.permissionID) ? '已绑定' : '未绑定' }}
-              </el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column prop="name" label="权限名称" min-width="150" />
-          <el-table-column prop="permissionID" label="权限ID" min-width="120" />
-          <el-table-column prop="code" label="权限编码" min-width="150" />
-          <el-table-column prop="description" label="权限描述" min-width="200" show-overflow-tooltip />
-          <el-table-column label="操作" width="100">
-            <template #default="{ row }">
-              <el-button 
-                :type="isPermissionSelected(row.permissionID) ? 'danger' : 'primary'"
-                size="small"
-                @click="togglePermissionSelection(row)"
-              >
-                {{ isPermissionSelected(row.permissionID) ? '解绑' : '绑定' }}
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        
-        <!-- 统计信息 -->
-        <div class="binding-stats">
-          <el-alert 
-            :title="`已绑定 ${selectedPermissions.length} 个权限，未绑定 ${permissionList.length - selectedPermissions.length} 个权限`"
-            type="info"
-            :closable="false"
-            show-icon
-          />
-        </div>
-      </div>
-      
-      <template #footer>
-        <el-button @click="bindPermissionDialogVisible = false">取消</el-button>
-        <el-button type="primary" @click="savePermissionBinding" :loading="submitting">
-          保存
-        </el-button>
-      </template>
-    </el-dialog>
+    <GenericSelector
+      v-model:visible="bindPermissionDialogVisible"
+      :title="`绑定权限 - ${currentRole?.name || ''}`"
+      left-title="可选权限"
+      right-title="已选权限"
+      :available-items="availablePermissions"
+      :initial-target-items="initialBoundPermissions"
+      :item-config="{ id: 'permissionID', label: 'name', sublabel: 'code' }"
+      unit-name="个"
+      search-placeholder="搜索权限名称或编码..."
+      @confirm="handlePermissionConfirm"
+      @cancel="resetBindList"
+    />
     </div>
   </AdminLayout>
 </template>
@@ -161,11 +119,12 @@ import { roleApi } from '@/apis/system/role';
 import { permissionApi } from '@/apis/system/permission';
 import { SysRole, SysPermission } from '@/types';
 import { AdminLayout } from '@/views/admin';
+import { GenericSelector } from '@/components/base';
 
 defineOptions({
   name: 'RoleManageView'
 });
-import { ref, onMounted, reactive } from 'vue';
+import { ref, onMounted, reactive, computed } from 'vue';
 import { ElMessage, ElMessageBox, FormInstance, FormRules } from 'element-plus';
 import { Plus } from '@element-plus/icons-vue';
 
@@ -176,11 +135,8 @@ const submitting = ref(false);
 
 // 权限绑定相关数据
 const permissionList = ref<SysPermission[]>([]);
-const selectedPermissions = ref<string[]>([]);
 const currentRole = ref<SysRole | null>(null);
-const bindList = ref<{ permissions: SysPermission[] }>({
-  permissions: []
-});
+const initialBoundPermissions = ref<SysPermission[]>([]);
 
 // 对话框状态
 const dialogVisible = ref(false);
@@ -295,6 +251,12 @@ function resetForm() {
   });
 }
 
+// 计算可选权限（过滤掉已绑定的）
+const availablePermissions = computed(() => {
+  const boundIds = new Set(initialBoundPermissions.value.map(p => p.permissionID));
+  return permissionList.value.filter(p => !boundIds.has(p.permissionID));
+});
+
 // 查看绑定权限
 async function handleBindPermission(row: SysRole) {
   currentRole.value = row;
@@ -314,14 +276,8 @@ async function handleBindPermission(row: SysRole) {
     const bindingResult = await roleApi.getRolePermission({
       roleID: row.roleID
     });
-    console.log('已绑定的权限:', bindingResult);
-    bindList.value.permissions = bindingResult.dataList || [];
+    initialBoundPermissions.value = bindingResult.dataList || [];
     
-    // 设置已选中的权限
-    selectedPermissions.value = bindList.value.permissions.map(permission => permission.permissionID).filter((id): id is string => !!id);
-    
-    console.log('已绑定的权限:', bindList.value.permissions);
-    console.log('所有权限:', permissionList.value);
     bindPermissionDialogVisible.value = true;
   } catch (error) {
     console.error('获取权限绑定信息失败:', error);
@@ -331,32 +287,12 @@ async function handleBindPermission(row: SysRole) {
 
 // 重置绑定列表
 function resetBindList() {
-  bindList.value = {
-    permissions: []
-  };
-  selectedPermissions.value = [];
+  initialBoundPermissions.value = [];
   currentRole.value = null;
 }
 
-// 检查权限是否已选中
-function isPermissionSelected(permissionID: string | undefined): boolean {
-  return permissionID ? selectedPermissions.value.includes(permissionID) : false;
-}
-
-// 切换权限选择状态
-function togglePermissionSelection(permission: SysPermission) {
-  if (!permission.permissionID) return;
-  
-  const index = selectedPermissions.value.indexOf(permission.permissionID);
-  if (index > -1) {
-    selectedPermissions.value.splice(index, 1);
-  } else {
-    selectedPermissions.value.push(permission.permissionID);
-  }
-}
-
-// 保存权限绑定
-async function savePermissionBinding() {
+// 权限选择确认 - 在confirm时提交请求
+async function handlePermissionConfirm(items: SysPermission[]) {
   if (!currentRole.value || !currentRole.value.roleID) {
     ElMessage.error('角色信息不完整');
     return;
@@ -366,13 +302,16 @@ async function savePermissionBinding() {
     submitting.value = true;
     
     // 获取当前已绑定的权限ID
-    const currentBoundPermissions = (bindList.value.permissions || []).map(permission => permission.permissionID).filter((id): id is string => !!id);
+    const currentBoundIds = initialBoundPermissions.value.map(p => p.permissionID).filter((id): id is string => !!id);
+    
+    // 新选择的权限ID
+    const newSelectedIds = items.map(p => p.permissionID).filter((id): id is string => !!id);
     
     // 找出需要绑定的权限（新增的）
-    const permissionsToBind = selectedPermissions.value.filter(permissionID => !currentBoundPermissions.includes(permissionID));
+    const permissionsToBind = newSelectedIds.filter(id => !currentBoundIds.includes(id));
     
     // 找出需要解绑的权限（移除的）
-    const permissionsToUnbind = currentBoundPermissions.filter(permissionID => !selectedPermissions.value.includes(permissionID));
+    const permissionsToUnbind = currentBoundIds.filter(id => !newSelectedIds.includes(id));
     
     // 构建需要绑定的权限对象数组
     if (permissionsToBind.length > 0) {
@@ -405,7 +344,6 @@ async function savePermissionBinding() {
     }
     
     ElMessage.success('权限绑定保存成功');
-    bindPermissionDialogVisible.value = false;
     
     // 刷新角色列表
     await loadRoleList();
@@ -515,30 +453,4 @@ onMounted(() => {
     }
   }
 }
-
-// 权限绑定容器样式
-.permission-binding-container {
-  .role-info {
-    background: #f5f7fa;
-    padding: 15px;
-    border-radius: 4px;
-    margin-bottom: 20px;
-    
-    h4 {
-      margin: 0 0 8px 0;
-      color: #303133;
-      font-size: 16px;
-    }
-    
-    p {
-      margin: 0;
-      color: #606266;
-      font-size: 14px;
-    }
-  }
-  
-  .binding-stats {
-    margin-top: 20px;
-  }
-}
 </style>