From 9ede258bea9e7077247028c204489819ab30dccb Mon Sep 17 00:00:00 2001
From: FOAM <491460741@qq.com>
Date: Mon, 13 Oct 2025 19:00:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business-asn/asn/viewXbDetail.vue   | 11 +++++++++++
 src/views/business-inv/inventoryLog/index.vue |  4 +++-
 src/views/business-pick/pickDetail/index.vue  | 10 ++++++----
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/views/business-asn/asn/viewXbDetail.vue b/src/views/business-asn/asn/viewXbDetail.vue
index fad6987..c4fe8d4 100644
--- a/src/views/business-asn/asn/viewXbDetail.vue
+++ b/src/views/business-asn/asn/viewXbDetail.vue
@@ -72,6 +72,17 @@
         >
           取消上架
         </el-button>-->
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="primary"
+          size="mini"
+          :disabled="crud.selections.length === 0"
+          @click="qxshM(crud.selections)"
+          :loading="logining3"
+        >
+          取消收货
+        </el-button>
         <el-upload
           class="upload-demo"
           ref="upload"
diff --git a/src/views/business-inv/inventoryLog/index.vue b/src/views/business-inv/inventoryLog/index.vue
index e4f4d1d..3f45867 100644
--- a/src/views/business-inv/inventoryLog/index.vue
+++ b/src/views/business-inv/inventoryLog/index.vue
@@ -16,6 +16,8 @@
                 @keyup.enter.native="crud.toQuery"/>
       <el-input v-model="query.itemName" clearable placeholder="品名" style="width: 120px;" class="filter-item"
                 @keyup.enter.native="crud.toQuery"/>
+      <el-input v-model="query.srcPointCode" clearable placeholder="源库位" style="width: 120px;" class="filter-item"
+                @keyup.enter.native="crud.toQuery"/>
       <el-select v-model="query.logType" clearable placeholder="操作类型"  style="width: 120px;" class="filter-item"
                  @keyup.enter.native="crud.toQuery">
         <el-option
@@ -94,7 +96,7 @@
         </el-table-column>
         <el-table-column prop="zzkw.code" label="制造库位" width="80px" align="center">
         </el-table-column>-->
-        <el-table-column prop="dstStockCode" label="箱单数"  align="center"/>
+        <el-table-column prop="dstStockCode" label="箱单号"  align="center"/>
         <el-table-column prop="srcQty" label="源数量"  width="80px"/>
         <el-table-column prop="dstQty" label="目标数量"  width="80px"/>
 <!--        发生数量-->
diff --git a/src/views/business-pick/pickDetail/index.vue b/src/views/business-pick/pickDetail/index.vue
index 4921bbf..d73b40d 100644
--- a/src/views/business-pick/pickDetail/index.vue
+++ b/src/views/business-pick/pickDetail/index.vue
@@ -114,12 +114,14 @@
         <el-table-column prop="propC2" label="税别"/>
         <el-table-column prop="area.name" label="拣货库区" width="150px"/>
         <el-table-column prop="ckPoint.code" label="拣货库位"/>
-        <el-table-column prop="item.extendD3" label="收容数" width="60px" align="center"/>
+        <el-table-column prop="po" label="拣货箱单号" width="100px"/>
         <el-table-column prop="shArea.name" label="叫料库区" width="150px"/>
         <el-table-column prop="point.code" label="制造库位"/>
-        <el-table-column prop="xdPf" label="箱单品番" width="100px"/>
         <el-table-column prop="orderQty" label="订单数量"/>
         <el-table-column prop="allocatedQty" label="分配数量"/>
+        <el-table-column prop="pickedQty" label="拣货数量"/>
+        <el-table-column prop="xdPf" label="箱单品番" width="100px"/>
+        <el-table-column prop="item.extendD3" label="收容数" width="60px" align="center"/>
         <el-table-column prop="remark" label="备注"/>
         <el-table-column prop="createBy" label="创建人"/>
         <el-table-column prop="createTime" width="150px" label="创建时间"/>
@@ -170,7 +172,7 @@
           <el-form-item label="叫料库区">
             <el-input v-model="cxjlFrom.gw_name"/>
           </el-form-item>
-          <el-form-item label="箱单品番">
+          <el-form-item label="箱单单品品番">
             <el-checkbox v-model="cxjlFrom.beXdPf"/>
           </el-form-item>
           <el-form-item label="备注">
@@ -236,7 +238,7 @@ export default {
       optShow: {
         add: false,
         edit: false,
-        del: false,
+        del: true,
         reset: false,
         download: true
       }