From e1e1c7b7f446334272516fa3784c7d753c351df1 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Thu, 18 Dec 2025 15:18:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/dashboard/picking-board-1028.vue  | 25 +++++--------------
 .../modules/dashboard/picking-board-1043.vue  | 25 +++++--------------
 2 files changed, 12 insertions(+), 38 deletions(-)

diff --git a/src/views/modules/dashboard/picking-board-1028.vue b/src/views/modules/dashboard/picking-board-1028.vue
index ad849e8..1776635 100644
--- a/src/views/modules/dashboard/picking-board-1028.vue
+++ b/src/views/modules/dashboard/picking-board-1028.vue
@@ -39,12 +39,6 @@
             <div class="title-icon"></div>
             <div class="title-text">
               <span class="title-main">人工拣选2</span>
-              <span class="title-divider">|</span>
-              <span class="title-sub">工单号码: <strong>{{ workOrderNo }}</strong></span>
-<!--              <span class="title-divider">|</span>
-              <span class="title-sub">产品名称: <strong>{{ materialName }}</strong></span>
-              <span class="title-divider"></span>
-              <span class="title-sub">工单时间: <strong>{{ workOrderTime }}</strong></span>-->
             </div>
           </div>
         </div>
@@ -54,17 +48,18 @@
           <table class="data-table">
             <thead>
               <tr>
-                <th style="width: 60px;">No.</th>
-                <th style="width: 150px;">拣选托盘码</th>
-                <th style="width: 200px;">拣选物料名称</th>
+                <th style="width: 60px;">工单号</th>
+                <th style="width: 150px;">产品编码</th>
+                <th style="width: 120px;">拣选托盘码</th>
+                <th style="width: 200px;">拣选物料编码</th>
                 <th style="width: 120px;">RFID</th>
                 <th style="width: 150px;">状态</th>
-                <th style="width: 120px;">存放位置</th>
               </tr>
             </thead>
             <tbody>
               <tr v-for="(item, idx) in station1028List" :key="idx">
-                <td class="text-center">{{ idx + 1 }}</td>
+                <td class="text-center">{{ item.orderNo }}</td>
+                <td class="text-center">{{ item.orderPartNo }}</td>
                 <td class="text-center">{{ item.pickingBatchNo }}</td>
                 <td class="text-center">{{ item.pickingMaterialName }}</td>
                 <td class="text-center">{{ item.rfidBarcode }}</td>
@@ -73,7 +68,6 @@
                     {{ item.status }}
                   </span>
                 </td>
-                <td class="text-center">{{ item.storageLocation }}</td>
               </tr>
             </tbody>
           </table>
@@ -292,13 +286,6 @@ export default {
               return 0
             })
 
-            // 更新工单信息（从第一条数据中提取）
-            if (this.station1028List.length > 0) {
-              this.workOrderNo = this.station1028List[0].orderNo || ''
-              this.materialName = this.station1028List[0].pickingMaterialName || ''
-              // 如果后端推送了工单号和工单时间，则更新
-              this.workOrderTime = this.station1028List[0].workOrderTime || ''
-            }
           }
         }
       }
diff --git a/src/views/modules/dashboard/picking-board-1043.vue b/src/views/modules/dashboard/picking-board-1043.vue
index dbe7cbc..de3e949 100644
--- a/src/views/modules/dashboard/picking-board-1043.vue
+++ b/src/views/modules/dashboard/picking-board-1043.vue
@@ -39,12 +39,6 @@
             <div class="title-icon"></div>
             <div class="title-text">
               <span class="title-main">人工拣选1</span>
-              <span class="title-divider">|</span>
-              <span class="title-sub">工单号码: <strong>{{ workOrderNo }}</strong></span>
-<!--              <span class="title-divider">|</span>
-              <span class="title-sub">产品名称: <strong>{{ materialName }}</strong></span>
-              <span class="title-divider"></span>
-              <span class="title-sub">工单时间: <strong>{{ workOrderTime }}</strong></span>-->
             </div>
           </div>
         </div>
@@ -54,17 +48,18 @@
           <table class="data-table">
             <thead>
               <tr>
-                <th style="width: 60px;">No.</th>
-                <th style="width: 150px;">拣选托盘码</th>
-                <th style="width: 200px;">拣选物料名称</th>
+                <th style="width: 60px;">工单号</th>
+                <th style="width: 150px;">产品编码</th>
+                <th style="width: 120px;">拣选托盘码</th>
+                <th style="width: 200px;">拣选物料编码</th>
                 <th style="width: 120px;">RFID</th>
                 <th style="width: 150px;">状态</th>
-                <th style="width: 120px;">存放位置</th>
               </tr>
             </thead>
             <tbody>
               <tr v-for="(item, idx) in station1043List" :key="idx">
-                <td class="text-center">{{ idx + 1 }}</td>
+                <td class="text-center">{{ item.orderNo }}</td>
+                <td class="text-center">{{ item.orderPartNo }}</td>
                 <td class="text-center">{{ item.pickingBatchNo }}</td>
                 <td class="text-center">{{ item.pickingMaterialName }}</td>
                 <td class="text-center">{{ item.rfidBarcode }}</td>
@@ -73,7 +68,6 @@
                     {{ item.status }}
                   </span>
                 </td>
-                <td class="text-center">{{ item.storageLocation }}</td>
               </tr>
             </tbody>
           </table>
@@ -292,13 +286,6 @@ export default {
               return 0
             })
 
-            // 更新工单信息（从第一条数据中提取）
-            if (this.station1043List.length > 0) {
-              this.workOrderNo = this.station1043List[0].orderNo || ''
-              this.materialName = this.station1043List[0].pickingMaterialName || ''
-              // 如果后端推送了工单号和工单时间，则更新
-              this.workOrderTime = this.station1043List[0].workOrderTime || ''
-            }
           }
         }
       }