fix: some
All checks were successful
构建并部署前端到测试环境 / deploy (push) Successful in 55s

This commit is contained in:
luo
2026-10-13 17:43:38 +08:00
parent c31183205d
commit 16effb69f3
8 changed files with 94 additions and 43 deletions

View File

@@ -472,22 +472,25 @@
)
return
}
const canManageAssociations = hasAuth(AUGUST_PERMISSIONS.phoneAssetAssociation.list)
const associationQuery = getExchangePhoneAssociationQuery(failure, newAsset)
const canManageAssociations =
!!associationQuery && hasAuth(AUGUST_PERMISSIONS.phoneAssetAssociation.list)
try {
await ElMessageBox.confirm(
canManageAssociations
? conflictMessage
: `${conflictMessage}。您暂无管理权限,请联系管理员解除。`,
'新资产手机号绑定冲突',
{
if (!canManageAssociations) {
await ElMessageBox.alert(conflictMessage, '换货提示', {
type: 'warning',
confirmButtonText: canManageAssociations ? '前往手机号资产关联' : '知道了',
cancelButtonText: '暂不处理',
showCancelButton: canManageAssociations,
confirmButtonText: '知道了',
dangerouslyUseHTMLString: false
}
)
})
return
}
await ElMessageBox.confirm(conflictMessage, '新资产手机号绑定冲突', {
type: 'warning',
confirmButtonText: '前往手机号资产关联',
cancelButtonText: '暂不处理',
showCancelButton: true,
dangerouslyUseHTMLString: false
})
if (canManageAssociations)
await router.push({ path: RoutesAlias.PhoneAssetAssociation, query: associationQuery })
} catch {