Merge branch 'develop' of gitlab.eascs.com:tms-ui/tms-obc-web into develop

package.json

@@ -1,7 +1,7 @@
 {
   "name": "tms-obc-web",
   "version": "0.0.0",
-  "description": "运营后台－WEB",
+  "description": "运营后台-WEB",
   "author": "cipchk <cipchk@qq.com>",
   "repository": {
     "type": "git",

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-03-11 11:02:51
+ * @LastEditTime : 2022-03-11 16:40:47
  * @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.
 -->
@@ -256,7 +256,6 @@
 </nz-card>
 
 <nz-card nzTitle="运费信息"#distannce3>
- <div  *ngIf="(i?.billStatus == '3' && i.goodsInfoList?.[0].settlementBasis == '2') || (i?.billStatus == '4' && i.goodsInfoList?.[0].settlementBasis == '1')" >
   <h2>{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}（{{ i?.goodsInfoList?.[0]?.settlementBasisLabel ? i?.goodsInfoList?.[0]?.settlementBasisLabel + '，' :' ' }}{{i?.goodsInfoList?.[0]?.ruleLabel}}）</h2>
   <st #st [data]="billExpenses" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
     <ng-template st-row="PriceType" let-item let-index="index"> 到付 </ng-template>
@@ -274,7 +273,6 @@
     </div>
   </div>
   <div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
- </div>
 </nz-card>
 
 

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

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-06 20:20:26
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-11 11:03:14
+ * @LastEditTime : 2022-03-11 16:40:33
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -87,12 +87,12 @@
     <sv label="用车需求">{{ i?.carModel }}/{{ i?.carLength }} </sv>
     <sv label="承运司机"> {{ i?.driverName }}/{{ i?.driverPhone }}{{ i?.carNo }} </sv>
     <sv label="车型车长载重"> {{ i?.driverCarModelLabel }},{{ i?.driverCarLengthLabel }}米,{{ i?.driverCarWeight }}吨 </sv>
-    <sv label="计划装货时间">
+    <!-- <sv label="计划装货时间">
       {{ i?.loadPlanTime }}
     </sv>
     <sv label="计划卸货时间">
       {{ i?.unloadPlanTime }}
-    </sv>
+    </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>
@@ -138,7 +138,6 @@
   </div>
 </nz-card>
 <nz-card nzTitle="运费信息" #distannce3>
-  <div  *ngIf="(i?.billStatus == '3' && i.goodsInfoList?.[0].settlementBasis == '2') || (i?.billStatus == '4' && i.goodsInfoList?.[0].settlementBasis == '1')" >
   <h2>{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}（{{ i?.goodsInfoList?.[0]?.settlementBasisLabel ? i?.goodsInfoList?.[0]?.settlementBasisLabel + '，' :' ' }}{{i?.goodsInfoList?.[0]?.ruleLabel}}）</h2>
   <st #st [data]="billExpenses" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
     <ng-template st-row="PriceType" let-item let-index="index"> 到付 </ng-template>
@@ -156,7 +155,6 @@
     </div>
   </div>
   <div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
-</div>
 </nz-card>
 
 <nz-card nzTitle="附件信息" #distannce4>

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-03-11 11:00:28
+ * @LastEditTime : 2022-03-11 16:41:08
  * @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.
 -->
@@ -43,7 +43,7 @@
       <nz-tabset style="margin-top: 15px">
         <nz-tab nzTitle="装卸货信息" (nzClick)="goDistance(distannce1)"> </nz-tab>
         <nz-tab nzTitle="基本信息" (nzClick)="goDistance(distannce2)"> </nz-tab>
-        <!-- <nz-tab nzTitle="运费信息" (nzClick)="goDistance(distannce3)"> </nz-tab> -->
+        <nz-tab nzTitle="运费信息" (nzClick)="goDistance(distannce3)"> </nz-tab>
         <nz-tab nzTitle="附件信息" (nzClick)="goDistance(distannce4)"> </nz-tab>
         <nz-tab nzTitle="轨迹信息" (nzClick)="goDistance(distannce5)"> </nz-tab>
       </nz-tabset>

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-03-11 11:24:29
+ * @LastEditTime : 2022-03-11 17:58:28
  * @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.
  */
@@ -93,11 +93,11 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
     }
   ];
   trajectory = 'car';
