From ec01c31aac884adb1110212e311d9f94c012ea8a Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Wed, 29 Oct 2025 14:06:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E9=80=80=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/production/production-inbound.js      |    2 +-
 src/api/sales-return/sales-return.js          |   17 +-
 src/views/main.vue                            |    6 +-
 .../production-inbound/inboundRegister.vue    |   36 +-
 src/views/modules/recv/recv.vue               |    4 -
 src/views/modules/sales-return/index.vue      |    4 +-
 .../sales-return/sales-return-inbound.vue     | 1107 +++++++++--------
 7 files changed, 643 insertions(+), 533 deletions(-)

diff --git a/src/api/production/production-inbound.js b/src/api/production/production-inbound.js
index 7f63157..39494ec 100644
--- a/src/api/production/production-inbound.js
+++ b/src/api/production/production-inbound.js
@@ -41,4 +41,4 @@ export const submitShopOrderInbound = data => createAPI(`/production/inbound/sub
 // 验证物料是否已发料
 export const validateMaterialIssued = data => createAPI(`/production/inbound/validateMaterialIssued`,'post',data)
 // 打印标签
-export const printLabel = data => createAPI('/label/setting/printLabel','post',data)
+export const printLabelCommon = data => createAPI('/label/setting/printLabelCommon','post',data)
diff --git a/src/api/sales-return/sales-return.js b/src/api/sales-return/sales-return.js
index 44cce88..63fb779 100644
--- a/src/api/sales-return/sales-return.js
+++ b/src/api/sales-return/sales-return.js
@@ -1,9 +1,18 @@
 import { createAPI } from "@/utils/httpRequest.js";
 
+/**
+ * 销售退货API接口
+ */
 
-// 获取采购单信息
-export const processReturn = data => createAPI(`salesreturn/processReturn`,'post',data)
+// 从IFS获取RMA列表
+export const getRmaList = data => createAPI(`salesreturn/getRmaList`, 'post', data)
 
-// 接收采购单信息
-export const getRmaList = data => createAPI(`salesreturn/getRmaList`,'post',data)
+// 处理销售退货（本地库存操作）
+export const processReturn = data => createAPI(`salesreturn/processReturn`, 'post', data)
+
+// 销售退货入库（调用IFS API）
+export const processRmaInbound = data => createAPI(`salesreturn/processRmaInbound`, 'post', data)
+
+// 打印标签（通用打印接口）
+export const printLabelCommon = data => createAPI('/label/setting/printLabelCommon', 'post', data)
 
diff --git a/src/views/main.vue b/src/views/main.vue
index 0bf7f8a..fbb86c5 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -58,7 +58,7 @@
             </div>
             <div class="menu-text">生产退料</div>
           </div>
-          <div class="menu-item disabled" @click="handleDisabledFeature('salereturn')">
+          <div class="menu-item" @click="navigateWithWarehouseCheck('salereturn')">
             <div class="menu-icon sales-return">
               <van-icon name="revoke" size="24" />
             </div>
@@ -680,8 +680,8 @@ export default {
 }
 
 .menu-icon {
-  width: 40px;
-  height: 40px;
+  width: 38px;
+  height: 38px;
   border-radius: 50%;
   display: flex;
   align-items: center;
diff --git a/src/views/modules/production-inbound/inboundRegister.vue b/src/views/modules/production-inbound/inboundRegister.vue
index 986f5db..4d38f54 100644
--- a/src/views/modules/production-inbound/inboundRegister.vue
+++ b/src/views/modules/production-inbound/inboundRegister.vue
@@ -14,10 +14,6 @@
         <div v-if="processFlag === 1">
           <div class="scan-box" style="margin: 2px;">
             <el-input clearable v-model="scanCode" placeholder="扫描或输入工单号"
-                      inputmode="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      spellcheck="false"
                       @keyup.enter.native="searchShopOrder" ref="scanCodeRef" />
           </div>
           <div class="item-list" v-if="shopOrderList.length > 0" style="margin: 2px;">
@@ -182,7 +178,7 @@
 </template>
 
 <script>
-import { getShopOrderFromIfs, getNextSequenceNo, submitShopOrderInbound, validateMaterialIssued, printLabel } from "@/api/production/production-inbound.js";
+import { getShopOrderFromIfs, getNextSequenceNo, submitShopOrderInbound, validateMaterialIssued, printLabelCommon } from "@/api/production/production-inbound.js";
 
 export default {
   data() {
@@ -352,7 +348,7 @@ export default {
           unCompleteQty: parseFloat(row.lotSize) - parseFloat(row.qtyComplete),
           sequenceNoNew: nextSequence,
           batchNo: `${row.orderNo}-${row.releaseNo}-${row.sequenceNo}-${nextSequence}`,
-          locationNo: '',
+          locationNo: 'AS',
           serialNo: '*',
           wdr: '*',
           engChgLevel: '1',
@@ -543,7 +539,13 @@ export default {
         if (data.code === 0) {
           this.$message.success("入库成功");
           this.clearAllHandlingUnitCache();
-          this.printViaServer(data.data);
+          
+          // 获取unitIds并打印标签
+          const unitIds = data.unitIds || [];
+          if (unitIds.length > 0) {
+            this.printViaServer(unitIds);
+          }
+          
           this.processFlag = 1;
           this.scanCode = '';
           this.shopOrderList = [];
@@ -561,20 +563,30 @@ export default {
     },
     /**
      * 通过服务器打印
+     * @param {Array} unitIds - HU unitId列表
      */
-    async printViaServer(transNo) {
+    async printViaServer(unitIds) {
+      if (!unitIds || unitIds.length === 0) {
+        console.warn('没有可打印的标签');
+        return;
+      }
+
       this.$emit('print-start')
       try {
         const printRequest = {
           userId: localStorage.getItem('userName'),
           username: localStorage.getItem('userName'),
           site: localStorage.getItem('site'),
-          transNo: transNo,
+          unitIds: unitIds,
           labelType: "库存成品标签"
         }
-        const { data } = await printLabel(printRequest)
-        if (data.code === 200) {
-          this.$message.success(`打印任务已发送！`)
+        console.log('打印请求:', printRequest);
+        
+        const { data } = await printLabelCommon(printRequest)
+        if (data.code === 200 || data.code === 0) {
+          this.$message.success(`打印任务已发送！共${unitIds.length}个标签`)
+        } else {
+          this.$message.error(data.msg || '打印失败')
         }
       } catch (error) {
         console.error('服务器打印失败:', error)
diff --git a/src/views/modules/recv/recv.vue b/src/views/modules/recv/recv.vue
index b48fd27..4722495 100644
--- a/src/views/modules/recv/recv.vue
+++ b/src/views/modules/recv/recv.vue
@@ -14,10 +14,6 @@
         <div v-if="processFlag === 1">
           <div class="scan-box" style="margin: 2px;">
             <el-input clearable v-model="scanCode" placeholder="扫描PO条码或输入PO号"
-                      inputmode="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      spellcheck="false"
                       @keyup.enter.native="searchPoList" ref="scanCodeRef" />
           </div>
           <div class="item-list" v-if="poList.length > 0" style="margin: 2px;">
diff --git a/src/views/modules/sales-return/index.vue b/src/views/modules/sales-return/index.vue
index 602338d..2cc0469 100644
--- a/src/views/modules/sales-return/index.vue
+++ b/src/views/modules/sales-return/index.vue
@@ -29,8 +29,8 @@ export default {
   data() {
     return {
       buttons: [
-        { icon: 'shopping-cart-o', label: '入库', iconClass: 'purchase', to: 'salereturn-inbound' },
-        { icon: 'orders-o', label: '报废', iconClass: 'inspection', to: 'salereturn-scrap' }
+        { icon: 'shopping-cart-o', label: '退货入库', iconClass: 'purchase', to: 'salereturn-inbound' },
+        { icon: 'orders-o', label: '报废', iconClass: 'scrap', to: 'salereturn-scrap' }
       ]
     }
   }
diff --git a/src/views/modules/sales-return/sales-return-inbound.vue b/src/views/modules/sales-return/sales-return-inbound.vue
index b6902da..86e395a 100644
--- a/src/views/modules/sales-return/sales-return-inbound.vue
+++ b/src/views/modules/sales-return/sales-return-inbound.vue
@@ -1,6 +1,9 @@
 <template>
   <div>
-    <div class="pda-container">
+    <div class="pda-container" v-loading.fullscreen.lock="fullscreenLoading"
+         element-loading-background="rgba(255, 255, 255, 0.3)"
+         element-loading-spinner="el-icon-loading"
+         :element-loading-text="loadingText">
       <!-- 头部栏 -->
       <div class="header-bar">
         <div class="header-left" @click="handleBack">
@@ -11,126 +14,265 @@
           首页
         </div>
       </div>
-      <!-- 搜索框 -->
-      <div class="search-container">
-        <el-input
-          v-model="scanRma"
-          placeholder="扫描RMA条码或输入RMA号"
-          prefix-icon="el-icon-search"
-          @keyup.enter.native="searchRmaList"
-          ref="scanRmaRef"
-          clearable
-        />
-      </div>
 
-      <div class="main-content">
-        <!-- RMA明细选择 -->
-        <div v-if="rmaList.length > 0" class="rma-list">
-          <div class="list-title">选择RMA明细行号</div>
-          <el-form>
-            <el-row v-for="(rmaDetail, index) in rmaList[0].detailList" :key="index" class="rma-row">
+      <div style="overflow-y: auto">
+        <!-- Step 1: 扫描RMA号 -->
+        <div v-if="processFlag === 1">
+          <div class="scan-box" style="margin: 2px;">
+            <el-input
+              clearable
+              v-model="scanRmaNo"
+              placeholder="扫描或输入RMA号"
+              @keyup.enter.native="searchRmaList"
+              ref="scanRmaRef"
+            />
+          </div>
+
+          <!-- RMA明细列表 -->
+          <div class="item-list" v-if="rmaList.length > 0" style="margin: 2px;">
+            <el-form label-position="top" style="margin: 3px;">
+              <el-row :gutter="5"
+                      v-for="(rmaLine, index) in rmaList" :key="index"
+                      :class="index < rmaList.length - 1 ? 'bottom-line-row' : ''">
+                <el-col :span="8">
+                  <el-form-item label="物料编码">
+                    <span>{{ rmaLine.invPartNo }}</span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="行号">
+                    <span>{{ rmaLine.rmaLineNo }}</span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="">
+                    <el-button type="text" class="recvButton"
+                               @click="selectRmaLine(rmaLine)"
+                               style="margin-top: 10px;margin-left: 20px"
+                               size="small">入库</el-button>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="物料描述">
+                    <span>{{ rmaLine.salesPartDesc }}</span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="退货数量">
+                    <span>{{ rmaLine.qtyToReturn }}</span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="4">
+                  <el-form-item label="已接收">
+                    <span>{{ rmaLine.qtyReceived || 0 }}</span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="4">
+                  <el-form-item label="单位">
+                    <span>{{ rmaLine.returnUOM }}</span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="10">
+                  <el-form-item label="状态">
+                    <el-tag :type="rmaLine.status === 'Released'||rmaLine.status==='PartiallyReceived'
+                    ? 'success' : 'warning'" size="mini">
+                      {{ rmaLine.status }}
+                    </el-tag>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </div>
+        </div>
+
+        <!-- Step 2: 入库明细 -->
+        <div v-if="processFlag === 2">
+          <el-form label-position="top" class="form-section" style="margin: 5px;">
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="RMA号">
+                  <el-input v-model="inboundItem.rmaNo" disabled />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="行号">
+                  <el-input v-model="inboundItem.rmaLineNo" disabled />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="物料编码">
+                  <el-input v-model="inboundItem.partNo" disabled />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="计量单位">
+                  <el-input v-model="inboundItem.uom" disabled />
+                </el-form-item>
+              </el-col>
               <el-col :span="24">
-                <div class="rma-item" @click="selectRmaDetail(rmaDetail)" :class="{ 'selected': selectedDetail && selectedDetail.partNo === rmaDetail.partNo }">
-                  <div class="item-info">
-                    <span class="part-no">{{ rmaDetail.partNo }}</span>
-                    <span class="batch-qty">批号:{{ rmaDetail.batchNo }} | 数量:{{ rmaDetail.processQty }}</span>
-                  </div>
-                  <div class="item-status">
-                    <i class="el-icon-check" v-if="isInReturnList(rmaDetail)"></i>
-                  </div>
-                </div>
+                <el-form-item label="物料描述">
+                  <el-input v-model="inboundItem.partDesc" disabled />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="退货数量">
+                  <el-input v-model="inboundItem.qtyToReturn" disabled />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="已接收">
+                  <el-input v-model="inboundItem.qtyReceived" disabled />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="此次入库数量">
+                  <el-input v-model="inboundItem.transQty" type="number" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label=" ">
+                  <el-button type="text" @click.stop="handlingUnitStep"
+                             style="font-size: 16px;margin-top: -5px" size="small">包装记录</el-button>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="库位">
+                  <el-input v-model="inboundItem.locationNo" placeholder="请输入库位" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="批号">
+                  <el-input v-model="inboundItem.batchNo" placeholder="请输入批号" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="8" style="margin-top: 10px">
+                <el-form-item>
+                  <el-button type="text" style="font-size: 16px;margin-left: 30px"
+                             @click="processFlag = 1">回退</el-button>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8" style="margin-top: 10px">
+                <el-form-item>
+                  <el-button type="text" style="font-size: 16px;margin-left: 20px"
+                             @click="confirmInbound">确认</el-button>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8" style="margin-top: 10px">
+                <el-form-item>
+                  <el-button type="text" style="font-size: 16px;margin-left: 10px"
+                             @click="$router.push('/')">退出</el-button>
+                </el-form-item>
               </el-col>
             </el-row>
           </el-form>
         </div>
-        <!-- 退货明细列表 -->
-        <div v-if="returnList.length > 0">
-          <div class="return-list-title">退货明细列表</div>
-          <div v-for="(detail, dIdx) in returnList" :key="dIdx" class="detail-block">
-            <el-card shadow="hover" class="detail-card">
-              <div slot="header" class="detail-header">
-                <span>明细{{ dIdx + 1 }}</span>
-                <el-button type="danger" icon="el-icon-delete" circle size="mini" @click="removeDetail(dIdx)" v-if="returnList.length > 1" style="float:right;"></el-button>
-              </div>
-              <div class="detail-info">
-                <div class="info-row">
-                  <span class="info-label">物料:</span>
-                  <span class="info-value">{{ detail.partNo }}</span>
-                </div>
-                <div class="info-row">
-                  <span class="info-label">数量:</span>
-                  <span class="info-value">{{ detail.processQty }}</span>
-                </div>
-                <div class="info-row">
-                  <span class="info-label">批号:</span>
-                  <span class="info-value">{{ detail.batchNo }}</span>
-                </div>
-              </div>
-                <!-- 包装单元和库位 -->
-                <div class="pack-unit-area">
-                  <div class="pack-actions">
-                    <!-- 创建包装单元 -->
-                    <div class="action-group">
-                      <div class="action-title">创建包装单元</div>
-                      <el-row :gutter="6">
-                        <el-col :span="10">
-                          <el-input v-model="detail.newPackCode" placeholder="包装编码" size="small" />
-                        </el-col>
-                        <el-col :span="8">
-                          <el-input v-model="detail.newPackQty" placeholder="数量" type="number" size="small" />
-                        </el-col>
-                        <el-col :span="6">
-                          <el-button type="primary" size="small" @click="createPackUnit(detail)" :disabled="!detail.newPackCode || !detail.newPackQty">创建</el-button>
-                        </el-col>
-                      </el-row>
-                    </div>
-
-                    <!-- 扫描包装单元 -->
-                    <div class="action-group" v-if="detail.packUnitList.length > 0">
-                      <div class="action-title">扫描包装单元</div>
-                      <el-row :gutter="6">
-                        <el-col :span="18">
-                          <el-input
-                            v-model="detail.scanPackCode"
-                            placeholder="扫描包装单元条码"
-                            prefix-icon="el-icon-scan"
-                            size="small"
-                            @keyup.enter.native="scanPackUnit(detail)"
-                          />
-                        </el-col>
-                        <el-col :span="6">
-                          <el-button type="primary" size="small" @click="scanPackUnit(detail)" :disabled="!detail.scanPackCode">扫描</el-button>
-                        </el-col>
-                      </el-row>
-                    </div>
-
-                    <!-- 库位指定 -->
-                    <div class="action-group">
-                      <div class="action-title">指定库位</div>
-                      <el-input
-                        v-model="detail.locationNo"
-                        placeholder="请扫描或输入库位编码"
-                        prefix-icon="el-icon-location"
-                        size="small"
-                      />
-                    </div>
-                  </div>
-
-                  <!-- 包装单元列表 -->
-                  <div v-if="detail.packUnitList.length > 0" class="pack-list">
-                    <div v-for="(pack, pIdx) in detail.packUnitList" :key="pIdx" class="pack-item">
-                      {{ pack.code }} ({{ pack.qty }})
-                      <span :class="pack.scanned ? 'status-ok' : 'status-wait'">
-                        {{ pack.scanned ? '✓' : '○' }}
-                      </span>
-                      <el-button type="text" @click="removePackUnit(detail, pIdx)" class="delete-btn">删除</el-button>
-                    </div>
-                  </div>
-                </div>
-            </el-card>
-          </div>
 
-          <el-button type="success" class="submit-btn" @click="submitReturn">确认入库</el-button>
+        <!-- Step 3: 包装记录 -->
+        <div v-if="processFlag === 3">
+          <el-form label-position="top" class="form-section" style="margin: 5px;">
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="物料编码">
+                  <el-input v-model="inboundItem.partNo" disabled />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="入库数量">
+                  <el-input v-model="inboundItem.transQty" disabled />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="物料描述">
+                  <el-input v-model="inboundItem.partDesc" disabled />
+                </el-form-item>
+              </el-col>
+
+              <!-- 自动计算开关 -->
+              <el-col :span="24" style="margin-bottom: 10px;">
+                <el-form-item>
+                  <el-switch
+                    v-model="autoCalculate"
+                    active-text="自动计算模式"
+                    inactive-text="手动输入模式"
+                    active-color="#17B3A3"
+                    style="display: block;"
+                  >
+                  </el-switch>
+                  <span v-if="autoCalculate" style="font-size: 13px; color: #17B3A3; margin-top: 5px; display: block; font-weight: bold;">
+                    💡 输入单包装数量后，按回车键或点击确定按钮
+                  </span>
+                  <span v-else style="font-size: 12px; color: #999; margin-top: 5px; display: block;">
+                    手动输入单包装数量和包装数，然后点击"创建"按钮
+                  </span>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="8" style="margin-top: 5px">
+                <el-form-item label="单包装数量">
+                  <el-input
+                    v-model="hanlingItem.perQty"
+                    type="number"
+                    :placeholder="autoCalculate ? '输入完按回车或失去焦点' : '请输入单包装数量'"
+                    @blur="autoCalculate && autoCreateHandlingUnits()"
+                    @keyup.enter.native="autoCalculate && autoCreateHandlingUnits()"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8" style="margin-top: 5px" v-if="!autoCalculate">
+                <el-form-item label="包装数">
+                  <el-input v-model="hanlingItem.packageQty" type="number" placeholder="请输入包装数" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8" v-if="!autoCalculate" style="margin-top: 16px">
+                <el-form-item>
+                  <el-button type="text" @click="createHandlingUnit" style="font-size: 16px">创建</el-button>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8" v-else style="margin-top: 16px">
+                <el-form-item>
+                  <el-button type="text" style="font-size: 16px">确定</el-button>
+                </el-form-item>
+              </el-col>
+
+              <el-table :data="handlingUnit" :row-style="{ height: '30px' }"
+                        style="width: 94%; margin-left: 10px;" highlight-current-row>
+                <el-table-column prop="code" label="序号" />
+                <el-table-column prop="packageQty" label="包装数" width="80" />
+                <el-table-column prop="perQty" label="单包装数量" width="100" />
+                <el-table-column label="操作" v-if="!autoCalculate">
+                  <template slot-scope="scope">
+                    <a @click="removeItem(scope.$index)">删除</a>
+                  </template>
+                </el-table-column>
+              </el-table>
+
+              <el-col :span="24" v-if="autoCalculate && handlingUnit.length > 0" style="margin-top: 10px;">
+                <span style="font-size: 12px; color: #999;">
+                  💡 如需修改，请重新输入单包装数量
+                </span>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item>
+                  <span>合计</span>
+                  <span style="margin-left: 38%">{{ totalQty }}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item>
+                  <el-button type="text" @click="processFlag = 2"
+                             style="font-size: 18px;margin-left: 60px">回退</el-button>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item>
+                  <el-button type="text" @click="processFlag = 2"
+                             style="font-size: 18px;">确定</el-button>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
         </div>
       </div>
     </div>
@@ -138,215 +280,350 @@
 </template>
 
 <script>
-import { getRmaList, processReturn } from "@/api/sales-return/sales-return.js";
+import { getRmaList, processRmaInbound,printLabelCommon } from "@/api/sales-return/sales-return.js";
+
 export default {
+  name: 'SalesReturnInbound',
+
   data() {
     return {
-      scanRma: "",
+      processFlag: 1,  // 1=扫描RMA 2=入库明细 3=包装记录
+      scanRmaNo: '',
       rmaList: [],
-      returnList: [], // 退货明细列表
-      selectedDetail: null, // 当前选择的RMA明细
-      processType: "inbound", // 固定为入库处理
-      site:localStorage.getItem('site')
+      inboundItem: {},
+      handlingUnit: [],
+      hanlingItem: { code: '', qty: '', perQty: '', packageQty: '' },
+      site: localStorage.getItem('site'),
+      warehouseId: localStorage.getItem('selectedWarehouse'),
+      fullscreenLoading: false,
+      loadingText: '加载中...',
+      autoCalculate: false
     };
   },
+
   computed: {
-    processTypeText() {
-      const typeMap = {
-        'inbound': '入库',
-        'scrap': '报废',
-        'repair': '返修'
-      };
-      return typeMap[this.processType] || '处理';
+    totalQty() {
+      const sum = this.handlingUnit.reduce((sum, item) => sum + Number(item.qty), 0);
+      this.inboundItem.transQty = sum;
+      return sum;
+    },
+    huKey() {
+      return `hu_rma_${this.inboundItem.rmaNo}_${this.inboundItem.rmaLineNo}`;
     }
   },
+
+  watch: {
+    autoCalculate(newVal, oldVal) {
+      this.hanlingItem.perQty = '';
+      this.hanlingItem.packageQty = '';
+      this.handlingUnit = [];
+      localStorage.setItem(this.huKey, JSON.stringify(this.handlingUnit));
+
+      if (newVal) {
+        this.$message.success('已切换到自动创建HU模式');
+      } else {
+        this.$message.success('已切换到手动输入模式');
+      }
+    }
+  },
+
   methods: {
     handleBack() {
-      this.$router.back();
-    },
-    searchRmaList() {
-      if (!this.scanRma) return (this.rmaList = []);
-      getRmaList({ rmaNo: this.scanRma,site:this.site }).then(({ data }) => {
-        if (data.code === 0) this.rmaList = data.rows;
-      });
-    },
-    // 选择RMA明细
-    selectRmaDetail(rmaDetail) {
-      this.selectedDetail = rmaDetail;
-      // 自动添加到退货明细列表
-      if (!this.isInReturnList(rmaDetail)) {
-        this.addToReturnList(rmaDetail);
+      if (this.processFlag === 1) {
+        this.$router.back();
+      } else if (this.processFlag === 3) {
+        this.processFlag = 2;
+      } else {
+        this.processFlag = 1;
       }
-      this.$message.success(`已选择物料: ${rmaDetail.partNo}`);
-    },
-    addToReturnList(rmaDetail) {
-      // 避免重复添加
-      if (this.isInReturnList(rmaDetail)) return;
-      this.returnList.push({
-        site: this.site,
-        partNo: rmaDetail.partNo,
-        processQty: rmaDetail.processQty,
-        batchNo: rmaDetail.batchNo,
-        locationNo: "",
-        warehouseId: "",
-        packUnitList: [],
-        newPackCode: "",
-        newPackQty: "",
-        scanPackCode: ""
-      });
-    },
-    isInReturnList(rmaDetail) {
-      return this.returnList.some(
-        d => d.partNo === rmaDetail.partNo && d.batchNo === rmaDetail.batchNo
-      );
     },
-    removeDetail(idx) {
-      this.returnList.splice(idx, 1);
-    },
-    // 创建包装单元
-    createPackUnit(detail) {
-      if (!detail.newPackCode || !detail.newPackQty) {
-        this.$message.warning('请输入包装编码和数量');
-        return;
-      }
 
-      // 检查编码是否重复
-      const exists = detail.packUnitList.find(pack => pack.code === detail.newPackCode);
-      if (exists) {
-        this.$message.error('包装编码已存在');
+    /**
+     * 搜索RMA列表
+     */
+    searchRmaList() {
+      if (!this.scanRmaNo) {
+        this.rmaList = [];
         return;
       }
 
-      detail.packUnitList.push({
-        code: detail.newPackCode,
-        qty: parseFloat(detail.newPackQty),
-        scanned: false,
-        createTime: new Date()
+      this.loadingText = '搜索中...';
+      this.fullscreenLoading = true;
+
+      getRmaList({
+        rmaNo: this.scanRmaNo.trim(),
+        site: this.site
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.rmaList = data.rows || [];
+          if (this.rmaList.length === 0) {
+            this.$message.warning('未找到匹配的RMA记录');
+          }
+        } else {
+          this.$message.error(data.msg || '查询失败');
+          this.rmaList = [];
+        }
+        this.$nextTick(() => {
+          if (this.$refs.scanRmaRef) {
+            this.$refs.scanRmaRef.blur();
+          }
+        });
+      }).catch(error => {
+        console.error('搜索失败:', error);
+        this.$message.error('搜索失败，请重试');
+        this.rmaList = [];
+      }).finally(() => {
+        this.fullscreenLoading = false;
       });
-
-      // 清空输入框
-      detail.newPackCode = "";
-      detail.newPackQty = "";
-
-      this.$message.success('包装单元创建成功');
     },
 
-    // 打印标签
-    printLabel(detail) {
-      const unPrintedPacks = detail.packUnitList.filter(pack => !pack.printed);
-      if (unPrintedPacks.length === 0) {
-        this.$message.warning('没有需要打印的标签');
-        return;
+    /**
+     * 选择RMA行
+     */
+    selectRmaLine(row) {
+      // 校验状态
+      if (row.status !== 'Released' && row.status !== 'PartiallyReceived') {
+        return this.$message.warning(`RMA状态为 ${row.status}，只有Released或PartiallyReceived状态才能入库`);
       }
 
-      this.$message.success(`正在打印 ${unPrintedPacks.length} 个标签...`);
+      this.inboundItem = {
+        rmaNo: this.scanRmaNo.trim(),
+        rmaLineNo: row.rmaLineNo,
+        partNo: row.invPartNo,
+        partDesc: row.salesPartDesc,
+        qtyToReturn: row.qtyToReturn,
+        qtyReceived: row.qtyReceived || 0,
+        transQty: '',
+        uom: row.returnUOM,
+        locationNo: 'AS',
+        batchNo: `${this.scanRmaNo}-${row.rmaLineNo}-1`,
+        site: this.site
+      };
 
-      // 这里可以调用打印API
-      // printLabel({
-      //   rmaNo: this.scanRma,
-      //   partNo: detail.partNo,
-      //   packCodes: unPrintedPacks.map(p => p.code)
-      // });
+      this.processFlag = 2;
+    },
 
-      // 标记为已打印
-      unPrintedPacks.forEach(pack => {
-        pack.printed = true;
-      });
+    /**
+     * 进入包装记录步骤
+     */
+    handlingUnitStep() {
+      this.processFlag = 3;
+      this.autoCalculate = false;
+      const saved = localStorage.getItem(this.huKey);
+      this.handlingUnit = saved ? JSON.parse(saved) : [];
     },
 
-    // 扫描包装单元
-    scanPackUnit(detail) {
-      if (!detail.scanPackCode) {
-        this.$message.warning('请输入要扫描的包装单元条码');
+    /**
+     * 自动创建HU列表（自动模式）
+     */
+    autoCreateHandlingUnits() {
+      const perQty = this.hanlingItem.perQty;
+
+      if (!perQty || isNaN(perQty) || parseFloat(perQty) <= 0) {
+        this.$message.warning('请输入有效的单包装数量');
         return;
       }
 
-      const pack = detail.packUnitList.find(p => p.code === detail.scanPackCode);
-      if (!pack) {
-        this.$message.error('未找到对应的包装单元');
+      const qtyToReceive = parseFloat(this.inboundItem.transQty) || 0;
+      if (qtyToReceive <= 0) {
+        this.$message.warning('入库数量为0，无法创建HU');
+        this.hanlingItem.perQty = '';
         return;
       }
 
-      if (pack.scanned) {
-        this.$message.warning('该包装单元已经扫描过了');
-        return;
+      const perQtyValue = parseFloat(perQty);
+      const packageQty = Math.floor(qtyToReceive / perQtyValue);
+      const remainder = qtyToReceive - (packageQty * perQtyValue);
+
+      this.handlingUnit = [];
+
+      if (packageQty > 0) {
+        for (let i = 1; i <= packageQty; i++) {
+          const qty = perQtyValue;
+          const code = String(i);
+          this.handlingUnit.push({
+            code: code,
+            perQty: perQtyValue,
+            packageQty: 1,
+            qty: qty
+          });
+        }
+      }
+
+      if (remainder > 0) {
+        const code = String(this.handlingUnit.length + 1);
+        this.handlingUnit.push({
+          code: code,
+          perQty: remainder,
+          packageQty: 1,
+          qty: remainder
+        });
       }
 
-      pack.scanned = true;
-      pack.scanTime = new Date();
-      detail.scanPackCode = "";
+      localStorage.setItem(this.huKey, JSON.stringify(this.handlingUnit));
+      this.hanlingItem.perQty = '';
+      this.hanlingItem.packageQty = '';
+
+      this.$message.success(`自动创建了${this.handlingUnit.length}个HU，合计数量：${qtyToReceive}`);
+    },
 
-      this.$message.success('扫描成功');
+    /**
+     * 手动创建HU（手动模式）
+     */
+    createHandlingUnit() {
+      const { perQty, packageQty } = this.hanlingItem;
+      if (!perQty || !packageQty || isNaN(perQty) || isNaN(packageQty)) {
+        return this.$message.warning("请填写有效的包装信息");
+      }
+      const qty = parseFloat(perQty) * parseInt(packageQty);
+      const code = String(this.handlingUnit.length + 1);
+      const newItem = { ...this.hanlingItem, qty, code };
+      this.handlingUnit.push(newItem);
+      localStorage.setItem(this.huKey, JSON.stringify(this.handlingUnit));
+
+      this.hanlingItem.perQty = '';
+      this.hanlingItem.packageQty = '';
     },
 
-    addPackUnit(detail) {
-      detail.packUnitList.push({code: "", qty: '', perQty: '', packageQty: ''});
+    removeItem(index) {
+      this.handlingUnit.splice(index, 1);
+      localStorage.setItem(this.huKey, JSON.stringify(this.handlingUnit));
     },
-    removePackUnit(detail, idx) {
-      detail.packUnitList.splice(idx, 1);
+
+    clearAllHandlingUnitCache() {
+      this.hanlingItem = { code: '', qty: '', perQty: '', packageQty: '' };
+      const keys = Object.keys(localStorage);
+      keys.forEach(key => {
+        if (key.startsWith('hu_rma_')) {
+          localStorage.removeItem(key);
+        }
+      });
     },
-    submitReturn() {
-      if (!this.scanRma || this.returnList.length === 0) {
-        this.$message.error("请先扫描RMA号并选择退货明细");
-        return;
-      }
 
-      // 验证每个明细都必须指定库位
-      const missingLocation = this.returnList.some(detail => !detail.locationNo || !detail.locationNo.trim());
-      if (missingLocation) {
-        this.$message.error("请为每个明细指定库位");
-        return;
-      }
+    /**
+     * 确认入库
+     */
+    async confirmInbound() {
+      if (this.fullscreenLoading) return;
 
-      // 验证是否有包装单元且已扫描
-      const hasUnscannedPacks = this.returnList.some(detail =>
-        detail.packUnitList.length > 0 && detail.packUnitList.some(pack => !pack.scanned)
-      );
+      const item = this.inboundItem;
+      if (!item.transQty || !item.locationNo || !item.batchNo) {
+        return this.$message.error("请填写完整信息");
+      }
 
-      if (hasUnscannedPacks) {
-        this.$message.error("请先扫描所有包装单元");
-        return;
+      const transQty = parseFloat(item.transQty) || 0;
+      const qtyToReturn = parseFloat(item.qtyToReturn) || 0;
+      const qtyReceived = parseFloat(item.qtyReceived) || 0;
+
+      // 检查数量是否超出
+      if (qtyReceived + transQty > qtyToReturn) {
+        return this.$message.error( `已接收数量(${qtyReceived}) + 本次入库数量(${transQty}) = ${qtyReceived + transQty}，超过退货数量(${qtyToReturn})`);
+        /*try {
+          await this.$confirm(
+            `已接收数量(${qtyReceived}) + 本次入库数量(${transQty}) = ${qtyReceived + transQty}，超过退货数量(${qtyToReturn})，是否继续？`,
+            '数量超出提示',
+            {
+              confirmButtonText: '继续',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }
+          );
+        } catch (error) {
+          return;
+        }*/
       }
 
+      this.loadingText = '提交中...';
+      this.fullscreenLoading = true;
+
+      // 构建提交数据
       const submitData = {
-        rmaNo: this.scanRma,
-        processType: this.processType,
-        detailList: this.returnList.map(detail => ({
-          ...detail,
-          packUnitList: detail.packUnitList.filter(pack => pack.scanned)
+        rmaNo: item.rmaNo,
+        site: item.site,
+        partNo: item.partNo,
+        processQty: transQty,
+        batchNo: item.batchNo,
+        locationNo: item.locationNo,
+        warehouseId: this.warehouseId,
+        rmaLineNo: item.rmaLineNo,
+        packUnitList: this.handlingUnit.map(hu => ({
+          code: hu.code,
+          qty: hu.qty,
+          perQty: hu.perQty,
+          packageQty: hu.packageQty
         }))
       };
 
-      this.$confirm(`确认执行${this.processTypeText}操作吗？`, '提示', {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        processReturn(submitData).then(({data}) => {
-          if (data.code === 0) {
-            this.$message.success(`${this.processTypeText}成功`);
+      processRmaInbound(submitData).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.$message.success("入库成功");
+          this.clearAllHandlingUnitCache();
+
+          // 如果有HU，询问是否打印标签
+          const unitIds = data.unitIds || [];
+          if (unitIds.length > 0) {
+            this.printLabels(unitIds);
             this.resetForm();
-          } else {
-            this.$message.error(data.msg || `${this.processTypeText}失败`);
           }
-        }).catch(error => {
-          console.error('提交失败:', error);
-          this.$message.error(`${this.processTypeText}失败`);
-        });
-      }).catch(() => {
-        // 用户取消
+        } else {
+          this.$message.error(data.msg || '入库失败');
+        }
+      }).catch(error => {
+        console.error('入库失败:', error);
+        this.$message.error('网络错误，请重试');
+      }).finally(() => {
+        this.fullscreenLoading = false;
       });
     },
 
-    // 重置表单
+    /**
+     * 打印标签
+     * @param {Array} unitIds - HU unitId列表
+     */
+    async printLabels(unitIds) {
+      if (!unitIds || unitIds.length === 0) {
+        this.$message.warning('没有可打印的标签');
+        return;
+      }
+
+      try {
+        this.fullscreenLoading = true;
+        this.loadingText = '正在打印标签...';
+
+        const printRequest = {
+          userId: localStorage.getItem('userName'),
+          username: localStorage.getItem('userName'),
+          site: this.site,
+          unitIds: unitIds,
+          labelType: "库存成品标签"
+        };
+
+        console.log('打印请求:', printRequest);
+
+        const { data } = await printLabelCommon(printRequest);
+        if (data.code === 200 || data.code === 0) {
+          this.$message.success(`打印任务已发送！共${unitIds.length}个标签`);
+        } else {
+          this.$message.error(data.msg || '打印失败');
+        }
+      } catch (error) {
+        console.error('打印标签失败:', error);
+        this.$message.error(`打印失败: ${error.message || error}`);
+      } finally {
+        this.fullscreenLoading = false;
+        this.loadingText = '加载中...';
+      }
+    },
+
+    /**
+     * 重置表单
+     */
     resetForm() {
-      this.scanRma = "";
+      this.processFlag = 1;
+      this.scanRmaNo = '';
       this.rmaList = [];
-      this.returnList = [];
-      this.selectedDetail = null;
-      this.processType = "inbound";
-
-      // 聚焦搜索框
+      this.inboundItem = {};
+      this.handlingUnit = [];
       this.$nextTick(() => {
         if (this.$refs.scanRmaRef) {
           this.$refs.scanRmaRef.focus();
@@ -354,6 +631,7 @@ export default {
       });
     }
   },
+
   mounted() {
     this.$nextTick(() => this.$refs.scanRmaRef && this.$refs.scanRmaRef.focus());
   }
@@ -362,20 +640,23 @@ export default {
 
 <style scoped>
 .pda-container {
+  width: 100vw;
+  height: 100vh;
+  display: flex;
+  flex-direction: column;
   background: #f5f5f5;
-  min-height: 100vh;
-  padding-bottom: 20px;
 }
 
-/* 头部栏 - 参考原有样式 */
+/* 头部栏 */
 .header-bar {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  background: #17b3a3;
-  color: #fff;
-  padding: 12px 16px;
-  font-size: 16px;
+  padding: 8px 16px;
+  background: #17B3A3;
+  color: white;
+  height: 40px;
+  min-height: 40px;
 }
 
 .header-left {
@@ -389,277 +670,89 @@ export default {
   font-size: 18px;
 }
 
-.header-right {
-  cursor: pointer;
-}
-
-/* 搜索容器 */
-.search-container {
-  padding: 12px 16px;
-  background: white;
-}
-
-.search-container .el-input {
-  font-size: 16px;
-}
-
-/* RMA明细选择 */
-.rma-list {
-  padding: 0 16px;
-}
-
-.list-title {
+.header-left span {
   font-size: 16px;
-  font-weight: bold;
-  color: #17b3a3;
-  margin: 12px 0 8px 0;
-}
-
-.rma-row {
-  margin-bottom: 8px;
+  font-weight: 500;
 }
 
-.rma-item {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 16px;
-  background: white;
-  border-radius: 6px;
+.header-right {
   cursor: pointer;
-  border: 1px solid #e0e0e0;
-  min-height: 60px;
-}
-
-.rma-item.selected {
-  border-color: #17b3a3;
-  background: #f0f9ff;
-}
-
-.rma-item:active {
-  background: #e6f7ff;
-}
-
-.item-info {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  align-items: flex-start;
-}
-
-.part-no {
-  font-size: 16px;
-  font-weight: bold;
-  color: #333;
-  margin-bottom: 4px;
-}
-
-.batch-qty {
   font-size: 14px;
-  color: #666;
-}
-
-.item-status {
-  font-size: 20px;
-  color: #17b3a3;
+  padding: 4px 8px;
+  border-radius: 4px;
 }
 
-/* 退货明细列表 */
-.return-list-title {
+/* 扫描框 */
+.scan-box input {
+  width: 100%;
+  padding: 12px;
   font-size: 16px;
-  font-weight: bold;
-  color: #17b3a3;
-  margin: 12px 16px 8px 16px;
 }
 
-.detail-card {
-  margin: 0 16px 12px 16px;
+/* 列表 */
+.item-list {
+  flex: 1;
+  overflow-y: auto;
+  margin: 10px 0;
+  border: 1px solid rgba(200, 200, 200, 0.8);
 }
 
-.detail-header {
-  font-weight: bold;
+.item-list span {
+  color: #000;
   font-size: 15px;
-  color: #333;
-  border-left: 4px solid #17b3a3;
-  padding-left: 8px;
-}
-
-/* 明细信息显示 */
-.detail-info {
-  margin-bottom: 12px;
-}
-
-.info-row {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 6px 0;
-  border-bottom: 1px solid #f0f0f0;
-}
-
-.info-row:last-child {
-  border-bottom: none;
-}
-
-.info-label {
-  font-size: 14px;
-  color: #666;
-  font-weight: 500;
-}
-
-.info-value {
-  font-size: 14px;
-  color: #333;
-  font-weight: 500;
-}
-
-/* 包装单元区域 */
-.pack-unit-area {
-  margin-top: 0;
-  padding: 12px;
-  background: #f8f9fa;
-  border-radius: 6px;
-}
-
-.pack-actions {
-  margin-bottom: 8px;
-}
-
-.action-group {
-  margin-bottom: 10px;
 }
 
-.action-group:last-child {
-  margin-bottom: 0;
+.bottom-line-row {
+  border-bottom: 1px solid rgba(200, 200, 200, 0.8);
 }
 
-.action-title {
-  font-size: 13px;
+.recvButton {
+  font-size: 16px;
+  border-radius: 3px;
   color: #17b3a3;
-  font-weight: 500;
-  margin-bottom: 6px;
 }
 
-.action-group .el-input {
-  height: 32px;
+.item-list .el-row {
+  cursor: pointer;
+  transition: background 0.3s;
 }
 
-.action-group .el-button {
-  height: 32px;
-  font-size: 12px;
-  padding: 8px 12px;
+.item-list .el-row:hover {
+  background: #f5f7fa;
 }
 
-.pack-list {
-  margin-top: 8px;
+/* 表单区域 */
+.form-section >>> .el-col {
+  margin-bottom: 2px;
 }
 
-.pack-item {
+/* 状态栏（已经在header-bar中了，保留作为兼容） */
+.status-bar {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  padding: 8px;
-  margin-bottom: 6px;
-  background: white;
-  border-radius: 4px;
-  border: 1px solid #e0e0e0;
-  font-size: 13px;
-}
-
-.status-ok {
-  color: #67C23A;
-  font-weight: bold;
-  font-size: 16px;
-}
-
-.status-wait {
-  color: #E6A23C;
-  font-weight: bold;
-  font-size: 16px;
-}
-
-.delete-btn {
-  color: #F56C6C;
-  padding: 0;
-  font-size: 12px;
-}
-
-/* 库位区域 */
-.location-section {
-  margin: 16px;
-  padding: 16px;
-  background: white;
-  border-radius: 6px;
-}
-
-.section-label {
-  font-size: 16px;
-  font-weight: bold;
-  color: #17b3a3;
-  margin-bottom: 12px;
-}
-
-.location-input {
-  font-size: 16px;
-}
-
-.location-input .el-input__inner {
-  height: 44px;
-  font-size: 16px;
-}
-
-/* 提交按钮 */
-.submit-btn {
-  width: calc(100% - 32px);
-  margin: 16px 16px 12px 16px;
-  height: 44px;
-  font-size: 16px;
   background: #17b3a3;
-  border-color: #17b3a3;
-  border-radius: 6px;
+  color: white;
 }
 
-.submit-btn:hover {
-  background: #15a093;
-  border-color: #15a093;
+/* 自定义loading样式 */
+.pda-container >>> .el-loading-mask {
+  background-color: rgba(255, 255, 255, 0.3) !important;
 }
 
-/* PDA适配 - 增大触摸目标 */
-.el-input__inner {
-  height: 44px;
-  font-size: 16px;
-  padding: 0 15px;
-}
-
-.el-button {
-  min-height: 40px;
-  padding: 10px 16px;
-  font-size: 14px;
+.pda-container >>> .el-loading-spinner {
+  margin-top: -25px;
 }
 
-.el-button--primary {
-  background-color: #17b3a3;
-  border-color: #17b3a3;
+.pda-container >>> .el-loading-spinner .circular {
+  width: 35px;
+  height: 35px;
 }
 
-.el-button--primary:hover {
-  background-color: #15a093;
-  border-color: #15a093;
-}
-
-/* 表单项间距优化 */
-.el-form-item {
-  margin-bottom: 12px;
-}
-
-.el-form-item__label {
+.pda-container >>> .el-loading-text {
+  color: #17b3a3 !important;
   font-size: 14px;
-  color: #333;
   font-weight: 500;
-}
-
-/* 主内容区域 */
-.main-content {
-  padding-bottom: 12px;
+  margin-top: 10px;
 }
 </style>