项目分配权限调整入口位置

src/api/system/projectPermission.js

@@ -18,10 +18,11 @@ export function listImportProjectUser(data) {
     })
 }
 // 导入用户列表数据提交
-export function addImportProjectUserList(importProjectUserListIds, projectBizId) {
+export function addImportProjectUserList(importProjectUserListIds, projectBizId,tenantBizId) {
     const data = {
         userBizIdList: importProjectUserListIds,
-        projectBizId: projectBizId
+        projectBizId: projectBizId,
+        tenantBizId: tenantBizId
     }
     return request({
         url: '/user/api/relProjectUser/add/user/list',
@@ -62,10 +63,11 @@ export function listImportProjectRole(data) {
     })
 }
 // 导入角色列表数据提交
-export function addImportProjectRoleList(importProjectRoleListIds, projectBizId) {
+export function addImportProjectRoleList(importProjectRoleListIds, projectBizId,tenantBizId) {
     const data = {
         roleBizIdList: importProjectRoleListIds,
-        projectBizId: projectBizId
+        projectBizId: projectBizId,
+        tenantBizId: tenantBizId
     }
     return request({
         url: '/user/api/relProjectRole/add/role/list',
@@ -84,9 +86,10 @@ export function listMenu(data) {
 }
 
 // 获取项目菜单导入的菜单树
-export function getMenuTree(projectBizId) {
+export function getMenuTree(projectBizId,tenantBizId) {
     const data = {
-        projectBizId: projectBizId
+        projectBizId: projectBizId,
+        tenantBizId: tenantBizId
     }
     return request({
         url: '/user/api/relProjectMenu/import/query/menu/tree',
@@ -95,9 +98,9 @@ export function getMenuTree(projectBizId) {
     })
 }
 // 获取项目菜单导入选中的菜单列表
-export function getImportSelectedMenuList(projectBizId) {
+export function getImportSelectedMenuList(projectBizId,tenantBizId) {
     return request({
-        url: '/user/api/relProjectMenu/import/query/selected/menu/list?projectBizId=' + projectBizId,
+        url: '/user/api/relProjectMenu/import/query/selected/menu/list?projectBizId=' + projectBizId + "&tenantBizId="+tenantBizId,
         method: 'get'
     })
 }

src/views/system/project/index.vue

@@ -107,17 +107,17 @@
         width="200px"
       >
         <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            icon="Edit"
-            @click="handlePermission(scope.row)"
-            v-if="
-              (userStore.isSuperAdmin === 0 && scope.row.scope !== 1) ||
-              userStore.isSuperAdmin === 1
-            "
-            >分配权限</el-button
-          >
+<!--          <el-button-->
+<!--            link-->
+<!--            type="primary"-->
+<!--            icon="Edit"-->
+<!--            @click="handlePermission(scope.row)"-->
+<!--            v-if="-->
+<!--              (userStore.isSuperAdmin === 0 && scope.row.scope !== 1) ||-->
+<!--              userStore.isSuperAdmin === 1-->
+<!--            "-->
+<!--            >分配权限</el-button-->
+<!--          >-->
           <el-button
             link
             type="primary"

src/views/system/project/permission.vue

@@ -619,7 +619,9 @@ import {
 } from '@/api/system/projectPermission'
 
 import { ref } from 'vue'
+import useUserStore from '@/store/modules/user'
 
+const userStore = useUserStore()
 const { proxy } = getCurrentInstance()
 const {
   sys_status,
@@ -704,18 +706,21 @@ const data = reactive({
   queryParams: {
     pageNum: 1,
     pageSize: 10,
+    tenantBizId: route.query.tenantBizId,
     projectBizId: route.query.projectBizId,
     projectName: undefined
   },
   importProjectProjectListQueryParams: {
     pageNum: 1,
     pageSize: 10,
+    tenantBizId: route.query.tenantBizId,
     projectBizId: route.query.projectBizId,
     projectName: undefined
   },
   userQueryParams: {
     pageNum: 1,
     pageSize: 10,
+    tenantBizId: route.query.tenantBizId,
     projectBizId: route.query.projectBizId,
     userName: undefined,
     realName: undefined,
@@ -724,6 +729,7 @@ const data = reactive({
   importProjectUserListQueryParams: {
     pageNum: 1,
     pageSize: 10,
+    tenantBizId: route.query.tenantBizId,
     projectBizId: route.query.projectBizId,
     userName: undefined,
     realName: undefined,
@@ -732,18 +738,21 @@ const data = reactive({
   roleQueryParams: {
     pageNum: 1,
     pageSize: 10,
+    tenantBizId: route.query.tenantBizId,
     projectBizId: route.query.projectBizId,
     roleName: undefined
   },
   importProjectRoleListQueryParams: {
     pageNum: 1,
     pageSize: 10,
+    tenantBizId: route.query.tenantBizId,
     projectBizId: route.query.projectBizId,
     roleName: undefined
   },
   menuQueryParams: {
     pageNum: 1,
     pageSize: 999999,
+    tenantBizId: route.query.tenantBizId,
     projectBizId: route.query.projectBizId,
     menuName: undefined
   }
@@ -834,11 +843,12 @@ function importProjectUserListSubmitForm() {
   const importProjectUserListIdList = importProjectUserListIds.value
   const importProjectUserListNameList = importProjectUserListNames.value
   const projectBizId = route.query.projectBizId
+  const tenantBizId = route.query.tenantBizId
 
   proxy.$modal
     .confirm('是否确认导入用户账号为"' + importProjectUserListNameList + '"的数据项?')
     .then(function () {
-      return addImportProjectUserList(importProjectUserListIdList, projectBizId)
+      return addImportProjectUserList(importProjectUserListIdList, projectBizId,tenantBizId)
     })
     .then(() => {
       importProjectUserListOpen.value = false
@@ -928,11 +938,12 @@ function importProjectRoleListSubmitForm() {
   const importProjectRoleListIdList = importProjectRoleListIds.value
   const importProjectRoleListNameList = importProjectRoleListNames.value
   const projectBizId = route.query.projectBizId
+  const tenantBizId = route.query.tenantBizId
 
   proxy.$modal
     .confirm('是否确认导入角色名称为"' + importProjectRoleListNameList + '"的数据项?')
     .then(function () {
-      return addImportProjectRoleList(importProjectRoleListIdList, projectBizId)
+      return addImportProjectRoleList(importProjectRoleListIdList, projectBizId,tenantBizId)
     })
     .then(() => {
       importProjectRoleListOpen.value = false
@@ -987,7 +998,7 @@ function handleImportProjectMenuList() {
 // 加载菜单树
 const loadMenuTree = async () => {
   try {
-    const res = await getMenuTree(route.query.projectBizId)
+    const res = await getMenuTree(route.query.projectBizId,route.query.tenantBizId)
     menuTree.value = res.data // 直接使用后端返回的树形结构
     loadImportSelectedMenuList() // 加载选中的菜单列表，更新树勾选
   } catch (error) {
@@ -998,7 +1009,7 @@ const loadMenuTree = async () => {
 // 修改加载选中菜单列表的逻辑
 const loadImportSelectedMenuList = async () => {
   try {
-    const res = await getImportSelectedMenuList(route.query.projectBizId)
+    const res = await getImportSelectedMenuList(route.query.projectBizId,route.query.tenantBizId)
     const targetKeys = res.data || []
 
     // 开启严格模式（禁用联动）
@@ -1038,6 +1049,7 @@ const saveImportSelectedMenuList = async () => {
 
     await addImportProjectMenuList({
       projectBizId: route.query.projectBizId,
+      tenantBizId: route.query.tenantBizId,
       menuBizIdList: allCheckedKeys
     })
     getMenuList()
@@ -1060,6 +1072,7 @@ const leftQuery = reactive({
   pageNo: 1,
   pageSize: 10,
   projectBizId: route.query.projectBizId,
+  tenantBizId: route.query.tenantBizId,
   userBizId: '',
   roleName: ''
 })
@@ -1073,6 +1086,7 @@ const rightQuery = reactive({
   pageNo: 1,
   pageSize: 10,
   projectBizId: route.query.projectBizId,
+  tenantBizId: route.query.tenantBizId,
   userBizId: '',
   roleName: ''
 })
@@ -1181,6 +1195,7 @@ function moveToRight() {
   })
   const data = {
     projectBizId: route.query.projectBizId,
+    tenantBizId: route.query.tenantBizId,
     userBizId: leftQuery.userBizId,
     roleBizIdList: roleBizIdList
   }
@@ -1209,6 +1224,7 @@ function moveToLeft() {
   })
   const data = {
     projectBizId: route.query.projectBizId,
+    tenantBizId: route.query.tenantBizId,
     userBizId: rightQuery.userBizId,
     roleBizIdList: roleBizIdList
   }
@@ -1246,6 +1262,7 @@ const fpMenuProps = {
 }
 const getSelectedFpMenuListParams = reactive({
   projectBizId: route.query.projectBizId,
+  tenantBizId: route.query.tenantBizId,
   roleBizId: ''
 })
 const addFpMenuParams = reactive({
@@ -1255,6 +1272,7 @@ const getFpMenuTreeParams = reactive({
   pageNo: 1,
   pageSize: 10,
   projectBizId: route.query.projectBizId,
+  tenantBizId: route.query.tenantBizId,
   menuName: undefined
 })
 const fpMenuTitle = ref('')
@@ -1322,6 +1340,7 @@ const saveFpMenuList = async () => {
 
     await addFpMenuList({
       projectBizId: route.query.projectBizId,
+      tenantBizId: route.query.tenantBizId,
       roleBizId: addFpMenuParams.roleBizId,
       menuBizIdList: allCheckedKeys
     })

src/views/system/tenant/permission.vue

@@ -44,9 +44,20 @@
           </el-table-column>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template #default="scope">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
-                >删除</el-button
+              <el-button
+                  link
+                  type="primary"
+                  icon="Edit"
+                  @click="handlePermission(scope.row)"
+                  v-if="
+              (userStore.isSuperAdmin === 0 && scope.row.scope !== 1) ||
+              userStore.isSuperAdmin === 1
+            "
+              >分配权限</el-button
               >
+<!--              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"-->
+<!--                >删除</el-button-->
+<!--              >-->
             </template>
           </el-table-column>
         </el-table>
@@ -745,6 +756,10 @@ import {
 import DeptList from './deptList.vue'
 import InsuranceList from './insuranceList.vue'
 import { ref } from 'vue'
+import useUserStore from '@/store/modules/user'
+
+const router = useRouter()
+const userStore = useUserStore()
 
 const { proxy } = getCurrentInstance()
 const {
@@ -920,6 +935,11 @@ function handleDelete(row) {
     })
     .catch(() => {})
 }
+
+/** 项目分配权限 */
+function handlePermission(row) {
+  router.push(`/system/project/permission?tenantBizId=`+route.query.tenantBizId+`&projectBizId=` + row.projectBizId)
+}
 //========项目-列表结束=========
 
 //========项目-导入逻辑开始=========