From 5fcdba486e98ce6e399038b19f21b05cbf001440 Mon Sep 17 00:00:00 2001
From: 1107302052 <1107302052@qq.com>
Date: Tue, 15 Mar 2022 13:00:50 +0800
Subject: [PATCH] 'fixbug'

---
 .../modal/vehicle/sure-arrive/sure-arrive.component.ts     | 7 ++++---
 .../modal/vehicle/sure-depart/sure-depart.component.ts     | 6 +++---
 .../waybill-management/components/bulk/bulk.component.ts   | 3 +--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts b/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts
index 99899e08..9a58fc6c 100644
--- a/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts
+++ b/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts
@@ -407,7 +407,7 @@ export class VehicleSureArriveComponent implements OnInit {
           } as SFUploadWidgetSchema,
         }
       },
-      required: ['time' ]
+      required: ['time','weight','volume' ]
     };
   }
     this.ui = {
@@ -434,6 +434,7 @@ export class VehicleSureArriveComponent implements OnInit {
         time: value?.time,
       }
       params.time = this.datePipe.transform(value.time, 'yyyy-MM-dd HH:mm:ss ')
+ 
       this.service.request(this.service.$api_get_insertWholeUnloadCarInfo, params).subscribe((res) => {
         if(res) {
           this.service.msgSrv.success('确认到车成功！')
@@ -441,8 +442,8 @@ export class VehicleSureArriveComponent implements OnInit {
         }
       })
     } else {
-      if(!value.time ) {
-        this.service.msgSrv.warning('卸货时间为空！')
+      if(!value.time || !this.data?.volume || !this.data?.weight) {
+        this.service.msgSrv.warning('卸货时间或卸货重量为空！')
         return;
        }
         const params = {
diff --git a/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts b/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts
index 6bc299cf..927c3f9d 100644
--- a/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts
+++ b/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts
@@ -249,7 +249,7 @@ export class VehicleSureDepartComponent implements OnInit {
             } as SFUploadWidgetSchema,
           }
         },
-        required: ['time']
+        required: ['time','weight', 'volume']
       };
     }
   
@@ -282,8 +282,8 @@ export class VehicleSureDepartComponent implements OnInit {
         }
       })
     } else {
-      if(!value?.time) {
-        this.service.msgSrv.warning('装货时间为空！')
+      if(!value?.time || !this.data?.volume || !this.data?.weight) {
+        this.service.msgSrv.warning('装货时间或装货重量为空！')
         return;
        }
         console.log(value)
diff --git a/src/app/routes/waybill-management/components/bulk/bulk.component.ts b/src/app/routes/waybill-management/components/bulk/bulk.component.ts
index f4f45f08..bf20b5d7 100644
--- a/src/app/routes/waybill-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/waybill-management/components/bulk/bulk.component.ts
@@ -283,8 +283,7 @@ tabs = {
         width: '200px',
         className: 'text-left',
         format: (item: any) =>
-          `${item.settlementWeight || '0'}吨/
-           ${item.settlementVolume || '0'}方`
+          `${item.settlementWeight || ''}`
       },
       {
         title: '承运司机',