解决冲突
This commit is contained in:
		@ -4,7 +4,7 @@
 | 
			
		||||
 * @Author       : Shiming
 | 
			
		||||
 * @Date         : 2022-01-12 10:52:50
 | 
			
		||||
 * @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
 | 
			
		||||
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 | 
			
		||||
-->
 | 
			
		||||
@ -68,6 +68,9 @@
 | 
			
		||||
    >
 | 
			
		||||
      <ng-template st-row="billCode" let-item let-index="index">
 | 
			
		||||
        <a [routerLink]="'vehicle-detail/' + item.id">{{ item.billCode }}</a>
 | 
			
		||||
        <div>
 | 
			
		||||
          <span>{{ item?.billTypeLabel }}{{ item?.serviceTypeLabel }}</span>
 | 
			
		||||
        </div>
 | 
			
		||||
        <div>
 | 
			
		||||
          <span>{{ item?.billStatusLabel }}</span>
 | 
			
		||||
        </div>
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user