From e9422ad9262fdc0e2e10ce1513c1cbe15e3f98ec 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: Tue, 30 Dec 2025 16:41:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/warehouse/labelQuery.js               |    9 +
 .../warehouse/labelChangeForDaPanDian.vue     | 1487 +++++++++++++++++
 .../modules/warehouse/labelQueryLocation.vue  |   14 +-
 3 files changed, 1505 insertions(+), 5 deletions(-)
 create mode 100644 src/views/modules/warehouse/labelChangeForDaPanDian.vue

diff --git a/src/api/warehouse/labelQuery.js b/src/api/warehouse/labelQuery.js
index 45f72aa..9519229 100644
--- a/src/api/warehouse/labelQuery.js
+++ b/src/api/warehouse/labelQuery.js
@@ -14,6 +14,15 @@ export const deleteLabel = data => createAPI('/warehouse/labelQuery/deleteLabel'
 // 修改标签库位 - rqrq
 export const updateLabelLocation = data => createAPI('/warehouse/labelQuery/updateLabelLocation', 'POST', data)
 
+// 修改标签库存信息（批次、库位、WDR、engChgLevel、失效日期、数量、是否在库）- rqrq
+export const updateHandlingUnitInventory = data => createAPI('/warehouse/labelQuery/updateHandlingUnitInventory', 'POST', data)
+
+// 去除非栈板库存 - rqrq
+export const removeNonPalletInventory = data => createAPI('/warehouse/labelQuery/removeNonPalletInventory', 'POST', data)
+
+// 恢复非栈板库存 - rqrq
+export const restoreNonPalletInventory = data => createAPI('/warehouse/labelQuery/restoreNonPalletInventory', 'POST', data)
+
 // 获取失败的打印任务列表
 export const getFailedPrintTasks = data => createAPI('/warehouse/labelQuery/getFailedPrintTasks', 'POST', data)
 
diff --git a/src/views/modules/warehouse/labelChangeForDaPanDian.vue b/src/views/modules/warehouse/labelChangeForDaPanDian.vue
new file mode 100644
index 0000000..6156ac3
--- /dev/null
+++ b/src/views/modules/warehouse/labelChangeForDaPanDian.vue
@@ -0,0 +1,1487 @@
+<template>
+  <div class="mod-config">
+    <el-form :inline="true" label-position="top">
+      <el-form-item label="入库状态">
+        <el-select v-model="queryHeaderData.inStockFlag" placeholder="请选择" style="width: 120px;">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="未入库" value="X"></el-option>
+          <el-option label="已出库" value="N"></el-option>
+          <el-option label="在库" value="Y"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="物料编号">
+        <el-input style="width: 120px;" v-model="queryHeaderData.partNo" placeholder="请输入物料编号" @keyup.enter.native="getDataList()"></el-input>
+      </el-form-item>
+      <el-form-item label="批次号">
+        <el-input style="width: 120px;" v-model="queryHeaderData.batchNo" placeholder="请输入批次号" @keyup.enter.native="getDataList()"></el-input>
+      </el-form-item>
+      <el-form-item label="库位">
+        <el-input style="width: 120px;" v-model="queryHeaderData.locationId" placeholder="请输入库位" @keyup.enter.native="getDataList()"></el-input>
+      </el-form-item>
+      <el-form-item label="标签号">
+        <el-input style="width: 120px;" v-model="queryHeaderData.unitId" placeholder="请输入标签号" @keyup.enter.native="getDataList()"></el-input>
+      </el-form-item>
+      <el-form-item label="物料描述">
+        <el-input style="width: 120px;" v-model="queryHeaderData.partDesc" placeholder="请输入物料描述" @keyup.enter.native="getDataList()"></el-input>
+      </el-form-item>
+      <el-form-item style="margin-top: 20px;">
+        <el-button @click="getDataList()" type="primary">查询</el-button>
+        <el-button @click="resetQuery()" type="default">重置</el-button>
+
+        <!-- 导出按钮 - rqrq -->
+        <download-excel
+          :fields="fields()"
+          :data="exportData"
+          type="xls"
+          :name="exportName"
+          :header="exportHeader"
+          :footer="exportFooter"
+          :fetch="createExportData"
+          :before-generate="startDownload"
+          :before-finish="finishDownload"
+          worksheet="导出信息"
+          class="el-button el-button--primary el-button--medium">
+          {{ '导出' }}
+        </download-excel>
+
+        <!-- 去除非栈板库存按钮 - rqrq -->
+        <el-button @click="showRemoveNonPalletDialog()" type="danger" style="margin-left: 10px;">
+          去除非栈板库存
+        </el-button>
+
+        <!-- 恢复非栈板库存按钮 - rqrq -->
+        <el-button @click="showRestoreNonPalletDialog()" type="warning" style="margin-left: 10px;">
+          恢复非栈板库存
+        </el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-table
+      id="labelQueryTable"
+      :height="height"
+      :data="dataList"
+      border
+      v-loading="dataListLoading || printLoading"
+      :element-loading-text="loadingText"
+      style="width: 100%; margin-bottom: 15px;">
+
+      <!-- 动态列配置 - rqrq -->
+      <el-table-column
+        v-for="(item,index) in columnList" :key="index"
+        :sortable="item.columnSortable"
+        :prop="item.columnProp"
+        :header-align="item.headerAlign"
+        :show-overflow-tooltip="item.showOverflowTooltip"
+        :align="item.align"
+        :fixed="item.fixed==''?false:item.fixed"
+        :min-width="item.columnWidth"
+        :label="item.columnLabel">
+        <template slot-scope="scope">
+          <span v-if="item.columnProp === 'inStockFlag'">
+            <span v-if="scope.row.inStockFlag === 'Y'" type="success">在库</span>
+            <span v-else-if="scope.row.inStockFlag === 'N'" type="info">已出库</span>
+            <span v-else-if="scope.row.inStockFlag === 'X'" type="warning">未入库</span>
+            <span v-else>{{ scope.row.inStockFlag }}</span>
+          </span>
+          <span v-else-if="item.columnProp === 'lastPrintDate' || item.columnProp === 'createdDate'">
+            {{ formatDate(scope.row[item.columnProp]) }}
+          </span>
+          <span v-else-if="item.columnProp === 'reserveFlag'">
+            {{ scope.row.reserveFlag === 'Y' ? '是' : '否' }}
+          </span>
+          <span v-else>{{ scope.row[item.columnProp] }}</span>
+        </template>
+      </el-table-column>
+
+      <!-- 操作列 - rqrq -->
+      <el-table-column label="操作" min-width="200" fixed="right" header-align="center" align="center">
+        <template slot-scope="scope">
+          <a
+           @click="reprintLabel(scope.row)"
+           type="primary"
+           :loading="scope.row.printing">
+           重打标签
+          </a>
+          <a
+           @click="openEditInventoryDialog(scope.row)"
+           type="primary"
+           style="margin-left: 10px; color: #409EFF;">
+           修改库存
+          </a>
+          <a
+           @click="deleteLabel(scope.row)"
+           type="danger"
+           style="margin-left: 10px; color: #f56c6c;">
+           删除
+          </a>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[20, 50, 100]"
+      :page-size="pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+
+    <!-- 其它入库标签打印弹窗 -->
+    <el-dialog
+      title="其它入库标签打印"
+      :visible.sync="otherInboundVisible"
+      width="450px"
+      :close-on-click-modal="false">
+      <el-form :model="otherInboundForm" ref="otherInboundForm" class="other-inbound-form">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="物料编码" prop="partNo" class="form-item-vertical">
+              <el-input v-model="otherInboundForm.partNo" placeholder="请输入物料编码"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="物料描述" prop="partDesc" class="form-item-vertical">
+              <el-input v-model="otherInboundForm.partDesc" placeholder="请输入物料描述"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="批次号" prop="batchNo" class="form-item-vertical">
+              <el-input v-model="otherInboundForm.batchNo" placeholder="请输入批次号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="WDR" prop="wdr" class="form-item-vertical">
+              <el-input v-model="otherInboundForm.wdr" placeholder="请输入WDR" value="*"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="数量" prop="qty" class="form-item-vertical">
+              <el-input
+                v-model="otherInboundForm.qty"
+                :min="0.01"
+                :precision="2"
+                style="width: 100%"
+                placeholder="请输入数量">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="包装数" prop="packageCount" class="form-item-vertical">
+              <el-input
+                v-model="otherInboundForm.packageCount"
+                :min="1"
+                style="width: 100%"
+                placeholder="请输入包装数">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="高度(mm)" prop="height" class="form-item-vertical">
+              <el-input v-model="otherInboundForm.height"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="失效日期" class="form-item-vertical">
+              <el-date-picker
+                v-model="otherInboundForm.expiredDate"
+                type="date"
+                placeholder="请选择失效日期"
+                style="width: 100%"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="otherInboundVisible = false">取消</el-button>
+        <el-button type="primary" @click="createOtherInboundHU()" :loading="otherInboundLoading">保存并打印</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 失败打印任务重试弹窗 -->
+    <el-dialog
+      title="失败打印任务列表"
+      :visible.sync="failedPrintTasksVisible"
+      width="600px"
+      :close-on-click-modal="false">
+      <el-table
+        :data="failedPrintTasksList"
+        border
+        stripe
+        v-loading="failedPrintTasksLoading"
+        max-height="400"
+        style="width: 100%">
+        <el-table-column
+          prop="unitId"
+          label="标签号"
+          min-width="150"
+          align="center"
+          header-align="center">
+        </el-table-column>
+        <el-table-column
+          prop="printerIp"
+          label="打印机IP"
+          min-width="120"
+          align="center"
+          header-align="center">
+        </el-table-column>
+        <el-table-column
+          prop="retryCount"
+          label="打印次数"
+          width="80"
+          align="center"
+          header-align="center">
+        </el-table-column>
+        <el-table-column
+          prop="createdDate"
+          label="创建时间"
+          min-width="150"
+          align="center"
+          header-align="center">
+          <template slot-scope="scope">
+            {{ formatDate(scope.row.createdDate) }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="failedPrintTasksVisible = false">取消</el-button>
+        <el-button type="primary" @click="retryAllFailedTasks()" :loading="retryLoading">重试全部</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog
+      title="修改标签库存信息"
+      :visible.sync="editDialogVisible"
+      :close-on-click-modal="false"
+      v-drag
+      width="800px">
+      <el-form :model="editForm" ref="editForm" label-position="top" style="margin-top: 1px; margin-left: 0px;">
+        <!-- 第一行：基本信息（只读） - rqrq -->
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="标签ID">
+              <el-input v-model="editForm.unitId" readonly></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="物料编号">
+              <el-input v-model="editForm.partNo" readonly></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="批次号">
+              <el-input v-model="editForm.batchNo" readonly></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!-- 第二行：可编辑字段 - rqrq -->
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="仓库" prop="warehouseId">
+              <el-input v-model="editForm.warehouseId" placeholder="请输入仓库" readonly></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="库位" prop="locationId">
+              <el-input v-model="editForm.locationId" placeholder="请输入库位" readonly></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否在库" prop="inStockFlag">
+              <el-input v-model="editForm.inStockFlag"  readonly></el-input>
+              <!--              <el-select v-model="editForm.inStockFlag" placeholder="请选择" readonly style="width: 100%">-->
+              <!--                <el-option label="在库" value="Y"></el-option>-->
+              <!--                <el-option label="已出库" value="N"></el-option>-->
+              <!--                <el-option label="未入库" value="X"></el-option>-->
+              <!--              </el-select>-->
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!-- 第三行：预留信息 - rqrq -->
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="是否预留" prop="reserveFlag">
+              <el-select v-model="editForm.reserveFlag" @change="handleReserveFlagChange" placeholder="请选择" style="width: 100%">
+                <el-option label="是" value="Y"></el-option>
+                <el-option label="否" value="N"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="预留单号1">
+              <el-input v-model="editForm.reserveOrderRef1" placeholder="请输入预留单号1"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="预留单号2">
+              <el-input v-model="editForm.reserveOrderRef2" placeholder="请输入预留单号2"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!-- 第四行：预留单号3和高度 - rqrq -->
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="预留单号3">
+              <el-input v-model="editForm.reserveOrderRef3" placeholder="请输入预留单号3"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="高度(mm)">
+              <el-input v-model="editForm.height" type="number" placeholder="请输入高度"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="saveEdit" :disabled="editLoading">
+          {{ editLoading ? '保存中...' : '确定' }}
+        </el-button>
+        <el-button @click="editDialogVisible = false" :disabled="editLoading">取消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 修改库存信息弹窗 - rqrq -->
+    <el-dialog
+      title="修改库存信息"
+      :visible.sync="editInventoryDialogVisible"
+      :close-on-click-modal="false"
+      v-drag
+      width="700px">
+      <el-form :model="editInventoryForm" ref="editInventoryForm" label-position="top" style="margin-top: 1px; margin-left: 0px;">
+        <!-- 第一行：只读信息 - rqrq -->
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="标签号">
+              <el-input v-model="editInventoryForm.unitId" readonly></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="物料编码">
+              <el-input v-model="editInventoryForm.partNo" readonly></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!-- 第二行：批次号、库位 - rqrq -->
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="批次号" prop="batchNo">
+              <el-input v-model="editInventoryForm.batchNo" placeholder="请输入批次号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="库位" prop="locationId">
+              <el-select
+                v-model="editInventoryForm.locationId"
+                filterable
+                clearable
+                placeholder="请选择库位"
+                style="width: 100%"
+                @change="handleLocationChange">
+                <el-option
+                  v-for="item in locationOptions"
+                  :key="item.locationId"
+                  :label="item.locationId + ' - ' + (item.locationName || '')"
+                  :value="item.locationId">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!-- 第三行：仓库编码、WDR - rqrq -->
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="仓库编码">
+              <el-input v-model="editInventoryForm.warehouseId" readonly placeholder="选择库位后自动带出"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="WDR" prop="wdr">
+              <el-input v-model="editInventoryForm.wdr" placeholder="请输入WDR"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!-- 第四行：engChgLevel、失效日期 - rqrq -->
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="engChgLevel" prop="engChgLevel">
+              <el-input v-model="editInventoryForm.engChgLevel" placeholder="请输入engChgLevel"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="失效日期" prop="expiredDate">
+              <el-date-picker
+                v-model="editInventoryForm.expiredDate"
+                type="date"
+                placeholder="请选择失效日期"
+                style="width: 100%"
+                value-format="yyyy-MM-dd">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!-- 第五行：数量、是否在库 - rqrq -->
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="数量" prop="qty">
+              <el-input v-model="editInventoryForm.qty" type="number" placeholder="请输入数量"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否在库" prop="inStockFlag">
+              <el-select v-model="editInventoryForm.inStockFlag" placeholder="请选择" style="width: 100%">
+                <el-option label="在库" value="Y"></el-option>
+                <el-option label="已出库" value="N"></el-option>
+                <el-option label="未入库" value="X"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="saveEditInventory" :disabled="editInventoryLoading">
+          {{ editInventoryLoading ? '保存中...' : '确定' }}
+        </el-button>
+        <el-button @click="editInventoryDialogVisible = false" :disabled="editInventoryLoading">取消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 去除非栈板库存密码验证弹窗 - rqrq -->
+    <el-dialog
+      title="去除非栈板库存"
+      :visible.sync="removeNonPalletDialogVisible"
+      :close-on-click-modal="false"
+      width="400px">
+      <el-form label-position="top">
+        <el-form-item label="请输入操作密码">
+          <el-input
+            v-model="removeNonPalletPassword"
+            type="password"
+            placeholder="请输入密码"
+            show-password
+            @keyup.enter.native="confirmRemoveNonPallet">
+          </el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="danger" @click="confirmRemoveNonPallet" :disabled="removeNonPalletLoading">
+          {{ removeNonPalletLoading ? '执行中...' : '确定' }}
+        </el-button>
+        <el-button @click="removeNonPalletDialogVisible = false" :disabled="removeNonPalletLoading">取消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 恢复非栈板库存密码验证弹窗 - rqrq -->
+    <el-dialog
+      title="恢复非栈板库存"
+      :visible.sync="restoreNonPalletDialogVisible"
+      :close-on-click-modal="false"
+      width="400px">
+      <el-form label-position="top">
+        <el-form-item label="请输入操作密码">
+          <el-input
+            v-model="restoreNonPalletPassword"
+            type="password"
+            placeholder="请输入密码"
+            show-password
+            @keyup.enter.native="confirmRestoreNonPallet">
+          </el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="warning" @click="confirmRestoreNonPallet" :disabled="restoreNonPalletLoading">
+          {{ restoreNonPalletLoading ? '执行中...' : '确定' }}
+        </el-button>
+        <el-button @click="restoreNonPalletDialogVisible = false" :disabled="restoreNonPalletLoading">取消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { getHandlingUnitLabelList, reprintLabel, deleteLabel, getFailedPrintTasks, retryFailedPrintTasks, updateHandlingUnitInventory, removeNonPalletInventory, restoreNonPalletInventory } from '@/api/warehouse/labelQuery'
+import { getLocationList } from '@/api/warehouse/location'
+import { searchSysLanguagePackList, saveUserFavorite, searchUserFavorite } from '@/api/sysLanguage'
+import { createOtherInboundHU, printLabel } from '@/api/warehouse/otherInbound'
+
+export default {
+  data() {
+    return {
+      dataForm: {
+        key: ''
+      },
+      dataList: [],
+      pageIndex: 1,
+      pageSize: 50,
+      totalPage: 0,
+      dataListLoading: false,
+      printLoading: false,
+      loadingText: '加载中...',
+      dataListSelections: [],
+      favorite: false,
+      height: 500,
+      // 表格列配置 - rqrq
+      columnList: [
+        {
+          columnProp: "unitId",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "标签号",
+          columnWidth: 150,
+          columnSortable: false,
+          showOverflowTooltip: true,
+          fixed: ""
+        },
+        {
+          columnProp: "partNo",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "物料编号",
+          columnWidth: 120,
+          columnSortable: false,
+          showOverflowTooltip: true,
+          fixed: ""
+        },
+        {
+          columnProp: "partDesc",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "物料描述",
+          columnWidth: 150,
+          columnSortable: false,
+          showOverflowTooltip: true,
+          fixed: ""
+        },
+        {
+          columnProp: "batchNo",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "批次号",
+          columnWidth: 120,
+          columnSortable: false,
+          showOverflowTooltip: true,
+          fixed: ""
+        },
+        {
+          columnProp: "locationId",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "库位",
+          columnWidth: 100,
+          columnSortable: false,
+          showOverflowTooltip: true,
+          fixed: ""
+        },
+        {
+          columnProp: "warehouseId",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "仓库",
+          columnWidth: 100,
+          columnSortable: false,
+          showOverflowTooltip: true,
+          fixed: ""
+        },
+        {
+          columnProp: "wdr",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "WDR",
+          columnWidth: 100,
+          columnSortable: false,
+          showOverflowTooltip: true,
+          fixed: ""
+        },
+        {
+          columnProp: "engChgLevel",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "engChgLevel",
+          columnWidth: 100,
+          columnSortable: false,
+          showOverflowTooltip: true,
+          fixed: ""
+        },
+        {
+          columnProp: "expiredDate",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "expiredDate",
+          columnWidth: 130,
+          columnSortable: false,
+          showOverflowTooltip: true,
+          fixed: ""
+        },
+        {
+          columnProp: "qty",
+          headerAlign: "center",
+          align: "right",
+          columnLabel: "数量",
+          columnWidth: 80,
+          columnSortable: false,
+          showOverflowTooltip: true,
+          fixed: ""
+        },
+        {
+          columnProp: "inStockFlag",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "入库状态",
+          columnWidth: 80,
+          columnSortable: false,
+          showOverflowTooltip: true,
+          fixed: ""
+        },
+        {
+          columnProp: "printCount",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "打印次数",
+          columnWidth: 80,
+          columnSortable: false,
+          showOverflowTooltip: true,
+          fixed: ""
+        },
+        {
+          columnProp: "lastPrintDate",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "最后打印时间",
+          columnWidth: 150,
+          columnSortable: false,
+          showOverflowTooltip: true,
+          fixed: ""
+        },
+        {
+          columnProp: "createdDate",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "创建时间",
+          columnWidth: 150,
+          columnSortable: false,
+          showOverflowTooltip: true,
+          fixed: ""
+        },
+        {
+          columnProp: "height",
+          headerAlign: "center",
+          align: "right",
+          columnLabel: "高度(mm)",
+          columnWidth: 100,
+          columnSortable: false,
+          showOverflowTooltip: true,
+          fixed: ""
+        },
+        {
+          columnProp: "reserveFlag",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "是否预留",
+          columnWidth: 80,
+          columnSortable: false,
+          showOverflowTooltip: true,
+          fixed: ""
+        },
+        {
+          columnProp: "reserveOrderRef1",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "预留单号1",
+          columnWidth: 120,
+          columnSortable: false,
+          showOverflowTooltip: true,
+          fixed: ""
+        },
+        {
+          columnProp: "reserveOrderRef2",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "预留单号2",
+          columnWidth: 120,
+          columnSortable: false,
+          showOverflowTooltip: true,
+          fixed: ""
+        },
+        {
+          columnProp: "reserveOrderRef3",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "预留单号3",
+          columnWidth: 120,
+          columnSortable: false,
+          showOverflowTooltip: true,
+          fixed: ""
+        }
+      ],
+      queryHeaderData: {
+        inStockFlag: '',
+        partNo: '',
+        batchNo: '',
+        locationId: '',
+        unitId: '',
+        partDesc: ''
+      },
+      // 打印相关配置
+      reportId: 'HU_LABEL', // 默认报表ID，可根据实际情况调整
+      zplCode: '', // ZPL代码
+      paperSize: 'A4',
+      orientation: 'portrait',
+      dpi: 203,
+      // 其它入库标签打印相关
+      otherInboundVisible: false,
+      otherInboundLoading: false,
+      otherInboundForm: {
+        partNo: '',
+        partDesc: '',
+        batchNo: '',
+        locationId: '',
+        warehouseId: '',
+        wdr: '*',
+        qty: 1,
+        umId: '个',
+        packageCount: 1,
+        manufactureDate: '',
+        expiredDate: '',
+        remark: ''
+      },
+      // 导出相关 - rqrq
+      exportData: [],
+      exportName: '标签查询' + this.dayjs().format('YYYYMMDDHHmmss'),
+      exportHeader: ["标签查询"],
+      exportFooter: [],
+      otherInboundRules: {
+        partNo: [
+          { required: true, message: '物料编码不能为空', trigger: 'blur' }
+        ],
+        partDesc: [
+          { required: true, message: '物料描述不能为空', trigger: 'blur' }
+        ],
+        batchNo: [
+          { required: true, message: '批次号不能为空', trigger: 'blur' }
+        ],
+        locationId: [
+          { required: true, message: '库位不能为空', trigger: 'blur' }
+        ],
+        warehouseId: [
+          { required: true, message: '仓库不能为空', trigger: 'blur' }
+        ],
+        qty: [
+          { required: true, message: '数量不能为空', trigger: 'blur' },
+          { type: 'number', min: 0.01, message: '数量必须大于0', trigger: 'blur' }
+        ],
+        umId: [
+          { required: true, message: '单位不能为空', trigger: 'blur' }
+        ],
+        packageCount: [
+          { required: true, message: '包装数不能为空', trigger: 'blur' },
+          { type: 'number', min: 1, message: '包装数必须大于等于1', trigger: 'blur' }
+        ]
+      },
+      // 失败打印任务相关
+      failedPrintTasksVisible: false,
+      failedPrintTasksLoading: false,
+      failedPrintTasksList: [],
+      retryLoading: false,
+      // 修改库位相关 - rqrq
+      editDialogVisible: false,
+      editLoading: false,
+      editForm: {
+        unitId: '',
+        partNo: '',
+        batchNo: '',
+        warehouseId: '',
+        locationId: '',
+        inStockFlag: '',
+        reserveFlag: 'N',
+        reserveOrderRef1: '',
+        reserveOrderRef2: '',
+        reserveOrderRef3: '',
+        height: ''
+      },
+      // 修改库存信息相关 - rqrq
+      editInventoryDialogVisible: false,
+      editInventoryLoading: false,
+      locationOptions: [], // 库位下拉选项 - rqrq
+      editInventoryForm: {
+        unitId: '',
+        partNo: '',
+        batchNo: '',
+        locationId: '',
+        warehouseId: '',
+        wdr: '',
+        engChgLevel: '',
+        expiredDate: '',
+        qty: '',
+        inStockFlag: ''
+      },
+      // 去除非栈板库存相关 - rqrq
+      removeNonPalletDialogVisible: false,
+      removeNonPalletLoading: false,
+      removeNonPalletPassword: '',
+      // 恢复非栈板库存相关 - rqrq
+      restoreNonPalletDialogVisible: false,
+      restoreNonPalletLoading: false,
+      restoreNonPalletPassword: '',
+    }
+  },
+  activated() {
+    this.getDataList()
+    this.getHeight()
+  },
+  mounted() {
+    this.getDataList()
+    this.getHeight()
+  },
+  methods: {
+    // 获取数据列表
+    getDataList() {
+      this.dataListLoading = true
+      const params = {
+        page: this.pageIndex,
+        size: this.pageSize,
+        site: localStorage.getItem('site'),
+        ...this.queryHeaderData
+      }
+
+      getHandlingUnitLabelList(params).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.dataList = data.page.list || []
+          this.totalPage = data.page.totalCount || 0
+        } else {
+          this.dataList = []
+          this.totalPage = 0
+          this.$alert(data.msg || '查询失败', '错误', { confirmButtonText: '确定' })
+        }
+        this.dataListLoading = false
+      }).catch(() => {
+        this.dataList = []
+        this.totalPage = 0
+        this.dataListLoading = false
+      })
+    },
+
+    // 重置查询条件
+    resetQuery() {
+      this.queryHeaderData = {
+        inStockFlag: '',
+        partNo: '',
+        batchNo: '',
+        locationId: '',
+        unitId: '',
+        partDesc: ''
+      }
+      this.pageIndex = 1
+      this.getDataList()
+    },
+
+    // 重打标签
+    async reprintLabel(row) {
+
+      try {
+        // 设置页面打印状态
+        this.printLoading = true
+        this.loadingText = `${row.unitId} 打印中...`
+        // 设置行打印状态
+        this.$set(row, 'printing', true)
+        let printLabelType;
+        if (row.partNo && row.partNo.startsWith("80")) {
+          printLabelType = '库存成品标签';
+        } else {
+          printLabelType = 'BIL标签';
+        }
+        const printRequest = {
+          reportId: this.reportId,
+          zplCode: this.zplCode,
+          paperSize: this.paperSize,
+          orientation: this.orientation,
+          dpi: this.dpi,
+          userId: localStorage.getItem('userName'),
+          username: localStorage.getItem('userName'),
+          site: localStorage.getItem('site'),
+          unitId: row.unitId,
+          labelType:printLabelType
+        }
+
+        const { data } = await reprintLabel(printRequest)
+        if (data && data.code === 0) {
+          this.$message.success('打印任务已发送成功')
+          // 刷新当前行数据
+          this.getDataList()
+        } else {
+          this.$alert(data.msg || '打印失败', '错误', { confirmButtonText: '确定' })
+        }
+      } catch (error) {
+        this.$alert('打印失败：' + error.message, '错误', { confirmButtonText: '确定' })
+      } finally {
+        // 清除页面打印状态
+        this.printLoading = false
+        this.loadingText = '加载中...'
+        // 清除行打印状态
+        this.$set(row, 'printing', false)
+      }
+    },
+
+    // 删除标签
+    deleteLabel(row) {
+      this.$confirm(`确定要删除单元ID为 ${row.unitId} 的标签吗？此操作不可恢复！`, '删除确认', {
+        confirmButtonText: '确定删除',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(async () => {
+        try {
+          this.dataListLoading = true
+          const { data } = await deleteLabel({
+            site: localStorage.getItem('site'),
+            unitId: row.unitId
+          })
+          if (data && data.code === 0) {
+            this.$message.success('删除成功')
+            // 刷新数据列表
+            this.getDataList()
+          } else {
+            this.$alert(data.msg || '删除失败', '错误', { confirmButtonText: '确定' })
+          }
+        } catch (error) {
+          this.$alert('删除失败：' + error.message, '错误', { confirmButtonText: '确定' })
+        } finally {
+          this.dataListLoading = false
+        }
+      }).catch(() => {
+        // 用户取消删除
+      })
+    },
+
+    // 每页数
+    sizeChangeHandle(val) {
+      this.pageSize = val
+      this.pageIndex = 1
+      this.getDataList()
+    },
+
+    // 当前页
+    currentChangeHandle(val) {
+      this.pageIndex = val
+      this.getDataList()
+    },
+
+    // 格式化日期
+    formatDate(date) {
+      if (!date) return ''
+      const d = new Date(date)
+      const year = d.getFullYear()
+      const month = String(d.getMonth() + 1).padStart(2, '0')
+      const day = String(d.getDate()).padStart(2, '0')
+      const hours = String(d.getHours()).padStart(2, '0')
+      const minutes = String(d.getMinutes()).padStart(2, '0')
+      const seconds = String(d.getSeconds()).padStart(2, '0')
+      return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
+    },
+    // 导出相关方法 - rqrq
+    async createExportData() {
+      const queryParams = {
+        site: localStorage.getItem('site'),
+        ...this.queryHeaderData,
+        page: 1,
+        size: 999999  // 设置一个很大的数字来获取全部数据 - rqrq
+      }
+      const {data} = await getHandlingUnitLabelList(queryParams)
+      if (data && data.code === 0) {
+        return (data.page.list || []).map(item => {
+          return {
+            ...item,
+            inStockFlag: item.inStockFlag === 'Y' ? '在库' : item.inStockFlag === 'N' ? '已出库' : item.inStockFlag === 'X' ? '未入库' : item.inStockFlag,
+            reserveFlag: item.reserveFlag === 'Y' ? '是' : '否',
+            lastPrintDate: this.formatDate(item.lastPrintDate),
+            createdDate: this.formatDate(item.createdDate)
+          }
+        })
+      }
+      return []
+    },
+    startDownload() {
+      // 开始导出 - rqrq
+    },
+    finishDownload() {
+      // 导出完成 - rqrq
+    },
+    fields() {
+      let json = "{"
+      this.columnList.forEach((item, index) => {
+        if (index == this.columnList.length - 1) {
+          json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
+        } else {
+          json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
+        }
+      })
+      json += "}"
+      let s = eval("(" + json + ")")
+      return s
+    },
+
+    // 获取表格高度
+    getHeight() {
+      this.$nextTick(() => {
+        this.height = window.innerHeight - 280
+      })
+    },
+
+    // 显示其它入库标签打印对话框
+    showOtherInboundDialog() {
+      this.otherInboundVisible = true
+      // 重置表单
+      this.otherInboundForm = {
+        partNo: '',
+        partDesc: '',
+        batchNo: '',
+        locationId: '',
+        warehouseId: '',
+        wdr: '*',
+        qty: 1,
+        umId: '个',
+        packageCount: 1,
+        manufactureDate: '',
+        expiredDate: '',
+        remark: '',
+        height: '',
+      }
+      this.$nextTick(() => {
+        if (this.$refs['otherInboundForm']) {
+          this.$refs['otherInboundForm'].clearValidate()
+        }
+      })
+    },
+
+    // 创建其它入库HandlingUnit
+    async createOtherInboundHU() {
+      try {
+        // 基本验证
+        if (!this.otherInboundForm.partNo) {
+          this.$alert('物料编码不能为空', '错误', { confirmButtonText: '确定' })
+          return
+        }
+        if (!this.otherInboundForm.partDesc) {
+          this.$alert('物料描述不能为空', '错误', { confirmButtonText: '确定' })
+          return
+        }
+        if (!this.otherInboundForm.batchNo) {
+          this.$alert('批次号不能为空', '错误', { confirmButtonText: '确定' })
+          return
+        }
+        if (!this.otherInboundForm.qty || parseFloat(this.otherInboundForm.qty) <= 0) {
+          this.$alert('数量必须大于0', '错误', { confirmButtonText: '确定' })
+          return
+        }
+        if (!this.otherInboundForm.packageCount || parseInt(this.otherInboundForm.packageCount) <= 0) {
+          this.$alert('包装数必须大于0', '错误', { confirmButtonText: '确定' })
+          return
+        }
+
+        this.otherInboundLoading = true
+
+         // 准备创建HU的数据
+         const createData = {
+           site: localStorage.getItem('site'),
+           warehouseId: this.otherInboundForm.warehouseId,
+           partNo: this.otherInboundForm.partNo,
+           partDesc: this.otherInboundForm.partDesc,
+           batchNo: this.otherInboundForm.batchNo,
+           wdr: this.otherInboundForm.wdr,
+           locationId: this.otherInboundForm.locationId,
+           umid: this.otherInboundForm.umId,
+           perPackageQty: parseFloat(this.otherInboundForm.qty),
+           packageCount: parseInt(this.otherInboundForm.packageCount),
+           manufactureDate: this.otherInboundForm.manufactureDate || null,
+           expiredDate: this.otherInboundForm.expiredDate || null,
+           remark: this.otherInboundForm.remark,
+            height: this.otherInboundForm.height || null,
+         }
+
+        // 创建HandlingUnit
+        const { data } = await createOtherInboundHU(createData)
+        if (data && data.code === 0) {
+          this.$message.success('创建HandlingUnit成功')
+
+          // 确定标签类型
+          let printLabelType
+          if (this.otherInboundForm.partNo && this.otherInboundForm.partNo.startsWith("80")) {
+            printLabelType = '库存成品标签'
+          } else {
+            printLabelType = 'BIL标签'
+          }
+
+          // 创建成功后进行打印
+          await this.printHandlingUnits(data.unitIds, printLabelType)
+
+          this.otherInboundVisible = false
+          this.getDataList() // 刷新列表
+        } else {
+          this.$alert(data.msg || '创建HandlingUnit失败', '错误', { confirmButtonText: '确定' })
+        }
+      } catch (error) {
+        this.$alert('创建失败：' + error.message, '错误', { confirmButtonText: '确定' })
+      } finally {
+        this.otherInboundLoading = false
+      }
+    },
+
+    // 打印HandlingUnit标签
+    async printHandlingUnits(unitIds, printLabelType) {
+      if (!unitIds || unitIds.length === 0) {
+        return
+      }
+
+      try {
+        // 逐个打印每个HandlingUnit
+        for (const unitId of unitIds) {
+          await this.printViaServer(unitId, printLabelType)
+        }
+        this.$message.success(`成功打印 ${unitIds.length} 个HandlingUnit标签`)
+      } catch (error) {
+        this.$alert('打印失败: ' + error.message, '错误', { confirmButtonText: '确定' })
+      }
+    },
+
+    // 通过服务器打印
+    async printViaServer(unitId, printLabelType) {
+      try {
+        const printRequest = {
+          reportId: this.reportId,
+          zplCode: this.zplCode,
+          paperSize: this.paperSize,
+          orientation: this.orientation,
+          dpi: this.dpi,
+          userId: localStorage.getItem('userName'),
+          username: localStorage.getItem('userName'),
+          site: localStorage.getItem('site'),
+          unitId: unitId,
+          labelType: printLabelType
+        }
+        const { data } = await printLabel(printRequest)
+        if (data.code === 200) {
+          return Promise.resolve()
+        } else {
+          return Promise.reject(new Error(data.msg || '打印失败'))
+        }
+      } catch (error) {
+        return Promise.reject(error)
+      }
+    },
+
+    /**
+     * 显示失败打印任务对话框
+     */
+    async showFailedPrintTasksDialog() {
+      this.failedPrintTasksVisible = true
+      this.failedPrintTasksLoading = true
+
+      try {
+        const { data } = await getFailedPrintTasks({
+          site: localStorage.getItem('site')
+        })
+
+        if (data && data.code === 0) {
+          this.failedPrintTasksList = data.rows || []
+          if (this.failedPrintTasksList.length === 0) {
+            this.$message.warning('没有失败的打印任务')
+          }
+        } else {
+          this.$alert(data.msg || '查询失败', '错误', { confirmButtonText: '确定' })
+          this.failedPrintTasksList = []
+        }
+      } catch (error) {
+        this.$alert('查询失败：' + error.message, '错误', { confirmButtonText: '确定' })
+        this.failedPrintTasksList = []
+      } finally {
+        this.failedPrintTasksLoading = false
+      }
+    },
+
+    /**
+     * 重试全部失败的打印任务
+     */
+    async retryAllFailedTasks() {
+      if (this.failedPrintTasksList.length === 0) {
+        this.$message.warning('没有需要重试的任务')
+        return
+      }
+
+      this.$confirm(`确定要重试全部 ${this.failedPrintTasksList.length} 个失败的打印任务吗？`, '重试确认', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(async () => {
+        this.retryLoading = true
+
+        try {
+          const { data } = await retryFailedPrintTasks({
+            site: localStorage.getItem('site')
+          })
+
+          if (data && data.code === 0) {
+            this.$message.success(`成功将 ${data.count || 0} 个任务重新加入打印队列`)
+            // 关闭对话框
+            this.failedPrintTasksVisible = false
+            // 清空列表
+            this.failedPrintTasksList = []
+          } else {
+            this.$alert(data.msg || '重试失败', '错误', { confirmButtonText: '确定' })
+          }
+        } catch (error) {
+          this.$alert('重试失败：' + error.message, '错误', { confirmButtonText: '确定' })
+        } finally {
+          this.retryLoading = false
+        }
+      }).catch(() => {
+        // 用户取消重试
+      })
+    },
+
+    /**
+     * 打开修改库存信息弹窗 - rqrq
+     * @param row 当前行数据
+     */
+    openEditInventoryDialog(row) {
+      // 填充表单数据 - rqrq
+      this.editInventoryForm = {
+        unitId: row.unitId || '',
+        partNo: row.partNo || '',
+        batchNo: row.batchNo || '',
+        locationId: row.locationId || '',
+        warehouseId: row.warehouseId || '',
+        wdr: row.wdr || '',
+        engChgLevel: row.engChgLevel || '',
+        expiredDate: row.expiredDate ? row.expiredDate.substring(0, 10) : '',
+        qty: row.qty || '',
+        inStockFlag: row.inStockFlag || 'Y'
+      }
+      // 加载库位下拉选项 - rqrq
+      this.loadLocationOptions()
+      // 显示弹窗 - rqrq
+      this.editInventoryDialogVisible = true
+    },
+
+    /**
+     * 加载库位下拉选项 - rqrq
+     */
+    loadLocationOptions() {
+      const params = {
+        site: localStorage.getItem('site'),
+        page: 1,
+        limit: 9999
+      }
+      getLocationList(params).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.locationOptions = data.page.list || []
+        } else {
+          this.locationOptions = []
+        }
+      }).catch(() => {
+        this.locationOptions = []
+      })
+    },
+
+    /**
+     * 库位选择变化处理 - 自动带出仓库编码 - rqrq
+     * @param locationId 选中的库位ID
+     */
+    handleLocationChange(locationId) {
+      if (!locationId) {
+        this.editInventoryForm.warehouseId = ''
+        return
+      }
+      // 从库位选项中找到对应的仓库编码 - rqrq
+      const location = this.locationOptions.find(item => item.locationId === locationId)
+      if (location) {
+        this.editInventoryForm.warehouseId = location.warehouseId || ''
+      }
+    },
+
+    /**
+     * 保存修改库存信息 - rqrq
+     */
+    saveEditInventory() {
+      // 参数校验 - rqrq
+      if (!this.editInventoryForm.unitId) {
+        this.$alert('标签号不能为空', '错误', { confirmButtonText: '确定' })
+        return
+      }
+
+      this.editInventoryLoading = true
+
+      const saveData = {
+        site: localStorage.getItem('site'),
+        unitId: this.editInventoryForm.unitId,
+        batchNo: this.editInventoryForm.batchNo,
+        locationId: this.editInventoryForm.locationId,
+        warehouseId: this.editInventoryForm.warehouseId,
+        wdr: this.editInventoryForm.wdr,
+        engChgLevel: this.editInventoryForm.engChgLevel,
+        expiredDate: this.editInventoryForm.expiredDate,
+        qty: this.editInventoryForm.qty ? parseFloat(this.editInventoryForm.qty) : null,
+        inStockFlag: this.editInventoryForm.inStockFlag
+      }
+
+      updateHandlingUnitInventory(saveData).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.$message.success('修改库存信息成功')
+          this.editInventoryDialogVisible = false
+          // 刷新列表 - rqrq
+          this.getDataList()
+        } else {
+          this.$alert(data.msg || '修改失败', '错误', { confirmButtonText: '确定' })
+        }
+      }).catch(error => {
+        this.$alert('修改失败：' + error.message, '错误', { confirmButtonText: '确定' })
+      }).finally(() => {
+        this.editInventoryLoading = false
+      })
+    },
+
+    /**
+     * 显示去除非栈板库存弹窗 - rqrq
+     */
+    showRemoveNonPalletDialog() {
+      this.removeNonPalletPassword = ''
+      this.removeNonPalletDialogVisible = true
+    },
+
+    /**
+     * 确认去除非栈板库存 - rqrq
+     */
+    confirmRemoveNonPallet() {
+      // 验证密码 - rqrq
+      if (this.removeNonPalletPassword !== 'dapandian') {
+        this.$alert('密码错误', '错误', { confirmButtonText: '确定' })
+        return
+      }
+
+      // 二次确认 - rqrq
+      this.$confirm('此操作会抹杀所有非栈板库存!请谨慎操作。(可以恢复不要慌)', '警告', {
+        confirmButtonText: '确定执行',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.removeNonPalletLoading = true
+
+        removeNonPalletInventory({
+          site: localStorage.getItem('site')
+        }).then(({ data }) => {
+          if (data && data.code === 0) {
+            this.$message.success(`成功修改了 ${data.count || 0} 条标签`)
+            this.removeNonPalletDialogVisible = false
+            // 刷新列表 - rqrq
+            this.getDataList()
+          } else {
+            this.$alert(data.msg || '操作失败', '错误', { confirmButtonText: '确定' })
+          }
+        }).catch(error => {
+          this.$alert('操作失败：' + error.message, '错误', { confirmButtonText: '确定' })
+        }).finally(() => {
+          this.removeNonPalletLoading = false
+        })
+      }).catch(() => {
+        // 用户取消
+      })
+    },
+
+    /**
+     * 显示恢复非栈板库存弹窗 - rqrq
+     */
+    showRestoreNonPalletDialog() {
+      this.restoreNonPalletPassword = ''
+      this.restoreNonPalletDialogVisible = true
+    },
+
+    /**
+     * 确认恢复非栈板库存 - rqrq
+     */
+    confirmRestoreNonPallet() {
+      // 验证密码 - rqrq
+      if (this.restoreNonPalletPassword !== 'wocuole') {
+        this.$alert('密码错误', '错误', { confirmButtonText: '确定' })
+        return
+      }
+
+      // 二次确认 - rqrq
+      this.$confirm('是否要恢复上次被抹杀的库存?', '确认', {
+        confirmButtonText: '确定恢复',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.restoreNonPalletLoading = true
+
+        restoreNonPalletInventory({
+          site: localStorage.getItem('site')
+        }).then(({ data }) => {
+          if (data && data.code === 0) {
+            this.$message.success(`成功修改了 ${data.count || 0} 条标签`)
+            this.restoreNonPalletDialogVisible = false
+            // 刷新列表 - rqrq
+            this.getDataList()
+          } else {
+            this.$alert(data.msg || '操作失败', '错误', { confirmButtonText: '确定' })
+          }
+        }).catch(error => {
+          this.$alert('操作失败：' + error.message, '错误', { confirmButtonText: '确定' })
+        }).finally(() => {
+          this.restoreNonPalletLoading = false
+        })
+      }).catch(() => {
+        // 用户取消
+      })
+    }
+  }
+}
+</script>
+
+<style>
+.mod-config .el-form-item {
+  margin-bottom: 15px;
+}
+.sl-svg {
+  font-size: 20px;
+  cursor: pointer;
+  color: #409EFF;
+}
+
+/* 其它入库标签打印表单样式 */
+.other-inbound-form .form-item-vertical {
+  margin-bottom: 20px;
+}
+
+.other-inbound-form .form-item-vertical .el-form-item__label {
+  display: block;
+  text-align: left;
+  padding: 0 0 8px 0;
+  line-height: 1.5;
+  font-weight: 500;
+}
+
+.other-inbound-form .form-item-vertical .el-form-item__content {
+  margin-left: 0 !important;
+}
+
+.other-inbound-form .el-row {
+  margin-bottom: 0;
+}
+</style>
diff --git a/src/views/modules/warehouse/labelQueryLocation.vue b/src/views/modules/warehouse/labelQueryLocation.vue
index 4f74154..68cf877 100644
--- a/src/views/modules/warehouse/labelQueryLocation.vue
+++ b/src/views/modules/warehouse/labelQueryLocation.vue
@@ -95,7 +95,7 @@
 </template>
 
 <script>
