fix bug
This commit is contained in:
		| @ -4,7 +4,7 @@ | |||||||
|  * @Author       : Shiming |  * @Author       : Shiming | ||||||
|  * @Date         : 2021-12-24 16:58:02 |  * @Date         : 2021-12-24 16:58:02 | ||||||
|  * @LastEditors  : Shiming |  * @LastEditors  : Shiming | ||||||
|  * @LastEditTime : 2022-04-01 10:58:50 |  * @LastEditTime : 2022-04-06 15:40:05 | ||||||
|  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.html |  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.html | ||||||
|  * Copyright (C) 2022 huzhenhong. All rights reserved. |  * Copyright (C) 2022 huzhenhong. All rights reserved. | ||||||
| --> | --> | ||||||
| @ -275,7 +275,7 @@ | |||||||
|       附加费{{ i?.totalSurcharge | currency }},附加费率{{ (i?.totalRate * 100).toFixed(2)}}%) |       附加费{{ i?.totalSurcharge | currency }},附加费率{{ (i?.totalRate * 100).toFixed(2)}}%) | ||||||
|     </div> |     </div> | ||||||
|   </div> |   </div> | ||||||
|   <div>车队长:{{ i?.payeeName }}{{ i?.payeePhone ? "/" +  i?.payeePhone : ''}}</div> |   <div *ngIf ="i?.payeePhone && i?.payeePhone !== i?.driverPhone">车队长:{{ i?.payeeName }}{{ i?.payeePhone ? "/" +  i?.payeePhone : ''}}</div> | ||||||
| </nz-card> | </nz-card> | ||||||
|  |  | ||||||
|  |  | ||||||
|  | |||||||
| @ -156,7 +156,7 @@ | |||||||
|       附加费{{ i?.totalSurcharge | currency }},附加费率{{ (i?.totalRate * 100).toFixed(2)}}%) |       附加费{{ i?.totalSurcharge | currency }},附加费率{{ (i?.totalRate * 100).toFixed(2)}}%) | ||||||
|     </div> |     </div> | ||||||
|   </div> |   </div> | ||||||
|   <div>车队长:{{ i?.payeeName }}{{   i?.payeePhone ? "/" +  i?.payeePhone : ''}}</div> |   <div *ngIf ="i?.payeePhone && i?.payeePhone !== i?.driverPhone">车队长:{{ i?.payeeName }}{{   i?.payeePhone ? "/" +  i?.payeePhone : ''}}</div> | ||||||
| </nz-card> | </nz-card> | ||||||
|  |  | ||||||
| <nz-card nzTitle="附件信息" #distannce4> | <nz-card nzTitle="附件信息" #distannce4> | ||||||
|  | |||||||
| @ -253,7 +253,7 @@ | |||||||
|     总计:<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span> (运费{{ i?.totalFreight | currency }}, |     总计:<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span> (运费{{ i?.totalFreight | currency }}, | ||||||
|     附加费{{ i?.totalSurcharge | currency }},附加费率{{ (i?.totalRate * 100).toFixed(2)}}% ) |     附加费{{ i?.totalSurcharge | currency }},附加费率{{ (i?.totalRate * 100).toFixed(2)}}% ) | ||||||
|   </div> |   </div> | ||||||
|   <div>车队长:{{ i?.payeeName }}{{   i?.payeePhone ? "/" +  i?.payeePhone : ''}}</div> |   <div *ngIf ="i?.payeePhone && i?.payeePhone !== i?.driverPhone">车队长:{{ i?.payeeName }}{{   i?.payeePhone ? "/" +  i?.payeePhone : ''}}</div> | ||||||
| </nz-card> | </nz-card> | ||||||
|  |  | ||||||
| <nz-card nzTitle="附件信息" #distannce4> | <nz-card nzTitle="附件信息" #distannce4> | ||||||
|  | |||||||
| @ -4,7 +4,7 @@ | |||||||
|  * @Author       : Shiming |  * @Author       : Shiming | ||||||
|  * @Date         : 2021-12-28 14:42:03 |  * @Date         : 2021-12-28 14:42:03 | ||||||
|  * @LastEditors  : Shiming |  * @LastEditors  : Shiming | ||||||
|  * @LastEditTime : 2022-04-01 11:06:21 |  * @LastEditTime : 2022-04-06 15:39:20 | ||||||
|  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html |  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html | ||||||
|  * Copyright (C) 2022 huzhenhong. All rights reserved. |  * Copyright (C) 2022 huzhenhong. All rights reserved. | ||||||
| --> | --> | ||||||
| @ -170,7 +170,7 @@ | |||||||
|     总计:<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span> (运费{{ i?.totalFreight | currency }}, |     总计:<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span> (运费{{ i?.totalFreight | currency }}, | ||||||
|     附加费{{ i?.totalSurcharge | currency }},附加费率{{ (i?.totalRate * 100).toFixed(2) }}% ) |     附加费{{ i?.totalSurcharge | currency }},附加费率{{ (i?.totalRate * 100).toFixed(2) }}% ) | ||||||
|   </div> |   </div> | ||||||
|   <div>车队长:{{ i?.payeeName }}{{ i?.payeePhone ? '/' + i?.payeePhone : '' }}</div> |   <div *ngIf ="i?.payeePhone && i?.payeePhone !== i?.driverPhone">车队长:{{ i?.payeeName }}{{ i?.payeePhone ? '/' + i?.payeePhone : '' }}</div> | ||||||
| </nz-card> | </nz-card> | ||||||
|  |  | ||||||
| <nz-card nzTitle="附件信息" #distannce4> | <nz-card nzTitle="附件信息" #distannce4> | ||||||
|  | |||||||
| @ -1,7 +1,7 @@ | |||||||
| <!-- | <!-- | ||||||
|  * @Author: your name |  * @Author: your name | ||||||
|  * @Date: 2021-12-03 15:31:52 |  * @Date: 2021-12-03 15:31:52 | ||||||
|  * @LastEditTime : 2022-03-30 17:31:38 |  * @LastEditTime : 2022-04-06 15:37:59 | ||||||
|  * @LastEditors  : Shiming |  * @LastEditors  : Shiming | ||||||
|  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE |  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE | ||||||
|  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\bulk-detail\\bulk-detail.component.html |  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\bulk-detail\\bulk-detail.component.html | ||||||
| @ -176,7 +176,7 @@ | |||||||
|       附加费{{ i?.totalSurcharge | currency }},附加费率{{ (i?.totalRate * 100).toFixed(2)}}%) |       附加费{{ i?.totalSurcharge | currency }},附加费率{{ (i?.totalRate * 100).toFixed(2)}}%) | ||||||
|     </div> |     </div> | ||||||
|   </div> |   </div> | ||||||
|   <div>车队长:{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}</div> |   <div *ngIf ="i?.payee?.phone && i?.payee?.phone !== i?.driverVo.phone">车队长:{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}</div> | ||||||
| </nz-card> | </nz-card> | ||||||
|  |  | ||||||
| <nz-card nzTitle="附件信息" #distannce4> | <nz-card nzTitle="附件信息" #distannce4> | ||||||
|  | |||||||
| @ -104,6 +104,9 @@ export class WaybillManagementBulkComponent implements OnInit { | |||||||
|             searchDebounceTime: 300, |             searchDebounceTime: 300, | ||||||
|             searchLoadingText: '搜索中...', |             searchLoadingText: '搜索中...', | ||||||
|             allowClear: true, |             allowClear: true, | ||||||
|  |             visibleIf: { | ||||||
|  |               _$expand: (value: boolean) => value | ||||||
|  |             }, | ||||||
|             onSearch: (q: any) => { |             onSearch: (q: any) => { | ||||||
|               console.log(q) |               console.log(q) | ||||||
|               let str =q.replace(/^\s+|\s+$/g,""); |               let str =q.replace(/^\s+|\s+$/g,""); | ||||||
|  | |||||||
| @ -1,7 +1,7 @@ | |||||||
| <!-- | <!-- | ||||||
|  * @Author: your name |  * @Author: your name | ||||||
|  * @Date: 2021-12-03 15:31:52 |  * @Date: 2021-12-03 15:31:52 | ||||||
|  * @LastEditTime : 2022-04-01 11:12:17 |  * @LastEditTime : 2022-04-06 15:37:30 | ||||||
|  * @LastEditors  : Shiming |  * @LastEditors  : Shiming | ||||||
|  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE |  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE | ||||||
|  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\vehicle-detail\\vehicle-detail.component.html |  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\vehicle-detail\\vehicle-detail.component.html | ||||||
| @ -157,7 +157,7 @@ | |||||||
|     总计:<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span> (运费{{ i?.totalFreight | currency }}, |     总计:<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span> (运费{{ i?.totalFreight | currency }}, | ||||||
|     附加费{{ i?.totalSurcharge | currency }},附加费率{{ (i?.totalRate * 100).toFixed(2)}}% ) |     附加费{{ i?.totalSurcharge | currency }},附加费率{{ (i?.totalRate * 100).toFixed(2)}}% ) | ||||||
|   </div> |   </div> | ||||||
|   <div>车队长:{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}</div> |   <div  *ngIf ="i?.payee?.phone && i?.payee?.phone !== i?.driverVo.phone">车队长:{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}</div> | ||||||
| </nz-card> | </nz-card> | ||||||
|  |  | ||||||
| <nz-card nzTitle="附件信息" #distannce4> | <nz-card nzTitle="附件信息" #distannce4> | ||||||
|  | |||||||
| @ -99,6 +99,9 @@ export class WaybillManagementVehicleComponent implements OnInit { | |||||||
|             searchDebounceTime: 300, |             searchDebounceTime: 300, | ||||||
|             searchLoadingText: '搜索中...', |             searchLoadingText: '搜索中...', | ||||||
|             allowClear: true, |             allowClear: true, | ||||||
|  |             visibleIf: { | ||||||
|  |               _$expand: (value: boolean) => value | ||||||
|  |             }, | ||||||
|             onSearch: (q: any) => { |             onSearch: (q: any) => { | ||||||
|               let str = q.replace(/^\s+|\s+$/g, ''); |               let str = q.replace(/^\s+|\s+$/g, ''); | ||||||
|               if (str) { |               if (str) { | ||||||
|  | |||||||
		Reference in New Issue
	
	Block a user