车辆接口更新

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

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-24 16:58:02
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-18 17:18:29
+ * @LastEditTime : 2022-01-20 20:22:48
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -30,12 +30,12 @@
     <nz-divider></nz-divider>
    <div>
       <div sv-container>
-        <sv label="网络货运人">{{ i?.goodsResource?.[0]?.enterpriseInfoName }} </sv>
+        <sv label="网络货运人">{{ i?.goodsResource?.enterpriseInfoName }} </sv>
-        <sv label="货主">{{ i?.goodsResource?.[0]?.shipperAppUserName }} </sv>
+        <sv label="货主">{{ i?.goodsResource?.shipperAppUserName }} </sv>
-        <sv label="所属项目">{{i?.goodsResource?.[0]?.enterpriseProjectName}}</sv>
+        <sv label="所属项目">{{i?.goodsResource?.enterpriseProjectName}}</sv>
-        <sv label="服务类型">{{i?.goodsResource?.[0]?.serviceTypeLabel}}</sv>
+        <sv label="服务类型">{{i?.goodsResource?.serviceTypeLabel}}</sv>
-        <sv label="录单员">{{i?.createUserNameLabel}} </sv>
+        <sv label="录单员">{{i?.goodsResource?.createUserName}} /{{i?.goodsResource?.createUserPhone}} </sv>
-        <sv label="调度员">{{i?.goodsResource?.[0]?.dispatchName}} </sv>
+        <sv label="调度员">{{i?.goodsResource?.dispatchName}}/{{i?.goodsResource?.dispatchPhone}} </sv>
      </div>
      <nz-tabset style="margin-top: 15px;">
       <nz-tab nzTitle="装卸货信息" (nzClick)="goDistance(distannce1)">
@@ -52,18 +52,18 @@
    </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-steps [nzCurrent]="i?.scheduleVOList?.length + 1" nzLabelPlacement="vertical">
-        <nz-step [nzStatus]="i?.resourceStatus !== '1'?'finish':'process'" nzIcon="solution"
+           <nz-step
-        [nzDescription]="i?.createAt" nzTitle="下单"></nz-step>
+                  *ngFor="let item of i?.scheduleVOList"
-
+             [nzTitle]="item.state"
-        <nz-step *ngIf="i?.resourceStatus === '1' || i?.resourceStatus === '2' "
+             [nzSubtitle]="item.stateTime"
-          [nzStatus]="i?.resourceStatus=== '1'? 'wait':'finish'" nzIcon="file-done" [nzTitle]="'接单'"></nz-step>
+             [nzStatus]="item.displayStatus === 'SHOW' ? 'finish' : 'wait'"
-          
+           >
-        <nz-step nzStatus="finish" nzIcon="close-circle" nzTitle="取消货源" *ngIf="i?.resourceStatus === '3'"></nz-step>
+          </nz-step>
-      </nz-steps>
+         </nz-steps>
     </div>
   </div>
 </nz-card>
@@ -204,15 +204,13 @@
         </ng-template>
 
         <ng-template sf-template="carmand" let-item let-ui="ui">
-        {{i?.goodsInfoList?.[0]?.maxWeightLabel}}/{{i?.goodsInfoList?.[0]?.maxCubeLabel}}
+          {{ i?.carModel }}/{{ i?.carLength }}
         </ng-template>
-
         <ng-template sf-template="drivers" let-item let-ui="ui">
-          {{i?.driverId}}
+          {{i?.driverName}}/{{i?.driverPhone}}/{{i?.carNo}}
-      </ng-template>
+        </ng-template>
-
+        <ng-template sf-template="weightModel" let-item let-ui="ui">
-      <ng-template sf-template="weightModel" let-item let-ui="ui">
+          {{ i?.driverCarModelLabel }},{{ i?.driverCarLengthLabel }}米,{{ i?.driverCarWeight }}吨 
-          {{i?.goodsInfoList?.[0]?.weight}}顿,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件
         </ng-template>
 
       <ng-template sf-template="loadTime" let-item let-ui="ui">
