From 8311b7c7839976d76e50dd15ab1f899792050abe Mon Sep 17 00:00:00 2001
From: 1107302052 <1107302052@qq.com>
Date: Mon, 14 Mar 2022 15:25:49 +0800
Subject: [PATCH] 'fixbug'

---
 .../bulk-detail/bulk-detail.component.html    |  4 +--
 .../components/vehicle/vehicle.component.ts   | 10 ------
 .../freight-people.component.ts               |  4 +--
 .../vehicle-detail.component.html             | 31 +++++++++----------
 .../services/waybill-management.service.ts    |  2 +-
 5 files changed, 19 insertions(+), 32 deletions(-)

diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
index 60108072..895ed730 100644
--- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
+++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
@@ -94,8 +94,8 @@
       {{ i?.unloadPlanTime }}
     </sv> -->
     <sv label="接单数量"> {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方 </sv>
-    <sv *ngIf="i?.billStatus =='3' || i?.billStatus =='4' || i?.billStatus =='5'" label="装货数量"> {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方,{{ i?.acceptNumber }}件 </sv>
-    <sv *ngIf="i?.billStatus =='4' || i?.billStatus =='5'" label="卸货数量"> {{ i?.settlementWeight }}吨,{{ i?.settlementVolume }}方,{{ i?.acceptNumber }}件 </sv>
+    <sv *ngIf="i?.billStatus =='3' || i?.billStatus =='4' || i?.billStatus =='5'" label="装货数量"> {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方</sv>
+    <sv *ngIf="i?.billStatus =='4' || i?.billStatus =='5'" label="卸货数量"> {{ i?.settlementWeight }}吨,{{ i?.settlementVolume }}方</sv>
   </sv-container>
   <div class="mt-md">
     <h4 class="text-md"
diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
index eb7ed520..55188893 100644
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
@@ -748,16 +748,6 @@ resourceStatus: any;
           nzContent: VehicleFreightPeopleComponent,
           nzComponentParams: { data: { ids: params, enterpriseInfoIds: params2, } },
           nzFooter: null,
-          // nzOnOk: sin => {
-          //   this.service.request(this.service.$api_change_bulk, { billId: item.id, ...sin.sf.value }).subscribe(res => {
-          //     if (res) {
-          //       this.service.msgSrv.success('变更运费成功');
-          //       modal.destroy();
-          //       this.st.reload();
-          //     }
-          //   });
-          //   return false;
-          // }
         });
         modal.afterClose.subscribe((result) => {
           if (result) {
diff --git a/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.ts b/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.ts
index 186d9e9d..14065be9 100644
--- a/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.ts
+++ b/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.ts
@@ -61,7 +61,7 @@ export class VehicleFreightPeopleComponent implements OnInit {
     };
     this.ui = {
       '*': {
-        spanLabelFixed: 100,
+        spanLabelFixed: 130,
         grid: { span: 16 }
       }
     };
@@ -80,7 +80,7 @@ export class VehicleFreightPeopleComponent implements OnInit {
     console.log(params);
     this.service.request(this.service.$api_set_updateEnterpriseInfoBatch, params).subscribe((res: any) => {
       if (res) {
-        this.modal.destroy();
+        this.modal.destroy(true);
         this.service.msgSrv.success('变更运费成功');
       }
     });
diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html
index 4ca6d51d..5302dbeb 100644
--- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html
@@ -133,13 +133,13 @@
 <nz-card nzTitle="服务信息">
   <sv-container>
     <sv label="服务包">
-      {{i?.goodsResource?.insuranceTypeLabel}}
+      {{i?.insuranceTypeLabel}}
     </sv>
     <sv label="货物价值">
-      {{i?.goodsResource?.goodsValue !==null?(i?.goodsResource?.goodsValue|currency)+'元':'-'}}
+      {{i?.goodsValue !==null?(i?.goodsValue|currency)+'元':'-'}}
     </sv>
     <sv label="保价费金额">
-      {{i?.goodsResource?.insurancePremium!==null?(i?.goodsResource?.insurancePremium |currency)+'元':'-'}}
+      {{i?.insurancePremium!==null?(i?.insurancePremium |currency)+'元':'-'}}
     </sv>
   </sv-container>
 </nz-card>
@@ -181,28 +181,25 @@
 <nz-card nzTitle="补充信息">
   <sv-container>
     <sv label="是否回单">
-      {{i?.receiptType == 1 ?'是':'否'}}
+      {{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }}
     </sv>
-    <sv label="回单类型" *ngIf="i?.receiptType == 1">
-      {{i?.receiptTypeLabel}}
+    <sv label="回单类型" *ngIf="i?.supplementaryInformationVO?.stateReceipt">
+      {{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }}
     </sv>
-    <sv label="联系人" *ngIf="i?.receiptType == 1">
-      {{i?.receiptUser}}{{ i?.receiptUserPhone ? ' /' + i?.receiptUserPhone : ''}}
+    <sv label="联系人" *ngIf="i?.supplementaryInformationVO?.stateReceipt">  {{ i?.supplementaryInformationVO?.receiptUserName }} / {{ i?.supplementaryInformationVO?.phon }} </sv>
+    <sv label="所在地区" *ngIf="i?.supplementaryInformationVO?.stateReceipt">
+      {{ i?.supplementaryInformationVO?.area }}
     </sv>
-    <sv label="所在地区" *ngIf="i?.receiptType == 1">
-      {{i?.receiptPlace}}
+    <sv label="详细地址" *ngIf="i?.supplementaryInformationVO?.stateReceipt">
+      {{ i?.supplementaryInformationVO?.address }}
     </sv>
-    <sv label="详细地址" *ngIf="i?.receiptType == 1">
-      {{i?.receiptAddress}}
-    </sv>
-  
   </sv-container>
   <sv-container col="1" class="mt-md">
-    <sv label="回单凭证" *ngIf="i?.receiptType == 1">
-      <app-imagelist *ngIf="i?.receiptFilePath" [imgList]="[i?.receiptFilePath]"></app-imagelist>
+    <sv label="回单凭证" *ngIf="i?.supplementaryInformationVO?.stateReceipt">
+      <app-imagelist [imgList]="i?.receiptFilePath"></app-imagelist>
     </sv>
     <sv label="备注">
-      {{i?.goodsResource?.remarks}}
+      {{ i?.supplementaryInformationVO?.remarks }}
     </sv>
   </sv-container>
 </nz-card>
diff --git a/src/app/routes/waybill-management/services/waybill-management.service.ts b/src/app/routes/waybill-management/services/waybill-management.service.ts
index d4b60735..aeea4f10 100644
--- a/src/app/routes/waybill-management/services/waybill-management.service.ts
+++ b/src/app/routes/waybill-management/services/waybill-management.service.ts
@@ -56,7 +56,7 @@ export class WaybillManagementServe extends BaseService {
  // 获取轨迹
  $api_get_getTrajectory = `/api/sdc/billShipper/getTrajectoryByBillId`;
  //  获取订单司机轨迹
- $api_get_getAppDriverPosition = `/api/sdc/billShipper/getAppDriverPosition`;
+ $api_get_getAppDriverPosition = `/api/sdc/wayBillOperate/getAppDriverPosition`;
   // 获取货主企业列表
   public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList';
   constructor(public injector: Injector) {