From 1c627d57057a284d9ba5e5b46dadec27346c4b92 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Fri, 24 Dec 2021 14:00:19 +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        |  2 +-
 .../components/risk/risk.component.ts          | 18 ++++++++++++++++--
 .../vehicle-detail.component.html              | 16 ++++++++--------
 .../vehicle-detail/vehicle-detail.component.ts | 11 ++++++++---
 .../services/order-management.service.ts       |  2 ++
 5 files changed, 35 insertions(+), 14 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 e1ff9bdb..908128a6 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-20 09:29:11
+ * @LastEditTime: 2021-12-24 13:26:16
  * @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
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 a620e7f5..4d17f2ca 100644
--- a/src/app/routes/order-management/components/risk/risk.component.ts
+++ b/src/app/routes/order-management/components/risk/risk.component.ts
@@ -15,7 +15,6 @@ import { OrderManagementService } from '../../services/order-management.service'
   styleUrls: ['./risk.component.less']
 })
 export class OrderManagementRiskComponent implements OnInit {
-  url = `/user?_allow_anonymous=true`;
   ui: SFUISchema = {};
   uiView: SFUISchema = {};
   schema: SFSchema = {};
@@ -59,10 +58,25 @@ export class OrderManagementRiskComponent implements OnInit {
     return this.st?.list.filter(item => item.checked) || [];
   }
   ngOnInit(): void {
+    this.getGoodsSourceStatistical()
     this.initSF();
     this.initST();
   }
-
+  getGoodsSourceStatistical() {
+    this.service.request(this.service.$api_get_listStatisticalStatus, {}).subscribe(res => {
+      if (res) {
+       res.forEach((element: any) => {
+        if(element.statusLabel === '待发车') {
+          this.tabs.stayQuantity = element.quantity
+        } else if (element.statusLabel === '待接单') {
+          this.tabs.receivedQuantity = element.quantity
+        } else if (element.statusLabel === '待签收') {
+          this.tabs.cancelQuantity = element.quantity
+        } 
+       });
+      }
+    })
+  }
   /**
    * 初始化查询表单
    */
diff --git 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
index 6626428a..8d28419f 100644
--- 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,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2021-12-23 17:40:37
+ * @LastEditTime: 2021-12-24 13:59:12
  * @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
@@ -81,13 +81,13 @@
 <nz-card nzTitle="运单进度">
   <div class="approval-status">
     <div style="width: 60%; margin: 0 auto">
-      <nz-steps [nzLabelPlacement]="'vertical'">
+      <!-- <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> -->
     </div>
   </div>
 </nz-card>
@@ -97,27 +97,27 @@
     <div nz-row [nzGutter]="24">
       <div nz-col [nzSpan]="12">
         <div class="handling-info p-md">
-          <!-- <div class="flex" *ngFor="let item of i?.unLoadingPlaceList;let idx = index">
+          <div class="flex" *ngFor="let item of i?.unLoadingPlaceList;let idx = index">
             <div *ngIf="item?.type === '1'" class="loading-row">
               <div class="info">
                 <h4>装货地：{{item?.province}}{{item?.city}}{{item?.area}}{{item?.detailedAddress}}</h4>
                 <p>联系人：{{item?.appUserName}}/{{item?.contractTelephone}}</p>
               </div>
             </div>
-          </div> -->
+          </div>
           <p class="time-info">计划装货时间：{{i?.goodsResource?.[0]?.loadingTime}}</p>
         </div>
       </div>
       <div nz-col [nzSpan]="12">
         <div class="handling-info p-md">
-          <!-- <div class="flex" *ngFor="let item of i?.unLoadingPlaceList;let idx = index">
+          <div class="flex" *ngFor="let item of i?.unLoadingPlaceList;let idx = index">
             <div *ngIf="item?.type === '2'" class="loading-row">
               <div class="info">
                 <h4>卸货地：{{item?.province}}{{item?.city}}{{item?.area}}{{item?.detailedAddress}}</h4>
                 <p>联系人：{{item?.appUserName}}/{{item?.contractTelephone}}</p>
               </div>
             </div>
-          </div> -->
+          </div>
           <p class="time-info">计划卸货时间：{{i?.goodsResource?.[0]?.unloadingTime}}</p>
         </div>
       </div>
@@ -141,7 +141,7 @@
         {{i?.goodsInfoList?.[0]?.maxWeightLabel}}/{{i?.goodsInfoList?.[0]?.maxCube}}
       </sv>
       <sv label="承运司机">
-        {{i?.driverId}}
+        <!-- {{i?.driverId}} -->
       </sv>
       <sv label="车型车长载重">
         {{i?.goodsInfoList?.[0]?.weight}}顿,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件
diff --git 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
index 7d7ef975..57d3e80e 100644
--- 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-23 16:35:59
+ * @LastEditTime: 2021-12-24 13:58:21
  * @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
@@ -22,8 +22,12 @@ import { OrderManagementService } from '../../services/order-management.service'
 export class OrderManagementVehicleDetailComponent implements OnInit {
 
   id = this.route.snapshot.params.id;
-  @ViewChild('distannce3', { static: false })
-  i: any= {unLoadingPlaceList:[]};
+  i: any= {
+    unLoadingPlaceList:[],
+    billExpenseDetails: [],
+    goodsInfoList:[],
+    goodsResource: []
+  };
   imges: any;
   isVisible = false;
   logColumns: STColumn[] = [
@@ -68,6 +72,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
       console.log(res)
       if (res) {
         this.i =res;
+        console.log(this.i?.unLoadingPlaceList)
       }
     })
   }
diff --git a/src/app/routes/order-management/services/order-management.service.ts b/src/app/routes/order-management/services/order-management.service.ts
index b1ff6ebc..82b44c4f 100644
--- a/src/app/routes/order-management/services/order-management.service.ts
+++ b/src/app/routes/order-management/services/order-management.service.ts
@@ -24,6 +24,8 @@ export class OrderManagementService extends BaseService {
    // 风险单：
   //  风险单列表查询
   $api_get_listRiskPage = `/api/sdc/billRiskOperate/listRiskPage`;
+  //  风险单列表查询
+  $api_get_listStatisticalStatus = `/api/sdc/billRiskOperate/listStatisticalStatus`;
   //  风险单详情查询
   $api_get_getRiskDetail = `/api/sdc/billRiskOperate/getRiskDetail`;
   //  风险单审核