From 7b5f1e33b4936c02fbe31d4b064ea3873da2e511 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 18 九月 2025 14:06:55 +0800
Subject: [PATCH] 发货弹窗成品料架
---
north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue b/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
index f4fa07f..c45fcd2 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
@@ -23,8 +23,8 @@
printConfig: {},
importConfig: {},
exportConfig: {},
- scrollY:{ enabled: true,gt:13 },//寮�鍚櫄鎷熸粴鍔�
- scrollX:{ enabled: true,gt:15 },//寮�鍚櫄鎷熸粴鍔�
+ // scrollY:{ enabled: true,gt:13 },//寮�鍚櫄鎷熸粴鍔�
+ // scrollX:{ enabled: true,gt:15 },//寮�鍚櫄鎷熸粴鍔�
filterConfig: { //绛涢�夐厤缃」
// remote: true
},
@@ -136,20 +136,17 @@
switch (orderType.value) {
case 1 :{
xGrid.value.loadData(data.value)
- //xGrid.value.setMergeCells(mergeCells.value)
xGrid.value.updateFooter()
break
}
case 2 :{
xGrid.value.loadData(data.value)
- //xGrid.value.clearMergeCells()
xGrid.value.clearMergeFooterItems()
xGrid.value.updateFooter()
break
}
case 3:{
- //xGrid.value.clearMergeCells()
xGrid.value.clearMergeFooterItems()
xGrid.value.updateFooter()
const lastProcess = title.value[title.value.length-1].process
@@ -202,7 +199,6 @@
})
orderType.value = 1
await xGrid.value.loadData(res.data.data)
- //await xGrid.value.setMergeCells(res.data.mergeCells)
mergeCells.value = res.data.mergeCells
data.value = res.data.data
gridOptions.loading = false
@@ -219,7 +215,6 @@
//xGrid.value.clearMergeCells()
xGrid.value.clearMergeFooterItems()
} else {
- //xGrid.value.setMergeCells(mergeCells.value)
xGrid.value.updateFooter()
}
}
@@ -239,7 +234,12 @@
}
}else {
- count += Number(item[field]) || 0
+ if(xGrid.value.isFilter() || orderType.value!==1) {
+ count += Number(item[field+'Show']) || Number(item[field]) || 0
+ } else {
+ count += Number(item[field]) || 0
+ }
+
}
})
return count.toFixed(2).replace(/\.?0+$/, '');
--
Gitblit v1.8.0