From f2d1b5615b05c002ec63db4df7164c9ed3ecc4a3 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期二, 26 八月 2025 16:42:21 +0800
Subject: [PATCH] 1、优化产品结构树以及设备结构树、列表右键菜单重复右键后出现window菜单问题 2、优化产品结构树节点删除后的loading展示时机 3、优化产品以及设备结构树权限配置获取列表时的loading展示时机
---
src/views/dnc/base/modules/ProductStructure/Permission/AssignPermissionModal.vue | 39 +++++++++++++++++++++++++--------------
1 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/src/views/dnc/base/modules/ProductStructure/Permission/AssignPermissionModal.vue b/src/views/dnc/base/modules/ProductStructure/Permission/AssignPermissionModal.vue
index 0de6856..464e7df 100644
--- a/src/views/dnc/base/modules/ProductStructure/Permission/AssignPermissionModal.vue
+++ b/src/views/dnc/base/modules/ProductStructure/Permission/AssignPermissionModal.vue
@@ -11,7 +11,7 @@
</a-form-model>
<a-tabs v-model="activeTabKey">
- <a-tab-pane :key="1" tab="鍒嗛厤閮ㄩ棬">
+ <a-tab-pane :key="1" tab="鍒嗛厤杞﹂棿">
<DepartPermissionTransfer ref="departPermissionTransferRef" :currentTreeNodeInfo="currentTreeNodeInfo"
:treeDataProps="allDepartmentsList" :allTreeKeys="allTreeKeys"
:isAssignSonNode="isAssignSonNode"/>
@@ -19,7 +19,8 @@
<a-tab-pane :key="2" tab="鍒嗛厤鐢ㄦ埛">
<UserPermissionTransfer ref="userPermissionTransferRef" :currentTreeNodeInfo="currentTreeNodeInfo"
- :dataSource="allUsersList" :isAssignSonNode="isAssignSonNode"/>
+ :dataSource="allUsersList" :isAssignSonNode="isAssignSonNode"
+ @setAdminDisabled="setAdminDisabled"/>
</a-tab-pane>
</a-tabs>
</a-modal>
@@ -29,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',
@@ -78,12 +78,15 @@
this.visible = true
},
- // 璋冪敤鎺ュ彛鑾峰彇鎵�鏈夐儴闂ㄥ垪琛�
+ // 璋冪敤鎺ュ彛鑾峰彇鎵�鏈夎溅闂村垪琛�
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 => {
- console.log('res-------------------', res)
if (res.success) {
this.allDepartmentsList = res.result
this.generateList(this.allDepartmentsList)
@@ -92,7 +95,7 @@
this.$refs.departPermissionTransferRef.expandedKeys = this.allTreeKeys
this.$refs.departPermissionTransferRef.flatten(JSON.parse(JSON.stringify(this.allDepartmentsList)))
})
- // 鍙湁涓婃閫�鍑烘椂鍦ㄩ儴闂ㄥ垎閰峵ab鐣岄潰鎵嶄細杩涘叆姝ゅ垽鏂�
+ // 鍙湁涓婃閫�鍑烘椂鍦ㄨ溅闂村垎閰峵ab鐣岄潰鎵嶄細杩涘叆姝ゅ垽鏂�
// 鑻ヤ笂娆￠��鍑烘椂鍦ㄧ敤鎴峰垎閰峵ab鐣岄潰鍒欏啀娆¤繘鍏ユ椂key鐢�2鍙樹负1鏃朵細瑙﹀彂watch鐩戞祴activeTabKey鍙樺寲鍒欎細灏唊ey:1鍔犲叆hasLoadedDataTabKeyArray锛屽洜姝ゆ棤闇�鍐嶆鍔犲叆key:1
if (!this.hasLoadedDataTabKeyArray.includes(this.activeTabKey)) this.hasLoadedDataTabKeyArray.push(this.activeTabKey)
}
@@ -114,20 +117,28 @@
// 璋冪敤鎺ュ彛鑾峰彇鎵�鏈夌敤鎴峰垪琛�
getAllUsersListByApi() {
+ this.$nextTick(() => {
+ this.allUsersList = []
+ this.$refs.userPermissionTransferRef.spinning = true
+ })
dncApi.getAllUsersListApi()
.then(res => {
if (res.success) {
- this.allUsersList = res.result.records.map(item => {
- return {
- ...item,
- disabled: item.username === 'admin'
- }
- })
+ this.allUsersList = res.result
this.$nextTick(() => this.$refs.userPermissionTransferRef.getHasPermissionUserByApi())
}
})
},
+ setAdminDisabled() {
+ this.allUsersList = this.allUsersList.map(item => {
+ return {
+ ...item,
+ disabled: item.username === 'admin'
+ }
+ })
+ },
+
handleModalClose() {
this.visible = false
this.hasLoadedDataTabKeyArray = []
--
Gitblit v1.9.3