From c56b9a47d4642582020edd51bf664ed7b1935022 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期六, 08 二月 2025 10:39:55 +0800
Subject: [PATCH] 产品结构树： 1、调整权限配置功能 2、调整指派到设备树组件子节点选中逻辑
---
src/views/dnc/base/modules/ProductStructure/Permission/AssignPermissionModal.vue | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/src/views/dnc/base/modules/ProductStructure/Permission/AssignPermissionModal.vue b/src/views/dnc/base/modules/ProductStructure/Permission/AssignPermissionModal.vue
index d9851a5..0de6856 100644
--- a/src/views/dnc/base/modules/ProductStructure/Permission/AssignPermissionModal.vue
+++ b/src/views/dnc/base/modules/ProductStructure/Permission/AssignPermissionModal.vue
@@ -5,7 +5,7 @@
<a-form-item label="鍚嶇О">
<a-input readOnly :value="currentTreeNodeInfo.label"></a-input>
</a-form-item>
- <a-form-item label="鏄惁鍒嗛厤瀛愯妭鐐�">
+ <a-form-item label="鏄惁鍚屾椂閰嶇疆瀛愯妭鐐�">
<a-switch v-model="isAssignSonNode"></a-switch>
</a-form-item>
</a-form-model>
@@ -13,7 +13,8 @@
<a-tabs v-model="activeTabKey">
<a-tab-pane :key="1" tab="鍒嗛厤閮ㄩ棬">
<DepartPermissionTransfer ref="departPermissionTransferRef" :currentTreeNodeInfo="currentTreeNodeInfo"
- :dataSource="allDepartmentsList" :isAssignSonNode="isAssignSonNode"/>
+ :treeDataProps="allDepartmentsList" :allTreeKeys="allTreeKeys"
+ :isAssignSonNode="isAssignSonNode"/>
</a-tab-pane>
<a-tab-pane :key="2" tab="鍒嗛厤鐢ㄦ埛">
@@ -28,6 +29,7 @@
import dncApi from '@/api/dnc'
import DepartPermissionTransfer from './DepartPermissionTransfer'
import UserPermissionTransfer from './UserPermissionTransfer'
+ import { queryProductionTreeList } from '@/api/api'
export default {
name: 'AssignPermissionModal',
@@ -45,6 +47,7 @@
activeTabKey: 1,
allDepartmentsList: [],
allUsersList: [],
+ allTreeKeys: [],
hasLoadedDataTabKeyArray: []
}
},
@@ -77,11 +80,18 @@
// 璋冪敤鎺ュ彛鑾峰彇鎵�鏈夐儴闂ㄥ垪琛�
getAllDepartmentsListByApi() {
- dncApi.getAllDepartmentsListApi()
+ this.allTreeKeys = []
+ queryProductionTreeList()
.then(res => {
+ console.log('res-------------------', res)
if (res.success) {
- this.allDepartmentsList = res.list
- this.$nextTick(() => this.$refs.departPermissionTransferRef.getHasPermissionDepartByApi())
+ this.allDepartmentsList = res.result
+ this.generateList(this.allDepartmentsList)
+ this.$nextTick(() => {
+ this.$refs.departPermissionTransferRef.getHasPermissionDepartByApi()
+ this.$refs.departPermissionTransferRef.expandedKeys = this.allTreeKeys
+ this.$refs.departPermissionTransferRef.flatten(JSON.parse(JSON.stringify(this.allDepartmentsList)))
+ })
// 鍙湁涓婃閫�鍑烘椂鍦ㄩ儴闂ㄥ垎閰峵ab鐣岄潰鎵嶄細杩涘叆姝ゅ垽鏂�
// 鑻ヤ笂娆￠��鍑烘椂鍦ㄧ敤鎴峰垎閰峵ab鐣岄潰鍒欏啀娆¤繘鍏ユ椂key鐢�2鍙樹负1鏃朵細瑙﹀彂watch鐩戞祴activeTabKey鍙樺寲鍒欎細灏唊ey:1鍔犲叆hasLoadedDataTabKeyArray锛屽洜姝ゆ棤闇�鍐嶆鍔犲叆key:1
if (!this.hasLoadedDataTabKeyArray.includes(this.activeTabKey)) this.hasLoadedDataTabKeyArray.push(this.activeTabKey)
@@ -89,12 +99,30 @@
})
},
+ /**
+ * 閫掑綊鑾峰緱鎵�鏈夋爲鑺傜偣key
+ * @param data
+ */
+ generateList(data) {
+ for (let i = 0; i < data.length; i++) {
+ const node = data[i]
+ const key = node.key
+ this.allTreeKeys.push(key)
+ if (node.children) this.generateList(node.children)
+ }
+ },
+
// 璋冪敤鎺ュ彛鑾峰彇鎵�鏈夌敤鎴峰垪琛�
getAllUsersListByApi() {
dncApi.getAllUsersListApi()
.then(res => {
if (res.success) {
- this.allUsersList = res.result.records
+ this.allUsersList = res.result.records.map(item => {
+ return {
+ ...item,
+ disabled: item.username === 'admin'
+ }
+ })
this.$nextTick(() => this.$refs.userPermissionTransferRef.getHasPermissionUserByApi())
}
})
--
Gitblit v1.9.3