@@ -228,28 +226,21 @@
 
 </nz-card>
 
-
-<!-- <nz-card nzTitle="运费信息" id="distannce3">
-  <st #st [data]="dirvingMessage" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
-  </st>
-  <div style="margin-top: 15px;">总计：{{i?.total | currency: '￥'}}（运费￥3500.00，附加运费￥191.98，附加费率3.5%）</div>
-  <div style="display: flex;">收款人：
-    <div style="display: flex;">
-      <input nz-input placeholder="请输入司机手机号" [(ngModel)]="dirverPhone" />
-    &nbsp;&nbsp;&nbsp;&nbsp;<input nz-input placeholder="选择银行卡" [(ngModel)]="dirverBankCard" />
-    </div>
-    
-  </div>
-</nz-card> -->
 <nz-card nzTitle="运费信息" #distannce3>
-  <h2>{{i?.freightPrice}}{{i?.freightTypeLabel}}（以发货为准，保留小数）</h2>
+  <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>
+    <div>
+      总计：<span style="color: #da001b; font-size: 18px">{{ totalObj?.price  | currency }}</span> （运费￥{{
+        totalObj?.price - attObj?.price  | currency}}，附加费￥{{ attObj?.price  | currency }}，附加费率{{i?.attPercent }}%）
+    </div>
+  </div>
+  <div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
 </nz-card>
 
+
 <nz-card nzTitle="附件信息" #distannce4>
   <sv-container>
     <sv label="协议附件">
@@ -265,20 +256,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/bulk-detail-change/bulk-detail-change.component.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-24 16:58:02
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-18 17:18:37
+ * @LastEditTime : 2022-01-20 20:21:35
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -23,6 +23,7 @@ import { Observable, Observer } from 'rxjs';
 import { apiConf } from '@conf/api.conf';
 import { OrderManagementService } from '../../services/order-management.service';
 import { NzCardComponent } from 'ng-zorro-antd/card';
