From a7659883c8ef44281e370ef374a7832b296ffbb7 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Mon, 15 Apr 2024 15:20:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=87=AA=E6=8F=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventory/distrilbutionBillLading.vue     | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue
index a04be651..5457c528 100644
--- a/src/views/distribution/inventory/distrilbutionBillLading.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLading.vue
@@ -2279,6 +2279,10 @@ export default {
       let isa = false;
       this.selectionList.some(i => {
         let a = this.dataList.filter(ele => ele.id == i.id).length >= 1;
+        if(!this.$route.query.id){
+          i.reservationNum=i.handQuantity
+        } 
+       
         if (!a) {
           this.dataList.push(i);
         }
@@ -2971,9 +2975,14 @@ export default {
       params.isAll = 0;
       $_getListOne(page.currentPage, page.pageSize, Object.assign(params, this.queryOrder)).then(
         res => {
+          console.log(res,'res===>');
+          if(res.data.code !=200 || !res.data.data){
+            
+            return
+          }
           const data = res.data.data;
-          this.pageOrder.total = data.total;
-          this.dataOrder = data.records;
+          this.pageOrder.total = data.total || 0;
+          this.dataOrder = data.records || [];
           this.dataOrder = this.dataOrder.map(i => {
             const notificationMap = {
               1: '已通知',
@@ -3005,7 +3014,11 @@ export default {
           this.loading = false;
           this.selectionClear();
         }
-      );
+      ).catch(res=>{
+
+      }).finally(()=>{
+        this.loading = false;
+      });
     },
     //库存品
     handleAddView(row) {

From ca80d274dcdbd599b8b1247f321622d1f761f81f Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Mon, 15 Apr 2024 16:05:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=AA=E7=9B=98?=
 =?UTF-8?q?=E7=82=B9=E6=98=8E=E7=BB=86=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/distribution/createTask.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/api/distribution/createTask.js b/src/api/distribution/createTask.js
index 628b49a9..ffd26bd5 100644
--- a/src/api/distribution/createTask.js
+++ b/src/api/distribution/createTask.js
@@ -219,6 +219,7 @@ export const postExportContrastStockInfo = params => {
     url: '/api/logpm-warehouse/blade-taskQuest/taskQuest/exportContrastStockInfo',
     method: 'get',
     params,
+    responseType: 'blob',
   });
 };