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

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

Browse Source
This commit is contained in:
xiaoxing.liu
2022-04-13 19:07:10 +08:00
parent 023bfdf71d a8fa9fd1af
commit 9fe45a2a96
69 changed files with 1273 additions and 1038 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html
View File

@ -34,13 +34,13 @@
</ng-template>
<ng-template st-row="verifyStatus" let-item>
<a (click)="viewResult(item)" *ngIf="item?.verifyStatus === '2'">{{item?.verifyStatusLabel}}</a>
<span *ngIf="item?.verifyStatus === '1'">{{item?.verifyStatusLabel}}</span>
<span *ngIf="item?.verifyStatus !== '2'">{{item?.verifyStatusLabel}}</span>
</ng-template>
<ng-template st-row="orderCode" let-item>
<span class="text-blue-dark">{{item?.orderCode}}</span>
<a (click)="routeToOrder(item)">{{item?.orderCode}}</a>
</ng-template>
<ng-template st-row="wayBillCode" let-item>
<span class="text-blue-dark">{{item?.wayBillCode}}</span>
<a (click)="routeTowaybill(item)">{{item?.wayBillCode}}</a>
</ng-template>
<ng-template st-row="tolalAmount" let-item let-index="index">
<div class="text-right">{{item?.tolalAmount | currency }}</div>

23
src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts
View File

@ -163,9 +163,9 @@ export class DatatableFundReportingComponent implements OnInit {
title: '本地校验',
type: 'string',
enum: [
{ label: '校验中', value: 0 },
{ label: '通过', value: 1 },
{ label: '不通过', value: 2 }
{ label: '检测中', value: '0' },
{ label: '通过', value: '1' },
{ label: '不通过', value: '2' }
],
ui: {
placeholder: '请选择',
@ -465,6 +465,23 @@ export class DatatableFundReportingComponent implements OnInit {
}
}
routeToOrder(item: any) {
if (item.orderType === '1') {
window.open(location.origin + `/#/order-management/vehicle/vehicle-detail/${item.orderId}`);
} else {
window.open(location.origin + `/#/order-management/bulk/bulk-detail/${item.orderId}`);
}
}
routeTowaybill(item: any) {
if (item.orderType === '1') {
window.open(location.origin + `/#/waybill-management/vehicle/vehicle-detail/${item.wayBillId}`);
} else {
window.open(location.origin + `/#/waybill-management/bulk/bulk-detail/${item.wayBillId}`);
}
}
}

4
src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html
View File

@ -49,10 +49,10 @@
</ng-template>
<ng-template st-row="billCode" let-item>
<span class="text-red-dark">{{item?.billCode}}</span>
<a class="text-red-dark" (click)="routeToOrder(item)">{{item?.billCode}}</a>
</ng-template>
<ng-template st-row="wayBillCode" let-item>
<span class="text-red-dark">{{item?.wayBillCode}}</span>
<a class="text-red-dark" (click)="routeTowaybill(item)">{{item?.wayBillCode}}</a>
</ng-template>
<ng-template st-row="freightAmount" let-item let-index="index">

34
src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts
View File

@ -23,13 +23,13 @@ export class DatatableOrderReportingComponent implements OnInit {
@ViewChild('sf', { static: false }) sf!: SFComponent;
tabType!: string;
tabs: any[] = [
{ name: '待上传', value: '1' },
{ name: '上传中', value: '2' },
{ name: '已上传', value: '3' },
{ name: '异常', value: '4' },
{ name: '待上传', value: '0' },
{ name: '上传中', value: '3' },
{ name: '已上传', value: '1' },
{ name: '异常', value: '2' },
{ name: '全部', value: '' }
];
selectedIndex = '1';
selectedIndex = '0';
isLoading: boolean = false;
selectedRows: any[] = [];
constructor(
@ -53,7 +53,7 @@ export class DatatableOrderReportingComponent implements OnInit {
*/
get reqParams() {
const params = Object.assign({}, this.sf?.value || {}, {
putStatus: this.selectedIndex,
billPutStatus: this.selectedIndex,
});
delete params._$expand;
return { ...params };
@ -169,7 +169,7 @@ export class DatatableOrderReportingComponent implements OnInit {
title: '本地校验',
type: 'string',
enum: [
{ label: '校验中', value: 0 },
{ label: '检测中', value: 0 },
{ label: '通过', value: 1 },
{ label: '不通过', value: 2 }
],
@ -583,7 +583,7 @@ export class DatatableOrderReportingComponent implements OnInit {
filterCheckStatus(status: number) {
switch (status) {
case 0:
return '校验中';
return '检测中';
case 1:
return '通过';
case 2:
@ -594,4 +594,22 @@ export class DatatableOrderReportingComponent implements OnInit {
}
}
routeToOrder(item: any) {
if (item.billType === '1') {
window.open(location.origin + `/#/order-management/vehicle/vehicle-detail/${item.orderId}`);
} else {
window.open(location.origin + `/#/order-management/bulk/bulk-detail/${item.orderId}`);
}
}
routeTowaybill(item: any) {
if (item.billType === '1') {
window.open(location.origin + `/#/waybill-management/vehicle/vehicle-detail/${item.waybillId}`);
} else {
window.open(location.origin + `/#/waybill-management/bulk/bulk-detail/${item.waybillId}`);
}
}
}

6
src/app/routes/datatable/reporting/components/view-track/view-track.component.ts
View File

@ -50,10 +50,10 @@ export class DatatableReportingvViewTrackComponent implements OnInit {
});
});
this.mapList = list;
this.addressItems = [...res.cityArray];
this.addressItems = [...res.parkArray];
if (this.addressItems && this.addressItems.length > 0) {
this.addressItems.forEach(item => {
item.vinOutTime = this.getLocalTime(item.vinOutTime);
item.parkBte = this.getLocalTime(item.parkBte);
});
}
}
@ -78,7 +78,7 @@ export class DatatableReportingvViewTrackComponent implements OnInit {
this.addressItems = [...res.enclosureDataAppTrack];
if (this.addressItems && this.addressItems.length > 0) {
this.addressItems.forEach(item => {
item.vinOutTime = item.vinOutTime ? this.getLocalTime(item.gtm) : '';
item.parkBte = item.parkBte ? this.getLocalTime(item.parkBte) : '';
item.cityName = item.appAdress;
});
}