From a251b673b7fdfec5eff1322d0a25d067f702b882 Mon Sep 17 00:00:00 2001 From: zhaowei <zhaowei> Date: 星期二, 03 六月 2025 09:11:16 +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