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

Merge branch 'develop' of gitlab.eascs.com:tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
Lingzi
2022-03-14 14:09:07 +08:00
parent 98281b6b3a 4883a55ce8
commit 182e547ffe
13 changed files with 577 additions and 547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-24 16:58:02
* @LastEditors : Shiming
* @LastEditTime : 2022-03-11 11:02:51
* @LastEditTime : 2022-03-11 16:40:47
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -256,7 +256,6 @@
</nz-card>
<nz-card nzTitle="运费信息"#distannce3>
<div *ngIf="(i?.billStatus == '3' && i.goodsInfoList?.[0].settlementBasis == '2') || (i?.billStatus == '4' && i.goodsInfoList?.[0].settlementBasis == '1')" >
<h2>{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}（{{ i?.goodsInfoList?.[0]?.settlementBasisLabel ? i?.goodsInfoList?.[0]?.settlementBasisLabel + '，' :' ' }}{{i?.goodsInfoList?.[0]?.ruleLabel}}）</h2>
<st #st [data]="billExpenses" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
<ng-template st-row="PriceType" let-item let-index="index"> 到付 </ng-template>
@ -274,7 +273,6 @@
</div>
</div>
<div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
</div>
</nz-card>

873
src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
View File

File diff suppressed because it is too large Load Diff

