From 6c17e1f3da486ffd16b7237d9bc35a9bcbef5348 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 29 三月 2024 16:35:41 +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 | 27 +++++++++++++++++++++++++--
1 files changed, 25 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 26a04c7..66dbf68 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
@@ -412,18 +412,35 @@
onMounted(()=>{
//鍚敤琛ㄦ牸鎷栧姩閫変腑
addListener(xGrid.value,gridOptions)
- const str = route.query.orderId
+ const str = route.query.orderId || history.state.orderId
if (typeof str === 'undefined' || str === null || str === '' || str === '\n' || str === '\r'){
return
}
request.post(`/order/getOrderById/${str}`).then((res) => {
if(res.code==200){
titleUploadData.value = res.data.order
+ if(history.state.orderId!=null){
+ titleUploadData.value.orderId=''
+ titleUploadData.value.id=null
+ titleUploadData.value.processReview=null
+ titleUploadData.value.orderReview=null
+ titleUploadData.value.productionOrder=null
+ titleUploadData.value.processingCard=null
+ titleUploadData.value.warehousing=null
+ titleUploadData.value.delivery=null
+ titleUploadData.value.createTime=null
+
+ if(history.state.type=='copy'){
+ xGrid.value.reloadData(res.data.orderDetails)
+ }
+ return
+ }
//鍙栨秷宸ヨ壓鎸夐挳绂佺敤
gridOptions.toolbarConfig.buttons[1].disabled = false
//宸ヨ壓瀹℃牳鍚庝繚瀛樻寜閽鐢�
if(res.data.order.processReview === 2){
gridOptions.toolbarConfig.buttons[4].disabled = true
+
}
//鍙栨秷瀹℃牳鎸夐挳绂佺敤
if(res.data.order.processReview === 2 && res.data.order.orderReview === 0){
@@ -476,6 +493,7 @@
if(res.code==200){
titleSelectJson.value=deepClone(res.data)
+ //杩涘叆椤甸潰涓嬫媺妗嗚缃粯璁ゅ��
titleUploadData.value.orderType = titleSelectJson.value.orderType[0].basicName
titleUploadData.value.orderClassify = titleSelectJson.value.orderClassify[0].basicName
titleUploadData.value.icon = titleSelectJson.value.icon[0].basicName
@@ -513,7 +531,12 @@
request.post(`/order/updateOrderMoney`,updateData).then(res => {
if (res.code == 200){
ElMessage.success( t('order.msg.updateAmountSuccessfully') )
- router.push({path:'/main/order/createOrder',query:{orderId:titleUploadData.value.orderId,random:Math.random()}})
+ router.push({path:'/main/order/createOrder',
+ query:{
+ orderId:titleUploadData.value.orderId,
+ random:Math.random()
+ }
+ })
}
})
--
Gitblit v1.8.0