diff --git a/src/views/distribution/turndelivery/deliveryMarket.vue b/src/views/distribution/turndelivery/deliveryMarket.vue index c1b21d1b..f0f5dac1 100644 --- a/src/views/distribution/turndelivery/deliveryMarket.vue +++ b/src/views/distribution/turndelivery/deliveryMarket.vue @@ -741,7 +741,7 @@ this.getTeam(); this.getvehicleData(); this.getMasterDriverData(); - this.onLoad(this.page); + // this.onLoad(this.page); }, computed: { ...mapGetters(['permission']), @@ -754,7 +754,7 @@ } }, mounted() { - // this.onLoad(this.page); + this.onLoad(this.page); }, methods: { //查询叉车人员 @@ -837,9 +837,9 @@ getMasterDriverData() { return new Promise((rv, rev) => { getDriverList(1, 10, '').then(res => { - this.driverData = res.data.data.records; - console.log('===============>', res.data.data); - rv(res.data.data.records); + this.driverData = res.data.data; + console.log("配送司机", res.data.data); + rv(res.data.data); }); }); }, @@ -864,9 +864,9 @@ getvehicleData() { return new Promise((rv, rev) => { getVehicleList(1, 10, '').then(res => { - this.vehicleData = res.data.data.records; + this.vehicleData = res.data.data; console.log('^^^^^^^^^^^^^^^^', res.data.data); - rv(res.data.data.records); + rv(res.data.data); }); }); }, @@ -1321,7 +1321,10 @@ this.query = {}; }, + + onLoad(page, params = {}) { + //初始化页面数据 this.stockUpForm.deliveryType = '2'; // this.stockUpForm.deliveryWay = '2'; @@ -1332,20 +1335,19 @@ // this.loadAndUnload = ['1', '2']; if (this.reservationIds) { this.isoperation = false; - console.log('》》》》》》》》》》》》》》》', this.reservationIds); let ids = this.reservationIds; getReservationAddr(ids).then(res => { - console.log('------------->', res); const data = res.data.data; this.page.total = data.total; this. reservationData= data; - console.log('>>>>>>>>>>>', this.data); this.loading = false; }); } + + if (this.deliveryListId) { + this.isoperation = true; - console.log('<<<<<<<<<<', this.deliveryListId); //市配计划编辑回显 getMarketDeliveryList(this.deliveryListId).then(async res => { @@ -1401,6 +1403,7 @@ } }); }); + console.log("***********",b) this.deliveryDriver = b; this.driverList = b; this.driverInfo = driverInfo; @@ -1414,6 +1417,8 @@ this.waixieForm.vehicleNum = deliveryTripartiteVO.vehicleNum; this.waixieForm.driverPhone = deliveryTripartiteVO.driverPhone; this.waixieForm.deliveryFee = deliveryTripartiteVO.deliveryFee; + + } }); }