From ecb3045fb71d05b7ee3bf73fdf413f5091d65f65 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 19 三月 2024 09:22:33 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 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 5b27678..9f25879 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
@@ -248,6 +248,10 @@
reviewOrder(0)
break
}
+ case 'cancelOrder':{
+ cancelOrder()
+ break
+ }
case 'saveOrder': {
if ($grid.getTableData().tableData.length === 0){
ElMessage.error( t('order.msg.tableLengthNot'))
@@ -426,14 +430,19 @@
}
//鎸夐挳瀹℃牳杩囧悗鍙樹负鍙嶅
- if(res.data.order.orderReview === 2){
+ if(Math.abs(res.data.order.orderReview) === 2){
gridOptions.toolbarConfig.buttons[2].disabled = false
gridOptions.toolbarConfig.buttons[2].code='reviews'
gridOptions.toolbarConfig.buttons[2].name=t('basicData.cancelReview')
gridOptions.toolbarConfig.buttons[3].disabled = false
+ const button = {'code': 'cancelOrder',
+ status: 'primary',
+ 'name': (res.data.order.orderReview>0?t('basicData.cancel'):t('basicData.restore'))}
+ gridOptions.toolbarConfig.buttons.push(button)
}
if(res.data.order.productionOrder !==0 ){
gridOptions.toolbarConfig.buttons[2].disabled = true
+
}
//鍔犺浇鍓〃鏁版嵁
@@ -444,6 +453,18 @@
})
})
+const cancelOrder = () => {
+ request.post(`/order/cancelOrder/${titleUploadData.value.orderId}`).then((res) =>{
+ if (res.code== 200){
+ ElMessage.success(t('order.msg.updateOrderState'))
+ router.push({path:'/main/order/createOrder',query:{orderId:titleUploadData.value.orderId,random:Math.random()}})
+ }else{
+ ElMessage.error(res.msg)
+ }
+ })
+}
+
+
//椤甸潰绗竴娆″姞杞芥墽琛�
request.get(`/basicData/orderBasicData`).then((res) => {
--
Gitblit v1.8.0