From 78f4659a7361003f030b603f30183db45fb13de7 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Fri, 24 Dec 2021 15:36:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/risk/risk.component.html       |  4 +-
 .../components/risk/risk.component.ts         | 10 +++--
 .../vehicle-detail-change.component.ts        | 41 ++++++++-----------
 3 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/src/app/routes/order-management/components/risk/risk.component.html b/src/app/routes/order-management/components/risk/risk.component.html
index 908128a6..11c73e86 100644
--- a/src/app/routes/order-management/components/risk/risk.component.html
+++ b/src/app/routes/order-management/components/risk/risk.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2021-12-24 13:26:16
+ * @LastEditTime: 2021-12-24 15:36:09
  * @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\supply-management\components\vehicle\vehicle.component.html
@@ -42,7 +42,7 @@
   [nzTabBarExtraContent]="extraTemplate">
   <nz-tab [nzTitle]="'全部'"></nz-tab>
   <nz-tab [nzTitle]="'待申诉('+tabs?.stayQuantity+')'"></nz-tab>
-  <nz-tab [nzTitle]="'申诉中('+tabs?.stayQuantity+')'"></nz-tab>
+  <nz-tab [nzTitle]="'申诉中('+tabs?.underwayQuantity+')'"></nz-tab>
   <nz-tab [nzTitle]="'申诉成功('+tabs?.receivedQuantity+')'"></nz-tab>
   <nz-tab [nzTitle]="'申诉失败('+tabs?.cancelQuantity+')'"></nz-tab>
 </nz-tabset>
diff --git a/src/app/routes/order-management/components/risk/risk.component.ts b/src/app/routes/order-management/components/risk/risk.component.ts
index 4d17f2ca..1c5f70f1 100644
--- a/src/app/routes/order-management/components/risk/risk.component.ts
+++ b/src/app/routes/order-management/components/risk/risk.component.ts
@@ -29,7 +29,7 @@ export class OrderManagementRiskComponent implements OnInit {
   @ViewChild('sfView', { static: false }) sfView!: SFComponent;
   columns: STColumn[] = [];
   tabs = {
-    totalQuantity: 0,
+    underwayQuantity: 0,
     cancelQuantity: 0,
     receivedQuantity: 0,
     stayQuantity: 0
@@ -66,12 +66,14 @@ export class OrderManagementRiskComponent implements OnInit {
     this.service.request(this.service.$api_get_listStatisticalStatus, {}).subscribe(res => {
       if (res) {
        res.forEach((element: any) => {
-        if(element.statusLabel === '待发车') {
+        if(element.representationsStatusLabel === '待申述') {
           this.tabs.stayQuantity = element.quantity
-        } else if (element.statusLabel === '待接单') {
+        } else if (element.representationsStatusLabel === '申诉失败') {
           this.tabs.receivedQuantity = element.quantity
-        } else if (element.statusLabel === '待签收') {
+        } else if (element.representationsStatusLabel === '申述成功') {
           this.tabs.cancelQuantity = element.quantity
+        } else if (element.representationsStatusLabel === '申诉中') {
+          this.tabs.underwayQuantity = element.quantity
         } 
        });
       }
diff --git a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
index 1a9b7416..b7c8a254 100644
--- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
+++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
@@ -2,7 +2,7 @@ import { ViewChild } from '@angular/core';
 /*
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2021-12-24 14:59:33
+ * @LastEditTime: 2021-12-24 15:35:18
  * @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
@@ -424,19 +424,15 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
     console.log(this.sf.value)
     const params = {
       id: this.id,
-      unLoadingPlaceList: [...this.startInfo, ...this.endInfo,], 
-      goodsResource: [{
-        id: this.i?.goodsResource?.id,
-        enterpriseInfoId: this.sf3.value?.enterpriseInfoId,
-      }],
+      unLoadingPlaceDTOList: [...this.startInfo, ...this.endInfo,], 
       receiptFilePath: imgList,
-      goodsInfoList: [{
+      goodsInfoDTOList: [{
         id: this.i?.goodsInfoList?.[0].id,
         goodsName: this.sf3.value?.goodsName,
         ...this.sf4.value
       }],
       // 运费信息
-      expenseList: this.i?.billExpenseDetails,
+      billExpenseDetailDTOList: this.i?.billExpenseDetails,
       // 收款人
       payeeId: this.dirverPhone,
       dirverBankCard: this.dirverBankCard, // 银行卡
@@ -572,18 +568,18 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
 initSF3() {
   this.schema3 = {
     properties: {
-      enterpriseInfoId: {
-        title: '网络货运人',
-        type: 'string',
-        ui: {
-          placeholder: '请选择',
-          widget: 'select',
-          asyncData: () => this.service2.getNetworkFreightForwarder(),
-          visibleIf: {
-            _$expand: (value: boolean) => value,
-          },
-        }
-      },
+      // enterpriseInfoId: {
+      //   title: '网络货运人',
+      //   type: 'string',
+      //   ui: {
+      //     placeholder: '请选择',
+      //     widget: 'select',
+      //     asyncData: () => this.service2.getNetworkFreightForwarder(),
+      //     visibleIf: {
+      //       _$expand: (value: boolean) => value,
+      //     },
+      //   }
+      // },
       goodsName: {
         type: 'string',
         title: '货物名称',
@@ -603,16 +599,13 @@ initSF3() {
         }
       }
     },
-    required: ['goodsName', 'enterpriseInfoId']
+    required: ['goodsName',]
   };
   this.ui3 = {
     '*': {
       spanLabelFixed: 110,
       grid: { span: 12 }
     },
-    $enterpriseInfoId: {
-      grid: { span: 16, }
-    },
     $goodsName: {
       grid: { span: 12 }
     },