fix bug
This commit is contained in:
wangshiming
@ -4,7 +4,7 @@
|
||||
* @Author : Shiming
|
||||
* @Date : 2021-12-24 16:58:02
|
||||
* @LastEditors : Shiming
|
||||
* @LastEditTime : 2022-03-11 11:24:51
|
||||
* @LastEditTime : 2022-03-11 17:51:15
|
||||
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.ts
|
||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||
*/
|
||||
@ -42,13 +42,13 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
|
||||
validateForm1: FormGroup;
|
||||
id = this.route.snapshot.params.id;
|
||||
@ViewChild('distannce3', { static: false })
|
||||
i: any= {unLoadingPlaceList:[]};
|
||||
i: any = { unLoadingPlaceList: [] };
|
||||
totalDistance = 0.0; //总里程
|
||||
totalTime = 0.0; //路程总时间
|
||||
startInfo: any = []; // 装货信息
|
||||
endInfo: any = []; // 卸货信息
|
||||
unloadTime: any; // 货源单设置回显
|
||||
loadTime: any; // 货源单设置回显
|
||||
loadTime: any; // 货源单设置回显
|
||||
sf3data: any; // 货源单设置回显
|
||||
sf4data: any; // 货源单设置回显
|
||||
dirverPhone: any; // 货源单设置回显
|
||||
@ -75,7 +75,7 @@ loadTime: any; // 货源单设置回显
|
||||
ui: SFUISchema = {};
|
||||
logColumns2: STColumn[] = [
|
||||
{ title: '时间', index: 'vinOutTime' },
|
||||
{ title: '地点', index: 'cityName' },
|
||||
{ title: '地点', index: 'cityName' }
|
||||
];
|
||||
logColumns: STColumn[] = [
|
||||
{ title: '款项', index: 'expenseCodeLabel' },
|
||||
@ -98,8 +98,8 @@ loadTime: any; // 货源单设置回显
|
||||
}
|
||||
];
|
||||
trajectory = 'car';
|
||||
mapList:any[] = []; //地图点位数据组
|
||||
addressItems:any[] = []; //打点地址数据组
|
||||
mapList: any[] = []; //地图点位数据组
|
||||
addressItems: any[] = []; //打点地址数据组
|
||||
constructor(
|
||||
private route: ActivatedRoute,
|
||||
private router: Router,
|
||||
@ -110,19 +110,19 @@ loadTime: any; // 货源单设置回显
|
||||
public shipperservice: ShipperBaseService,
|
||||
fb: FormBuilder,
|
||||
private envSrv: EAEnvironmentService,
|
||||
private ar: ActivatedRoute,
|
||||
private ar: ActivatedRoute
|
||||
) {
|
||||
this.validateForm1 = fb.group({
|
||||
loadTime: [null, []],
|
||||
unloadTime: [null, []],
|
||||
unloadTime: [null, []]
|
||||
});
|
||||
}
|
||||
|
||||
ngOnInit(): void {
|
||||
this.initData()
|
||||
this.initData();
|
||||
this.initSF3();
|
||||
this.initSF4();
|
||||
this.getTrajectory()
|
||||
this.getTrajectory();
|
||||
}
|
||||
initSF() {
|
||||
this.schema = {
|
||||
@ -141,7 +141,7 @@ loadTime: any; // 货源单设置回显
|
||||
urlReName: 'data.fullFileWatermarkPath',
|
||||
descriptionI18n: '提货单',
|
||||
data: {
|
||||
appId: this.envSrv.env.appId,
|
||||
appId: this.envSrv.env.appId
|
||||
},
|
||||
name: 'multipartFile',
|
||||
beforeUpload: (file: any, fileList: any) => {
|
||||
@ -163,8 +163,8 @@ loadTime: any; // 货源单设置回显
|
||||
});
|
||||
},
|
||||
multiple: false,
|
||||
listType: 'picture-card',
|
||||
} as SFUploadWidgetSchema,
|
||||
listType: 'picture-card'
|
||||
} as SFUploadWidgetSchema
|
||||
},
|
||||
loadingPeopleVehiclesGoodsFilePath: {
|
||||
type: 'string',
|
||||
@ -180,7 +180,7 @@ loadTime: any; // 货源单设置回显
|
||||
urlReName: 'data.fullFileWatermarkPath',
|
||||
descriptionI18n: '人车货照片',
|
||||
data: {
|
||||
appId: this.envSrv.env.appId,
|
||||
appId: this.envSrv.env.appId
|
||||
},
|
||||
name: 'multipartFile',
|
||||
beforeUpload: (file: any, fileList: any) => {
|
||||
@ -202,24 +202,16 @@ loadTime: any; // 货源单设置回显
|
||||
});
|
||||
},
|
||||
multiple: false,
|
||||
listType: 'picture-card',
|
||||
} as SFUploadWidgetSchema,
|
||||
},
|
||||
no4: {
|
||||
type: 'string',
|
||||
title: '',
|
||||
ui: {
|
||||
widget: 'text',
|
||||
},
|
||||
default: '',
|
||||
listType: 'picture-card'
|
||||
} as SFUploadWidgetSchema
|
||||
},
|
||||
no7: {
|
||||
type: 'string',
|
||||
title: '',
|
||||
ui: {
|
||||
widget: 'text',
|
||||
widget: 'text'
|
||||
},
|
||||
default: '',
|
||||
default: ''
|
||||
},
|
||||
unloadingLadingBillFilePath: {
|
||||
type: 'string',
|
||||
@ -235,7 +227,7 @@ loadTime: any; // 货源单设置回显
|
||||
urlReName: 'data.fullFileWatermarkPath',
|
||||
descriptionI18n: '提货单',
|
||||
data: {
|
||||
appId: this.envSrv.env.appId,
|
||||
appId: this.envSrv.env.appId
|
||||
},
|
||||
name: 'multipartFile',
|
||||
beforeUpload: (file: any, fileList: any) => {
|
||||
@ -257,8 +249,8 @@ loadTime: any; // 货源单设置回显
|
||||
});
|
||||
},
|
||||
multiple: false,
|
||||
listType: 'picture-card',
|
||||
} as SFUploadWidgetSchema,
|
||||
listType: 'picture-card'
|
||||
} as SFUploadWidgetSchema
|
||||
},
|
||||
unloadingPeopleVehiclesGoodsFilePath: {
|
||||
type: 'string',
|
||||
@ -274,7 +266,7 @@ loadTime: any; // 货源单设置回显
|
||||
urlReName: 'data.fullFileWatermarkPath',
|
||||
descriptionI18n: '人车货照片',
|
||||
data: {
|
||||
appId: this.envSrv.env.appId,
|
||||
appId: this.envSrv.env.appId
|
||||
},
|
||||
name: 'multipartFile',
|
||||
beforeUpload: (file: any, fileList: any) => {
|
||||
@ -296,62 +288,62 @@ loadTime: any; // 货源单设置回显
|
||||
});
|
||||
},
|
||||
multiple: false,
|
||||
listType: 'picture-card',
|
||||
} as SFUploadWidgetSchema,
|
||||
listType: 'picture-card'
|
||||
} as SFUploadWidgetSchema
|
||||
},
|
||||
no5: {
|
||||
type: 'string',
|
||||
title: '',
|
||||
ui: {
|
||||
widget: 'text',
|
||||
widget: 'text'
|
||||
},
|
||||
default: '',
|
||||
default: ''
|
||||
},
|
||||
no6: {
|
||||
type: 'string',
|
||||
title: '',
|
||||
ui: {
|
||||
widget: 'text',
|
||||
widget: 'text'
|
||||
},
|
||||
default: '',
|
||||
default: ''
|
||||
}
|
||||
},
|
||||
},
|
||||
required: ['loadingLadingBillFilePath','unloadingLadingBillFilePath']
|
||||
required: ['loadingLadingBillFilePath', 'unloadingLadingBillFilePath']
|
||||
};
|
||||
this.ui = {
|
||||
'*': {
|
||||
spanLabelFixed: 100,
|
||||
grid: { span: 20 }
|
||||
},
|
||||
$unloadingLadingBillFilePath: { grid: { span: 12} },
|
||||
$unloadingPeopleVehiclesGoodsFilePath: { grid: { span: 12} },
|
||||
$loadingLadingBillFilePath: { grid: { span: 12} },
|
||||
$loadingPeopleVehiclesGoodsFilePath: { grid: { span: 12} },
|
||||
$no5: { grid: { span: 24} },
|
||||
$unloadingLadingBillFilePath: { grid: { span: 12 } },
|
||||
$unloadingPeopleVehiclesGoodsFilePath: { grid: { span: 12 } },
|
||||
$loadingLadingBillFilePath: { grid: { span: 12 } },
|
||||
$loadingPeopleVehiclesGoodsFilePath: { grid: { span: 12 } },
|
||||
$no5: { grid: { span: 24 } }
|
||||
};
|
||||
}
|
||||
initData() {
|
||||
this.service.request(this.service.$api_getBulkBillDetail, {id: this.id}).subscribe(res => {
|
||||
this.service.request(this.service.$api_getBulkBillDetail, { id: this.id }).subscribe(res => {
|
||||
if (res) {
|
||||
this.i = res;
|
||||
this.billExpenses = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'TRA');
|
||||
this.initSF();
|
||||
// 对装货凭证进行初始化
|
||||
let arr : any= []
|
||||
let arr: any = [];
|
||||
res?.receiptFilePath.forEach((element: any, index: any) => {
|
||||
arr.push( {
|
||||
arr.push({
|
||||
url: element,
|
||||
status: 'done',
|
||||
uid: index
|
||||
})
|
||||
});
|
||||
this.sf4data
|
||||
});
|
||||
this.sf4data;
|
||||
this.listImagUrls = arr;
|
||||
// this.sf4data = res?.goodsInfoList?.[0]
|
||||
this.sf4data = {
|
||||
...res,
|
||||
...res?.goodsInfoList?.[0]
|
||||
}
|
||||
};
|
||||
this.sf3data = {
|
||||
goodsTypeId: res?.goodsInfoList[0]?.goodsTypeId || '',
|
||||
goodsTypeName: res?.goodsInfoList[0]?.goodsTypeName || '',
|
||||
@ -364,7 +356,7 @@ loadTime: any; // 货源单设置回显
|
||||
this.changeGoodsType(this.sf3data.goodsTypeId, { label: this.sf3data.goodsTypeName, value: this.sf3data.goodsTypeId });
|
||||
// 对装卸货信息进行初始化
|
||||
res?.unLoadingPlaceList.forEach((element: any) => {
|
||||
if(element.type === 1 || element.type === '1') {
|
||||
if (element.type === 1 || element.type === '1') {
|
||||
const controlId = this.startInfo.length;
|
||||
this.startInfo.push({
|
||||
detailedAddress: element.detailedAddress,
|
||||
@ -377,11 +369,11 @@ loadTime: any; // 货源单设置回显
|
||||
area: element.area,
|
||||
type: element.type,
|
||||
id: element.id
|
||||
})
|
||||
});
|
||||
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));
|
||||
} else if(element.type === 2 || element.type === '2') {
|
||||
} else if (element.type === 2 || element.type === '2') {
|
||||
const controlId = this.endInfo.length;
|
||||
this.endInfo.push({
|
||||
detailedAddress: element?.detailedAddress,
|
||||
@ -394,74 +386,72 @@ loadTime: any; // 货源单设置回显
|
||||
area: element.area,
|
||||
type: element.type,
|
||||
id: element.id
|
||||
})
|
||||
});
|
||||
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));
|
||||
}
|
||||
});
|
||||
// 对装货凭证进行初始化
|
||||
if (res.loadingLadingBillFilePath) {
|
||||
this.formData = {
|
||||
loadingLadingBillFilePath: [
|
||||
{
|
||||
uid: 'logo',
|
||||
name: 'LOGO',
|
||||
status: 'done',
|
||||
url: res.loadingLadingBillFilePath,
|
||||
url: res?.loadingLadingBillFilePath,
|
||||
response: {
|
||||
url: res.loadingLadingBillFilePath,
|
||||
},
|
||||
},
|
||||
url: res?.loadingLadingBillFilePath
|
||||
}
|
||||
}
|
||||
],
|
||||
loadingPeopleVehiclesGoodsFilePath: [
|
||||
{
|
||||
uid: 'logo',
|
||||
name: 'LOGO',
|
||||
status: 'done',
|
||||
url: res.loadingPeopleVehiclesGoodsFilePath,
|
||||
url: res?.loadingPeopleVehiclesGoodsFilePath,
|
||||
response: {
|
||||
url: res.loadingPeopleVehiclesGoodsFilePath,
|
||||
},
|
||||
},
|
||||
url: res?.loadingPeopleVehiclesGoodsFilePath
|
||||
}
|
||||
}
|
||||
],
|
||||
unloadingLadingBillFilePath: [
|
||||
{
|
||||
uid: 'logo',
|
||||
name: 'LOGO',
|
||||
status: 'done',
|
||||
url: res.unloadingLadingBillFilePath,
|
||||
url: res?.unloadingLadingBillFilePath,
|
||||
response: {
|
||||
url: res.unloadingLadingBillFilePath,
|
||||
},
|
||||
},
|
||||
url: res?.unloadingLadingBillFilePath
|
||||
}
|
||||
}
|
||||
],
|
||||
unloadingPeopleVehiclesGoodsFilePath: [
|
||||
{
|
||||
uid: 'logo',
|
||||
name: 'LOGO',
|
||||
status: 'done',
|
||||
url: res.unloadingPeopleVehiclesGoodsFilePath,
|
||||
url: res?.unloadingPeopleVehiclesGoodsFilePath,
|
||||
response: {
|
||||
url: res.unloadingPeopleVehiclesGoodsFilePath,
|
||||
},
|
||||
},
|
||||
],
|
||||
};
|
||||
url: res?.unloadingPeopleVehiclesGoodsFilePath
|
||||
}
|
||||
}
|
||||
]
|
||||
};
|
||||
// 发车时间到车时间初始化
|
||||
this.loadTime = res.loadTime
|
||||
this.unloadTime = res.unloadTime
|
||||
this.dirvingMessage = res.billExpenseDetails;
|
||||
this.loadTime = res?.loadTime;
|
||||
this.unloadTime = res?.unloadTime;
|
||||
this.dirvingMessage = res?.billExpenseDetails;
|
||||
// 计算里程，时间
|
||||
if (this.startInfo[0]?.area && this.endInfo[0]?.area) {
|
||||
this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => {
|
||||
this.totalDistance = res.distance;
|
||||
this.totalTime = res.time;
|
||||
this.totalDistance = res?.distance;
|
||||
this.totalTime = res?.time;
|
||||
});
|
||||
}
|
||||
}
|
||||
})
|
||||
});
|
||||
}
|
||||
|
||||
goBack() {
|
||||
@ -479,39 +469,66 @@ loadTime: any; // 货源单设置回显
|
||||
});
|
||||
this.sf3.validator({ emitError: true });
|
||||
this.sf4.validator({ emitError: true });
|
||||
if (this.validateForm1.invalid || !this.sf3.valid || !this.sf4.valid ) {
|
||||
if (this.validateForm1.invalid || !this.sf3.valid || !this.sf4.valid) {
|
||||
this.service.msgSrv.warning('请完善必填项！');
|
||||
return;
|
||||
}
|
||||
if ((this.sf4.value?.acceptWeight > this.i?.goodsInfoList?.[0]?.weight) || (this.sf4.value?.settlementWeight.settlementWeight > this.i?.goodsInfoList?.[0]?.weight) ) {
|
||||
if (
|
||||
this.sf4.value?.acceptWeight > this.i?.goodsInfoList?.[0]?.weight ||
|
||||
this.sf4.value?.settlementWeight.settlementWeight > this.i?.goodsInfoList?.[0]?.weight
|
||||
) {
|
||||
this.service.msgSrv.warning('装货重量/卸货重量不能大于货物重量！');
|
||||
return;
|
||||
}
|
||||
let imgList : any= [];
|
||||
if(this.listImagUrls.length > 0) {
|
||||
this.listImagUrls?.forEach((res :any) => {
|
||||
if(res.url) {
|
||||
imgList.push(res.url)
|
||||
let imgList: any = [];
|
||||
if (this.listImagUrls.length > 0) {
|
||||
this.listImagUrls?.forEach((res: any) => {
|
||||
if (res?.url) {
|
||||
imgList.push(res?.url);
|
||||
}
|
||||
})
|
||||
});
|
||||
}
|
||||
if(typeof(this.unloadTime) !== 'string' ){
|
||||
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())
|
||||
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.loadTime) !== 'string' ) {
|
||||
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())
|
||||
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());
|
||||
}
|
||||
const params = {
|
||||
id: this.id,
|
||||
unLoadingPlaceDTOList: [...this.startInfo, ...this.endInfo,],
|
||||
unLoadingPlaceDTOList: [...this.startInfo, ...this.endInfo],
|
||||
receiptFilePath: imgList,
|
||||
goodsInfoDTOList: [{
|
||||
goodsInfoDTOList: [
|
||||
{
|
||||
id: this.i?.goodsInfoList?.[0].id,
|
||||
goodsName: this.sf3.value?.goodsName,
|
||||
...this.sf4.value
|
||||
}],
|
||||
}
|
||||
],
|
||||
// 运费信息
|
||||
// 收款人
|
||||
payeeId: this.dirverPhone,
|
||||
@ -524,26 +541,34 @@ loadTime: any; // 货源单设置回显
|
||||
acceptVolume: this.sf4.value?.acceptVolume,
|
||||
settlementWeight: this.sf4.value?.settlementWeight,
|
||||
settlementVolume: this.sf4.value?.settlementVolume,
|
||||
loadingLadingBillFilePath: this.sf.value?.loadingLadingBillFilePath?.data ? this.sf.value?.loadingLadingBillFilePath.data.fullFilePath : this.sf.value?.loadingLadingBillFilePath?.url,
|
||||
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,
|
||||
loadingPeopleVehiclesGoodsFilePath: this.sf.value?.loadingPeopleVehiclesGoodsFilePath?.data
|
||||
? this.sf.value?.loadingPeopleVehiclesGoodsFilePath.data.fullFilePath
|
||||
: this.sf.value?.loadingPeopleVehiclesGoodsFilePath?.url,
|
||||
|
||||
unloadingLadingBillFilePath: this.sf.value?.unloadingLadingBillFilePath?.data ? this.sf.value?.unloadingLadingBillFilePath.data.fullFilePath : this.sf.value?.unloadingLadingBillFilePath?.url,
|
||||
unloadingLadingBillFilePath: this.sf.value?.unloadingLadingBillFilePath?.data
|
||||
? this.sf.value?.unloadingLadingBillFilePath.data.fullFilePath
|
||||
: this.sf.value?.unloadingLadingBillFilePath?.url,
|
||||
|
||||
unloadingPeopleVehiclesGoodsFilePath: this.sf.value?.unloadingPeopleVehiclesGoodsFilePath?.data ? this.sf.value?.unloadingPeopleVehiclesGoodsFilePath.data.fullFilePath : this.sf.value?.unloadingPeopleVehiclesGoodsFilePath?.url,
|
||||
}
|
||||
unloadingPeopleVehiclesGoodsFilePath: this.sf.value?.unloadingPeopleVehiclesGoodsFilePath?.data
|
||||
? this.sf.value?.unloadingPeopleVehiclesGoodsFilePath.data.fullFilePath
|
||||
: this.sf.value?.unloadingPeopleVehiclesGoodsFilePath?.url
|
||||
};
|
||||
this.service.request(this.service.$api_set_modifyBulkOrder, params).subscribe((res: any) => {
|
||||
if(res) {
|
||||
if (res) {
|
||||
this.service.msgSrv.success('修改成功！');
|
||||
this.router.navigate(['/order-management/bulk/bulk-detail/', this.id]);
|
||||
} else {
|
||||
this.service.msgSrv.error(res?.msg);
|
||||
}
|
||||
})
|
||||
});
|
||||
}
|
||||
addPreZero(num: any){
|
||||
if(num<10){
|
||||
return '0'+num;
|
||||
addPreZero(num: any) {
|
||||
if (num < 10) {
|
||||
return '0' + num;
|
||||
} else {
|
||||
return num;
|
||||
}
|
||||
@ -589,8 +614,8 @@ loadTime: any; // 货源单设置回显
|
||||
|
||||
if (this.startInfo[0]?.area && this.endInfo[0]?.area) {
|
||||
this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe((res: any) => {
|
||||
this.totalDistance = res.distance;
|
||||
this.totalTime = res.time;
|
||||
this.totalDistance = res?.distance;
|
||||
this.totalTime = res?.time;
|
||||
});
|
||||
}
|
||||
}
|
||||
@ -672,7 +697,7 @@ loadTime: any; // 货源单设置回显
|
||||
}
|
||||
};
|
||||
}
|
||||
changeGoodsType(value: string, data: any) {
|
||||
changeGoodsType(value: string, data: any) {
|
||||
if (data.label === '其它') return;
|
||||
const params = {
|
||||
pageIndex: 1,
|
||||
@ -697,8 +722,8 @@ changeGoodsType(value: string, data: any) {
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
initSF4() {
|
||||
}
|
||||
initSF4() {
|
||||
this.schema4 = {
|
||||
properties: {
|
||||
weight: {
|
||||
@ -753,61 +778,61 @@ initSF4() {
|
||||
acceptWeight: {
|
||||
type: 'number',
|
||||
title: '装货重量',
|
||||
minimum:0,
|
||||
maximum:99999,
|
||||
minimum: 0,
|
||||
maximum: 99999,
|
||||
ui: {
|
||||
unit: '吨',
|
||||
placeholder: '请输入',
|
||||
grid: {
|
||||
span: 12
|
||||
},
|
||||
hideStep: true,
|
||||
hideStep: true
|
||||
} as SFNumberWidgetSchema
|
||||
},
|
||||
acceptVolume: {
|
||||
type: 'number',
|
||||
title: '装货体积',
|
||||
minimum:0,
|
||||
maximum:99999,
|
||||
minimum: 0,
|
||||
maximum: 99999,
|
||||
ui: {
|
||||
unit: '吨',
|
||||
placeholder: '请输入',
|
||||
grid: {
|
||||
span: 12
|
||||
},
|
||||
hideStep: true,
|
||||
hideStep: true
|
||||
} as SFNumberWidgetSchema
|
||||
},
|
||||
settlementWeight: {
|
||||
type: 'number',
|
||||
title: '卸货重量',
|
||||
minimum:0,
|
||||
maximum:99999,
|
||||
minimum: 0,
|
||||
maximum: 99999,
|
||||
ui: {
|
||||
unit: '吨',
|
||||
placeholder: '请输入',
|
||||
grid: {
|
||||
span: 12
|
||||
},
|
||||
hideStep: true,
|
||||
hideStep: true
|
||||
} as SFNumberWidgetSchema
|
||||
},
|
||||
settlementVolume: {
|
||||
type: 'number',
|
||||
title: '卸货体积',
|
||||
minimum:0,
|
||||
maximum:99999,
|
||||
minimum: 0,
|
||||
maximum: 99999,
|
||||
ui: {
|
||||
unit: '吨',
|
||||
placeholder: '请输入',
|
||||
grid: {
|
||||
span: 12
|
||||
},
|
||||
hideStep: true,
|
||||
hideStep: true
|
||||
} as SFNumberWidgetSchema
|
||||
}
|
||||
},
|
||||
required: ['loadTime','unloadTime']
|
||||
required: ['loadTime', 'unloadTime']
|
||||
};
|
||||
this.ui4 = {
|
||||
'*': {
|
||||
@ -832,19 +857,19 @@ initSF4() {
|
||||
},
|
||||
$unloadTime: {
|
||||
grid: { span: 12 }
|
||||
},
|
||||
}
|
||||
};
|
||||
}
|
||||
// 处理上传图片
|
||||
handlePreview1 = async (file: NzUploadFile) => {
|
||||
}
|
||||
// 处理上传图片
|
||||
handlePreview1 = async (file: NzUploadFile) => {
|
||||
if (!file.url && !file.preview) {
|
||||
file.preview = await getBase64(file.originFileObj!);
|
||||
}
|
||||
this.previewImage1 = file.url || file.preview;
|
||||
this.previewVisible1 = true;
|
||||
};
|
||||
};
|
||||
|
||||
handleChange1(info: NzUploadChangeParam): void {
|
||||
handleChange1(info: NzUploadChangeParam): void {
|
||||
switch (info.file.status) {
|
||||
case 'uploading':
|
||||
break;
|
||||
@ -862,8 +887,8 @@ handleChange1(info: NzUploadChangeParam): void {
|
||||
this.service.msgSrv.error('网络错误');
|
||||
break;
|
||||
}
|
||||
}
|
||||
beforeUpload = (file: NzUploadFile, _fileList: NzUploadFile[]) => {
|
||||
}
|
||||
beforeUpload = (file: NzUploadFile, _fileList: NzUploadFile[]) => {
|
||||
return new Observable((observer: Observer<boolean>) => {
|
||||
const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/gif' || file.type === 'image/bmp';
|
||||
if (!isJpgOrPng) {
|
||||
@ -881,26 +906,26 @@ beforeUpload = (file: NzUploadFile, _fileList: NzUploadFile[]) => {
|
||||
observer.next(isJpgOrPng && isLt2M);
|
||||
observer.complete();
|
||||
});
|
||||
};
|
||||
agreement(value: any) {
|
||||
if(value === '1') {
|
||||
this.imges = this.i?.supplementAgreement
|
||||
};
|
||||
agreement(value: any) {
|
||||
if (value === '1') {
|
||||
this.imges = this.i?.supplementAgreement;
|
||||
} else if (value === '2') {
|
||||
this.imges = this.i?.supplementAgreement
|
||||
this.imges = this.i?.supplementAgreement;
|
||||
}
|
||||
this.isVisible = true;
|
||||
}
|
||||
handleCancel() {
|
||||
this.isVisible = false
|
||||
}
|
||||
handleOK() {
|
||||
this.isVisible = false
|
||||
}
|
||||
goDistance(elf: NzCardComponent) {
|
||||
}
|
||||
handleCancel() {
|
||||
this.isVisible = false;
|
||||
}
|
||||
handleOK() {
|
||||
this.isVisible = false;
|
||||
}
|
||||
goDistance(elf: NzCardComponent) {
|
||||
if (elf) {
|
||||
elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' });
|
||||
}
|
||||
}
|
||||
}
|
||||
// 装卸货地址互换
|
||||
swapAddress() {
|
||||
let item = this.startInfo;
|
||||
@ -917,18 +942,18 @@ goDistance(elf: NzCardComponent) {
|
||||
// 计算里程，时间
|
||||
if (this.startInfo[0]?.area && this.endInfo[0]?.area) {
|
||||
this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => {
|
||||
this.totalDistance = res.distance;
|
||||
this.totalTime = res.time;
|
||||
this.totalDistance = res?.distance;
|
||||
this.totalTime = res?.time;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// 获取车辆轨迹
|
||||
getTrajectory(){
|
||||
getTrajectory() {
|
||||
this.service.request(this.service.$api_get_getTrajectory, { id: this.id }).subscribe(res => {
|
||||
if (res) {
|
||||
const points = res.trackArray;
|
||||
let list :any[] = [];
|
||||
const points = res?.trackArray;
|
||||
let list: any[] = [];
|
||||
points?.forEach((item: any) => {
|
||||
list.push({
|
||||
name: item.hgt,
|
||||
@ -936,8 +961,8 @@ goDistance(elf: NzCardComponent) {
|
||||
});
|
||||
});
|
||||
this.mapList = list;
|
||||
this.addressItems = res.cityArray;
|
||||
if(this.addressItems && this.addressItems.length > 0){
|
||||
this.addressItems = res?.cityArray;
|
||||
if (this.addressItems && this.addressItems.length > 0) {
|
||||
this.addressItems.forEach(item => {
|
||||
item.vinOutTime = this.getLocalTime(item.vinOutTime);
|
||||
});
|
||||
@ -947,11 +972,11 @@ goDistance(elf: NzCardComponent) {
|
||||
}
|
||||
|
||||
// 获取司机轨迹
|
||||
getDriverTrajectory(){
|
||||
getDriverTrajectory() {
|
||||
this.service.request(this.service.$api_get_getAppDriverPosition, { id: this.id }).subscribe(res => {
|
||||
if (res) {
|
||||
const points = res.tracks;
|
||||
let list :any[] = [];
|
||||
const points = res?.tracks;
|
||||
let list: any[] = [];
|
||||
points?.forEach((item: any) => {
|
||||
list.push({
|
||||
name: item.hgt,
|
||||
@ -959,8 +984,8 @@ goDistance(elf: NzCardComponent) {
|
||||
});
|
||||
});
|
||||
this.mapList = list;
|
||||
this.addressItems = [...res.enclosureDataAppTrack];
|
||||
if(this.addressItems && this.addressItems.length > 0){
|
||||
this.addressItems = [...res?.enclosureDataAppTrack];
|
||||
if (this.addressItems && this.addressItems.length > 0) {
|
||||
this.addressItems.forEach(item => {
|
||||
item.vinOutTime = this.getLocalTime(item.gtm);
|
||||
item.cityName = item.appAdress;
|
||||
@ -969,10 +994,10 @@ goDistance(elf: NzCardComponent) {
|
||||
}
|
||||
});
|
||||
}
|
||||
trajectoryChange(event:any){
|
||||
if(event ==='car'){
|
||||
this.getTrajectory()
|
||||
}else if(event ==='driver'){
|
||||
trajectoryChange(event: any) {
|
||||
if (event === 'car') {
|
||||
this.getTrajectory();
|
||||
} else if (event === 'driver') {
|
||||
this.getDriverTrajectory();
|
||||
}
|
||||
}
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
* @Author : Shiming
|
||||
* @Date : 2021-12-23 13:39:58
|
||||
* @LastEditors : Shiming
|
||||
* @LastEditTime : 2022-03-11 11:24:29
|
||||
* @LastEditTime : 2022-03-11 17:57:24
|
||||
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.ts
|
||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||
*/
|
||||
@ -93,11 +93,11 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
|
||||
}
|
||||
];
|
||||
trajectory = 'car';
|
||||
mapList:any[] = []; //地图点位数据组
|
||||
addressItems:any[] = []; //打点地址数据组
|
||||
mapList: any[] = []; //地图点位数据组
|
||||
addressItems: any[] = []; //打点地址数据组
|
||||
logColumns2: STColumn[] = [
|
||||
{ title: '时间', index: 'vinOutTime' },
|
||||
{ title: '地点', index: 'cityName' },
|
||||
{ title: '地点', index: 'cityName' }
|
||||
];
|
||||
constructor(
|
||||
private route: ActivatedRoute,
|
||||
@ -204,14 +204,6 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
|
||||
listType: 'picture-card'
|
||||
} as SFUploadWidgetSchema
|
||||
},
|
||||
no4: {
|
||||
type: 'string',
|
||||
title: '',
|
||||
ui: {
|
||||
widget: 'text'
|
||||
},
|
||||
default: ''
|
||||
},
|
||||
no7: {
|
||||
type: 'string',
|
||||
title: '',
|
||||
@ -405,7 +397,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
|
||||
}
|
||||
});
|
||||
// 对装货凭证进行初始化
|
||||
if (res?.loadingLadingBillFilePath) {
|
||||
if(res?.loadingLadingBillFilePath || res?.loadingPeopleVehiclesGoodsFilePath || res?.unloadingLadingBillFilePath || res?.unloadingPeopleVehiclesGoodsFilePath) {
|
||||
this.formData = {
|
||||
loadingLadingBillFilePath: [
|
||||
{
|
||||
@ -425,7 +417,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
|
||||
status: 'done',
|
||||
url: res?.loadingPeopleVehiclesGoodsFilePath,
|
||||
response: {
|
||||
url: res?.loadingPeopleVehiclesGoodsFilePath
|
||||
url: res?.loadingPeopleVehiclesGoodsFilePath,
|
||||
}
|
||||
}
|
||||
],
|
||||
@ -453,6 +445,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
|
||||
]
|
||||
};
|
||||
}
|
||||
|
||||
// 发车时间到车时间初始化
|
||||
this.loadTime = res?.loadTime;
|
||||
this.unloadTime = res?.unloadTime;
|
||||
@ -683,7 +676,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
|
||||
'*': {
|
||||
spanLabelFixed: 110,
|
||||
grid: { span: 12 }
|
||||
},
|
||||
}
|
||||
};
|
||||
}
|
||||
changeGoodsType(value: string, data: any) {
|
||||
@ -922,11 +915,11 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
|
||||
}
|
||||
}
|
||||
// 获取车辆轨迹
|
||||
getTrajectory(){
|
||||
getTrajectory() {
|
||||
this.service.request(this.service.$api_get_getTrajectory, { id: this.id }).subscribe(res => {
|
||||
if (res) {
|
||||
const points = res?.trackArray;
|
||||
let list :any[] = [];
|
||||
let list: any[] = [];
|
||||
points?.forEach((item: any) => {
|
||||
list.push({
|
||||
name: item.hgt,
|
||||
@ -935,7 +928,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
|
||||
});
|
||||
this.mapList = list;
|
||||
this.addressItems = res?.cityArray;
|
||||
if(this.addressItems && this.addressItems.length > 0){
|
||||
if (this.addressItems && this.addressItems.length > 0) {
|
||||
this.addressItems.forEach(item => {
|
||||
item.vinOutTime = this.getLocalTime(item.vinOutTime);
|
||||
});
|
||||
@ -945,11 +938,11 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
|
||||
}
|
||||
|
||||
// 获取司机轨迹
|
||||
getDriverTrajectory(){
|
||||
getDriverTrajectory() {
|
||||
this.service.request(this.service.$api_get_getAppDriverPosition, { id: this.id }).subscribe(res => {
|
||||
if (res) {
|
||||
const points = res?.tracks;
|
||||
let list :any[] = [];
|
||||
let list: any[] = [];
|
||||
points?.forEach((item: any) => {
|
||||
list.push({
|
||||
name: item.hgt,
|
||||
@ -958,7 +951,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
|
||||
});
|
||||
this.mapList = list;
|
||||
this.addressItems = [...res?.enclosureDataAppTrack];
|
||||
if(this.addressItems && this.addressItems.length > 0){
|
||||
if (this.addressItems && this.addressItems.length > 0) {
|
||||
this.addressItems.forEach(item => {
|
||||
item.vinOutTime = this.getLocalTime(item.gtm);
|
||||
item.cityName = item.appAdress;
|
||||
@ -967,10 +960,10 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
|
||||
}
|
||||
});
|
||||
}
|
||||
trajectoryChange(event:any){
|
||||
if(event ==='car'){
|
||||
this.getTrajectory()
|
||||
}else if(event ==='driver'){
|
||||
trajectoryChange(event: any) {
|
||||
if (event === 'car') {
|
||||
this.getTrajectory();
|
||||
} else if (event === 'driver') {
|
||||
this.getDriverTrajectory();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user