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 a7c6a286..7cd3f7fc 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 @@ @@ -133,10 +130,6 @@ -
@@ -159,9 +152,6 @@ /> -
@@ -175,30 +165,14 @@
-
- -

计划装货时间：{{i?.goodsResource?.[0]?.loadTime}}

+

计划装货时间：{{i?.loadPlanTime}}

- -

计划卸货时间：{{i?.goodsResource?.[0]?.unloadingTime}}

+

计划卸货时间：{{i?.unloadPlanTime}}

@@ -301,10 +275,10 @@ - + - +
总计：{{i?.total | currency: '￥'}}（运费￥3500.00，附加运费￥191.98，附加费率3.5%）
diff --git a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.less b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.less index 1e8af457..0eb3feb0 100644 --- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.less +++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.less @@ -80,5 +80,7 @@ width : 300px; height: 180px; } - + .ant-col-10 { + flex: none; + } } \ No newline at end of file diff --git a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts index ec32b265..e1e85e8f 100644 --- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts +++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts @@ -2,14 +2,14 @@ import { ViewChild } from '@angular/core'; /* * @Author: your name * @Date: 2021-12-03 15:31:52 - * @LastEditTime: 2021-12-24 16:27:03 + * @LastEditTime: 2021-12-24 16:50:42 * @LastEditors: Please set LastEditors * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath: \tms-obc-web\src\app\routes\order-management\components\vehicle-detail\vehicle-detail.component.ts */ import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; -import { ActivatedRoute } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; import { STColumn, STComponent } from '@delon/abc/st'; import { SFComponent, SFSchema, SFSelectWidgetSchema, SFUISchema, SFUploadWidgetSchema } from '@delon/form'; import { _HttpClient } from '@delon/theme'; @@ -68,6 +68,7 @@ loadTime: any; // 货源单设置回显 ui: SFUISchema = {}; constructor( private route: ActivatedRoute, + private router: Router, private msgSrv: NzMessageService, public service: OrderManagementService, private modalService: NzModalService, @@ -424,7 +425,7 @@ loadTime: any; // 货源单设置回显 } console.log('dirvingMessage=>>>>>>'+ this.dirvingMessage) console.log( this.dirvingMessage) - console.log( this.st) + console.log( this.st._data) const params = { id: this.id, unLoadingPlaceDTOList: [...this.startInfo, ...this.endInfo,], @@ -435,7 +436,7 @@ loadTime: any; // 货源单设置回显 ...this.sf4.value }], // 运费信息 - billExpenseDetailDTOList: this.dirvingMessage, + billExpenseDetailDTOList: this.st._data, // 收款人 payeeId: this.dirverPhone, dirverBankCard: this.dirverBankCard, // 银行卡 @@ -454,6 +455,12 @@ loadTime: any; // 货源单设置回显 console.log(params) this.service.request(this.service.$api_set_modifyWholeOrder, params).subscribe((res: any) => { console.log(res) + if(res) { + this.service.msgSrv.success('修改成功！'); + this.router.navigate(['/order-management/vehicle']); + } else { + this.service.msgSrv.error(res?.msg); + } }) } addPreZero(num: any){ @@ -464,68 +471,6 @@ loadTime: any; // 货源单设置回显 } } // -------------------装卸货信息处理 - addStartInfo(event: any) { - if (this.startInfo.length < 5) { - const controlId = this.startInfo.length; - this.startInfo.push({ - detailedAddress: '', - appUserName: '', - contractTelephone: '', - latitude: '', - longitude: '', - province: '', - city: '', - area: '', - type: 1 - }); - this.validateForm1.addControl(`loadAddress${controlId}`, new FormControl(null, Validators.required)); - this.validateForm1.addControl(`loadName${controlId}`, new FormControl(null, Validators.required)); - this.validateForm1.addControl(`loadPhone${controlId}`, new FormControl(null, Validators.required)); - } - } - subStartInfo(event: any, index: number, id?:any) { - console.log(event, index, id) - if(id) { - this.service.request(this.service.$api_delete_Wholedeletebatch, [id]).subscribe((res) => { - console.log(res) - }) - } - this.startInfo.splice(index, 1); - this.validateForm1.removeControl(`loadAddress${index}`); - this.validateForm1.removeControl(`loadName${index}`); - this.validateForm1.removeControl(`loadPhone${index}`); - } - subEndInfo(event: any, index: number, id?:any) { - if(id) { - this.service.request(this.service.$api_delete_Wholedeletebatch, [id]).subscribe((res) => { - console.log(res) - }) - } - console.log(event, index, id) - this.endInfo.splice(index, 1); - this.validateForm1.removeControl(`unloadAddress${index}`); - this.validateForm1.removeControl(`unloadName${index}`); - this.validateForm1.removeControl(`unloadPhone${index}`); - } - addEndInfo(event: any) { - if (this.addEndInfo.length < 5) { - const controlId = this.endInfo.length; - this.endInfo.push({ - detailedAddress: '', - appUserName: '', - contractTelephone: '', - latitude: '', - longitude: '', - province: '', - city: '', - area: '', - type: 2 - }); - this.validateForm1.addControl(`unloadAddress${controlId}`, new FormControl(null, Validators.required)); - this.validateForm1.addControl(`unloadName${controlId}`, new FormControl(null, Validators.required)); - this.validateForm1.addControl(`unloadPhone${controlId}`, new FormControl(null, Validators.required)); - } - } // 打开地图 openMap(type: string, index: number) { const modalRef = this.modalService.create({