-  mapList:any[] = [];  //地图点位数据组
+  mapList: any[] = []; //地图点位数据组
-  addressItems:any[] = [];  //打点地址数据组
+  addressItems: any[] = []; //打点地址数据组
   logColumns2: STColumn[] = [
     { title: '时间', index: 'vinOutTime' },
-    { title: '地点', index: 'cityName' },
+    { title: '地点', index: 'cityName' }
   ];
   constructor(
     private route: ActivatedRoute,
@@ -204,14 +204,6 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
             listType: 'picture-card'
           } as SFUploadWidgetSchema
         },
-        no4: {
-          type: 'string',
-          title: '',
-          ui: {
-            widget: 'text'
-          },
-          default: ''
-        },
         no7: {
           type: 'string',
           title: '',
@@ -405,7 +397,6 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
           }
         });
         // 对装货凭证进行初始化
-        if (res?.loadingLadingBillFilePath) {
           this.formData = {
             loadingLadingBillFilePath: [
               {
@@ -425,7 +416,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
                 status: 'done',
                 url: res?.loadingPeopleVehiclesGoodsFilePath,
                 response: {
-                  url: res?.loadingPeopleVehiclesGoodsFilePath
+                  url: res?.loadingPeopleVehiclesGoodsFilePath,
                 }
               }
             ],
@@ -452,7 +443,6 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
               }
             ]
           };
-        }
         // 发车时间到车时间初始化
         this.loadTime = res?.loadTime;
         this.unloadTime = res?.unloadTime;
@@ -683,7 +673,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
       '*': {
         spanLabelFixed: 110,
         grid: { span: 12 }
-      },
+      }
     };
   }
   changeGoodsType(value: string, data: any) {
@@ -821,7 +811,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
       file.preview = await getBase64(file.originFileObj!);
     }
     console.log('888888888');
-    
+
     this.previewImage1 = file.url || file.preview;
     this.previewVisible1 = true;
   };
@@ -921,60 +911,60 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
       });
     }
   }
