From 1612e84f0fd75e1fce634696e0b26232b14e06aa Mon Sep 17 00:00:00 2001 From: x_z Date: Wed, 21 Dec 2022 17:58:54 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=85=B3=E9=97=AD=E7=AA=97?= =?UTF-8?q?=E5=8F=A3=E6=8C=89=E9=92=AE=E5=92=8C=E9=A9=B3=E5=9B=9E=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E9=87=8D=E5=90=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inventory/deviceCollectOrderAudit.vue | 5 ++++- src/views/inventory/invMAOrderAudit.vue | 9 +++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/views/inventory/deviceCollectOrderAudit.vue b/src/views/inventory/deviceCollectOrderAudit.vue index 37ff194..46966be 100644 --- a/src/views/inventory/deviceCollectOrderAudit.vue +++ b/src/views/inventory/deviceCollectOrderAudit.vue @@ -226,7 +226,10 @@ export default { confirmButtonText: '通过', cancelButtonText: '驳回', type: 'warning', - center: true + center: true, + closeOnPressEscape:false,//按下 ESC 键关闭弹窗 + closeOnClickModal:false,//点击遮罩关闭弹窗 + distinguishCancelAndClose:true,//区分取消与关闭 }).then(() => { let params = { id: row.id, diff --git a/src/views/inventory/invMAOrderAudit.vue b/src/views/inventory/invMAOrderAudit.vue index a65c43e..2a1111e 100644 --- a/src/views/inventory/invMAOrderAudit.vue +++ b/src/views/inventory/invMAOrderAudit.vue @@ -274,7 +274,10 @@ export default { confirmButtonText: '确定', cancelButtonText: '驳回', type: 'warning', - center: true + center: true, + closeOnPressEscape:false,//按下 ESC 键关闭弹窗 + closeOnClickModal:false,//点击遮罩关闭弹窗 + distinguishCancelAndClose:true,//区分取消与关闭 }).then(() => { let params = { id: row.id, @@ -305,7 +308,9 @@ export default { } }).catch((error) => { this.$message.error(error.message); - }) + }); + } else { + return; } }); },