From c49d78b86075eed9a8dfa31de8839a35c4225ac4 Mon Sep 17 00:00:00 2001
From: zhang_li <li.zhang@ccwin-in.com>
Date: Fri, 28 Mar 2025 15:25:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?YT-2290=E5=B7=B2=E5=8F=91=E6=9C=AA=E7=BB=93?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=EF=BC=8C=E5=BA=94=E9=9A=90=E8=97=8F=E5=B7=B2?=
 =?UTF-8?q?=E7=BB=93=E6=95=B0=E9=87=8F=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../unfinishedShipmentMain.data.ts            | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts
index 07a7b0f0e..97157b8d2 100644
--- a/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts
+++ b/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts
@@ -233,19 +233,19 @@ export const UnfinishedShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
       value: 0
     }
   },
-  {
-    label: '已结数量',
-    field: 'finishdQuantity',
-    sort: 'custom',
-    table: {
-      width: 150,
-    },
-    isTableForm:false,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    }
-  },
+  // {
+  //   label: '已结数量',
+  //   field: 'finishdQuantity',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150,
+  //   },
+  //   isTableForm:false,
+  //   form: {
+  //     component: 'InputNumber',
+  //     value: 0
+  //   }
+  // },
   {
     label: '销售单价',
     field: 'unitPrice',

From 084e2ddcf7fe4fbdb7a657c71c52992932aaaf1c Mon Sep 17 00:00:00 2001
From: zhang_li <li.zhang@ccwin-in.com>
Date: Fri, 28 Mar 2025 15:28:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?YT-2006=E5=8F=B7=E5=8F=A3=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=92=8C=E5=8F=B7=E5=8F=A3=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=8C=E7=82=B9=E5=87=BB=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=8E=92=E5=BA=8F=E4=B8=8D=E5=A5=BD=E4=BD=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Table/src/Table.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Table/src/Table.vue b/src/components/Table/src/Table.vue
index 43881054e..b45b2c470 100644
--- a/src/components/Table/src/Table.vue
+++ b/src/components/Table/src/Table.vue
@@ -352,7 +352,7 @@ export default defineComponent({
         }
       }
       //默认排序
-      updateSort(columns)
+      // updateSort(columns)
       return [...[renderTableExpand()], ...[renderTableSelection()]].concat(
         (columnsChildren || columns).map((v) => {
           const zhName = v.label || '';//中文名称