From 95b6a6388e4cc4e6ed0f54cc04212a86cd8cf829 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 23 五月 2025 13:37:09 +0800
Subject: [PATCH] 1、用户管理新增和编辑用户时设置工单为必填项 2、新增终端登录、首页、设备点检、故障上报、上下班打卡、停机原因维护页面（未与后端联调且客户未确定页面设计）并调整全局路由守卫相关逻辑 3、调整设备结构树设备层级和车间层级区分的判断条件 4、调整电子样板检索与部件借用弹窗列表与搜索区域样式
---
src/views/dnc/base/modules/ProductStructure/Permission/UserPermissionTransfer.vue | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/views/dnc/base/modules/ProductStructure/Permission/UserPermissionTransfer.vue b/src/views/dnc/base/modules/ProductStructure/Permission/UserPermissionTransfer.vue
index 4521965..8cde6f1 100644
--- a/src/views/dnc/base/modules/ProductStructure/Permission/UserPermissionTransfer.vue
+++ b/src/views/dnc/base/modules/ProductStructure/Permission/UserPermissionTransfer.vue
@@ -42,9 +42,18 @@
},
methods: {
getHasPermissionUserByApi() {
+ const that = this
+ that.spinning = true
+ that.targetKeys = []
dncApi.getHasPermissionUserApi(this.currentTreeNodeInfo)
.then(res => {
- if (res.success) this.targetKeys = res.list.map(item => item.id)
+ if (res.success) {
+ that.targetKeys = res.list.map(item => item.id)
+ if (that.targetKeys.includes(that.dataSource.find(item => item.username === 'admin').id)) that.$emit('setAdminDisabled')
+ }
+ })
+ .finally(() => {
+ that.spinning = false
})
},
@@ -58,20 +67,10 @@
isAssignSonNode: isAssignSonNode ? 1 : 2,
userIdArray: moveKeys
}
- console.log('params--------------------------', params)
- console.log(targetKeys, direction, moveKeys)
if (direction === 'right') {
method = dncApi.assignPermissionToUser
} else {
method = dncApi.removePermissionFromUser
- const adminId = dataSource.find(item => item.username === 'admin').id
- if (moveKeys.includes(adminId)) {
- $notification.warning({
- message: '娑堟伅',
- description: '涓嶈兘绉婚櫎绠＄悊鍛樻潈闄�'
- })
- return
- }
}
that.spinning = true
method(params)
@@ -81,7 +80,8 @@
message: '娑堟伅',
description: res.message
})
- this.targetKeys = targetKeys
+ that.targetKeys = targetKeys
+ if (targetKeys.includes(that.dataSource.find(item => item.username === 'admin').id)) that.$emit('setAdminDisabled')
} else {
$notification.error({
message: '娑堟伅',
--
Gitblit v1.9.3