Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

车辆对接

Browse Source
This commit is contained in:
wangshiming
2021-12-24 16:30:58 +08:00
parent 4011f13d30
commit 86ca0d4549
9 changed files with 211 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
View File

@ -186,10 +186,10 @@
<!-- <nz-form-item>
<nz-form-label [nzSpan]="4" nzRequired>装货时间</nz-form-label>
<nz-form-control [nzErrorTip]="'请输入装货时间'">
<nz-date-picker nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss" formControlName="loadingTime" [(ngModel)]="loadingTime"></nz-date-picker>
<nz-date-picker nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss" formControlName="loadTime" [(ngModel)]="loadTime"></nz-date-picker>
</nz-form-control>
</nz-form-item> -->
<p class="time-info">计划装货时间：{{i?.goodsResource?.[0]?.loadingTime}}</p>
<p class="time-info">计划装货时间：{{i?.goodsResource?.[0]?.loadTime}}</p>
</div>
<div nz-col [nzSpan]="8">
<!-- <nz-form-item>
@ -284,11 +284,11 @@
{{i?.goodsInfoList?.[0]?.weight}}顿,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件
</ng-template>
<ng-template sf-template="loadingTime" let-item let-ui="ui">
<nz-date-picker nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss" [(ngModel)]="loadingTime"></nz-date-picker>
<ng-template sf-template="loadTime" let-item let-ui="ui">
<nz-date-picker nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss" [(ngModel)]="loadTime"></nz-date-picker>
</ng-template>
<ng-template sf-template="unloadingTime" let-item let-ui="ui">
<nz-date-picker nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss" [(ngModel)]="unloadingTime"></nz-date-picker>
<ng-template sf-template="unloadTime" let-item let-ui="ui">
<nz-date-picker nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss" [(ngModel)]="unloadTime"></nz-date-picker>
</ng-template>
</sf>
@ -299,7 +299,7 @@
<nz-card nzTitle="运费信息" id="distannce3">
<st #st [data]="i?.billExpenseDetails" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
<st #st [data]="dirvingMessage" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
<ng-template st-row="price" let-item let-index="index">
<input nz-input [ngModel]="item?.price" (ngModelChange)="st.setRow(index, { name: $event })" />
</ng-template>

53
src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
View File

@ -2,7 +2,7 @@ import { ViewChild } from '@angular/core';
/*
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2021-12-24 15:35:18
* @LastEditTime: 2021-12-24 16:27:03
* @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
@ -43,13 +43,14 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
totalTime = 0.0; //路程总时间
startInfo: any = []; // 装货信息
endInfo: any = []; // 卸货信息
unloadingTime: any; // 货源单设置回显
loadingTime: any; // 货源单设置回显
unloadTime: any; // 货源单设置回显
loadTime: any; // 货源单设置回显
sf3data: any; // 货源单设置回显
sf4data: any; // 货源单设置回显
dirverPhone: any; // 货源单设置回显
dirverBankCard: any; // 货源单设置回显
listImagUrls: any[] = []; // 货源单设置回显
dirvingMessage = [];
imges: any;
previewImage1 = '';
previewVisible1 = false;
@ -76,8 +77,8 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
private envSrv: EAEnvironmentService,
) {
this.validateForm1 = fb.group({
loadingTime: [null, []],
unloadingTime: [null, []],
loadTime: [null, []],
unloadTime: [null, []],
});
}
@ -299,7 +300,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
})
});
this.listImagUrls = arr;
this.sf4data = res?.goodsInfoList?.[0]
// 对装卸货信息进行初始化
res?.unLoadingPlaceList.forEach((element: any) => {
if(element.type === 1 || element.type === '1') {
@ -388,8 +389,10 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
};
}
// 发车时间到车时间初始化
this.loadingTime = res.loadingTime
this.loadingTime = res.unloadTime
this.loadTime = res.loadTime
this.unloadTime = res.unloadTime
this.dirvingMessage = res.billExpenseDetails;
}
})
}
@ -411,17 +414,17 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
}
})
}
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.unloadTime) !== 'string' ){
var c = new Date(this.unloadTime);
this.unloadTime = 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())
if(typeof(this.loadTime) !== 'string' ) {
var c = new Date(this.loadTime);
this.loadTime = 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)
console.log(this.sf.value)
console.log('dirvingMessage=>>>>>>'+ this.dirvingMessage)
console.log( this.dirvingMessage)
console.log( this.st)
const params = {
id: this.id,
unLoadingPlaceDTOList: [...this.startInfo, ...this.endInfo,],
@ -432,14 +435,14 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
...this.sf4.value
}],
// 运费信息
billExpenseDetailDTOList: this.i?.billExpenseDetails,
billExpenseDetailDTOList: this.dirvingMessage,
// 收款人
payeeId: this.dirverPhone,
dirverBankCard: this.dirverBankCard, // 银行卡
// 发车时间
loadPlanTime: this.loadingTime,
loadTime: this.loadTime,
// 到车时间
unloadPlanTime: this.loadingTime,
unloadTime: this.unloadTime,
loadingLadingBillFilePath: this.sf.value?.loadingLadingBillFilePath?.data ? this.sf.value?.loadingLadingBillFilePath.data.fullFilePath : this.sf.value?.loadingLadingBillFilePath?.url,
loadingPeopleVehiclesGoodsFilePath: this.sf.value?.loadingPeopleVehiclesGoodsFilePath?.data ? this.sf.value?.loadingPeopleVehiclesGoodsFilePath.data.fullFilePath : this.sf.value?.loadingPeopleVehiclesGoodsFilePath?.url,
@ -689,7 +692,7 @@ initSF4() {
placeholder: '请输入'
}
},
loadingTime: {
loadTime: {
type: 'string',
title: '发车时间',
ui: {
@ -697,7 +700,7 @@ initSF4() {
placeholder: '请输入'
}
},
unloadingTime: {
unloadTime: {
type: 'string',
title: '到车时间',
ui: {
@ -707,7 +710,7 @@ initSF4() {
},
},
required: ['weight','loadingTime','unloadingTime']
required: ['weight','loadTime','unloadTime']
};
this.ui4 = {
'*': {
@ -732,10 +735,10 @@ initSF4() {
$drivers: {
grid: { span: 12 }
},
$loadingTime: {
$loadTime: {
grid: { span: 12 }
},
$unloadingTime: {
$unloadTime: {
grid: { span: 12 }
},
};