市配预约订单选取调整

src/api/distribution/distributionReservation.js

@@ -235,6 +235,19 @@ export const getDeliveryZeroOrderDetail = (deliveryId,id) => {
   });
 }
 
+/**
+ * 查询预约计划零担详情
+ * @param ids
+ * @returns {AxiosPromise}
+ */
+export const getReservationPackageListByOrderId = (reservationId,orderId,current, size) => {
+  return request({
+    url: '/api/logpm-distribution/reservation/getReservationPackageListByOrderId',
+    method: 'get',
+    params: { reservationId,orderId,current, size }
+  });
+}
+
 
 
 

src/api/distribution/distributionStockArticle.js

@@ -250,4 +250,16 @@ export const selectUpdateAvailableStockArticle = (current, size, params) => {
   })
 }
 
+export const getPackageListByStockArticleId = (current, size, orderId) => {
+  return request({
+    url: '/api/logpm-distribution/distributionStockArticle/getPackageListByStockArticleId',
+    method: 'get',
+    params: {
+      orderId,
+      current,
+      size,
+    }
+  })
+}
+
 

src/views/distribution/reservation/reservationAddFrom.vue

@@ -589,11 +589,11 @@
     autonomouslySave,
     update,
     remove,
-    getReservationInfo, getReservationZeroOrderDetail
+    getReservationInfo, getReservationZeroOrderDetail, getReservationPackageListByOrderId
   } from '@/api/distribution/distributionReservation';
   import {
     getStockArticleList,
-    selectStockArticleList,
+    getPackageListByStockArticleId,
     selectStockArticleInfoList,
     selectUpdateAvailableStockArticle, getZeroOrderDetail
   } from '@/api/distribution/distributionStockArticle';
@@ -2053,68 +2053,79 @@
         this.loading = true;
         this.packageList = row.packageList;
         this.obj = row;
+        let page = this.page;
         console.log('row>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>', row);
         if (this.reservationId) {
-          //这里就是编辑的数据回显问题
+          getReservationPackageListByOrderId(this.reservationId,row.id,page.currentPage,page.pageSize).then(res=>{
-          let packageInfo = row.parcelListVOS;
+            console.log("->>>>>>>>>>>>>>>>>>",res);
-          // this.packageData = row.parcelListVOS;
+          })
-          let packageListData = this.packageData;
-          if (row.packageList.length > 0) {
-            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);
-                  });
-                }
-              });
-            });
-          } else {
-            //新增订单，默认全选
-            packageInfo.forEach((item, index) => {
-              this.$nextTick(() => {
-                this.$refs.packageList.toggleRowSelection(this.packageData[index], true);
-              });
-            });
-          }
-          this.packageData = row.parcelListVOS;
 
-          // 当row内packageList为空时, 默认全选
+
-          if (row.packageList.length === 0) {
+
-            this.packageDataSec = row.parcelListVOS;
+
-          } else {
+          // //这里就是编辑的数据回显问题
-            this.packageDataSec = row.parcelListVOS.filter(item => {
+          // let packageInfo = row.parcelListVOS;
-              return row.packageList.some(value => value.id === item.id);
+          // // this.packageData = row.parcelListVOS;
-            });
+          // let packageListData = this.packageData;
-          }
+          // if (row.packageList.length > 0) {
+          //   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);
+          //         });
+          //       }
+          //     });
+          //   });
+          // } else {
+          //   //新增订单，默认全选
+          //   packageInfo.forEach((item, index) => {
+          //     this.$nextTick(() => {
+          //       this.$refs.packageList.toggleRowSelection(this.packageData[index], true);
+          //     });
+          //   });
+          // }
+          // this.packageData = row.parcelListVOS;
+          //
+          // // 当row内packageList为空时, 默认全选
+          // if (row.packageList.length === 0) {
+          //   this.packageDataSec = row.parcelListVOS;
+          // } else {
+          //   this.packageDataSec = row.parcelListVOS.filter(item => {
+          //     return row.packageList.some(value => value.id === item.id);
+          //   });
+          // }
 
         } else {
-          this.packageData = row.parcelListVOS;
+          getPackageListByStockArticleId(page.currentPage,page.pageSize,row.id).then(res=>{
-          this.packageDataSec = row.parcelListVOS;
+            console.log("res---------------->",res);
-          //这里回显展示的效果应该是展示被其他预约单勾选的订单处于禁用勾选，冻结订单处于禁用无法勾选，其他默认为全选
+          })
-          let data = row.parcelListVOS;
+          // this.packageData = row.parcelListVOS;
-          data.forEach((item, index) => {
+          // this.packageDataSec = row.parcelListVOS;
-            if (
+          // //这里回显展示的效果应该是展示被其他预约单勾选的订单处于禁用勾选，冻结订单处于禁用无法勾选，其他默认为全选
-              item.orderPackageReservationStatusName === '已预约' ||
+          // let data = row.parcelListVOS;
-              item.orderPackageReservationStatus === '20'
+          // data.forEach((item, index) => {
-            ) {
+          //   if (
-              //   //这里就是表示包件此时状态处于已预约，表示该订单下的这个包件信息被其他的预约信息使用，此时应该处于勾选禁用状态
+          //     item.orderPackageReservationStatusName === '已预约' ||
-              this.$nextTick(() => {
+          //     item.orderPackageReservationStatus === '20'
-                this.$refs.packageList.toggleRowSelection(this.packageData[index], true);
-              });
-              // console.log('::', item);
-              // this.checkPackage(item, index);
-            }
-            // else if (
-            //   item.orderPackageFreezeStatusName !== '已冻结' ||
-            //   item.orderPackageFreezeStatus !== '20'
           //   ) {
+          //     //   //这里就是表示包件此时状态处于已预约，表示该订单下的这个包件信息被其他的预约信息使用，此时应该处于勾选禁用状态
           //     this.$nextTick(() => {
           //       this.$refs.packageList.toggleRowSelection(this.packageData[index], true);
           //     });
+          //     // console.log('::', item);
+          //     // this.checkPackage(item, index);
           //   }
-          });
+          //   // else if (
+          //   //   item.orderPackageFreezeStatusName !== '已冻结' ||
+          //   //   item.orderPackageFreezeStatus !== '20'
+          //   // ) {
+          //   //   this.$nextTick(() => {
+          //   //     this.$refs.packageList.toggleRowSelection(this.packageData[index], true);
+          //   //   });
+          //   // }
+          // });
         }
         this.isaddvalue = true;
         this.loading = false;