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

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-04 13:33:51
+ * @LastEditTime : 2022-03-04 14:15:24
  * @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.
 -->
@@ -42,7 +42,7 @@
       </nz-tab>
       <nz-tab nzTitle="基本信息" (nzClick)="goDistance(distannce2)">
       </nz-tab>
-      <nz-tab nzTitle="运费信息" (nzClick)="goDistance(distannce3)">
+      <nz-tab nzTitle="运费信息"  (nzClick)="goDistance(distannce3)">
       </nz-tab>
       <nz-tab nzTitle="附件信息" (nzClick)="goDistance(distannce4)">
       </nz-tab>
@@ -261,9 +261,11 @@
 
 </nz-card>
 
-<nz-card nzTitle="运费信息" #distannce3>
+<nz-card nzTitle="运费信息"#distannce3>
-  <h2>{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}（以发货为准，保留小数）</h2>
+ <div  *ngIf="(i?.billStatus == '3' && i.goodsInfoList?.[0].settlementBasis == '2') || (i?.billStatus == '4' && i.goodsInfoList?.[0].settlementBasis == '1')" >
-  <st #st [data]="i?.billExpenseDetails" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
+  <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>
     <ng-template st-row="price" let-item let-index="index">
       {{ item.price | currency }}
     </ng-template>
@@ -278,6 +280,7 @@
     </div>
   </div>
   <div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
+ </div>
 </nz-card>
 
 
@@ -342,17 +345,23 @@
 
 <nz-card>
   <div nz-row>
-    <nz-card nzTitle="轨迹信息" style="width: 100%;" #distannce5>
+    <nz-card nzTitle="轨迹信息" style="width: 100%" id="distannce5"  [nzExtra]="extraTemplate" #distannce5>
-      <div nz-row > 
+      <div nz-row>
-        <div nz-col [nzSpan]='12'>
+        <div nz-col [nzSpan]="12">
-    <!-- <st #st [data]="i?.auditRecordList" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
+          <st [scroll]="{y: '500px'}" #st [data]="addressItems" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
-    </st> -->
+    </st>
-  </div>
+        </div>
-  <div nz-col [nzSpan]='12'>
+        <div nz-col [nzSpan]="12">
-     <amap-path-simplifier></amap-path-simplifier>
+          <amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [MapList]="MapList"></amap-path-simplifier>
-   </div>
+        </div>
-   </div>
+      </div>
     </nz-card>
+    <ng-template #extraTemplate>
+      <nz-radio-group [(ngModel)]="trajectory">
+        <label nz-radio-button nzValue="car">车辆轨迹</label>
+        <label nz-radio-button nzValue="driver">司机轨迹</label>
+      </nz-radio-group>
+    </ng-template>
   </div>
 </nz-card>
 <nz-modal [(nzVisible)]="isVisible"   [nzFooter]="nzModalFooter" nzTitle="附件信息" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">

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

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-24 16:58:02
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-04 13:26:50
+ * @LastEditTime : 2022-03-04 14:15:21
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -22,6 +22,7 @@ import { NzUploadChangeParam, NzUploadFile } from 'ng-zorro-antd/upload';
 import { Observable, Observer } from 'rxjs';
 import { apiConf } from '@conf/api.conf';
 import { OrderManagementService } from '../../services/order-management.service';
