From b5244bec8ebfe724d844c41331d0ce3b28833356 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 22 四月 2024 08:36:06 +0800
Subject: [PATCH] 其他金额功能添加，以及修改xml文件名称
---
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 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 45bd176..ec959ee 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
@@ -72,17 +72,20 @@
let otherMoney = ref(null)
const gridOptions = reactive({
+ loading:false,
border: "full",//琛ㄦ牸鍔犺竟妗�
keepSource: true,//淇濇寔婧愭暟鎹�
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+ //virtualScroll: true, // 寮�鍚櫄鎷熸粴鍔ㄥ姛鑳�
id: 'OrderList',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
exportConfig: {},
- scrollY:{ enabled: true },//寮�鍚櫄鎷熸粴鍔�
+ scrollY:{ enabled: true,gt:15 },//寮�鍚櫄鎷熸粴鍔�
+ scrollX:{ enabled: true,gt:30 },//寮�鍚櫄鎷熸粴鍔�
showOverflow:true,
menuConfig: {
body: {
@@ -435,6 +438,7 @@
//鍒濆鍖栧垽鏂槸鍚︽湁id浼犲叆
onMounted(()=>{
+ gridOptions.loading=true
//鍚敤琛ㄦ牸鎷栧姩閫変腑
addListener(xGrid.value,gridOptions)
const str = route.query.orderId || history.state.orderId
@@ -495,15 +499,17 @@
orderDetails.forEach(item => {
item.otherColumns = JSON.parse(item.otherColumns)
})
-
- //鍔犺浇鍓〃鏁版嵁
+ otherMoney.value =res.data.orderOtherMoneyList
+ //鍔犺浇鍓〃鏁版嵁
xGrid.value.reloadData(orderDetails)
+ gridOptions.loading=false
}else{
ElMessage.error(res.msg)
}
})
})
+//浣滃簾璁㈠崟
const cancelOrder = () => {
request.post(`/order/cancelOrder/${titleUploadData.value.orderId}`).then((res) =>{
if (res.code== 200){
@@ -695,7 +701,9 @@
}else if(column.property.indexOf('otherColumns.M')>-1){
let quantity = 0
xGrid.value.getTableData().fullData.forEach(item => {
- quantity += item.quantity*(getNestedProperty(item,column.property)*1)
+ let orderQuantity = isNaN(item.quantity) ? 0 : item.quantity
+ let value = isNaN((getNestedProperty(item,column.property)*1)) ? 0 : (getNestedProperty(item,column.property)*1)
+ quantity += orderQuantity*value
})
if(!isNaN(quantity)){
otherMoney.value.forEach(item => {
--
Gitblit v1.8.0