From 1e6c537c6ae83a30fa3732939d16422ff2d105dd Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 19 十二月 2025 09:22:07 +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/WorkInProgressCombination.vue |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgressCombination.vue b/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgressCombination.vue
index a88e7a1..4235538 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgressCombination.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgressCombination.vue
@@ -297,7 +297,7 @@
         const List = ["quantity",'stockNum','stockArea',]
         if (List.includes(column.field)) {
           //return footSum(data, column.field)
-          return footSum(data, column.field)
+          return total.value?.[column.field] ?? 0
         }
         return ''
       })
@@ -408,7 +408,7 @@
           :model-value="terminationVal === 0"
           @change="onlandingTerminationChange"
       >
-        {{ t('processCard.termination') }}
+        {{ t('processCard.notTermination') }}
       </el-checkbox>
       &nbsp;
         <el-button type="primary" @click="getWorkOrder">{{$t('basicData.search')}}</el-button>

--
Gitblit v1.8.0