车辆对接

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

@@ -128,7 +128,7 @@
       </sv>
     </sv-container>
   </nz-card>
-  <nz-card nzTitle="运费信息（到货后15天内支付运费）">
+  <!-- <nz-card nzTitle="运费信息（到货后15天内支付运费）">
     <st [data]="i?.expenseList" [columns]="expenseColumns" [page]="{show:false}">
       <ng-template st-row="total" let-item>
         <div>
@@ -148,6 +148,22 @@
         </h3>
       </div>
     </div>
+  </nz-card> -->
+  <nz-card [nzTitle]="'运费信息（到货后'+i?.paymentDays+'天内支付运费）'">
+    <st [data]="i?.expenseVOList" [columns]="expenseColumns" [page]="{show:false}">
+      <ng-template st-row="total" let-item>
+        <div>
+          {{(item.price * item.rate) | currency}}
+          <span>(含附加费）</span>
+        </div>
+      </ng-template>
+    </st>
+    <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 nzTitle="补充信息">
     <sv-container>

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

@@ -26,6 +26,8 @@ export class SupplyManagementVehicleDetailComponent implements OnInit {
     1: '抢单',
     2: '指派'
   }
+  totalObj: any;
+  attObj: any;
   status: any = { 1: '待接单', 2: '已接单', 3: '已取消' };
   totalExpensePrice = 0;
   expenseColumns: STColumn[] = [
@@ -67,6 +69,8 @@ export class SupplyManagementVehicleDetailComponent implements OnInit {
     this.service.request(this.service.$api_get_getCompleteVehicleDetail, { id: this.id }).subscribe(res => {
       const expenseList = res?.expenseList || [];
       this.totalExpensePrice = 0;
+      this.attObj = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'ATT')[0];
+      this.totalObj = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'TOTAL')[0];
       expenseList.forEach((e: any) => {
         this.totalExpensePrice += e?.price * e?.rate;
       });