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-14 20:52:13 +08:00
parent 1f1db511e6 3a30575fd5
commit f958cfe64b
60 changed files with 615 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,19 +3,19 @@
<nz-card>
<!-- 搜索表单 -->
<div nz-row nzGutter="8">
<div nz-col [nzSpan]="_$expand ? 24 : 18">
<div nz-col [nzSpan]=" 24 ">
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
</div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()"
acl [acl-ability]="['RiskOrder-Search']">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button (click)="export()">导出</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
</button>
</div>
</div>
<div [class.text-right]="true">
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()"
acl [acl-ability]="['RiskOrder-Search']">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button (click)="export()">导出</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
</button>
</div>
</nz-card>
<nz-card>

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

@ -112,7 +112,6 @@ export class DatatableOrderReportingComponent implements OnInit {
placeholder: '请选择',
widget: 'select',
asyncData: () => this.shipperSrv.getNetworkFreightForwarder({}, false),
allowClear: true
}
},
@ -266,8 +265,13 @@ export class DatatableOrderReportingComponent implements OnInit {
},
};
this.ui = {
'*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 }, enter: () => this.search() },
$time: { grid: { span: 24 } },
'*': {
spanLabelFixed: 120,
grid: {
lg: 12,
xl: 8
}, enter: () => this.search()
},
};
}

26
src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts
View File

@ -91,14 +91,26 @@ export class DatatableReportingVerifyResultComponent implements OnInit {
}
update() {
if (this.record?.billType === '1') {
window.open(location.origin + `/#/order-management/vehicle-detailChange/${this.record?.id}`)
} else if (this.record.billType === '2') {
window.open(location.origin + `/#/order-management/bulk-detailChange/${this.record?.id}`);
switch (this?.subjectType) {
case 2:
this.openNewPage(`/usercenter/driver/detail/${this.record?.driverId}`);
break;
case 3:
if (this.record?.billType === '1') {
this.openNewPage(`/order-management/vehicle-detailChange/${this.record?.orderId}`);
} else if (this.record.billType === '2') {
this.openNewPage(`/order-management/bulk-detailChange/${this.record?.orderId}`);
}
break;
case 4:
this.openNewPage(`/vehicle/list/detail/${this.record?.carId}`);
break;
default:
break;
}
}
@ -119,4 +131,8 @@ export class DatatableReportingVerifyResultComponent implements OnInit {
}
}
openNewPage(url: string) {
window.open(location.origin + `/#` + url);
}
}