车辆接口更新

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

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-23 13:39:58
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-20 19:28:44
+ * @LastEditTime : 2022-01-20 20:23:52
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -47,26 +47,14 @@
     </div>
   </ng-template>
 </page-header-wrapper>
-<nz-card nzTitle="运单进度" #distannce1>
+<nz-card nzTitle="运单进度" #distannce1 >
   <div class="approval-status">
     <div style="width: 60%; margin: 0 auto">
-      <nz-steps [nzLabelPlacement]="'vertical'">
-        <nz-step
-          [nzStatus]="i?.resourceStatus !== '1' ? 'finish' : 'process'"
-          nzIcon="solution"
-          [nzDescription]="i?.createAt"
-          nzTitle="下单"
-        ></nz-step>
-
-        <nz-step
-          *ngIf="i?.resourceStatus === '1' || i?.resourceStatus === '2'"
-          [nzStatus]="i?.resourceStatus === '1' ? 'wait' : 'finish'"
-          nzIcon="file-done"
-          [nzTitle]="'接单'"
-        ></nz-step>
-
-        <nz-step nzStatus="finish" nzIcon="close-circle" nzTitle="取消货源" *ngIf="i?.resourceStatus === '3'"></nz-step>
-      </nz-steps>
+        <nz-steps [nzCurrent]="approvalLsit?.length + 1" nzLabelPlacement="vertical">
+          <nz-step     *ngFor="let item of approvalLsit"     [nzTitle]="item?.state"     [nzSubtitle]="item?.stateTime"
+              [nzStatus]="item?.displayStatus === 'SHOW' ? 'finish' : 'wait'"  >
+            </nz-step>
+         </nz-steps>
     </div>
   </div>
 </nz-card>
@@ -217,10 +205,6 @@
         <ng-template sf-template="carmand" let-item let-ui="ui">
           {{ i?.carModel }}/{{ i?.carLength }}
         </ng-template>
-        <!-- <sv label="用车需求">{{ i?.carModel }}/{{ i?.carLength }} </sv>
-        <sv label="承运司机">
-          {{i?.driverName}}/{{i?.driverPhone}}/{{i?.carNo}}
-        </sv> -->
         <ng-template sf-template="drivers" let-item let-ui="ui">
           {{i?.driverName}}/{{i?.driverPhone}}/{{i?.carNo}}
         </ng-template>
@@ -242,8 +226,12 @@
 
 <nz-card nzTitle="运费信息" #distannce3>
   <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 | currency}}，
+     附加费{{ attObj?.price | currency }}，附加费率{{i?.attPercent }}%）
+  </div>
+  <div>收款人：{{ i?.payeeName }}{{ i?.payeePhone }}</div>
 </nz-card>
 
 <nz-card nzTitle="附件信息" #distannce4>
@@ -261,18 +249,19 @@
 <nz-card nzTitle="补充信息">
   <sv-container>
     <sv label="是否回单">
-      {{ i?.goodsResource?.stateReceipt ? '是' : '否' }}
+      {{ i?.supplementaryInformationVO?.stateReceipt  ? '是' : '否' }}
     </sv>
     <sv label="回单类型">
-      {{ i?.goodsResource?.receiptTypeLabel }}
+      {{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }}
     </sv>
-    <sv label="联系人"> {{ i?.goodsResource?.receiptUserId }} / {{ i?.supplementaryInformationVO?.phon }} </sv>
+    <sv label="联系人"> {{ i?.supplementaryInformationVO?.receiptUserName }} / {{ i?.supplementaryInformationVO?.phon }} </sv>
     <sv label="所在地区">
-      {{ i?.goodsResource?.receiptAddress }}
+      {{ i?.supplementaryInformationVO?.area }}
     </sv>
     <sv label="详细地址">
-      {{ i?.goodsResource?.receiptAddress }}
+      {{ i?.supplementaryInformationVO?.address }}
     </sv>
+
   </sv-container>
   <sv-container col="1" class="mt-md">
     <sv label="回单凭证">

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

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-23 13:39:58
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-20 19:29:05
+ * @LastEditTime : 2022-01-20 20:11:43
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -40,7 +40,6 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
   id = this.route.snapshot.params.id;
   @ViewChild('distannce3', { static: false })
   i: any = { unLoadingPlaceList: [] };
-  logColumns: STColumn[] = [];
   totalDistance = 0.0; //总里程
   totalTime = 0.0; //路程总时间
   startInfo: any = []; // 装货信息
@@ -53,6 +52,9 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
   dirverBankCard: any; // 货源单设置回显
   listImagUrls: any[] = []; // 货源单设置回显
   dirvingMessage = [];
+  attObj: any;
+  totalObj: any;
+  approvalLsit: any;
   imges: any;
   previewImage1 = '';
   previewVisible1 = false;
@@ -68,6 +70,26 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
   @ViewChild('sf', { static: false }) sf!: SFComponent;
   schema: SFSchema = {};
   ui: SFUISchema = {};
+  logColumns: STColumn[] = [
+    { title: '款项', index: 'expenseCodeLabel' },
+    { title: '小计（元）', index: 'price' },
+    { title: '运输费（元）', index: 'price' },
+    { title: '附加费（元）', index: 'surcharge' },
+    { title: '支付时间', index: 'paymentTime' },
+    {
+      title: '支付状态',
+      className: 'text-center',
+      index: 'paymentStatus',
+      type: 'badge',
+      width: '120px',
+      badge: {
+        '1': { text: '待申请', color: 'warning' },
+        '2': { text: '已支付', color: 'success' },
+        '3': { text: '已拒绝', color: 'warning' },
+        '4': { text: '申请中', color: 'warning' }
+      }
+    }
+  ];
   constructor(
     private route: ActivatedRoute,
     private router: Router,
@@ -87,7 +109,6 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
 
   ngOnInit(): void {
     console.log(this.id);
-    this.initST();
     this.initSF();
     this.initSF3();
     this.initSF4();
@@ -292,6 +313,15 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
       console.log(res);
       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') {
+            delete this.approvalLsit[key];
+          }
+        });
         // 对装货凭证进行初始化
         let arr: any = [];
         res?.receiptFilePath.forEach((element: any, index: any) => {
@@ -664,29 +694,6 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
         }
       });
   }
-  initST() {
-    this.logColumns = [
-      { title: '款项', index: 'costName' },
-      { title: '总费用（元）', index: 'price' },
-      { title: '协议金额（元）', render: 'price' },
-      { title: '附加费（元）', index: 'surcharge' },
-      { title: '附加费率（%）', render: 'paymentMethodRate' },
-      { title: '支付时间', index: ' paymentTime' },
-      {
-        title: '支付状态',
-        className: 'text-center',
-        index: 'paymentStatus',
-        type: 'badge',
-        width: '120px',
-        badge: {
-          '1': { text: '待申请', color: 'warning' },
-          '2': { text: '已支付', color: 'success' },
-          '3': { text: '已拒绝', color: 'warning' },
-          '4': { text: '申请中', color: 'warning' }
-        }
-      }
-    ];
-  }
   initSF4() {
     this.schema4 = {
       properties: {