From a9d8f80c82234bc7c46f117eae00e75304a4e972 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 16 五月 2024 14:50:46 +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 | 11 +++++++++--
1 files changed, 9 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 f22a146..7162bad 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
@@ -25,7 +25,7 @@
const xGrid = ref()
let cellArea = ref()
const shapeList = ref([
- {name:'鏅舰',value:1}, {name:'寮傚舰',value: 2}
+ {name:'鏅舰',value:1}, {name:'寮傚舰',value:2}
])
// 瀹氫箟琛ㄥご涓婁紶鏁版嵁
@@ -442,13 +442,13 @@
//鍒濆鍖栧垽鏂槸鍚︽湁id浼犲叆
onMounted(()=>{
-
//鍚敤琛ㄦ牸鎷栧姩閫変腑
addListener(xGrid.value,gridOptions)
const str = route.query.orderId || history.state.orderId
if (typeof str === 'undefined' || str === null || str === '' || str === '\n' || str === '\r'){
return
}
+ gridOptions.loading = true
request.post(`/order/getOrderById/${str}`).then((res) => {
if(res.code==200){
titleUploadData.value = res.data.order
@@ -504,8 +504,11 @@
item.otherColumns = JSON.parse(item.otherColumns)
})
otherMoney.value =res.data.orderOtherMoneyList
+
//鍔犺浇鍓〃鏁版嵁
xGrid.value.reloadData(orderDetails)
+ gridOptions.loading = false
+
}else{
ElMessage.error(res.msg)
}
@@ -635,6 +638,10 @@
const changedCustomerId = titleUploadData.value.customerId
const customer = titleSelectJson.value.customer.filter(item => item.id === changedCustomerId)
titleUploadData.value.customerName = customer[0].customerName
+ titleUploadData.value.project = customer[0].project
+ titleUploadData.value.salesmanId = customer[0].salesmanId
+ titleUploadData.value.salesman = customer[0].salesman
+
//titleSelectJson.value.customer
}
--
Gitblit v1.8.0