修改备货校验

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('收货人不相同，请选择相同的收货人！！！');

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) {

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 => {