From a6095ab0bfd1e7e3a1310d6b11d3e907a2b82854 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 01 七月 2024 13:24:06 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
index 31d2307..bd68e64 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
@@ -366,13 +366,17 @@
{
confirmButtonText: t('basicData.confirmButtonText'),
cancelButtonText: t('basicData.cancelButtonText'),
+ distinguishCancelAndClose: true,
type: 'warning',
}
).then(()=>{
errorAreaComputed()
selectOrder(order)
- }).catch(()=>{
- selectOrder(order)
+ }).catch((action)=>{
+ if(action === 'cancel'){
+ selectOrder(order)
+ }
+
})
}else {
--
Gitblit v1.8.0