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 develop

Browse Source
This commit is contained in:
Taric Xin
2022-04-11 11:14:44 +08:00
parent 529b5e328c aebb7c28bd
commit e8df63e1e6
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,7 +56,7 @@
</ng-template> </ng-template>
<ng-template st-row="freightAmount" let-item let-index="index"> <ng-template st-row="freightAmount" let-item let-index="index">
<div class="text-right">{{item?.freightAmount | currency :' '}}</div> <div class="text-right">{{item?.freightAmount | currency }}</div>
</ng-template> </ng-template>
<ng-template st-row="goodsInfoList" let-item let-index="index"> <ng-template st-row="goodsInfoList" let-item let-index="index">
<div *ngFor="let _item of item?.goodsInfoList"> <div *ngFor="let _item of item?.goodsInfoList">

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

@ -306,7 +306,7 @@ export class DatatableOrderReportingComponent implements OnInit {
{ title: '装货地址', index: 'loadingAddress', className: 'text-center', width: '200px' }, { title: '装货地址', index: 'loadingAddress', className: 'text-center', width: '200px' },
{ title: '收货方名称', index: 'receivingName', className: 'text-center', width: '150px' }, { title: '收货方名称', index: 'receivingName', className: 'text-center', width: '150px' },
{ title: '收货地址', index: 'consigneeAddress', className: 'text-center', width: '150px' }, { title: '收货地址', index: 'consigneeAddress', className: 'text-center', width: '150px' },
{ title: '运费金额', render: 'freightAmount', className: 'text-center', width: '250px' }, { title: '运费金额', render: 'freightAmount', className: 'text-center', width: '100px' },
{ title: '车牌号', index: 'carNo', className: 'text-center', width: '150px' }, { title: '车牌号', index: 'carNo', className: 'text-center', width: '150px' },
{ {
title: '车牌颜色', title: '车牌颜色',
@ -518,7 +518,7 @@ export class DatatableOrderReportingComponent implements OnInit {
* 异步导出 * 异步导出
*/ */
export() { export() {
this.service.exportStart({...this.sf?.value, pageSize: -1 }, this.service.$api_export_reporting_order); this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_export_reporting_order);
} }
openWainingModal(content: string, title = '提示') { openWainingModal(content: string, title = '提示') {

4
src/app/routes/order-management/modal/vehicle/cancel-confirm/cancel-confirm.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-02-22 13:53:29 * @Date : 2022-02-22 13:53:29
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-02-28 13:35:23 * @LastEditTime : 2022-04-11 11:09:25
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\cancel-confirm\\cancel-confirm.component.html * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\cancel-confirm\\cancel-confirm.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->
@ -15,7 +15,7 @@
<sv label="司机"> <sv label="司机">
<div>{{ i.driverName }} / {{ i.driverPhone }} / {{ i.carNo }}</div> <div>{{ i.driverName }} / {{ i.driverPhone }} / {{ i.carNo }}</div>
</sv> </sv>
<sv label="收款人"> <sv label="车队长" *ngIf ="i?.payeePhone && i?.payeePhone !== i?.driverPhone">
<div>{{ i.payeeName }} / {{ i.payeePhone }}</div> <div>{{ i.payeeName }} / {{ i.payeePhone }}</div>
</sv> </sv>
<sv label="退款金额"> <sv label="退款金额">