From 82685a4ec94db01c564561582141c03054012ea3 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 07 二月 2025 10:16:38 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue | 46 +++++++++++++++++++++++++++++++---------------
1 files changed, 31 insertions(+), 15 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue b/north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue
index da678ad..610e1da 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue
@@ -8,6 +8,7 @@
import {changeFilterEvent, filterChanged} from "@/hook"
import { useI18n } from 'vue-i18n'
+import footSum from "@/hook/footSum";
//璇█鑾峰彇
const { t } = useI18n()
let router=useRouter()
@@ -58,7 +59,9 @@
}
//gridOptions.columns = JSON.parse(JSON.stringify(columns))
res.data.title.forEach((item, index) => {
- let column = { slots: { default: 'quantitySum' }, width: 90, title: item.process };
+ let column = { slots: { default: 'quantitySum' }, width: 90, title: item.process,
+ field: `dynamicColumn${index}` // 涓哄姩鎬佸垪娣诲姞鍞竴鐨� field
+ };
const insertIndex = 5; // 璁剧疆鎻掑叆浣嶇疆鐨勭储寮�
gridOptions.columns = [
...gridOptions.columns.slice(0, insertIndex + index), // 鍙栨彃鍏ヤ綅缃箣鍓嶇殑閮ㄥ垎
@@ -76,6 +79,15 @@
ElMessage.warning(res.msg)
}
})
+}
+
+const footSumDynamic = (data, columnTitle) => {
+ let sum = 0;
+ data.forEach(item => {
+ const value = Number(item.reportWorkQuantity[columnTitle]) || 0; // 浠� reportWorkQuantity 涓彁鍙栧�煎苟杞崲涓烘暟瀛�
+ sum += value;
+ });
+ return sum.toFixed(2);
}
const quantitySum = ( row,column )=>{
const reportWorkQuantity = row.reportWorkQuantity[column.title] || 0
@@ -157,20 +169,24 @@
data: [
],//table body瀹為檯鏁版嵁
//鑴氶儴姹傚拰
- // footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
- // let footList=['7','8','9','10']
- // return[
- // columns.map((column, columnIndex) => {
- // if (columnIndex === 0) {
- // return '鍚堣:'
- // }
- // if (footList.includes(column.field)) {
- // return sumNum(data, column.field)
- // }
- // return ''
- // })
- // ]
- // }
+ footerMethod ({ columns, data }) {
+ return [
+ columns.map((column, columnIndex) => {
+ if (columnIndex === 0) {
+ return t('basicData.total')
+ }
+ const List = ["quantity", "inventoryNum", "inventoryArea"]; // 闈欐�佸垪鐨勬眰鍜�
+ if (List.includes(column.field)) {
+ return footSum(data, column.field)
+ }
+ // 鍔ㄦ�佸垪鐨勬眰鍜�
+ if (column.field && column.field.startsWith('dynamicColumn')) {
+ return footSumDynamic(data, column.title)
+ }
+ return ''
+ })
+ ]
+ }
})
--
Gitblit v1.8.0