diff --git a/src/api/distribution/distributionReservation.js b/src/api/distribution/distributionReservation.js
index 8545d925..569b6cc0 100644
--- a/src/api/distribution/distributionReservation.js
+++ b/src/api/distribution/distributionReservation.js
@@ -209,6 +209,19 @@ export const patchPrintList = (ids) => {
});
}
+/**
+ * 查询预约计划零担详情
+ * @param ids
+ * @returns {AxiosPromise}
+ */
+export const getReservationZeroOrderDetail = (reservationId,id) => {
+ return request({
+ url: '/api/logpm-distribution/reservation/getReservationZeroOrderDetail',
+ method: 'get',
+ params: { id,reservationId }
+ });
+}
+
diff --git a/src/views/distribution/reservation/reservationAddFrom.vue b/src/views/distribution/reservation/reservationAddFrom.vue
index b85c0104..44baf8d2 100644
--- a/src/views/distribution/reservation/reservationAddFrom.vue
+++ b/src/views/distribution/reservation/reservationAddFrom.vue
@@ -317,26 +317,33 @@
title="零担订单信息"
width="50%"
:model="zeroOrderData">
-
-
-
- 名称：{{item.firsts }}
-
-
- 总数量：{{item.quantity }}
-
-
- 在库数量：{{item.handQuantity }}
-
-
- 出库数量：{{item.outboundQuantity }}
-
-
- 可用数量：{{(item.handQuantity - item.outboundQuantity)}}
-
-
-
-
+
+
+
+
+ 名称：{{item.firsts }}
+
+
+ 总数量：{{item.quantity }}
+
+
+ 在库数量：{{item.handQuantity }}
+
+
+ 冻结数量：{{item.deliveryQuantity }}
+
+
+ 出库数量：{{item.outboundQuantity }}
+
+
+
+ 可用数量：{{(item.quantity)}}
+
+
+
+
+
+
提交(零担订单)
@@ -560,7 +567,7 @@
autonomouslySave,
update,
remove,
- getReservationInfo
+ getReservationInfo, getReservationZeroOrderDetail
} from '@/api/distribution/distributionReservation';
import {
getStockArticleList,
@@ -1702,6 +1709,7 @@
deliveryTypeData: [],
//增值服务列表
addvalueServeType: [],
+ obj: {},
//增值表单输入框对象
addvalue: {},
costList: [], //字典
@@ -1719,7 +1727,7 @@
orderShow: false,
zeroOrderData:[],
zeroOrderShow: false,
- zeroPackageNum:0,
+ // zeroPackageNum:0,
//在库订单信息
stockArticleInfo: [],
//库存品信息
@@ -1973,9 +1981,23 @@
this.onLoad(this.page);
},
viewStockArticlePackage(row) {
- getZeroOrderDetail(row.id).then(res=>{
- this.zeroOrderData =res.data.data;
- })
+ this.obj = row;
+ if (this.reservationId){
+ //查询零担计划数量详情
+ console.log("order------------>",row.id);
+ getReservationZeroOrderDetail(this.reservationId,row.id).then(res=>{
+ this.zeroOrderData =res.data.data;
+ // console.log(res.data.data);
+ })
+
+ }else {
+ getZeroOrderDetail(row.id).then(res=>{
+ if (res.data.data != null){
+ this.zeroOrderData =res.data.data;
+ }
+ })
+ }
+
this.zeroOrderShow = true;
},
checkPackage(row, index) {
@@ -2265,7 +2287,13 @@
// }
},
onSubmitZeroOrder(){
- console.log("this.aaa------------->",this.zeroPackageNum);
+ this.orderData.forEach(item=>{
+ if (this.obj.id === item.id){
+ item.parcelNumberVOS = this.zeroOrderData;
+ }
+ })
+ this.zeroOrderShow = false;
+ console.log("this.orderData------------->",this.orderData);
},
// 增加库存品
onSubmitInventory() {