From 9d972f1120c4f0c206bded007e77e985bb659ade Mon Sep 17 00:00:00 2001
From: DXC <duxingchen@iris-rs.cn>
Date: Thu, 19 Mar 2026 11:31:51 +0800
Subject: [PATCH] fix: enforce strict SKU ascending sort and display both
 serial and batch numbers

---
 .../src/views/stock/stocktake/index.vue       | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/inventory-web/src/views/stock/stocktake/index.vue b/inventory-web/src/views/stock/stocktake/index.vue
index d5db6c8..b69d8ff 100644
--- a/inventory-web/src/views/stock/stocktake/index.vue
+++ b/inventory-web/src/views/stock/stocktake/index.vue
@@ -233,9 +233,9 @@
             <el-table-column prop="name" label="名称" min-width="90" show-overflow-tooltip />
 
             <el-table-column prop="sku" label="SKU" width="110" show-overflow-tooltip />
-            <el-table-column label="序列号/批次" min-width="140" show-overflow-tooltip>
-              <template #default="scope">
-                {{ scope.row.serial_number || scope.row.batch_no || '-' }}
+            <el-table-column label="序列号/批次" min-width="150" show-overflow-tooltip>
+              <template #default="{ row }">
+                <span>{{ row.serial_number || row.batch_number || row.batch_no || '-' }}</span>
               </template>
             </el-table-column>
 
@@ -503,7 +503,14 @@ const syncData = async () => {
     if (res.materials) res.materials.forEach((i: any) => { const item = processItem(i, 'material'); if (item) list.push(item) })
     if (res.semis) res.semis.forEach((i: any) => { const item = processItem(i, 'semi'); if (item) list.push(item) })
     if (res.products) res.products.forEach((i: any) => { const item = processItem(i, 'product'); if (item) list.push(item) })
-    
+
+    // ★ 强制按 SKU 数字+字符串升序排序
+    list.sort((a, b) => {
+      const skuA = a.sku || '';
+      const skuB = b.sku || '';
+      return skuA.localeCompare(skuB, undefined, { numeric: true, sensitivity: 'base' });
+    });
+
     // 静默更新数据（不触发loading）
     allData.value = list
     await fetchBorrowedQuantities(list)
@@ -759,6 +766,13 @@ const loadData = async () => {
     if (res.semis) res.semis.forEach((i: any) => processItem(i, 'semi'))
     if (res.products) res.products.forEach((i: any) => processItem(i, 'product'))
 
+    // ★ 强制按 SKU 数字+字符串升序排序
+    list.sort((a, b) => {
+      const skuA = a.sku || '';
+      const skuB = b.sku || '';
+      return skuA.localeCompare(skuB, undefined, { numeric: true, sensitivity: 'base' });
+    });
+
     allData.value = list
     await fetchBorrowedQuantities(list)
   } catch (e) {