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-02-22 19:45:04 +08:00
parent 8ad4883533 bc19cadc3c
commit 4160cf8f52
2 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-01-12 10:52:50 * @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-02-10 13:35:33 * @LastEditTime : 2022-02-22 17:47:08
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk\\bulk.component.html * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk\\bulk.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->
@ -83,6 +83,9 @@
</ng-template> </ng-template>
<ng-template st-row="billCode" let-item let-index="index"> <ng-template st-row="billCode" let-item let-index="index">
<a [routerLink]="'bulk-detail/' + item.id">{{ item.billCode }}</a> <a [routerLink]="'bulk-detail/' + item.id">{{ item.billCode }}</a>
<div>
<span>{{ item?.billTypeLabel }}{{ item?.serviceTypeLabel }}</span>
</div>
<div> <div>
<span>{{ item?.billStatusLabel }}</span> <span>{{ item?.billStatusLabel }}</span>
</div> </div>
@ -103,23 +106,6 @@
</p> </p>
</div> </div>
</ng-template> </ng-template>
<!-- <ng-template st-row="externalSn" let-item let-index="index">
<span class="mr-xs">{{111111}}</span>
<a (click)="editEnternalSn(item)">编辑</a>
</ng-template> -->
<ng-template st-row="enStatusStr27878" let-item let-index="index">
<div class="mr-xs" nzPopoverTitle="Title" nz-popover [nzPopoverContent]="contentTemplate">{{ item.no }}</div>
</ng-template>
<ng-template #contentTemplate>
<div>
<p>预付：¥200.00</p>
<p>到付：¥200.00</p>
<p>油卡：¥200.00</p>
<p>回单付：¥200.00</p>
<p>小计：¥200.00</p>
<p>附加费：¥200.00</p>
</div>
</ng-template>
</st> </st>
</div> </div>
</nz-card> </nz-card>

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

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-01-12 10:52:50 * @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-02-22 15:23:06 * @LastEditTime : 2022-02-22 17:47:23
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle\\vehicle.component.html * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle\\vehicle.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->
@ -68,6 +68,9 @@
> >
<ng-template st-row="billCode" let-item let-index="index"> <ng-template st-row="billCode" let-item let-index="index">
<a [routerLink]="'vehicle-detail/' + item.id">{{ item.billCode }}</a> <a [routerLink]="'vehicle-detail/' + item.id">{{ item.billCode }}</a>
<div>
<span>{{ item?.billTypeLabel }}{{ item?.serviceTypeLabel }}</span>
</div>
<div> <div>
<span>{{ item?.billStatusLabel }}</span> <span>{{ item?.billStatusLabel }}</span>
</div> </div>