车辆对接

src/app/routes/supply-management/components/vehicle/vehicle.component.html

@@ -1,8 +1,8 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-22 11:28:28
- * @LastEditTime: 2021-12-28 19:21:08
- * @LastEditors: your name
+ * @LastEditTime: 2022-01-05 15:45:01
+ * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\supply-management\components\vehicle\vehicle.component.html
 -->
@@ -56,9 +56,14 @@
         <p>{{item.resourceTypeLabel}}{{item.serviceTypeLabel}}</p>
       </ng-template>
       <ng-template st-row="totalAmount" let-item let-index="index">
-        <div class="mr-xs" nzPopoverTitle="Title" nz-popover [nzPopoverContent]="contentTemplate">￥{{item.totalAmount}}
+        <!-- [nzPopoverContent]="contentTemplate" -->
+        <div class="mr-xs" nzPopoverTitle="Title" nz-popover>￥{{item.totalAmount}}
         </div>
       </ng-template>
+      <ng-template st-row="useCarDemand" let-item let-index="index">
+        <div>车型: {{item.carModelLabel}}</div>
+        <div class="error">车长: {{item.expand}} 米</div>
+      </ng-template>
       <ng-template #contentTemplate>
         <div>
           <p>预付：¥200.00</p>

src/app/routes/supply-management/components/vehicle/vehicle.component.ts

@@ -398,9 +398,9 @@ export class SupplyManagementVehicleComponent implements OnInit {
       },
       {
         title: '用车需求',
+        className: 'text-center',
         width: '120px',
-        format: (item: any) => `<p>车型: ${item.vehicleDemand?.maxWeight || ''}</p><p>车长: ${item.vehicleDemand?.maxCube || ''}米</p>`,
-        index: 'vehicleDemand'
+        render: 'useCarDemand'
       },
       {
         title: '总费用',
@@ -411,9 +411,10 @@ export class SupplyManagementVehicleComponent implements OnInit {
       },
       {
         title: '总运费',
-        className: 'text-center',
         width: '120px',
-        index: '总运费'
+        className: 'text-center',
+        index: 'totalAmount',
+        render: 'totalAmount'
       },
       {
         title: '附加费',