From b6b2c379bd92f076acd16801b1442604ea21fc5d Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期三, 27 八月 2025 17:30:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/dnc/base/modules/ProductStructure/Permission/AssignPermissionModal.vue | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/views/dnc/base/modules/ProductStructure/Permission/AssignPermissionModal.vue b/src/views/dnc/base/modules/ProductStructure/Permission/AssignPermissionModal.vue
index 07b8f9e..464e7df 100644
--- a/src/views/dnc/base/modules/ProductStructure/Permission/AssignPermissionModal.vue
+++ b/src/views/dnc/base/modules/ProductStructure/Permission/AssignPermissionModal.vue
@@ -30,7 +30,6 @@
import dncApi from '@/api/dnc'
import DepartPermissionTransfer from './DepartPermissionTransfer'
import UserPermissionTransfer from './UserPermissionTransfer'
- import { queryProductionTreeList } from '@/api/api'
export default {
name: 'AssignPermissionModal',
@@ -81,8 +80,12 @@
// 璋冪敤鎺ュ彛鑾峰彇鎵�鏈夎溅闂村垪琛�
getAllDepartmentsListByApi() {
- this.allTreeKeys = []
- queryProductionTreeList()
+ this.allTreeKeys = this.allDepartmentsList = []
+ this.$nextTick(() => {
+ this.$refs.departPermissionTransferRef.targetKeys = this.$refs.departPermissionTransferRef.dataSource = []
+ this.$refs.departPermissionTransferRef.spinning = true
+ })
+ dncApi.getAllDepartmentsListApi()
.then(res => {
if (res.success) {
this.allDepartmentsList = res.result
@@ -114,10 +117,14 @@
// 璋冪敤鎺ュ彛鑾峰彇鎵�鏈夌敤鎴峰垪琛�
getAllUsersListByApi() {
+ this.$nextTick(() => {
+ this.allUsersList = []
+ this.$refs.userPermissionTransferRef.spinning = true
+ })
dncApi.getAllUsersListApi()
.then(res => {
if (res.success) {
- this.allUsersList = res.result.records
+ this.allUsersList = res.result
this.$nextTick(() => this.$refs.userPermissionTransferRef.getHasPermissionUserByApi())
}
})
--
Gitblit v1.9.3