8
src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-06 20:20:26
* @LastEditors : Shiming
* @LastEditTime : 2022-03-11 11:03:14
* @LastEditTime : 2022-03-11 16:40:33
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -87,12 +87,12 @@
<sv label="用车需求">{{ i?.carModel }}/{{ i?.carLength }} </sv>
<sv label="承运司机"> {{ i?.driverName }}/{{ i?.driverPhone }}{{ i?.carNo }} </sv>
<sv label="车型车长载重"> {{ i?.driverCarModelLabel }},{{ i?.driverCarLengthLabel }}米,{{ i?.driverCarWeight }}吨 </sv>
<sv label="计划装货时间">
<!-- <sv label="计划装货时间">
{{ i?.loadPlanTime }}
</sv>
<sv label="计划卸货时间">
{{ i?.unloadPlanTime }}
</sv>
</sv> -->
<sv label="接单数量"> {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方 </sv>
<sv *ngIf="i?.billStatus =='3' || i?.billStatus =='4' || i?.billStatus =='5'" label="装货数量"> {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方,{{ i?.acceptNumber }}件 </sv>
<sv *ngIf="i?.billStatus =='4' || i?.billStatus =='5'" label="卸货数量"> {{ i?.settlementWeight }}吨,{{ i?.settlementVolume }}方,{{ i?.acceptNumber }}件 </sv>
@ -138,7 +138,6 @@
</div>
</nz-card>
<nz-card nzTitle="运费信息" #distannce3>
<div *ngIf="(i?.billStatus == '3' && i.goodsInfoList?.[0].settlementBasis == '2') || (i?.billStatus == '4' && i.goodsInfoList?.[0].settlementBasis == '1')" >
<h2>{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}（{{ i?.goodsInfoList?.[0]?.settlementBasisLabel ? i?.goodsInfoList?.[0]?.settlementBasisLabel + '，' :' ' }}{{i?.goodsInfoList?.[0]?.ruleLabel}}）</h2>
<st #st [data]="billExpenses" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
<ng-template st-row="PriceType" let-item let-index="index"> 到付 </ng-template>
@ -156,7 +155,6 @@
</div>
</div>
<div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
</div>
</nz-card>
<nz-card nzTitle="附件信息" #distannce4>

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

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-23 13:39:58
* @LastEditors : Shiming
* @LastEditTime : 2022-03-11 11:00:28
* @LastEditTime : 2022-03-11 16:41:08
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -43,7 +43,7 @@
<nz-tabset style="margin-top: 15px">
<nz-tab nzTitle="装卸货信息" (nzClick)="goDistance(distannce1)"> </nz-tab>
<nz-tab nzTitle="基本信息" (nzClick)="goDistance(distannce2)"> </nz-tab>
<!-- <nz-tab nzTitle="运费信息" (nzClick)="goDistance(distannce3)"> </nz-tab> -->
<nz-tab nzTitle="运费信息" (nzClick)="goDistance(distannce3)"> </nz-tab>
<nz-tab nzTitle="附件信息" (nzClick)="goDistance(distannce4)"> </nz-tab>
<nz-tab nzTitle="轨迹信息" (nzClick)="goDistance(distannce5)"> </nz-tab>
</nz-tabset>

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

@ -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:58:28
* @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,6 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
}
});
// 对装货凭证进行初始化
if (res?.loadingLadingBillFilePath) {
this.formData = {
loadingLadingBillFilePath: [
{
@ -425,7 +416,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
status: 'done',
url: res?.loadingPeopleVehiclesGoodsFilePath,
response: {
url: res?.loadingPeopleVehiclesGoodsFilePath
url: res?.loadingPeopleVehiclesGoodsFilePath,
}
}
],
@ -452,7 +443,6 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
}
]
};
}
// 发车时间到车时间初始化
this.loadTime = res?.loadTime;
this.unloadTime = res?.unloadTime;
@ -683,7 +673,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
'*': {
spanLabelFixed: 110,
grid: { span: 12 }
},
}
};
}
changeGoodsType(value: string, data: any) {
@ -821,7 +811,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
file.preview = await getBase64(file.originFileObj!);
}
console.log('888888888');
this.previewImage1 = file.url || file.preview;
this.previewVisible1 = true;
};
@ -921,60 +911,60 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
});
}
}
// 获取车辆轨迹
getTrajectory(){
this.service.request(this.service.$api_get_getTrajectory, { id: this.id }).subscribe(res => {
if (res) {
const points = res?.trackArray;
let list :any[] = [];
points?.forEach((item: any) => {
list.push({
name: item.hgt,
lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))]
});
// 获取车辆轨迹
getTrajectory() {
this.service.request(this.service.$api_get_getTrajectory, { id: this.id }).subscribe(res => {
if (res) {
const points = res?.trackArray;
let list: any[] = [];
points?.forEach((item: any) => {
list.push({
name: item.hgt,
lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))]
});
this.mapList = list;
this.addressItems = res?.cityArray;
if(this.addressItems && this.addressItems.length > 0){
this.addressItems.forEach(item => {
item.vinOutTime = this.getLocalTime(item.vinOutTime);
});
}
}
});
}
// 获取司机轨迹
getDriverTrajectory(){
this.service.request(this.service.$api_get_getAppDriverPosition, { id: this.id }).subscribe(res => {
if (res) {
const points = res?.tracks;
let list :any[] = [];
points?.forEach((item: any) => {
list.push({
name: item.hgt,
lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))]
});
});
this.mapList = list;
this.addressItems = res?.cityArray;
if (this.addressItems && this.addressItems.length > 0) {
this.addressItems.forEach(item => {
item.vinOutTime = this.getLocalTime(item.vinOutTime);
});
this.mapList = list;
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;
});
}
}
});
}
trajectoryChange(event:any){
if(event ==='car'){
this.getTrajectory()
}else if(event ==='driver'){
this.getDriverTrajectory();
}
}
getLocalTime(time: any) {
return format(new Date(parseInt(time)), 'yyyy-MM-dd HH:mm:ss');
});
}
// 获取司机轨迹
getDriverTrajectory() {
this.service.request(this.service.$api_get_getAppDriverPosition, { id: this.id }).subscribe(res => {
if (res) {
const points = res?.tracks;
let list: any[] = [];
points?.forEach((item: any) => {
list.push({
name: item.hgt,
lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))]
});
});
this.mapList = list;
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;
});
}
}
});
}
trajectoryChange(event: any) {
if (event === 'car') {
this.getTrajectory();
} else if (event === 'driver') {
this.getDriverTrajectory();
}
}
getLocalTime(time: any) {
return format(new Date(parseInt(time)), 'yyyy-MM-dd HH:mm:ss');
}
}

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

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-28 14:42:03
* @LastEditors : Shiming
* @LastEditTime : 2022-03-11 10:59:57
* @LastEditTime : 2022-03-11 16:09:47
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -132,7 +132,20 @@
</div>
</div>
</nz-card>
<nz-card nzTitle="保险待定"> </nz-card>
<nz-card nzTitle="服务信息">
<sv-container>
<sv label="服务包">
{{i?.goodsResource?.insuranceTypeLabel}}
</sv>
<sv label="货物价值">
{{i?.goodsResource?.goodsValue !==null?(i?.goodsResource?.goodsValue|currency)+'元':'-'}}
</sv>
<sv label="保价费金额">
{{i?.goodsResource?.insurancePremium!==null?(i?.goodsResource?.insurancePremium |currency)+'元':'-'}}
</sv>
</sv-container>
</nz-card>
<nz-card nzTitle="运费信息" #distannce3>
<st #st [data]="billExpenses" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">