-import { getHandlingUnitLabelList, reprintLabel, deleteLabel, getHandlingUnitLabelAll } from '@/api/warehouse/labelQuery'
+import { getHandlingUnitLabelList, reprintLabel, deleteLabel, getHandlingUnitLabelAll, } from '@/api/warehouse/labelQuery'
 import { searchSysLanguagePackList, saveUserFavorite, searchUserFavorite } from '@/api/sysLanguage'
 import { createOtherInboundHU, printLabel } from '@/api/warehouse/otherInbound'
 import {getHandlingUnitLabelListLocation} from '../../../api/warehouse/labelQuery'
@@ -137,10 +137,14 @@ export default {
         {columnProp: "reserveFlag", headerAlign: "center", align: "center", columnLabel: "是否预留", columnWidth: 80, columnSortable: false, showOverflowTooltip: true, fixed: ""},
         {columnProp: "reserveOrderRef1", headerAlign: "center", align: "center", columnLabel: "预留单号1", columnWidth: 120, columnSortable: false, showOverflowTooltip: true, fixed: ""},
         {columnProp: "reserveOrderRef2", headerAlign: "center", align: "center", columnLabel: "预留单号2", columnWidth: 120, columnSortable: false, showOverflowTooltip: true, fixed: ""},
-        {columnProp: "reserveOrderRef3", headerAlign: "center", align: "center", columnLabel: "预留单号3", columnWidth: 120, columnSortable: false, showOverflowTooltip: true, fixed: ""}
+        {columnProp: "reserveOrderRef3", headerAlign: "center", align: "center", columnLabel: "预留单号3", columnWidth: 120, columnSortable: false, showOverflowTooltip: true, fixed: ""},
+        {columnProp: "wdr", headerAlign: "center", align: "center", columnLabel: "WDR", columnWidth: 80, columnSortable: false, showOverflowTooltip: true, fixed: ""},
+        {columnProp: "engChgLevel", headerAlign: "center", align: "center", columnLabel: "版本号", columnWidth: 80, columnSortable: false, showOverflowTooltip: true, fixed: ""},
+        {columnProp: "expiredDate", headerAlign: "center", align: "center", columnLabel: "失效日期", columnWidth: 120, columnSortable: false, showOverflowTooltip: true, fixed: ""},
+        {columnProp: "receiveDate", headerAlign: "center", align: "center", columnLabel: "接收日期", columnWidth: 120, columnSortable: false, showOverflowTooltip: true, fixed: ""},
       ],
       queryHeaderData: {
-        inStockFlag: '',
+        inStockFlag: 'Y',
         partNo: '',
         batchNo: '',
         locationId: '',
@@ -246,7 +250,7 @@ export default {
     // 重置查询条件
     resetQuery() {
       this.queryHeaderData = {
-        inStockFlag: '',
+        inStockFlag: 'Y',
         partNo: '',
         batchNo: '',
         locationId: '',
@@ -302,7 +306,7 @@ export default {
         page: 1,
         size: 999999  // 设置一个很大的数字来获取全部数据 - rqrq
       }
-      const {data} = await getHandlingUnitLabelAll(queryParams)
+      const {data} = await getHandlingUnitLabelListLocation(queryParams)
       if (data && data.code === 0) {
         return (data.page.list || []).map(item => {
           return {