From e0767e8573af3c61ac6e836e5879aa5242fef2e3 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Tue, 9 Dec 2025 14:03:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=BF=9B=E4=BB=93=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E4=B9=8B=E5=90=8E=E5=8F=98=E4=B8=BA=E2=80=98=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E5=B7=B2=E8=BF=9B=E4=BB=93=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/oms/emisWaybill/WsInBatchList.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/oms/emisWaybill/WsInBatchList.vue b/src/views/oms/emisWaybill/WsInBatchList.vue
index e5f4d77..d1e9b73 100644
--- a/src/views/oms/emisWaybill/WsInBatchList.vue
+++ b/src/views/oms/emisWaybill/WsInBatchList.vue
@@ -146,7 +146,7 @@
                   </div>
                   <div style="text-align: right;margin-top: 10px;">
                     <el-button  size="mini" @click="handleFeedDialogClick(item)">反馈异常</el-button>
-                    <el-button type="primary" size="mini" @click="confirmJinCang(item.inNo)">进仓确认</el-button>
+                    <el-button type="primary" size="mini" @click="confirmJinCang(item.inNo)" :disabled="item.confirmStatus==1">{{item.confirmStatus==1?'确认已进仓':'进仓确认'}}</el-button>
                   </div>
                   <div style="margin-top: 10px;padding: 10px 0px;border-top: 1px solid #e6ebf5;">
                         <!-- <div>进仓图片：</div> -->
@@ -213,7 +213,7 @@ export default {
       dateTimeRange:[],
       // 总条数
       total: 0,
-      // 进仓单批次表格数据
+      // 进仓单批次表格数据 
       emisWarehouseInBatchList: this.stockInBatchList,
 
       currentId:null,

From cced75f191c206f8058a5edc6b7847f828e792dd Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Tue, 9 Dec 2025 15:22:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=BF=9B=E4=BB=93=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E4=BC=A0=E5=AD=90=E5=8D=95id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/oms/emisWaybill/WsInBatchList.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/oms/emisWaybill/WsInBatchList.vue b/src/views/oms/emisWaybill/WsInBatchList.vue
index d1e9b73..f102c97 100644
--- a/src/views/oms/emisWaybill/WsInBatchList.vue
+++ b/src/views/oms/emisWaybill/WsInBatchList.vue
@@ -146,7 +146,7 @@
                   </div>
                   <div style="text-align: right;margin-top: 10px;">
                     <el-button  size="mini" @click="handleFeedDialogClick(item)">反馈异常</el-button>
-                    <el-button type="primary" size="mini" @click="confirmJinCang(item.inNo)" :disabled="item.confirmStatus==1">{{item.confirmStatus==1?'确认已进仓':'进仓确认'}}</el-button>
+                    <el-button type="primary" size="mini" @click="confirmJinCang(item.inNo,item.id)" :disabled="item.confirmStatus==1">{{item.confirmStatus==1?'确认已进仓':'进仓确认'}}</el-button>
                   </div>
                   <div style="margin-top: 10px;padding: 10px 0px;border-top: 1px solid #e6ebf5;">
                         <!-- <div>进仓图片：</div> -->
@@ -396,13 +396,13 @@ export default {
     dateTimeChange(value){
         this.dateTimeRange=value;
     },
-    async confirmJinCang(inNo) {
+    async confirmJinCang(inNo,id) {
       let confirmStatus = '2' // 部分入仓
       if (!inNo) {
         confirmStatus = '1' // 全部入仓
         inNo = this.billInfo.inNo
       }
-      let res = await cusConfirmWsIn({ inNo, confirmStatus, _loading: true }).then(() => {
+      let res = await cusConfirmWsIn({ inNo, confirmStatus, _loading: true ,id:id }).then(() => {
         this.$modal.msgSuccess("操作成功");
       })
     },