From 0e71d5087cf9657edef581bbb3e910aef6d399ef Mon Sep 17 00:00:00 2001
From: kilo <wan.ren@foxmail.com>
Date: Wed, 18 Oct 2023 19:20:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E9=85=8D=E6=9F=A5=E7=9C=8B=E5=8C=85?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/distributionDeliveryList.js  | 14 ++++
 .../turndelivery/deliveryDiscuss.vue          | 72 ++++++++++---------
 2 files changed, 54 insertions(+), 32 deletions(-)

diff --git a/src/api/distribution/distributionDeliveryList.js b/src/api/distribution/distributionDeliveryList.js
index 9e99837f..56b9feef 100644
--- a/src/api/distribution/distributionDeliveryList.js
+++ b/src/api/distribution/distributionDeliveryList.js
@@ -190,6 +190,20 @@ export const selectStockArticleAtlasInfo = id => {
     },
   });
 };
+/**
+ * 查询配送任务订单地图信息
+ * @param data
+ * @returns {AxiosPromise}
+ */
+export const getPackageListByDeliveryIdAndOrderId = (current,size,delivery,orderId) => {
+  return request({
+    url: '/api/logpm-distribution/deliveryList/getPackageListByDeliveryIdAndOrderId',
+    method: 'get',
+    params: {
+      current,size,delivery,orderId
+    },
+  });
+};
 
 /**
  * 取消配送任务
diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue
index 7bd1a374..93c378e8 100644
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
@@ -693,10 +693,10 @@
   import { getDriverList } from '@/api/basicdata/basicdataDriverArtery';
   import {
     selectStockArticleInfoList,
-    selectDiscussStockArticleInfoList, getZeroOrderDetail
+    selectDiscussStockArticleInfoList, getZeroOrderDetail, getPackageListByStockArticleId
   } from '@/api/distribution/distributionStockArticle';
   import { getInventoryList } from '@/api/distribution/distributionStockList';
-  import { getDeliveryList, updateDeliveryList } from '@/api/distribution/distributionDeliveryList';
+  import { getDeliveryList, updateDeliveryList,getPackageListByDeliveryIdAndOrderId} from '@/api/distribution/distributionDeliveryList';
   import { mapGetters } from 'vuex';
   import dayjs from 'dayjs';
   import { entryNum, updateEntryNum } from '@/api/distribution/distributionParcelNumber';
@@ -1217,39 +1217,47 @@
         //查询该订单下所有的包件信息
         this.loading = true;
         this.obj = row;
+        let page = this.page;
         console.log('++++++++++++', row);
         if (this.deliveryListId) {
-          //编辑
-          let params = {};
-          console.log('^^^^^^^^', row);
-          //这里订单的对象中应该存在三个数组，一个数组是该订单下的所有包件细信息
-          //一个数组是该订单被选择使用的包件信息
-          //还有一个就是正在操作的包件信息
-          let packageInfo = row.parcelListVOS;
-          if (row.packageList) {
-            let packageListInfo = row.packageList;
-            packageInfo.forEach((item, index) => {
-              packageListInfo.forEach(p => {
-                if (item.id === p.id) {
-                  this.$nextTick(() => {
-                    this.$refs.packageList.toggleRowSelection(this.packageData[index], true);
-                  });
-                }
-              });
-            });
-          }
-          this.packageData = row.parcelListVOS;
+          getPackageListByDeliveryIdAndOrderId(page.currentPage,page.pageSize,row.id).then(res=>{
+            console.log("getPackageListByDeliveryIdAndOrderId--------------------->",res);
+          })
+          // //编辑
+          // let params = {};
+          // console.log('^^^^^^^^', row);
+          // //这里订单的对象中应该存在三个数组，一个数组是该订单下的所有包件细信息
+          // //一个数组是该订单被选择使用的包件信息
+          // //还有一个就是正在操作的包件信息
+          // let packageInfo = row.parcelListVOS;
+          // if (row.packageList) {
+          //   let packageListInfo = row.packageList;
+          //   packageInfo.forEach((item, index) => {
+          //     packageListInfo.forEach(p => {
+          //       if (item.id === p.id) {
+          //         this.$nextTick(() => {
+          //           this.$refs.packageList.toggleRowSelection(this.packageData[index], true);
+          //         });
+          //       }
+          //     });
+          //   });
+          // }
+          // this.packageData = row.parcelListVOS;
         } else {
-          //新增
-          //默认打开包件信息，包件列表处于全选状态
-          let params = {};
-          this.packageData = row.parcelListVOS;
-          this.packageData.forEach((item, index) => {
-            this.$nextTick(() => {
-              this.$refs.packageList.toggleRowSelection(this.packageData[index], true);
-            });
-          });
-          console.log('^^^^^^^^', row);
+          getPackageListByStockArticleId(page.currentPage,page.pageSize,row.id).then(res=>{
+            console.log("________--------------------->",res);
+          })
+          // //新增
+          // //默认打开包件信息，包件列表处于全选状态
+          // let params = {};
+          // this.packageData = row.parcelListVOS;
+          // this.packageData.forEach((item, index) => {
+          //   this.$nextTick(() => {
+          //     this.$refs.packageList.toggleRowSelection(this.packageData[index], true);
+          //   });
+          // });
+          // console.log('^^^^^^^^', row);
+
         }
         this.loading = false;
         this.isShowPackage = true;