-    // 获取车辆轨迹
+  // 获取车辆轨迹
-    getTrajectory(){
+  getTrajectory() {
-      this.service.request(this.service.$api_get_getTrajectory, { id: this.id }).subscribe(res => {
+    this.service.request(this.service.$api_get_getTrajectory, { id: this.id }).subscribe(res => {
-        if (res) {
+      if (res) {
-          const points = res?.trackArray;
+        const points = res?.trackArray;
-          let list :any[] = [];
+        let list: any[] = [];
-          points?.forEach((item: any) => {
+        points?.forEach((item: any) => {
-            list.push({
+          list.push({
-              name: item.hgt,
+            name: item.hgt,
-              lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))]
+            lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))]
-            });
           });
-          this.mapList = list;
+        });
-          this.addressItems = res?.cityArray;
+        this.mapList = list;
-          if(this.addressItems && this.addressItems.length > 0){
+        this.addressItems = res?.cityArray;
-            this.addressItems.forEach(item => {
+        if (this.addressItems && this.addressItems.length > 0) {
-              item.vinOutTime = this.getLocalTime(item.vinOutTime);
+          this.addressItems.forEach(item => {
-            });
+            item.vinOutTime = this.getLocalTime(item.vinOutTime);
-          }
-        }
-      });
-    }
-  
-     // 获取司机轨迹
-     getDriverTrajectory(){
-      this.service.request(this.service.$api_get_getAppDriverPosition, { id: this.id }).subscribe(res => {
-        if (res) {
-          const points = res?.tracks;
-          let list :any[] = [];
-          points?.forEach((item: any) => {
-            list.push({
-              name: item.hgt,
-              lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))]
-            });
           });
-          this.mapList = list;
-          this.addressItems = [...res?.enclosureDataAppTrack];
-          if(this.addressItems && this.addressItems.length > 0){
-            this.addressItems.forEach(item => {
-              item.vinOutTime = this.getLocalTime(item.gtm);
-              item.cityName = item.appAdress;
-            });
-          }
         }
-      });
-     }
-     trajectoryChange(event:any){
-      if(event ==='car'){
-        this.getTrajectory()
-      }else if(event ==='driver'){
-        this.getDriverTrajectory();
       }
-   }
+    });
-    getLocalTime(time: any) {
+  }
-      return format(new Date(parseInt(time)), 'yyyy-MM-dd HH:mm:ss');
+
+  // 获取司机轨迹
+  getDriverTrajectory() {
+    this.service.request(this.service.$api_get_getAppDriverPosition, { id: this.id }).subscribe(res => {
+      if (res) {
+        const points = res?.tracks;
+        let list: any[] = [];
+        points?.forEach((item: any) => {
+          list.push({
+            name: item.hgt,
+            lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))]
+          });
+        });
+        this.mapList = list;
+        this.addressItems = [...res?.enclosureDataAppTrack];
+        if (this.addressItems && this.addressItems.length > 0) {
+          this.addressItems.forEach(item => {
+            item.vinOutTime = this.getLocalTime(item.gtm);
+            item.cityName = item.appAdress;
+          });
+        }
+      }
+    });
+  }
+  trajectoryChange(event: any) {
+    if (event === 'car') {
+      this.getTrajectory();
+    } else if (event === 'driver') {
+      this.getDriverTrajectory();
     }
+  }
+  getLocalTime(time: any) {
+    return format(new Date(parseInt(time)), 'yyyy-MM-dd HH:mm:ss');
+  }
 }

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-03-11 10:59:57
+ * @LastEditTime : 2022-03-11 16:09:47
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -132,7 +132,20 @@
     </div>
   </div>
 </nz-card>
-<nz-card nzTitle="保险待定"> </nz-card>
+<nz-card nzTitle="服务信息">
+  <sv-container>
+    <sv label="服务包">
+      {{i?.goodsResource?.insuranceTypeLabel}}
+    </sv>
+    <sv label="货物价值">
+      {{i?.goodsResource?.goodsValue !==null?(i?.goodsResource?.goodsValue|currency)+'元':'-'}}
+    </sv>
+    <sv label="保价费金额">
+      {{i?.goodsResource?.insurancePremium!==null?(i?.goodsResource?.insurancePremium |currency)+'元':'-'}}
+    </sv>
+  </sv-container>
+</nz-card>
+
 
 <nz-card nzTitle="运费信息" #distannce3>
   <st #st [data]="billExpenses" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">

src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts

