diff --git a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html index a86f31d0..5ad7a904 100644 --- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html +++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html @@ -1,7 +1,7 @@ 0) { this.listImagUrls?.forEach((res :any) => { @@ -397,15 +386,13 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { } }) } - console.log(imgList) - - if(typeof(this.validateForm1.value.unloadingTime) !== 'string' ) { - var c = new Date(this.validateForm1.value.unloadingTime); - this.validateForm1.value.unloadingTime = c.getFullYear() + '-' + this.addPreZero(c.getMonth() + 1) + '-' + this.addPreZero(c.getDate()) + ' ' + this.addPreZero(c.getHours()) + ':' + this.addPreZero(c.getMinutes()) + ':' + this.addPreZero(c.getSeconds()) + if(typeof(this.unloadingTime) !== 'string' ){ + var c = new Date(this.unloadingTime); + this.unloadingTime = c.getFullYear() + '-' + this.addPreZero(c.getMonth() + 1) + '-' + this.addPreZero(c.getDate()) + ' ' + this.addPreZero(c.getHours()) + ':' + this.addPreZero(c.getMinutes()) + ':' + this.addPreZero(c.getSeconds()) } - if(typeof(this.validateForm1.value.loadingTime) !== 'string' ) { - var c = new Date(this.validateForm1.value.loadingTime); - this.validateForm1.value.loadingTime = c.getFullYear() + '-' + this.addPreZero(c.getMonth() + 1) + '-' + this.addPreZero(c.getDate()) + ' ' + this.addPreZero(c.getHours()) + ':' + this.addPreZero(c.getMinutes()) + ':' + this.addPreZero(c.getSeconds()) + if(typeof(this.loadingTime) !== 'string' ) { + var c = new Date(this.loadingTime); + this.loadingTime = c.getFullYear() + '-' + this.addPreZero(c.getMonth() + 1) + '-' + this.addPreZero(c.getDate()) + ' ' + this.addPreZero(c.getHours()) + ':' + this.addPreZero(c.getMinutes()) + ':' + this.addPreZero(c.getSeconds()) } console.log(this.sf3.value) console.log(this.sf4.value) @@ -413,36 +400,33 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { id: this.id, unLoadingPlaceList: [...this.startInfo, ...this.endInfo,], goodsResource: [{ - id: '', - enterpriseInfoId: 'xxx', - + id: this.i?.goodsResource?.id, + enterpriseInfoId: this.sf3.value?.enterpriseInfoId, }], receiptFilePath: imgList, goodsInfoList: [{ - id: '', - goodsName: 'xxx', - weight: '', - volume: '', - number: '', + id: this.i?.goodsInfoList?.[0].id, + goodsName: this.sf3.value?.goodsName, + ...this.sf4.value }], // 运费信息 - expenseList: this.i?.i?.billExpenseDetails, + expenseList: this.i?.billExpenseDetails, // 收款人 - payeeId: '', - 银行卡: '', + payeeId: this.dirverPhone, + dirverBankCard: this.dirverBankCard, // 银行卡 // 发车时间 - loadPlanTime: '', + loadPlanTime: this.loadingTime, // 到车时间 - unloadPlanTime: '', - loadingLadingBillFilePath: '', - loadingPeopleVehiclesGoodsFilePath: '', - unloadingLadingBillFilePath: '', - unloadingPeopleVehiclesGoodsFilePath: '', + unloadPlanTime: this.loadingTime, + loadingLadingBillFilePath: this.sf.value?.loadingLadingBillFilePath.data.fullFilePath, + loadingPeopleVehiclesGoodsFilePath: this.sf.value?.loadingPeopleVehiclesGoodsFilePath.data.fullFilePath, + unloadingLadingBillFilePath: this.sf.value?.unloadingLadingBillFilePath.data.fullFilePath, + unloadingPeopleVehiclesGoodsFilePath: this.sf.value?.unloadingPeopleVehiclesGoodsFilePath.data.fullFilePath, } console.log(params) - // this.service.request(this.service.$api_set_getWholeOrderDetail, params).subscribe((res: any) => { - // console.log(res) - // }) + this.service.request(this.service.$api_set_getWholeOrderDetail, params).subscribe((res: any) => { + console.log(res) + }) } addPreZero(num: any){ if(num<10){ diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html index 8d28419f..f5d0249f 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html @@ -1,7 +1,7 @@