车辆对接

2021-12-28 16:33:45 +08:00
parent 8d381ef42a
commit 1c5ca651ea
12 changed files with 223 additions and 173 deletions
--- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
+++ b/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 }">
--- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts
+++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts
@ -2,7 +2,7 @@ import { Router } from '@angular/router';
 /*
 * @Author: your name
 * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2021-12-24 17:40:51
+ * @LastEditTime: 2021-12-28 16:23:04
 * @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.ts
@ -14,6 +14,7 @@ import { _HttpClient } from '@delon/theme';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { OrderManagementService } from '../../services/order-management.service';
+import { NzCardComponent } from 'ng-zorro-antd/card';
@Component({
  selector: 'app-supply-management-bulk-detail',
  templateUrl: './bulk-detail.component.html',
@ -25,6 +26,8 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
  id = this.route.snapshot.params.id;
  i: any;
  imges: any;
+  totalObj: any;
+  attObj: any;
  isVisible = false;
  logColumns: STColumn[] = [
    { title: '款项', index: 'expenseName' },
@ -66,6 +69,8 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
      console.log(res)
      if (res) {
        this.i =res;
+        this.attObj = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'ATT')[0];
+        this.totalObj = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'TOTAL')[0];
      }
    })
  }
@ -93,4 +98,9 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
  handleOK() {
  this.isVisible = false
  }
+  goDistance(elf: NzCardComponent) {
+    if (elf) {
+      elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' });
+    }
+  }
 }
--- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
@ -1,11 +1,12 @@
 <!--
 * @Author: your name
 * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2021-12-28 09:56:51
+ * @LastEditTime: 2021-12-28 16:32:53
 * @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
 -->
+<nz-affix [nzOffsetTop]="10">
 <page-header-wrapper [title]="''" [logo]="logo" [content]="headerContent">
  <ng-template #logo>
    <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
@ -52,6 +53,7 @@
    </div>
  </ng-template>
 </page-header-wrapper>
+</nz-affix>
 <nz-card nzTitle="运单进度" #distannce1>
  <div class="approval-status">
    <div style="width: 60%; margin: 0 auto">
@ -64,7 +66,7 @@
  </div>
 </nz-card>

-<nz-card nzTitle="基本信息" #distannce2>
+<nz-card nzTitle="基本信息" #distannce2 >
  <sv-container col="1">
    <sv-title>货物信息</sv-title>
    <sv label="网络货运人">
@ -82,14 +84,14 @@
      {{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-container>
-  <div class="mt-md">
-    <h4 class="text-md">装货卸货信息
+  <div class="mt-md" >
+    <h4 class="text-md" >装货卸货信息
      <span class="ml-sm text-sm">(
        <label>{{i?.loadingCount}}装</label>
        <label>{{i?.unloadingCount}}卸</label>
@ -135,8 +137,12 @@
  <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" #distannce4>
@ -206,7 +212,7 @@
 <nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" nzTitle="附件信息" (nzOnOk)="handleOK()"
  (nzOnCancel)="handleCancel()">
  <ng-container *nzModalContent>
-    <app-imagelist [imgList]="[imges]"></app-imagelist>
+    <app-imagelist [imgList]="imges"></app-imagelist>
  </ng-container>
  <ng-template #nzModalFooter>
    <button nz-button nzType="primary" (click)="handleOK()" [disabled]="">取消</button>
--- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts
+++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts
@ -2,7 +2,7 @@ import { ViewChild } from '@angular/core';
 /*
 * @Author: your name
 * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2021-12-27 21:05:48
+ * @LastEditTime: 2021-12-28 16:22: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.ts
@ -29,6 +29,8 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
    goodsResource: []
  };
  imges: any;
+  attObj: any;
+  totalObj: any;
  approvalLsit: any;
  isVisible = false;
  logColumns: STColumn[] = [
@ -72,6 +74,8 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
      if (res) {
        this.i = res;
        this.approvalLsit = res.scheduleVOList;
+        this.attObj = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'ATT')[0];
+        this.totalObj = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'TOTAL')[0];
        this.approvalLsit.map((item: any, key: any) => {
          console.log(item);
          if (item.displayStatus === 'HIDE') {
@ -108,7 +112,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit {

  goDistance(elf: NzCardComponent) {
    if (elf) {
-      elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' });
+      elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' , yOffset : 400  });
    }
  }
 }