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

src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html

@@ -28,7 +28,7 @@
   <st #st [scroll]="{x:'1200px'}" [data]="service.$api_order_reporting_page" [columns]="columns"
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
     [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
-    [page]="{ show: true, showSize: true, pageSizes: [10,20, 50, 100] }" [loading]="false">
+    [page]="{ show: true, showSize: true, pageSizes: [10,20, 50, 100] }" [loading]="service.http.loading">
     <ng-template st-row="orderStatus" let-item let-index="index">
       <a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">{{item?.billStatusLabel}}</a>
       <span *ngIf="item?.billStatus !== '2'">{{item?.billStatusLabel}}</span>
@@ -42,6 +42,13 @@
     <ng-template st-row="amount" let-item let-index="index">
       <div class="text-right">{{item?.amount | currency :' '}}</div>
     </ng-template>
+
+    <ng-template st-row="car" let-item let-index="index">
+      <a (click)="viewAuditResult(item)">查看轨迹</a>
+    </ng-template>
+    <ng-template st-row="driver" let-item let-index="index">
+      <a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">查看轨迹</a>
+    </ng-template>
   </st>
 </nz-card>
 <ng-template #extraTemplate>

src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts

@@ -267,7 +267,7 @@ export class DatatableOrderReportingComponent implements OnInit {
       { title: '订单状态', render: 'orderStatus', className: 'text-center', width: '120px', },
       { title: '司机状态', render: 'driverStatus', className: 'text-center', width: '120px', },
       { title: '车辆状态', render: 'carStatus', className: 'text-center', width: '120px', },
-      { title: '本地校验66', render: 'localValid', className: 'text-center', width: '120px', },
+      { title: '本地校验', render: 'localValid', className: 'text-center', width: '120px', },
       {
         title: '订单号',
         render: 'billComplianceVOS',
@@ -285,12 +285,12 @@ export class DatatableOrderReportingComponent implements OnInit {
       { title: '统一社会信用代码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
       { title: '业务类型', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '120px' },
       { title: '运单生成时间', render: 'goodsInfoVOList', className: 'text-center', width: '180px' },
-      { title: '发货时间', render: 'driver', className: 'text-center', width: '180px' },
+      { title: '发货时间', render: 'driver2', className: 'text-center', width: '180px' },
       { title: '收货时间', render: 'payeeName', className: 'text-center', width: '180px' },
       { title: '托运人名称', render: 'transportInfo', className: 'text-center', width: '250px' },
       { title: '托运人统一社会信用代码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
       { title: '装货地址', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '200px' },
-      { title: '收货方名称', render: 'driver', className: 'text-center', width: '150px' },
+      { title: '收货方名称', render: 'driver1', className: 'text-center', width: '150px' },
       { title: '收货地址', render: 'payeeName', className: 'text-center', width: '150px' },
       { title: '运费金额', render: 'amount', className: 'text-center', width: '250px' },
       { title: '车牌号', render: 'payeeName', className: 'text-center', width: '150px' },
@@ -302,8 +302,8 @@ export class DatatableOrderReportingComponent implements OnInit {
       { title: '实际承运人名称', render: 'payeeName', className: 'text-center', width: '150px' },
       { title: '实际承运人证件号码', render: 'transportInfo', className: 'text-center', width: '200px' },
       { title: '实际承运人道路运输许可证号', render: 'payeeName', className: 'text-center', width: '150px' },
-      { title: '车辆轨迹', render: 'transportInfo', className: 'text-center', width: '250px' },
+      { title: '车辆轨迹', render: 'car', className: 'text-center', width: '250px' },
-      { title: '司机轨迹', render: 'payeeName', className: 'text-center', width: '150px' },
+      { title: '司机轨迹', render: 'driver', className: 'text-center', width: '150px' },
       { title: '上传次数', render: 'transportInfo', className: 'text-center', width: '150px' },
       { title: '上传时间', render: 'transportInfo', className: 'text-center', width: '180px' },
     ];