From dd2da3e686702febff3769dd776b371dd2cd1216 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?=
 <qi.ruan@xujiesoft.com>
Date: Thu, 2 Oct 2025 22:34:52 +0800
Subject: [PATCH] 1

---
 .../automatedWarehouse/palletAssembly.vue     | 54 +++++++++++++++++--
 .../automatedWarehouse/palletPacking.vue      | 54 +++++++++++++++++--
 2 files changed, 98 insertions(+), 10 deletions(-)

diff --git a/src/views/modules/automatedWarehouse/palletAssembly.vue b/src/views/modules/automatedWarehouse/palletAssembly.vue
index 270a0a7..1fc8487 100644
--- a/src/views/modules/automatedWarehouse/palletAssembly.vue
+++ b/src/views/modules/automatedWarehouse/palletAssembly.vue
@@ -11,7 +11,7 @@
           首页
         </div>
       </div>
-
+      <div class="table-body" style="max-height: 500px; overflow-y: auto;">
       <div class="main-content form-section">
         <!-- 第一行：栈板扫描 -->
         <div class="input-group">
@@ -122,7 +122,12 @@
       <!-- 栈板明细表格 (扫描栈板后显示) -->
       <div v-if="palletScanned" class="rma-list">
         <div class="list-title-row" style="display: flex; gap: 8px; align-items: center; padding: 0;">
-          <div class="list-title" style="flex: 0.75; margin: 0;">栈板明细</div>
+          <div class="list-title" style="flex: 0.75; margin: 0;">
+            <button class="action-btn primary" style="flex: 0.25; margin: 0;" @click="showDetailModal" :disabled="completeAssemblyLoading">
+              {{ '浏览明细' }}
+            </button>
+            <laber style="margin-left: 5px;">条码数:{{detailList.length}}</laber>
+          </div>
           <button class="action-btn primary" style="flex: 0.25; margin: 0;" @click="handleCompleteAssembly" :disabled="completeAssemblyLoading">
             {{ completeAssemblyLoading ? '处理中...' : '完成组托' }}
           </button>
@@ -149,8 +154,45 @@
           </div>
         </div>
       </div>
+      </div>
     </div>
-
+    <el-dialog
+      :title="'已扫描数量:'+detailList.length"
+      :visible.sync="detailModalVisible"
+      width="90%"
+      :close-on-click-modal="false"
+      :show-close="false"
+      :modal="true"
+      :modal-append-to-body="true"
+      :append-to-body="true"
+    >
+      <div class="table-body" style="max-height: 240px; overflow-y: auto;">
+      <div class="detail-table">
+        <div class="table-header">
+          <div class="col-position">位置</div>
+          <div class="col-layer">层数</div>
+          <div class="col-serial">标签号</div>
+        </div>
+        <div
+          v-for="(detail, index) in detailList"
+          :key="index"
+          class="table-row"
+          @click="handleRowDblClick(detail, index)"
+        >
+          <div class="col-position">{{ detail.position }}</div>
+          <div class="col-layer">{{ detail.layer }}</div>
+          <div class="col-serial">{{ detail.serialNo }}</div>
+        </div>
+        <!-- 暂无数据提示 -->
+        <div v-if="detailList.length === 0" class="table-row empty-row">
+          <div class="empty-hint">暂无栈板明细数据</div>
+        </div>
+      </div>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <button class="action-btn secondary" style="margin-left: 10px;" @click="detailModalVisible=false">取消</button>
+      </div>
+    </el-dialog>
     <!-- 扫码模态框 -->
     <el-dialog
       title="扫描标签"
