fix bug
This commit is contained in:
		| @ -121,10 +121,10 @@ | |||||||
|         {{i?.insuranceTypeLabel}} |         {{i?.insuranceTypeLabel}} | ||||||
|       </sv> |       </sv> | ||||||
|       <sv label="货物价值"> |       <sv label="货物价值"> | ||||||
|         {{i?.goodsValue}} |         {{i?.goodsValue |currency}} | ||||||
|       </sv> |       </sv> | ||||||
|       <sv label="保价费金额"> |       <sv label="保价费金额"> | ||||||
|         {{i?.insuranceAmount |currency: '¥'}} 元 |         {{i?.insuranceAmount |currency}} 元 | ||||||
|       </sv> |       </sv> | ||||||
|     </sv-container> |     </sv-container> | ||||||
|   </nz-card> |   </nz-card> | ||||||
| @ -132,29 +132,28 @@ | |||||||
|     <st [data]="i?.expenseVOList" [columns]="expenseColumns" [page]="{show:false}"> |     <st [data]="i?.expenseVOList" [columns]="expenseColumns" [page]="{show:false}"> | ||||||
|       <ng-template st-row="total" let-item> |       <ng-template st-row="total" let-item> | ||||||
|         <div> |         <div> | ||||||
|           {{item?.totalAmount | currency: '¥'}} |           {{item?.totalAmount | currency}} | ||||||
|           <span>(含附加费)</span> |           <span>(含附加费)</span> | ||||||
|         </div> |         </div> | ||||||
|       </ng-template> |       </ng-template> | ||||||
|  |       <ng-template st-row="price" let-item> | ||||||
|  |         <div> | ||||||
|  |           {{item?.price | currency}} | ||||||
|  |         </div> | ||||||
|  |       </ng-template> | ||||||
|     </st> |     </st> | ||||||
|     <div class="freight-info-box mt-md" nz-row> |     <div class="freight-info-box mt-md" nz-row> | ||||||
|       <div nz-col nzSpan="24"> |       <div nz-col nzSpan="24"> | ||||||
|         <h3> |         <h3> | ||||||
|           <label>总计 :</label> |           <label>总计 :</label> | ||||||
|           <span class="text-error-dark text-xl"> |           <span class="text-error-dark text-xl"> | ||||||
|             {{(i?.totalAmount) | currency: '¥'}} |             {{(i?.totalAmount) | currency}} | ||||||
|           </span> |           </span> | ||||||
|           <span>(运费{{i?.totalFreight | currency: '¥'}}含附加运费 {{i?.totalSurcharge| currency: '¥' }})</span> |           <span>(运费{{i?.totalFreight | currency}}含附加运费 {{i?.totalSurcharge| currency}})</span> | ||||||
|         </h3> |         </h3> | ||||||
|         <div>收款人:{{ i?.payeeName }}/{{ i?.payeePhone }}/{{ i?.payeeCardNo }}</div> |         <div>收款人:{{ i?.payeeName }}/{{ i?.payeePhone }}/{{ i?.payeeCardNo }}</div> | ||||||
|       </div> |       </div> | ||||||
|     </div> |     </div> | ||||||
|     <!-- <div> |  | ||||||
|       总计:<span style="color: #da001b; font-size: 18px">{{ totalObj?.price | currency: '¥' }}</span> (运费¥{{ |  | ||||||
|         totalObj?.price - attObj?.price |  | ||||||
|       }},附加运费¥{{ attObj?.price }},附加费率{{ (attObj?.price / totalObj?.price) * 100 | number: '0.2-2' }}%) |  | ||||||
|     </div> |  | ||||||
|     <div>收款人:{{ i?.payeeName }}/{{ i?.payeePhone }}</div> --> |  | ||||||
|   </nz-card> |   </nz-card> | ||||||
|   <nz-card nzTitle="补充信息"> |   <nz-card nzTitle="补充信息"> | ||||||
|     <sv-container> |     <sv-container> | ||||||
|  | |||||||
| @ -47,7 +47,7 @@ export class SupplyManagementVehicleDetailComponent implements OnInit { | |||||||
|       title: '协议金额(元)', |       title: '协议金额(元)', | ||||||
|       width: '150px', |       width: '150px', | ||||||
|       className: 'text-center', |       className: 'text-center', | ||||||
|       index: 'price' |       render: 'price' | ||||||
|     }, |     }, | ||||||
|   ]; |   ]; | ||||||
|  |  | ||||||
|  | |||||||
| @ -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 14:39:40 |  * @LastEditTime : 2022-02-11 10:30:16 | ||||||
|  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\vehicle\\vehicle.component.html |  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\vehicle\\vehicle.component.html | ||||||
|  * Copyright (C) 2022 huzhenhong. All rights reserved. |  * Copyright (C) 2022 huzhenhong. All rights reserved. | ||||||
| --> | --> | ||||||
| @ -67,6 +67,9 @@ | |||||||
|         <p>{{ item?.resourceTypeLabel }}{{ item?.serviceTypeLabel }}</p> |         <p>{{ item?.resourceTypeLabel }}{{ item?.serviceTypeLabel }}</p> | ||||||
|         <p>{{ item?.resourceStatusLabel }}</p> |         <p>{{ item?.resourceStatusLabel }}</p> | ||||||
|       </ng-template> |       </ng-template> | ||||||
|  |       <ng-template st-row="total" let-item let-index="index"> | ||||||
|  |         <div class="mr-xs">{{ item?.totalAmount + item?.surcharge | currency }} </div> | ||||||
|  |       </ng-template> | ||||||
|       <ng-template st-row="totalAmount" let-item let-index="index"> |       <ng-template st-row="totalAmount" let-item let-index="index"> | ||||||
|         <div class="mr-xs">{{ item?.totalAmount | currency }} </div> |         <div class="mr-xs">{{ item?.totalAmount | currency }} </div> | ||||||
|       </ng-template> |       </ng-template> | ||||||
|  | |||||||
| @ -488,8 +488,7 @@ export class SupplyManagementVehicleComponent implements OnInit { | |||||||
|         title: '总费用', |         title: '总费用', | ||||||
|         className: 'text-right', |         className: 'text-right', | ||||||
|         width: '120px', |         width: '120px', | ||||||
|         index: 'totalAmount', |         render: 'total' | ||||||
|         render: 'totalAmount' |  | ||||||
|       }, |       }, | ||||||
|       { |       { | ||||||
|         title: '总运费', |         title: '总运费', | ||||||
|  | |||||||
		Reference in New Issue
	
	Block a user