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:
wangshiming
2022-03-02 17:37:19 +08:00
parent 60d00f960c a8ed4b0000
commit 90a626c601
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/routes/financial-management/components/payment-record/payment-record.component.html
View File

@ -36,9 +36,9 @@
{{ item.orderPaymentCode }} <br> <a>{{ item.paymentStatusLabel }}</a> {{ item.orderPaymentCode }} <br> <a>{{ item.paymentStatusLabel }}</a>
</ng-template> </ng-template>
<ng-template st-row="amountDetails" let-item let-index="index" let-column="column"> <ng-template st-row="amountDetails" let-item let-index="index" let-column="column">
预付:￥{{ item.price }}<br /> 预付:{{ item.price | currency }}<br />
<ng-container *ngIf="item.payType==='1'"> <ng-container *ngIf="item.payType==='1'">
附加费:￥ {{ item.surcharge }} 附加费: {{ item.surcharge| currency }}
</ng-container> </ng-container>
</ng-template> </ng-template>
<ng-template st-row="billCode" let-item let-index="index" let-column="column"> <ng-template st-row="billCode" let-item let-index="index" let-column="column">

2
src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html
View File

@ -106,7 +106,7 @@
</div> </div>
</div> </div>
<st #st [data]="service.$api_get_invoice_requested_order_detail" [columns]="columns" [req]="{ process: beforeReq }" <st #st [data]="service.$api_get_invoice_requested_order_detail" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
[res]="{ process: afterRes }" [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '200px' }" [res]="{ process: afterRes }" [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '200px' }"
(change)="stChange($event)"> (change)="stChange($event)">
<ng-template st-row="billHCode" let-item let-index="index" let-column="column"> <ng-template st-row="billHCode" let-item let-index="index" let-column="column">

4
src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts
View File

@ -166,9 +166,9 @@ export class InvoiceRequestedDetailComponent implements OnInit {
routeToOrder(item: any) { routeToOrder(item: any) {
if (item.billType === 1) { if (item.billType === 1) {
this.router.navigate(['/order-management/vehicle-detail/' + item.billHId]); this.router.navigate(['/order-management/vehicle/vehicle-detail/' + item.billHId]);
} else { } else {
this.router.navigate(['/order-management/bulk-detail/' + item.billHId]); this.router.navigate(['/order-management/bulk/bulk-detail/' + item.billHId]);
} }
} }