@@ -64,7 +64,7 @@ export class VehicleSureArriveComponent implements OnInit {
           ui: {
             widget: 'upload',
             action: apiConf.fileUpload,
-            fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+            accept: 'image/png,image/jpeg,image/jpg,image/gif',
             limit: 1,
             limitFileCount: 1,
             resReName: 'data.fullFileWatermarkPath',
@@ -77,7 +77,7 @@ export class VehicleSureArriveComponent implements OnInit {
             beforeUpload: (file: any, fileList: any) => {
               return new Observable((observer: Observer<boolean>) => {
                 const isLt1M = file.size / 1024 / 1024 < 5;
-                const fileType = 'image/png,image/jpeg';
+                const fileType = 'image/png,image/jpeg,image/jpg,image/gif';
                 if (fileType.indexOf(file.type) === -1) {
                   this.service.msgSrv.warning('图片格式不正确！');
                   observer.complete();
@@ -103,7 +103,7 @@ export class VehicleSureArriveComponent implements OnInit {
           ui: {
             widget: 'upload',
             action: apiConf.fileUpload,
-            fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+            accept: 'image/png,image/jpeg,image/jpg,image/gif',
             limit: 1,
             limitFileCount: 1,
             resReName: 'data.fullFileWatermarkPath',
@@ -116,7 +116,7 @@ export class VehicleSureArriveComponent implements OnInit {
             beforeUpload: (file: any, fileList: any) => {
               return new Observable((observer: Observer<boolean>) => {
                 const isLt1M = file.size / 1024 / 1024 < 5;
-                const fileType = 'image/png,image/jpeg';
+                const fileType = 'image/png,image/jpeg,image/jpg,image/gif';
                 if (fileType.indexOf(file.type) === -1) {
                   this.service.msgSrv.warning('图片格式不正确！');
                   observer.complete();
@@ -149,7 +149,7 @@ export class VehicleSureArriveComponent implements OnInit {
           ui: {
             widget: 'upload',
             action: apiConf.fileUpload,
-            fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+            accept: 'image/png,image/jpeg,image/jpg,image/gif',
             limit: 1,
             limitFileCount: 1,
             resReName: 'data.fullFileWatermarkPath',
@@ -162,7 +162,7 @@ export class VehicleSureArriveComponent implements OnInit {
             beforeUpload: (file: any, fileList: any) => {
               return new Observable((observer: Observer<boolean>) => {
                 const isLt1M = file.size / 1024 / 1024 < 5;
-                const fileType = 'image/png,image/jpeg';
+                const fileType = 'image/png,image/jpeg,image/jpg,image/gif';
                 if (fileType.indexOf(file.type) === -1) {
                   this.service.msgSrv.warning('图片格式不正确！');
                   observer.complete();
@@ -187,7 +187,7 @@ export class VehicleSureArriveComponent implements OnInit {
           ui: {
             widget: 'upload',
             action: apiConf.fileUpload,
-            fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+            accept: 'image/png,image/jpeg,image/jpg,image/gif',
             limit: 1,
             limitFileCount: 1,
             resReName: 'data.fullFileWatermarkPath',
@@ -200,7 +200,7 @@ export class VehicleSureArriveComponent implements OnInit {
             beforeUpload: (file: any, fileList: any) => {
               return new Observable((observer: Observer<boolean>) => {
                 const isLt1M = file.size / 1024 / 1024 < 5;
-                const fileType = 'image/png,image/jpeg';
+                const fileType = 'image/png,image/jpeg,image/jpg,image/gif';
                 if (fileType.indexOf(file.type) === -1) {
                   this.service.msgSrv.warning('图片格式不正确！');
                   observer.complete();
@@ -251,7 +251,7 @@ export class VehicleSureArriveComponent implements OnInit {
           ui: {
             widget: 'upload',
             action: apiConf.fileUpload,
-            fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+            accept: 'image/png,image/jpeg,image/jpg,image/gif',
             limit: 1,
             limitFileCount: 1,
             resReName: 'data.fullFileWatermarkPath',
@@ -264,7 +264,7 @@ export class VehicleSureArriveComponent implements OnInit {
             beforeUpload: (file: any, fileList: any) => {
               return new Observable((observer: Observer<boolean>) => {
                 const isLt1M = file.size / 1024 / 1024 < 5;
-                const fileType = 'image/png,image/jpeg';
+                const fileType = 'image/png,image/jpeg,image/jpg,image/gif';
                 if (fileType.indexOf(file.type) === -1) {
                   this.service.msgSrv.warning('图片格式不正确！');
                   observer.complete();
@@ -290,7 +290,7 @@ export class VehicleSureArriveComponent implements OnInit {
           ui: {
             widget: 'upload',
             action: apiConf.fileUpload,
-            fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+            accept: 'image/png,image/jpeg,image/jpg,image/gif',
             limit: 1,
             limitFileCount: 1,
             resReName: 'data.fullFileWatermarkPath',
@@ -303,7 +303,7 @@ export class VehicleSureArriveComponent implements OnInit {
             beforeUpload: (file: any, fileList: any) => {
               return new Observable((observer: Observer<boolean>) => {
                 const isLt1M = file.size / 1024 / 1024 < 5;
-                const fileType = 'image/png,image/jpeg';
+                const fileType = 'image/png,image/jpeg,image/jpg,image/gif';
                 if (fileType.indexOf(file.type) === -1) {
                   this.service.msgSrv.warning('图片格式不正确！');
                   observer.complete();
@@ -336,7 +336,7 @@ export class VehicleSureArriveComponent implements OnInit {
           ui: {
             widget: 'upload',
             action: apiConf.fileUpload,
-            fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+            accept: 'image/png,image/jpeg,image/jpg,image/gif',
             limit: 1,
             limitFileCount: 1,
             resReName: 'data.fullFileWatermarkPath',
@@ -349,7 +349,7 @@ export class VehicleSureArriveComponent implements OnInit {
             beforeUpload: (file: any, fileList: any) => {
               return new Observable((observer: Observer<boolean>) => {
                 const isLt1M = file.size / 1024 / 1024 < 5;
-                const fileType = 'image/png,image/jpeg';
+                const fileType = 'image/png,image/jpeg,image/jpg,image/gif';
                 if (fileType.indexOf(file.type) === -1) {
                   this.service.msgSrv.warning('图片格式不正确！');
                   observer.complete();
@@ -374,7 +374,7 @@ export class VehicleSureArriveComponent implements OnInit {
           ui: {
             widget: 'upload',
             action: apiConf.fileUpload,
-            fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+            accept: 'image/png,image/jpeg,image/jpg,image/gif',
             limit: 1,
             limitFileCount: 1,
             resReName: 'data.fullFileWatermarkPath',
@@ -387,7 +387,7 @@ export class VehicleSureArriveComponent implements OnInit {
             beforeUpload: (file: any, fileList: any) => {
               return new Observable((observer: Observer<boolean>) => {
                 const isLt1M = file.size / 1024 / 1024 < 5;
-                const fileType = 'image/png,image/jpeg';
+                const fileType = 'image/png,image/jpeg,image/jpg,image/gif';
                 if (fileType.indexOf(file.type) === -1) {
                   this.service.msgSrv.warning('图片格式不正确！');
                   observer.complete();

src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts

@@ -69,7 +69,7 @@ export class VehicleSureDepartComponent implements OnInit {
             ui: {
               widget: 'upload',
               action: apiConf.fileUpload,
-              fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+              accept: 'image/png,image/jpeg,image/jpg,image/gif',
               limit: 1,
               limitFileCount: 1,
               resReName: 'data.fullFileWatermarkPath',
@@ -82,7 +82,7 @@ export class VehicleSureDepartComponent implements OnInit {
               beforeUpload: (file: any, fileList: any) => {
                 return new Observable((observer: Observer<boolean>) => {
                   const isLt1M = file.size / 1024 / 1024 < 5;
-                  const fileType = 'image/png,image/jpeg';
+                  const fileType = 'image/png,image/jpeg,image/jpg,image/gif';
                   if (fileType.indexOf(file.type) === -1) {
                     this.service.msgSrv.warning('图片格式不正确！');
                     observer.complete();
@@ -107,7 +107,7 @@ export class VehicleSureDepartComponent implements OnInit {
             ui: {
               widget: 'upload',
               action: apiConf.fileUpload,
-              fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+              accept: 'image/png,image/jpeg,image/jpg,image/gif',
               limit: 1,
               limitFileCount: 1,
               resReName: 'data.fullFileWatermarkPath',
@@ -120,7 +120,7 @@ export class VehicleSureDepartComponent implements OnInit {
               beforeUpload: (file: any, fileList: any) => {
                 return new Observable((observer: Observer<boolean>) => {
                   const isLt1M = file.size / 1024 / 1024 < 5;
-                  const fileType = 'image/png,image/jpeg';
+                  const fileType = 'image/png,image/jpeg,image/jpg,image/gif';
                   if (fileType.indexOf(file.type) === -1) {
                     this.service.msgSrv.warning('图片格式不正确！');
                     observer.complete();
@@ -178,7 +178,7 @@ export class VehicleSureDepartComponent implements OnInit {
             ui: {
               widget: 'upload',
               action: apiConf.fileUpload,
-              fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+              accept: 'image/png,image/jpeg,image/jpg,image/gif',
               limit: 1,
               limitFileCount: 1,
               resReName: 'data.fullFileWatermarkPath',
@@ -191,7 +191,7 @@ export class VehicleSureDepartComponent implements OnInit {
               beforeUpload: (file: any, fileList: any) => {
                 return new Observable((observer: Observer<boolean>) => {
                   const isLt1M = file.size / 1024 / 1024 < 5;
-                  const fileType = 'image/png,image/jpeg';
+                  const fileType = 'image/png,image/jpeg,image/jpg,image/gif';
                   if (fileType.indexOf(file.type) === -1) {
                     this.service.msgSrv.warning('图片格式不正确！');
                     observer.complete();
@@ -216,7 +216,7 @@ export class VehicleSureDepartComponent implements OnInit {
             ui: {
               widget: 'upload',
               action: apiConf.fileUpload,
-              fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+              accept: 'image/png,image/jpeg,image/jpg,image/gif',
               limit: 1,
               limitFileCount: 1,
               resReName: 'data.fullFileWatermarkPath',
@@ -229,7 +229,7 @@ export class VehicleSureDepartComponent implements OnInit {
               beforeUpload: (file: any, fileList: any) => {
                 return new Observable((observer: Observer<boolean>) => {
                   const isLt1M = file.size / 1024 / 1024 < 5;
-                  const fileType = 'image/png,image/jpeg';
+                  const fileType = 'image/png,image/jpeg,image/jpg,image/gif';
                   if (fileType.indexOf(file.type) === -1) {
                     this.service.msgSrv.warning('图片格式不正确！');
                     observer.complete();

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime : 2022-03-11 15:52:33
+ * @LastEditTime : 2022-03-11 17:27:42
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\bulk-detail\\bulk-detail.component.html
@@ -83,14 +83,14 @@
       {{i?.driver?.name}}/{{i?.driver?.phone}}
     </sv>
     <sv label="车型车长载重">
-      {{i?.carVO?.carModelLabel}},{{i?.carVO?.carLengthLabel}}米,{{i?.carVO?.carLoad ? i?.carVO?.carLoad +'吨': ''}}
+      {{i?.car?.carModelLabel}},{{i?.car?.carLengthLabel}}米,{{i?.car?.carLoad ? i?.car?.carLoad +'吨': ''}}
     </sv>
-    <sv label="计划装货时间">
+    <!-- <sv label="计划装货时间">
       {{i?.loadPlanTime}}
     </sv>
     <sv label="计划卸货时间">
       {{i?.unloadPlanTime}}
-    </sv>
+    </sv> -->
     <sv label="接单数量">
       {{i?.acceptWeight}}吨,{{i?.acceptVolume}}方,{{i?.acceptNumber}}件
     </sv>
@@ -158,7 +158,6 @@
   <div>收款人：{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}</div>
 </nz-card> -->
 <nz-card  [nzTitle]="'运费信息' +'（到货后'+i?.paymentDays+'天内支付运费）'"  #distannce3>
-  <div  *ngIf="(i?.wayBillStatus == '3' && i.goodsInfos?.[0].settlementBasis == '2') || (i?.wayBillStatus == '4' && i.goodsInfos?.[0].settlementBasis == '1')" >
   <h2>{{i?.goodsInfos?.[0]?.freightPrice}}{{i?.goodsInfos?.[0]?.freightTypeLabel}}（{{ i?.goodsInfos?.[0]?.settlementBasisLabel ? i?.goodsInfos?.[0]?.settlementBasisLabel + '，' :' ' }}{{i?.goodsInfos?.[0]?.ruleLabel}}）</h2>
   <st #st [data]="billExpenses" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
     <ng-template st-row="PriceType" let-item let-index="index"> 到付 </ng-template>
@@ -176,7 +175,6 @@
     </div>
   </div>
   <div>收款人：{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}</div>
-</div>
 </nz-card>
 
 <nz-card nzTitle="附件信息" #distannce4>

src/app/routes/waybill-management/components/bulk/bulk.component.html

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime : 2022-02-23 15:41:43
+ * @LastEditTime : 2022-03-11 16:04:29
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\bulk\\bulk.component.html
@@ -63,9 +63,6 @@
       [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
       [loading]="false"
     >
-    <ng-template st-row="createUserName" let-item let-index="index">
-      <div> {{ item?.createUserName }}/{{ item?.createUserPhone }} </div>
-    </ng-template>
     <ng-template st-row="createUserName" let-item let-index="index">
       <div> {{ item?.createUserName }}/{{ item?.createUserPhone }} </div>
     </ng-template>

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime : 2022-03-11 15:52:07
+ * @LastEditTime : 2022-03-11 16:39:50
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\vehicle-detail\\vehicle-detail.component.html
@@ -130,8 +130,20 @@
   </div>
 </div>
 </nz-card>
+<nz-card nzTitle="服务信息">
+  <sv-container>
+    <sv label="服务包">
+      {{i?.goodsResource?.insuranceTypeLabel}}
+    </sv>
+    <sv label="货物价值">
+      {{i?.goodsResource?.goodsValue !==null?(i?.goodsResource?.goodsValue|currency)+'元':'-'}}
+    </sv>
+    <sv label="保价费金额">
+      {{i?.goodsResource?.insurancePremium!==null?(i?.goodsResource?.insurancePremium |currency)+'元':'-'}}
+    </sv>
+  </sv-container>
+</nz-card>
 <nz-card [nzTitle]="'运费信息' +'（到货后'+i?.paymentDays+'天内支付运费）'" #distannce3>
-  <div  *ngIf="(i?.wayBillStatus == '3' && i.goodsInfos?.[0].settlementBasis == '2') || (i?.wayBillStatus == '4' && i.goodsInfos?.[0].settlementBasis == '1')" >
   <st #st [data]="billExpenses" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
     <ng-template st-row="price" let-item let-index="index">
       {{ item.price | currency }}
@@ -145,7 +157,6 @@
     附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2)}}% ）
   </div>
   <div>收款人：{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}</div>
-  </div>
 </nz-card>
 
 <nz-card nzTitle="附件信息" #distannce4>

src/app/routes/waybill-management/services/waybill-management.service.ts

@@ -2,7 +2,7 @@ import { WaybillManagementBulkComponent } from './../components/bulk/bulk.compon
 /*
  * @Author: your name
  * @Date: 2021-12-07 14:52:29
- * @LastEditTime : 2022-03-08 14:51:11
+ * @LastEditTime : 2022-03-11 17:26:20
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\services\\waybill-management.service.ts
@@ -53,10 +53,10 @@ export class WaybillManagementServe extends BaseService {
   $api_get_listOperatePage = '/api/sdc/exceptionReport/listOperateUnReplyPage';
   // 查询运营端已回复异常上报
   $api_get_listOperateReplyPage = '/api/sdc/exceptionReport/listOperateReplyPage';
-  // 获取轨迹
+ // 获取轨迹
-  $api_get_getTrajectory = `/api/sdc/billShipper/getTrajectoryByBillId`;
+ $api_get_getTrajectory = `/api/sdc/billShipper/getTrajectoryByBillId`;
-  //  获取订单司机轨迹
+ //  获取订单司机轨迹
-  $api_get_getAppDriverPosition = `/api/sdc/billShipper/getAppDriverPosition`;
+ $api_get_getAppDriverPosition = `/api/sdc/billShipper/getAppDriverPosition`;
   // 获取货主企业列表
   public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList';
   constructor(public injector: Injector) {