From f8f915e197fc0207c41b93fbc0cdfb579a482536 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Thu, 26 Oct 2023 14:43:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=87=E8=B4=A7=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventory/delivery/distributionStockArticleSelf.vue       | 4 ++++
 src/views/distribution/inventory/distrilbutionBillLading.vue  | 2 +-
 .../distribution/stockup/distributionStockupDetailsSelf.vue   | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
index 593ff24d..d19e45d5 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
@@ -1517,6 +1517,10 @@ export default {
           this.$message.warning('请选择同一商场');
           return false;
         }
+        if (i.reservationStatus === '30') {
+          this.$message.warning(i.orderCode + '已预约，请勿重复预约！！！');
+          return  false;
+        }
 
         if (consigneeMobile != i.consigneeMobile && consigneePerson != i.consigneePerson) {
           this.$message.warning('收货人不相同，请选择相同的收货人！！！');
diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue
index 65181c40..759852bf 100644
--- a/src/views/distribution/inventory/distrilbutionBillLading.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLading.vue
@@ -2575,7 +2575,7 @@ export default {
       console.log('row :>> ', row);
 
       // 请求零担数据详情
-      const res = await zeroMaterial({ stockArticleId: row.id });
+      const res = await zeroMaterial({ stockArticleId: row.id,reservationId: this.$route.query.id  });
       console.log('res :>> ', res);
       const { code, data } = res.data;
       if (code === 200) {
diff --git a/src/views/distribution/stockup/distributionStockupDetailsSelf.vue b/src/views/distribution/stockup/distributionStockupDetailsSelf.vue
index 246cfa82..557b479c 100644
--- a/src/views/distribution/stockup/distributionStockupDetailsSelf.vue
+++ b/src/views/distribution/stockup/distributionStockupDetailsSelf.vue
@@ -253,7 +253,7 @@
           <el-button @click="dialogVisible = false">取 消</el-button>
         </span>
       </el-dialog>
-      <el-dialog title="包条码" :visible.sync="dialogPack" width="780px" v-model="dialogPack">
+      <el-dialog title="包条码" :visible.sync="dialogPack" width="1180px" v-model="dialogPack">
         <el-text type="primary" icon="el-icon-view" @click="handleBatchDetail('1')"
           >批量打印</el-text
         >
@@ -1451,7 +1451,7 @@ export default {
       //查询信息
       let po = {
         stockListId: row.stockListId,
-        reservationId: row.reservationId,
+        reservationId: row.billLadingId,
       };
       let s = [];
       getDisStockList(po).then(res => {