From 3ab330b8aefb3cd781c9b8730b4ab7ac65e7e9d7 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 07 三月 2025 09:14:08 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue b/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue
index 22da676..4e0133e 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue
@@ -94,6 +94,7 @@
request.post(`/report/teamOutput/1/${total.pageSize}/${startTime}/${newEndTime}/${selectProcesses}`, filterData.value).then((res) => {
if (res.code == 200) {
+ total.value = res.data.footSum
total.dataTotal = res.data.total.total*1
total.pageTotal= res.data.total.pageTotal
pageTotal.value = res.data.total
@@ -119,7 +120,7 @@
request.post(`/report/teamOutput/${pageNum.value}/${total.pageSize}/${startTime}/${newEndTime}/${selectProcesses}`, filterData.value).then((res) => {
if (res.code == 200) {
-
+ total.value = res.data.footSum
produceList = deepClone(res.data.data)
xGrid.value.reloadData(produceList)
} else {
@@ -141,6 +142,7 @@
request.post(`/report/teamOutput/${pageNum.value}/${total.pageSize}/${startTime}/${newEndTime}/${selectProcesses}`, filterData.value).then((res) => {
if (res.code == 200) {
+ total.value = res.data.footSum
total.dataTotal = res.data.total.total * 1
total.pageTotal = res.data.total.pageTotal
pageTotal.value = res.data.total
@@ -194,6 +196,7 @@
total.dataTotal = res.data.total.total*1
total.pageTotal=parseInt(res.data.total)
pageNum.value=1
+ total.value = res.data.footSum
produceList = deepClone(res.data.data)
xGrid.value.reloadData(produceList)
gridOptions.loading=false
@@ -295,7 +298,8 @@
}
const List = ["completedQuantity",'area',]
if (List.includes(column.field)) {
- return footSum(data, column.field)
+ //return footSum(data, column.field)
+ return total.value?.[column.field] ?? 0
}
return ''
})
--
Gitblit v1.8.0