From a85af42d1af9c8f56bd8b8e401540e35a3b49bb4 Mon Sep 17 00:00:00 2001
From: jiayang yue <jiayang.yue@xujiesoft.com>
Date: Thu, 27 Feb 2025 13:15:29 +0800
Subject: [PATCH] =?UTF-8?q?2025.02.27=20=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E9=80=81=E8=B4=A7=E8=AE=A1=E5=88=92=E6=B7=BB=E5=8A=A0=E6=8D=A2?=
 =?UTF-8?q?=E8=B4=A7=E6=95=B0=E9=87=8F=E5=88=97=20=E4=BE=9B=E5=BA=94?=
 =?UTF-8?q?=E5=95=86=E9=80=81=E8=B4=A7=E8=AE=A1=E5=88=92=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=20=E9=80=81=E8=B4=A7=E6=B1=87=E6=80=BB=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=B1=87=E6=80=BB=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../externalSupplierDeliverySchedule.vue      | 41 ++++++++++---------
 .../supplierDeliverySchedule.vue              | 20 ++++++++-
 2 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/src/views/modules/deliverySchedule/externalSupplierDeliverySchedule.vue b/src/views/modules/deliverySchedule/externalSupplierDeliverySchedule.vue
index 50f1b9b..0558814 100644
--- a/src/views/modules/deliverySchedule/externalSupplierDeliverySchedule.vue
+++ b/src/views/modules/deliverySchedule/externalSupplierDeliverySchedule.vue
@@ -148,8 +148,11 @@
     </el-pagination>
 
     <el-tabs style="margin-top: 0px; width: 100%; height: 100%;" v-model="activeName" class="customer-tab" type="border-card">
-      <el-tab-pane label="汇总" name="first">
+      <el-tab-pane label="送货汇总" name="first">
           <el-table
+            :key="collectDataList.length"
+            :summary-method="getSummaries"
+            show-summary
             :height="height - 325"
             :data="collectDataList"
             border
@@ -716,14 +719,14 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 109003,
-          serialNumber: '109003Table1PartNo',
+          serialNumber: '109003Table1NotifyQty',
           tableId: "109003Table1",
           tableName: "送货计划信息汇总表",
-          columnWidth: 202,
-          columnProp: 'partNo',
+          columnWidth: 120,
+          columnProp: 'notifyQty',
           headerAlign: 'center',
-          align: "left",
-          columnLabel: '物料编码',
+          align: "right",
+          columnLabel: '要求送货数量',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -734,14 +737,14 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 109003,
-          serialNumber: '109003Table1PartDescription',
+          serialNumber: '109003Table1PartNo',
           tableId: "109003Table1",
           tableName: "送货计划信息汇总表",
-          columnWidth: 282,
-          columnProp: 'partDescription',
+          columnWidth: 202,
+          columnProp: 'partNo',
           headerAlign: 'center',
           align: "left",
-          columnLabel: '物料名称',
+          columnLabel: '物料编码',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -752,13 +755,14 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 109003,
-          serialNumber: '109003Table1Spec',
+          serialNumber: '109003Table1PartDescription',
           tableId: "109003Table1",
           tableName: "送货计划信息汇总表",
-          columnProp: 'spec',
+          columnWidth: 282,
+          columnProp: 'partDescription',
           headerAlign: 'center',
           align: "left",
-          columnLabel: '规格型号',
+          columnLabel: '物料名称',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -769,14 +773,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 109003,
-          serialNumber: '109003Table1NotifyQty',
+          serialNumber: '109003Table1Spec',
           tableId: "109003Table1",
           tableName: "送货计划信息汇总表",
-          columnWidth: 120,
-          columnProp: 'notifyQty',
+          columnProp: 'spec',
           headerAlign: 'center',
-          align: "right",
-          columnLabel: '要求送货数量',
+          align: "left",
+          columnLabel: '规格型号',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -1047,8 +1050,6 @@ export default {
             return sum + value;
           }, 0);
           sums[index] = total; // 设置总计值
-        } else if (column.property === 'orderRef1') {
-          sums[index] = this.dataList.length;
         } else {
           sums[index] = ''; // 其他列空白
         }
diff --git a/src/views/modules/deliverySchedule/supplierDeliverySchedule.vue b/src/views/modules/deliverySchedule/supplierDeliverySchedule.vue
index 3840ab2..d44a139 100644
--- a/src/views/modules/deliverySchedule/supplierDeliverySchedule.vue
+++ b/src/views/modules/deliverySchedule/supplierDeliverySchedule.vue
@@ -397,6 +397,24 @@ export default {
           status: true,
           fixed: '',
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 109001,
+          serialNumber: '109001TableQtyReplace',
+          tableId: "109001Table",
+          tableName: "供应商送货计划表",
+          columnWidth: 120,
+          columnProp: 'qtyReplace',
+          headerAlign: 'center',
+          align: "right",
+          columnLabel: '换货数量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+        },
         {
           userId: this.$store.state.user.name,
           functionId: 109001,
@@ -860,7 +878,7 @@ export default {
           return;
         }
         const columnProp = column.property; // 对应 columnProp
-        if (['qty', 'pendingQty', 'delNotifyQty', 'deliveryQty'].includes(columnProp)) {
+        if (['qty', 'pendingQty', 'delNotifyQty', 'deliveryQty','qtyReplace'].includes(columnProp)) {
           // 合计指定列
           const total = data.reduce((sum, row) => {
             const value = Number(row[columnProp]) || 0;