Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

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',
   });
 };
 

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.pageOrder.total = data.total || 0;
-          this.dataOrder = data.records;
+          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) {