diff --git a/src/views/distribution/turndelivery/deliveryMarket.vue b/src/views/distribution/turndelivery/deliveryMarket.vue
index da4b4217..78e2285e 100644
--- a/src/views/distribution/turndelivery/deliveryMarket.vue
+++ b/src/views/distribution/turndelivery/deliveryMarket.vue
@@ -256,6 +256,7 @@
预约列表
+ 新 增
+
+
+
+
+
+ 移除
+
+
+
+
+
+
+
+
+
+
+
+
+
",'执行预约新增');
+ //开启弹窗
+ this.reservationDialogVisible = true;
+ console.log("aaaaa-------->",'aaa');
+ //查询可进行预约的预约单
+ let excludeId=[];
+ if (this.reservationData.length>0){
+ //列表存在的预约单进行过滤
+ excludeId = this.reservationData.map(item=> item.id).join(",")
+ }
+ this.getAddReservationList(this.page,excludeId);
+
+
+
+ },
+ saveAddReservation(){
+ if (this.selectionList.length === 0 ){
+ this.$message.warning("请选择需要增加的预约单");
+ }
+
+
+ this.reservationData.push(...this.selectionList);
+
+ console.log('aaa->>>>>>',this.selectionList);
+ console.log('this.reservationData->>>>>>',this.reservationData);
+ this.reservationDialogVisible = false;
+
+
+
+ },
+ //查询可用预约单
+ getAddReservationList(page,excludeId,params={}){
+ this.reservationQuery.reservationStatus = '20';
+ this.reservationQuery.excludeId = excludeId;
+ getList(page.currentPage,page.pageSize , Object.assign(params, this.reservationQuery)).then(res=>{
+ console.log('res=========>',res);
+ const data = res.data.data;
+ this.reservationListData = data.records;
+ this.page.total = data.total;
+ })
+
+ },
//查询叉车人员
async getFork() {
let ides = '';
@@ -957,7 +1254,7 @@
type: 'warning',
})
return
- }
+ }
}
console.log(">>>>>>>>>>>> 配送类型:",this.aaa +" "+ this.bbb)
@@ -1343,7 +1640,7 @@
this.query = {};
},
-
+
onLoad(page, params = {}) {