From edcea2d6b50985eb59534b3e44573bac6e636afc Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Fri, 20 Oct 2023 17:23:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E6=8F=90=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distributionStockArticleMarket.vue        |  2 +-
 .../inventory/distrilbutionBillLadingList.vue | 19 ++++++++++---------
 .../inventory/distrilbutionBillLadingView.vue |  4 ++--
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
index b14e96cd..89a8cf69 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
@@ -1105,7 +1105,7 @@ export default {
       // 返回false,说明全都相等
       if (!notEqualFlag) {
         this.$router.push({
-          path: '/distribution/inventory/distributionStockArticleFrom',
+          path: '/distribution/reservation/reservationSubmitFrom',
           query: {
             id: this.ids,
             name: '转预约单',
diff --git a/src/views/distribution/inventory/distrilbutionBillLadingList.vue b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
index ecc34f5b..a1072fd2 100644
--- a/src/views/distribution/inventory/distrilbutionBillLadingList.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
@@ -943,16 +943,17 @@ export default {
     },
     //签收
     handleSign(row, num) {
-      if (this.selectionList.length == 0) {
-        this.$message.warning('至少选择一条数据！！');
-        return;
-      }
-      let a = this.selectionList.find(i => i.conditions > 6);
-      if (!!a) {
-        this.$message.warning('有已签收的数据，请勿重复签收！！');
-        return;
+      if(num === 2){
+        if (this.selectionList.length == 0) {
+          this.$message.warning('至少选择一条数据！！');
+          return;
+        }
+        let a = this.selectionList.find(i => i.conditions > 20);
+        if (!!a) {
+          this.$message.warning('有已签收的数据，请勿重复签收！！');
+          return;
+        }
       }
-
       this.$confirm('确定签收吗?', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
diff --git a/src/views/distribution/inventory/distrilbutionBillLadingView.vue b/src/views/distribution/inventory/distrilbutionBillLadingView.vue
index 6a1f5d71..4b89e330 100644
--- a/src/views/distribution/inventory/distrilbutionBillLadingView.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLadingView.vue
@@ -318,7 +318,7 @@ export default {
             head: false,
           },
           {
-            prop: 'deliveryNumber',
+            prop: 'quantity',
             label: '备货数',
             type: 2,
             values: '',
@@ -329,7 +329,7 @@ export default {
             head: false,
           },
           {
-            prop: 'readyStock',
+            prop: 'preparedQuantity',
             label: '已备数量',
             type: 2,
             values: '',