java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

修复市配bug

dev-xx
qb 9 months ago
parent
8e7d8a3db4
commit
dfc81d95c9
1 changed files with 82 additions and 77 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 159
      src/views/distribution/turndelivery/deliveryMarket.vue

159
src/views/distribution/turndelivery/deliveryMarket.vue
Unescape View File

@ -1603,7 +1603,6 @@ export default {
} }
} }
} }
console.log('this.vehticleList :>> ', this.vehticleList);
break; break;
} }
} }
@ -1744,12 +1743,20 @@ export default {
ddd() { ddd() {
if (this.deliveryListId) { if (this.deliveryListId) {
this.vehicleIds = []; this.vehicleIds = [];
this.vehticleList = [];
this.vehticleInfo = [];
this.driverInfo = [];
this.deliveryDriver = []; this.deliveryDriver = [];
this.driverForm.masterDriverName = ''; this.driverForm.masterDriverName = '';
this.driverForm.masterVehicleNub = ''; this.driverForm.masterVehicleNub = '';
this.driverForm = {}; this.driverForm = {};
} else { } else {
// this.loadAndUnload = []; // this.loadAndUnload = [];
this.vehicleIds = [];
this.vehticleList = [];
this.vehticleInfo = [];
this.driverInfo = [];
this.deliveryDriver = [];
this.serveType = []; this.serveType = [];
this.driverForm = {}; this.driverForm = {};
this.waixieForm = {}; this.waixieForm = {};
@ -1791,85 +1798,83 @@ export default {
this.isoperation = true; this.isoperation = true;
//市配计划编辑回显 //市配计划编辑回显
getMarketDeliveryList(this.deliveryListId).then(async res => { getMarketDeliveryList(this.deliveryListId)
console.log('--------------->', res.data.data); .then(async res => {
const deliveryData = res.data.data; console.log('--------------->', res.data.data);
// this.stockUpForm.outboundDate = deliveryData.stockupInfo.outboundDate; const deliveryData = res.data.data;
// this.stockUpForm.taskTime = deliveryData.stockupInfo.taskTime; // this.stockUpForm.outboundDate = deliveryData.stockupInfo.outboundDate;
// this.stockUpForm.goodsAreaId = deliveryData.stockupInfo.goodsAreaId; // this.stockUpForm.taskTime = deliveryData.stockupInfo.taskTime;
// this.stockUpForm.forklift = deliveryData.stockupInfo.forkliftId; // this.stockUpForm.goodsAreaId = deliveryData.stockupInfo.goodsAreaId;
this.stockUpForm.loader = deliveryData.loadingTeamId; // this.stockUpForm.forklift = deliveryData.stockupInfo.forkliftId;
this.stockUpForm.unloader = deliveryData.unloadingTeamId; this.stockUpForm.loader = deliveryData.loadingTeamId;
this.stockUpForm.taskTime = deliveryData.taskTime; this.stockUpForm.unloader = deliveryData.unloadingTeamId;
// this.stockUpForm.stockupDate = deliveryData.stockupInfo.stockupDate; this.stockUpForm.taskTime = deliveryData.taskTime;
this.stockUpForm.remarks = deliveryData.remarks; // this.stockUpForm.stockupDate = deliveryData.stockupInfo.stockupDate;
// if (deliveryData.stockupInfo.teamResponsibility) { this.stockUpForm.remarks = deliveryData.remarks;
// this.loadAndUnload = deliveryData.stockupInfo.teamResponsibility.split(','); // if (deliveryData.stockupInfo.teamResponsibility) {
// } // this.loadAndUnload = deliveryData.stockupInfo.teamResponsibility.split(',');
console.log('reservationInfo--------------->', res.data.data.reservationInfo); // }
this.reservationData = deliveryData.reservationInfos; console.log('reservationInfo--------------->', res.data.data.reservationInfo);
if (deliveryData.kind === '1') { this.reservationData = deliveryData.reservationInfos;
//自主配送 if (deliveryData.kind === '1') {
let self = deliveryData.deliverySelfVO; //自主配送
let vehicle = await this.getvehicleData(); let self = deliveryData.deliverySelfVO;
console.log('___________________-->', vehicle); let vehicle = await this.getvehicleData();
let driver = await this.getMasterDriverData(); console.log('___________________-->', vehicle);
let a = []; let driver = await this.getMasterDriverData();
let b = []; let a = [];
let vehicleInfo = []; let b = [];
vehicle.forEach(item => { let vehicleInfo = [];
self.forEach(s => { vehicle.forEach(item => {
if (item.id === s.vehicleId) { self.forEach(s => {
a.push(s.vehicleId); if (item.id === s.vehicleId) {
vehicleInfo.push(item); a.push(s.vehicleId);
} vehicleInfo.push(item);
if (s.isMaster === 2) { }
this.driverForm.masterVehicleNub = s.vehicleNub; if (s.isMaster === 2) {
} this.driverForm.masterVehicleNub = s.vehicleNub;
}
});
}); });
}); this.vehticleList = a;
this.vehticleList = a; this.vehicleIds = a;
this.vehicleIds = a; console.log(' this.vehicleIds', this.vehicleIds);
console.log(' this.vehicleIds', this.vehicleIds); this.vehticleInfo = vehicleInfo;
this.vehticleInfo = vehicleInfo; let driverInfo = [];
let driverInfo = []; driver.forEach(item => {
driver.forEach(item => { self.forEach(s => {
self.forEach(s => { if (item.id === s.driverId) {
if (item.id === s.driverId) { b.push(s.driverId);
b.push(s.driverId); driverInfo.push(item);
driverInfo.push(item); }
} if (s.isMaster === 2) {
if (s.isMaster === 2) { this.driverForm.masterDriverName = s.driverName;
this.driverForm.masterDriverName = s.driverName; }
} });
}); });
}); console.log('***********', b);
console.log('***********', b); this.deliveryDriver = b;
this.deliveryDriver = b; this.driverList = b;
this.driverList = b; this.driverInfo = driverInfo;
this.driverInfo = driverInfo; this.loadingObj.pageLoading = false;
this.loadingObj.pageLoading=false } else {
} else { let deliveryTripartiteVO = deliveryData.deliveryTripartiteVO;
let deliveryTripartiteVO = deliveryData.deliveryTripartiteVO; this.aaa = false;
this.aaa = false; this.bbb = true;
this.bbb = true; // this.form.tripartiteSource = deliveryTripartiteVO.distributionCompanyId;
// this.form.tripartiteSource = deliveryTripartiteVO.distributionCompanyId; this.waixieForm.tripartiteSource = '1';
this.waixieForm.tripartiteSource = '1'; this.waixieForm.driverName = deliveryTripartiteVO.driverName;
this.waixieForm.driverName = deliveryTripartiteVO.driverName; this.waixieForm.vehicleNum = deliveryTripartiteVO.vehicleNum;
this.waixieForm.vehicleNum = deliveryTripartiteVO.vehicleNum; this.waixieForm.driverPhone = deliveryTripartiteVO.driverPhone;
this.waixieForm.driverPhone = deliveryTripartiteVO.driverPhone; this.waixieForm.deliveryFee = deliveryTripartiteVO.deliveryFee;
this.waixieForm.deliveryFee = deliveryTripartiteVO.deliveryFee; this.loadingObj.pageLoading = false;
this.loadingObj.pageLoading=false }
} })
}).catch(()=>{ .catch(() => {})
.finally(() => {
}).finally(()=>{ this.loading = false;
});
this.loading = false;
});
} }
}, },
}, },
}; };

Write Preview
Loading…
Cancel
Save