@@ -365,7 +407,7 @@ export default {
       palletCode: '',
       palletScanned: false,
       operationType: 'in', // 'in' 或 'out'
-
+      detailModalVisible:false,
       // 栈板类型和自动分拣
       currentPalletFamily: '',        // 当前栈板大分类（固定不可改）
       currentPalletType: '',          // 当前栈板类型
@@ -1070,7 +1112,9 @@ export default {
       this.callStartStationOptions = [];
       this.callTargetStationOptions = [];
     },
-
+    showDetailModal(){
+      this.detailModalVisible=true;
+    },
   },
   mounted() {
     this.$nextTick(() => {
diff --git a/src/views/modules/automatedWarehouse/palletPacking.vue b/src/views/modules/automatedWarehouse/palletPacking.vue
index 31abc71..c9b8d97 100644
--- a/src/views/modules/automatedWarehouse/palletPacking.vue
+++ b/src/views/modules/automatedWarehouse/palletPacking.vue
@@ -11,7 +11,7 @@
           首页
         </div>
       </div>
-
+      <div class="table-body" style="max-height: 500px; overflow-y: auto;">
       <div class="main-content form-section">
         <!-- 第一行：栈板扫描 -->
         <div class="input-group">
@@ -122,7 +122,12 @@
       <!-- 栈板明细表格 (扫描栈板后显示) -->
       <div v-if="palletScanned" class="rma-list">
         <div class="list-title-row" style="display: flex; gap: 8px; align-items: center; padding: 0;">
-          <div class="list-title" style="flex: 0.75; margin: 0;">栈板明细</div>
+            <div class="list-title" style="flex: 0.75; margin: 0;">
+              <button class="action-btn primary" style="flex: 0.25; margin: 0;" @click="showDetailModal" >
+                {{ '浏览明细' }}
+              </button>
+              <laber style="margin-left: 5px;">条码数:{{detailList.length}}</laber>
+            </div>
           <button class="action-btn secondary" style="flex: 0.25; margin: 0;" @click="handleTransportOrder">运输指令</button>
         </div>
         <div class="detail-table">
@@ -147,8 +152,45 @@
           </div>
         </div>
       </div>
+      </div>
     </div>
-
+      <el-dialog
+        :title="'已扫描数量:'+detailList.length"
+        :visible.sync="detailModalVisible"
+        width="90%"
+        :close-on-click-modal="false"
+        :show-close="false"
+        :modal="true"
+        :modal-append-to-body="true"
+        :append-to-body="true"
+      >
+        <div class="table-body" style="max-height: 240px; overflow-y: auto;">
+          <div class="detail-table">
+            <div class="table-header">
+              <div class="col-position">位置</div>
+              <div class="col-layer">层数</div>
+              <div class="col-serial">标签号</div>
+            </div>
+            <div
+              v-for="(detail, index) in detailList"
+              :key="index"
+              class="table-row"
+              @click="handleRowDblClick(detail, index)"
+            >
+              <div class="col-position">{{ detail.position }}</div>
+              <div class="col-layer">{{ detail.layer }}</div>
+              <div class="col-serial">{{ detail.serialNo }}</div>
+            </div>
+            <!-- 暂无数据提示 -->
+            <div v-if="detailList.length === 0" class="table-row empty-row">
+              <div class="empty-hint">暂无栈板明细数据</div>
+            </div>
+          </div>
+        </div>
+        <div slot="footer" class="dialog-footer">
+          <button class="action-btn secondary" style="margin-left: 10px;" @click="detailModalVisible=false">取消</button>
+        </div>
+      </el-dialog>
     <!-- 扫码模态框 -->
     <el-dialog
       title="扫描标签"
@@ -424,7 +466,7 @@ export default {
       palletCode: '',
       palletScanned: false,
       operationType: 'in', // 'in' 或 'out'
-
+      detailModalVisible:false,
       // 栈板类型和自动分拣
       currentPalletFamily: '',        // 当前栈板大分类（固定不可改）
       currentPalletType: '',          // 当前栈板类型
@@ -1203,7 +1245,9 @@ export default {
       this.callStartStationOptions = [];
       this.callTargetStationOptions = [];
     },
-
+    showDetailModal(){
+      this.detailModalVisible=true;
+    },
   },
   mounted() {
     this.$nextTick(() => {