From 80640b5b3976bd52f7805f21751781ff3781887c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Fri, 13 Mar 2026 17:43:24 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E9=92=A2=E5=8D=B7=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=92=A2=E5=8D=B7=E8=BF=BD=E6=BA=AF=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=B9=B6=E8=B0=83=E6=95=B4=E6=AC=A1=E5=93=81=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在correct.vue中添加钢卷追溯功能，包括追溯对话框和API调用
调整scrap.vue中次品标签的位置，使其显示在第一个标签页
在correct.vue中新增逻辑库区查询条件
---
 klp-ui/src/views/wms/coil/do/correct.vue  | 41 +++++++++++++++++++++--
 klp-ui/src/views/wms/coil/views/scrap.vue | 10 +++---
 2 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/klp-ui/src/views/wms/coil/do/correct.vue b/klp-ui/src/views/wms/coil/do/correct.vue
index 87c0daf7..74907289 100644
--- a/klp-ui/src/views/wms/coil/do/correct.vue
+++ b/klp-ui/src/views/wms/coil/do/correct.vue
@@ -33,6 +33,10 @@
               <el-input v-model="materialQueryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
                 @keyup.enter.native="handleMaterialQuery" style="width: 150px;" />
             </el-form-item>
+            <el-form-item label="逻辑库区" prop="warehouseId">
+              <warehouse-select v-model="materialQueryParams.warehouseId" placeholder="请选择逻辑库区" clearable
+                @keyup.enter.native="handleMaterialQuery" style="width: 150px;" />
+            </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" size="mini" @click="handleMaterialQuery">搜索</el-button>
               <el-button icon="el-icon-refresh" size="mini" @click="resetMaterialQuery">重置</el-button>
@@ -180,11 +184,13 @@
                           </div>
                         </div>
                       </div>
-                    </div>
+                    </div> 
                     <i slot="reference" class="el-icon-setting param-icon"></i>
                   </el-popover>
 
                   <i class="el-icon-view param-icon" @click="handlePreviewLabel(item)" title="查看标签"></i>
+
+                  <i class="el-icon-time param-icon" @click="handleTrace(item)" title="追溯"></i>
                 </div>
               </div>
 
@@ -387,11 +393,16 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!-- 钢卷追溯对话框（使用封装的组件） -->
+    <el-dialog title="钢卷追溯" :visible.sync="traceOpen" width="90%" append-to-body>
+      <coil-trace-result v-loading="traceLoading" :trace-result="traceResult"></coil-trace-result>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listMaterialCoil, updateMaterialCoilSimple, checkCoilNo, delMaterialCoil, restoreMaterialCoil, addMaterialCoil } from '@/api/wms/coil'
+import { listMaterialCoil, getMaterialCoilTrace, updateMaterialCoilSimple, checkCoilNo, delMaterialCoil, restoreMaterialCoil, addMaterialCoil } from '@/api/wms/coil'
 import { listUser } from '@/api/system/user'
 import { listPendingAction, startProcess, cancelAction, delPendingAction } from '@/api/wms/pendingAction'
 import { parseTime } from '@/utils/klp'
@@ -403,6 +414,7 @@ import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
 import ActualWarehouseSelect from "@/components/KLPService/ActualWarehouseSelect";
 import ProductSelect from "@/components/KLPService/ProductSelect";
 import RawMaterialSelect from "@/components/KLPService/RawMaterialSelect";
+import CoilTraceResult from "../panels/CoilTraceResult.vue";
 
 export default {
   name: 'DoPage',
@@ -425,9 +437,14 @@ export default {
     ActualWarehouseSelect,
     ProductSelect,
     RawMaterialSelect,
+    CoilTraceResult,
   },
   data() {
     return {
+      traceOpen: false,
+      traceLoading: false,
+      traceResult: null,
+
       coilType: 'all',
       title: '钢卷信息修正',
       // 物料列表相关
@@ -441,7 +458,8 @@ export default {
         // dataType: 1,
         // status: 0,
         enterCoilNo: null,
-        currentCoilNo: null
+        currentCoilNo: null,
+        warehouseId: null,
       },
       labelRender: {
         visible: false,
@@ -629,6 +647,23 @@ export default {
       this.reset();
       this.correctVisible = true;
       this.title = "添加钢卷物料";
+    },
+     /** 追溯按钮操作 */
+    handleTrace(row) {
+      this.traceOpen = true;
+      this.traceLoading = true;
+      this.traceResult = null; // 清空历史数据
+      getMaterialCoilTrace({
+        coilId: row.coilId,
+        currentCoilNo: row.currentCoilNo,
+      }).then(res => {
+        this.traceResult = res.data; // 将结果传递给组件
+      }).catch(err => {
+        console.error('溯源查询失败：', err);
+        this.$message.error('溯源查询失败，请重试');
+      }).finally(() => {
+        this.traceLoading = false;
+      });
     },
     // 表单重置
     reset() {
diff --git a/klp-ui/src/views/wms/coil/views/scrap.vue b/klp-ui/src/views/wms/coil/views/scrap.vue
index 506ea450..91f43395 100644
--- a/klp-ui/src/views/wms/coil/views/scrap.vue
+++ b/klp-ui/src/views/wms/coil/views/scrap.vue
@@ -1,5 +1,9 @@
 <template>
   <el-tabs class="app-container" v-model="activeTab">
+    <el-tab-pane label="次品" name="third">
+      <BasePage :qrcode="qrcode" :querys="query3" :labelType="labelType" :hideWarehouseQuery="hideWarehouseQuery"
+        :hideType="hideType" />
+    </el-tab-pane>
     <el-tab-pane label="待收卷" name="second">
       <BasePage :qrcode="qrcode" :querys="querys2" :labelType="labelType" :hideWarehouseQuery="hideWarehouseQuery"
         :hideType="hideType" />
@@ -8,10 +12,6 @@
       <BasePage :qrcode="qrcode" :querys="querys" :labelType="labelType" :hideWarehouseQuery="hideWarehouseQuery"
         :hideType="hideType" />
     </el-tab-pane>
-    <el-tab-pane label="次品" name="third">
-      <BasePage :qrcode="qrcode" :querys="query3" :labelType="labelType" :hideWarehouseQuery="hideWarehouseQuery"
-        :hideType="hideType" />
-    </el-tab-pane>
   </el-tabs>
 </template>
 
@@ -25,7 +25,7 @@ export default {
   data() {
     return {
       qrcode: false,
-      activeTab: 'second',
+      activeTab: 'third',
       querys: {
         dataType: 1,
         status: 0,