车辆对接

src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2021-12-28 10:46:37
+ * @LastEditTime: 2021-12-28 16:31:50
  * @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\order-management\components\vehicle-detail\vehicle-detail.component.html
@@ -31,51 +31,26 @@
         <sv label="网络货运人">{{ i?.goodsResource?.[0]?.enterpriseInfoName }} </sv>
         <sv label="货主">{{ i?.goodsResource?.[0]?.shipperAppUserName }} </sv>
         <sv label="所属项目">{{i?.goodsResource?.[0]?.enterpriseProjectName}}</sv>
-        <sv label="服务类型">{{i?.goodsResource?.[0]?.serviceTypeLabel}}</sv>
-        <sv label="录单员">{{i?.goodsResource?.[0]?.dispatchName}} 18100000000 </sv>
+        <sv label="服务类型8">{{i?.goodsResource?.[0]?.serviceTypeLabel}}</sv>
+        <sv label="录单员">{{i?.createUserNameLabel}} </sv>
         <sv label="调度员">{{i?.goodsResource?.[0]?.dispatchName}} </sv>
      </div>
      <nz-tabset style="margin-top: 15px;">
-      <nz-tab [nzTitle]="tempt" >
-        <ng-template #tempt>
-          <nz-anchor>
-            <nz-link nzHref="#distannce1" nzTitle="装卸货信息"></nz-link>
-          </nz-anchor>
-        </ng-template>
+      <nz-tab nzTitle="装卸货信息" (nzClick)="goDistance(distannce1)">
       </nz-tab>
-      <nz-tab [nzTitle]="tempt2" >
-        <ng-template #tempt2>
-          <nz-anchor>
-            <nz-link nzHref="#distannce2" nzTitle="基本信息"></nz-link>
-          </nz-anchor>
-        </ng-template>
+      <nz-tab nzTitle="基本信息" (nzClick)="goDistance(distannce2)">
       </nz-tab>
-      <nz-tab [nzTitle]="tempt3" >
-        <ng-template #tempt3>
-          <nz-anchor>
-            <nz-link nzHref="#distannce3" nzTitle="运费信息"></nz-link>
-          </nz-anchor>
-        </ng-template>
+      <nz-tab nzTitle="运费信息" (nzClick)="goDistance(distannce3)">
       </nz-tab>
-      <nz-tab [nzTitle]="tempt4" >
-        <ng-template #tempt4>
-          <nz-anchor>
-            <nz-link nzHref="#distannce4" nzTitle="附件信息"></nz-link>
-          </nz-anchor>
-        </ng-template>
+      <nz-tab nzTitle="附件信息" (nzClick)="goDistance(distannce4)">
       </nz-tab>
-      <nz-tab [nzTitle]="tempt5" >
-        <ng-template #tempt5>
-          <nz-anchor>
-            <nz-link nzHref="#distannce5" nzTitle="轨迹信息"></nz-link>
-          </nz-anchor>
-        </ng-template>
+      <nz-tab nzTitle="轨迹信息" (nzClick)="goDistance(distannce5)">
       </nz-tab>
     </nz-tabset>
    </div>
   </ng-template>
 </page-header-wrapper>
-<nz-card nzTitle="运单进度">
+<nz-card nzTitle="运单进度"  #distannce1>
   <div class="approval-status">
     <div style="width: 60%; margin: 0 auto">
         <nz-steps [nzCurrent]="i?.scheduleVOList?.length + 1" nzLabelPlacement="vertical">
@@ -91,7 +66,7 @@
   </div>
 </nz-card>
 
-<nz-card nzTitle="基本信息">
+<nz-card nzTitle="基本信息" #distannce2>
   <sv-container col="1">
     <sv label="货物名称">
       {{i?.goodsInfoList?.[0]?.goodsName}}
@@ -105,10 +80,10 @@
       {{i?.goodsInfoList?.[0]?.maxWeightLabel}}/{{i?.goodsInfoList?.[0]?.maxCube}}
     </sv>
     <sv label="承运司机">
-      {{i?.driverId}}
+      {{i?.driverName}}/{{i?.driverPhone}}{{i?.carNo}}
     </sv>
     <sv label="车型车长载重">
-      {{i?.goodsInfoList?.[0]?.weight}}吨,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件
+      {{i?.carModel}},{{i?.carLength}},{{i?.carLoad ? i?.carLoad +'吨': ''}}
     </sv>
     <sv label="计划装货时间">
       {{i?.loadPlanTime}}
@@ -129,10 +104,10 @@
 <div class="mt-md">
   <h4 class="text-md">装货卸货信息
     <span class="ml-sm text-sm">(
-      <label>{{i?.loadingCount}}装</label>
-      <label>{{i?.unloadingCount}}卸</label>
-      )
+      <label>{{i?.loadingCount || '一'}}装</label>
+      <label>{{i?.unloadingCount || '一'}}卸</label>
     </span>
+    )
   </h4>
   <div nz-row [nzGutter]="24">
     <div nz-col [nzSpan]="12">
@@ -164,16 +139,20 @@
   </div>
 </div>
 </nz-card>
-<nz-card nzTitle="运费信息" id="distannce3">
+<nz-card nzTitle="运费信息" #distannce3>
   <h2>{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}（以发货为准，保留小数）</h2>
   <st #st [data]="i?.billExpenseDetails" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
 
   </st>
-  <div>总计：{{i?.total | currency: '￥'}}（运费￥3500.00，附加运费￥191.98，附加费率3.5%）</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 nzTitle="附件信息" id="distannce4">
+<nz-card nzTitle="附件信息" #distannce4>
   <sv-container>
     <sv label="协议附件">
       <!-- {{i?.supplementaryInformationVO?.stateReceipt?'是':'否'}} -->
@@ -223,7 +202,7 @@
 
 <nz-card>
   <div nz-row>
-    <nz-card nzTitle="轨迹信息" style="width: 100%;" id="distannce5">
+    <nz-card nzTitle="轨迹信息" style="width: 100%;" #distannce5>
       <div nz-row > 
         <div nz-col [nzSpan]='12'>
     <!-- <st #st [data]="i?.auditRecordList" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">