+import { map } from 'rxjs/operators';
 function getBase64(file: File): Promise<string | ArrayBuffer | null> {
   return new Promise((resolve, reject) => {
     const reader = new FileReader();
@@ -41,7 +42,6 @@ export class OrderManagementBulkDetailChangeComponent 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 = [];  // 装货信息
@@ -55,6 +55,8 @@ loadTime: any; // 货源单设置回显
   listImagUrls: any[] = []; // 货源单设置回显
   dirvingMessage = [];
   imges: any;
+  totalObj: any;
+  attObj: any;
   previewImage1 = '';
   previewVisible1 = false;
   @ViewChild('sf3', { static: false }) sf3!: SFComponent;
@@ -69,6 +71,25 @@ loadTime: any; // 货源单设置回显
   @ViewChild('sf', { static: false }) sf!: SFComponent;
   schema: SFSchema = {};
   ui: SFUISchema = {};
+  logColumns: STColumn[] = [
+    { title: '款项', index: 'expenseName' },
+    { 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 +108,6 @@ loadTime: any; // 货源单设置回显
   }
 
   ngOnInit(): void {
-    this.initST();
     this.initSF();
     this.initSF3();
     this.initSF4();
@@ -288,9 +308,11 @@ loadTime: any; // 货源单设置回显
     };
   }
   initData() {
-    this.service.request(this.service.$api_set_getBulkOrderDetail, {id: this.id}).subscribe(res => {
+    this.service.request(this.service.$api_getBulkBillDetail, {id: this.id}).subscribe(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];
         // 对装货凭证进行初始化
         let arr : any= []
         res?.receiptFilePath.forEach((element: any, index: any) => {
@@ -307,6 +329,16 @@ loadTime: any; // 货源单设置回显
           ...res,
           ...res?.goodsInfoList?.[0]
         }
+        this.sf3data = {
+          goodsTypeId: res?.goodsInfoList[0]?.goodsTypeId || '',
+          goodsTypeName: res?.goodsInfoList[0]?.goodsTypeName || '',
+          goodsNameId: res?.goodsInfoList[0]?.goodsNameId || '',
+          goodsName: res?.goodsInfoList[0]?.goodsName || ''
+        };
+        if (this.sf3data.goodsTypeName === '其它') {
+          this.sf3data.goodsName1 = res?.goodsInfoList[0]?.goodsName || '';
+        }
+        this.changeGoodsType(this.sf3data.goodsTypeId, { label: this.sf3data.goodsTypeName, value: this.sf3data.goodsTypeId });
         // 对装卸货信息进行初始化
         res?.unLoadingPlaceList.forEach((element: any) => {
           if(element.type === 1 || element.type === '1') {
@@ -519,38 +551,71 @@ loadTime: any; // 货源单设置回显
 initSF3() {
   this.schema3 = {
     properties: {
-      // enterpriseInfoId: {
+      goodsTypeId: {
-      //   title: '网络货运人',
-      //   type: 'string',
-      //   ui: {
-      //     placeholder: '请选择',
-      //     widget: 'select',
-      //     asyncData: () => this.shipperservice.getNetworkFreightForwarder(),
-      //     visibleIf: {
-      //       _$expand: (value: boolean) => value,
-      //     },
-      //   }
-      // },
-      goodsName: {
         type: 'string',
         title: '货物名称',
         ui: {
-          widget: 'dict-select',
+          widget: 'select',
-          params: { dictKey: 'GoodsName' },
+          placeholder: '请选择',
-          placeholder: '请选择'
+          errors: { required: '请选择货物类型' },
-        }
+          asyncData: () =>
+            this.shipperservice.loadConfigByKey('goods.name.config.type').pipe(
+              map((data: any) => {
+                return data[0].children?.map((m: any) => {
+                  return { label: m.name, value: m.id };
+                });
+              })
+            ),
+          change: (value: any, data: any) => {
+            this.changeGoodsType(value, data);
+            this.sf3.setValue('/goodsTypeName', data.label);
+          }
+        } as SFSelectWidgetSchema
       },
-      qita: {
+      goodsTypeName: {
         type: 'string',
         title: '',
         ui: {
+          hidden: true
+        }
+      },
+      goodsNameId: {
+        type: 'string',
+        title: '',
+        ui: {
+          widget: 'select',
+          placeholder: '请选择',
+          errors: { required: '请填写货物名称' },
+          change: (_value: any, data: any) => {
+            this.sf3.setValue('/goodsName', data.label);
+          },
           visibleIf: {
-            goodsName: value => value === '3'
+            goodsTypeName: (value: any) => value && value !== '其它'
+          }
+        }
+      },
+      goodsName: {
+        type: 'string',
+        title: '',
+        ui: {
+          hidden: true,
+          visibleIf: {
+            goodsTypeName: (value: any) => value && value !== '其它'
+          }
+        }
+      },
+      goodsName1: {
+        type: 'string',
+        title: '',
+        ui: {
+          errors: { required: '请填写货物名称' },
+          visibleIf: {
+            goodsTypeName: (value: any) => value && value === '其它'
           }
         }
       }
     },
-    required: ['goodsName',]
+    required: ['goodsTypeId', 'goodsName', 'goodsNameId']
   };
   this.ui3 = {
     '*': {
@@ -565,28 +630,31 @@ initSF3() {
     }
   };
 }
-initST() {
+changeGoodsType(value: string, data: any) {
- this.logColumns = [
+  if (data.label === '其它') return;
-    { title: '款项', index: 'costName' },
+  const params = {
-    { title: '总费用（元）', index: 'price' },
+    pageIndex: 1,
-    { title: '协议金额（元）', render: 'price' },
+    pageSize: 100,
-    { title: '附加费（元）', index: 'surcharge' },
+    configId: value
-    { title: '附加费率（%）', render: 'paymentMethodRate' },
+  };
-    { title: '支付时间', index: ' paymentTime' },
+  this.service
-    {
+    .request(this.service.$api_get_config_item_page, params)
-      title: '支付状态',
+    .pipe(
-      className: 'text-center',
+      map(data => {
-      index: 'paymentStatus',
+        return data.records?.map((m: any) => {
-      type: 'badge',
+          return { label: m.name, value: m.id };
-      width: '120px',
+        });
-      badge: {
+      })
-        '1': { text: '待申请', color: 'warning' },
+    )
-        '2': { text: '已支付', color: 'success' },
+    .subscribe(res => {
-        '3': { text: '已拒绝', color: 'warning' },
+      if (res) {
-        '4': { text: '申请中', color: 'warning' },
+        this.sf3.getProperty('/goodsNameId')!.schema.enum = res;
-      },
+        this.sf3.getProperty('/goodsNameId')!.widget?.reset(res);
-    },
+        if (this.sf3data.goodsNameId) {
-  ];
+          this.sf3.setValue('/goodsNameId', this.sf3data.goodsNameId);
+        }
+      }
+    });
 }
 initSF4() {
   this.schema4 = {

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-steps [nzCurrent]="approvalLsit?.length + 1" nzLabelPlacement="vertical">
-        <nz-step
+          <nz-step     *ngFor="let item of approvalLsit"     [nzTitle]="item?.state"     [nzSubtitle]="item?.stateTime"
-          [nzStatus]="i?.resourceStatus !== '1' ? 'finish' : 'process'"
+              [nzStatus]="item?.displayStatus === 'SHOW' ? 'finish' : 'wait'"  >
-          nzIcon="solution"
+            </nz-step>
-          [nzDescription]="i?.createAt"
+         </nz-steps>
-          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>
     </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: {

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

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-28 14:42:03
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-20 19:07:33
+ * @LastEditTime : 2022-01-20 20:09:13
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -127,21 +127,14 @@
 <nz-card nzTitle="保险待定">
 </nz-card>
 
-<nz-card nzTitle="运费信息"  #distannce3>
+<nz-card nzTitle="运费信息" #distannce3>
-  <st #st [data]="i?.billExpenseDetails" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
+  <st #st [data]="i?.billExpenseDetails" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }"> </st>
-    <ng-template st-row="price" let-item let-index="index">
-      {{ item.price | currency}}
-    </ng-template>
-    <ng-template st-row="surcharge" let-item let-index="index">
-      {{ item.surcharge | currency}}
-    </ng-template>
-  </st>
   <div>
-    总计：<span style="color: #da001b; font-size: 18px">{{ totalObj?.price | currency }}</span> （运费{{
+    总计：<span style="color: #da001b; font-size: 18px">{{ totalObj?.price | currency }}</span>
-      totalObj?.price - attObj?.price | currency
+     （运费{{totalObj?.price - attObj?.price | currency}}，
-    }}，附加运费{{ attObj?.price | currency}}，附加费率{{ (attObj?.price / totalObj?.price) * 100 | number: '0.2-2' }}%）
+     附加费{{ attObj?.price | currency }}，附加费率{{i?.attPercent }}%）
   </div>
-  <div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
+  <div>收款人：{{ i?.payeeName }}{{ i?.payeePhone }}</div>
 </nz-card>
 
 <nz-card nzTitle="附件信息"  #distannce4>

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

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-28 14:42:03
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-18 17:20:08
+ * @LastEditTime : 2022-01-20 20:09:47
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -34,12 +34,11 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
   approvalLsit: any;
   isVisible = false;
   logColumns: STColumn[] = [
-    { title: '款项', index: 'costName' },
+    { title: '款项', index: 'expenseCodeLabel' },
-    { title: '总费用（元）', index: 'price',render: 'price' },
+    { title: '小计（元）', index: 'price' },
-    { title: '协议金额（元）', index: 'price',render: 'price' },
+    { title: '运输费（元）', index: 'price' },
-    { title: '附加费（元）', index: 'surcharge', render: 'surcharge'},
+    { title: '附加费（元）', index: 'surcharge' },
-    { title: '附加费率（%）', index: 'paymentMethodRate' },
+    { title: '支付时间', index: 'paymentTime' },
-    { title: '支付时间', index: ' paymentTime' },
     {
       title: '支付状态',
       className: 'text-center',