+import format from 'date-fns/format';
 import { NzCardComponent } from 'ng-zorro-antd/card';
 import { map } from 'rxjs/operators';
 function getBase64(file: File): Promise<string | ArrayBuffer | null> {
@@ -40,7 +41,9 @@ function getBase64(file: File): Promise<string | ArrayBuffer | null> {
 export class OrderManagementBulkDetailChangeComponent implements OnInit {
   validateForm1: FormGroup;
   id = this.route.snapshot.params.id;
+  trajectory = 'car';
   @ViewChild('distannce3', { static: false })
+  MapList: any[]=[];
   i: any= {unLoadingPlaceList:[]};
   totalDistance = 0.0; //总里程
   totalTime = 0.0; //路程总时间
@@ -66,29 +69,16 @@ loadTime: any; // 货源单设置回显
   @ViewChild('sf4', { static: false }) sf4!: SFComponent;
   schema4: SFSchema = {};
   isVisible = false;
+  billExpenses: any[] = []; //运费信息表格信息
+  addressItems: any[] = []; //打点地址数据组
   ui4!: SFUISchema;
   formData: any;
   @ViewChild('sf', { static: false }) sf!: SFComponent;
   schema: SFSchema = {};
   ui: SFUISchema = {};
   logColumns: STColumn[] = [
-    { title: '款项', index: 'expenseName' },
+    { title: '时间', index: 'vinOutTime' },
-    { title: '运输费（元）', render: 'price' },
+    { title: '地点', index: 'cityName' },
-    { title: '附加费（元）', render: 'surcharge' },
-    { title: '支付时间', index: ' paymentTime' },
-    {
-      title: '支付状态',
-      className: 'text-center',
-      index: 'paymentStatus',
-      type: 'badge',
-      width: '120px',
-      badge: {
-        '1': { text: '待申请', color: 'warning' },
-        '2': { text: '已支付', color: 'success' },
-        '3': { text: '已拒绝', color: 'warning' },
-        '4': { text: '申请中', color: 'warning' }
-      }
-    }
   ];
   constructor(
     private route: ActivatedRoute,
@@ -319,8 +309,7 @@ loadTime: any; // 货源单设置回显
     this.service.request(this.service.$api_getBulkBillDetail, {id: this.id}).subscribe(res => {
       if (res) {
         this.i = res;
-        this.attObj = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'ATT')[0];
+        this.billExpenses = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'TRA');
-        this.totalObj = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'TOTAL')[0];
         // 对装货凭证进行初始化
         let arr : any= []
         res?.receiptFilePath.forEach((element: any, index: any) => {
@@ -889,4 +878,30 @@ goDistance(elf: NzCardComponent) {
       });
     }
   }
+    // 获取轨迹
+    MapInit() {
+      this.service.request(this.service.$api_get_getTrajectory, { id: this.id }).subscribe(res => {
+        if (res) {
+          const points = res.trackArray;
+          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.parkArray;
+          if(this.addressItems && this.addressItems.length > 0){
+            this.addressItems.forEach(item => {
+              item.vinOutTime = this.getLocalTime(item.vinOutTime);
+            });
+          }
+        }
+      });
+    }
+  
+    getLocalTime(time: any) {
+      return format(new Date(parseInt(time)), 'yyyy-MM-dd HH:mm:ss');
+    }
 }

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-04 13:40:09
+ * @LastEditTime : 2022-03-04 14:07:44
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -135,6 +135,7 @@
   </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>
@@ -152,6 +153,7 @@
     </div>
   </div>
   <div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
+</div>
 </nz-card>
 
 <nz-card nzTitle="附件信息" #distannce4>

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

@@ -34,23 +34,8 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
   attObj: any;
   isVisible = false;
   logColumns: STColumn[] = [
-    { title: '款项', index: 'costName', render: 'PriceType' },
+    { title: '时间', index: 'vinOutTime' },
-    { title: '运输费（元）', render: 'price' },
+    { title: '地点', index: 'cityName' },
-    { title: '附加费（元）', render: 'surcharge' },
-    { title: '支付时间', index: 'paymentTime' },
-    {
-      title: '支付状态',
-      className: 'text-center',
-      index: 'paymentStatus',
-      type: 'badge',
-      width: '120px',
-      badge: {
-        '1': { text: '待申请', color: 'warning' },
-        '2': { text: '已支付', color: 'success' },
-        '3': { text: '已拒绝', color: 'warning' },
-        '4': { text: '申请中', color: 'warning' }
-      }
-    }
   ];
   trajectory = 'car';
   addressItems: any[] = []; //打点地址数据组
@@ -71,9 +56,7 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
     this.service.request(this.service.$api_getBulkBillDetail, { id: this.id }).subscribe(res => {
       if (res) {
         this.i = res;
-        console.log(this.i.billExpenseDetails )
         this.billExpenses = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'TRA');
-        console.log(this.billExpenses )
         this.i.scheduleVOList = this.i?.scheduleVOList?.filter((data:any)=>data.displayStatus !=="HIDE");
       }
     });

src/app/routes/order-management/components/bulk/bulk.component.ts

@@ -690,7 +690,7 @@ export class OrderManagementBulkComponent implements OnInit {
     };
     const params2 = {
       businessCode: item.billCode,
-      passiveUserId: item.shipperAppUserId
+      evaluateUserId: item.shipperAppUserId
     };
     this.service.request(this.service.$api_getBillEvaluateByShipper, params).subscribe(res => {
       console.log(res);

src/app/routes/order-management/components/vehicle/vehicle.component.ts

@@ -664,7 +664,7 @@ resourceStatus: any;
     }
     const params2 = {
       businessCode: item.billCode,
-      passiveUserId: item.shipperAppUserId,
+      evaluateUserId: item.shipperAppUserId,
     }
     this.service.request(this.service.$api_getBillEvaluateByShipper, params).subscribe(res => {
       console.log(res)

src/app/routes/supply-management/components/update-price/update-price.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-03 11:10:14
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-16 15:02:33
+ * @LastEditTime : 2022-03-04 14:34:57
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\update-price\\update-price.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -25,12 +25,22 @@
 </div>
 <div>
   <h4>变更日志</h4>
-  <st #st [data]="service.$api_getOperationLogRecordsList" [bordered]="true" [columns]="columns" [page]="{ show: false }"     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }">
+  <!-- <st #st [data]="service.$api_getOperationLogRecordsList" [bordered]="true" [columns]="columns" [page]="{ show: false }"     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }">
     <ng-template st-row="operator" let-item let-index="index">
       <span>{{item.operator}}</span>/
       <span>{{item.telephone}}</span>
     </ng-template>
-  </st>
+  </st> -->
+  <st #st [data]="service.$api_getOperationLogRecordsList" [columns]="columns"
+  [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams}"
+  [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+  [page]="{}"
+  >
+  
+  <ng-template st-row="operator" let-item>
+    {{item?.operator}}/{{item.telephone}}
+  </ng-template>
+</st>
 </div>
 <ng-template #addOnAfterTemplate>
   <span> {{ freightType[i?.freightType] }}</span>