diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts
index c50cb454..84da77ee 100644
--- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts
+++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts
@@ -29,7 +29,7 @@ export class DatatableOrderReportingComponent implements OnInit {
     { name: '异常', value: '2' },
     { name: '全部', value: '' }
   ];
-  selectedIndex = '1';
+  selectedIndex = '0';
   isLoading: boolean = false;
   selectedRows: any[] = [];
   constructor(
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 d20c201a..789d7ca7 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
@@ -15,26 +15,18 @@
     </button>
   </ng-template>
   <ng-template #headerContent>
-    <div  nz-row>
+    <div nz-row>
       <button nz-button nzType="primary" nzSize="small" nzDanger>{{ i?.billStatusLabel }}</button>
       <h4 class="ml-md" style="font-size: 18px">订单号: {{ i?.billCode }}</h4>
     </div>
     <div nz-row style="display: flex; justify-content: end" class="mb-xs">
-      <div nz-col >
-        <button
-          (click)="cancellation()"
-          nz-button
+      <div nz-col>
+        <button (click)="cancellation()" nz-button
           *ngIf="i?.billStatus !== '1'   && i?.billStatus !== '5'  && i?.billStatus !== '6' && i?.overallPaymentStatus != '2'"
-          acl  [acl-ability]="['ORDER-BULK-DETAIL-cancelAnOrder']"
-          >取消订单</button
-        >
-        <button
-          nz-button
-          *ngIf="i?.billStatus == '4' || i?.billStatus == '5' || i?.billStatus == '2' || i?.billStatus == '3'"
-          acl  [acl-ability]="['ORDER-BULK-DETAIL-modifyOrder']"
-          (click)="changeOrder()"
-          >修改订单</button
-        >
+          acl [acl-ability]="['ORDER-BULK-DETAIL-cancelAnOrder']">取消订单</button>
+        <button nz-button
+          *ngIf="i?.billStatus == '4' || i?.billStatus == '5' || i?.billStatus == '2' || i?.billStatus == '3'" acl
+          [acl-ability]="['ORDER-BULK-DETAIL-modifyOrder']" (click)="changeOrder()">修改订单</button>
       </div>
     </div>
     <div>
@@ -43,8 +35,9 @@
         <sv label="货主">{{ i?.goodsResource?.shipperAppUserName }} </sv>
         <sv label="所属项目">{{ i?.goodsResource?.enterpriseProjectName }}</sv>
         <sv label="服务类型">{{ i?.goodsResource?.serviceTypeLabel }}</sv>
-        <sv label="录单员">{{ i?.createUserName }} {{   i?.createUserPhone ? "/" +  i?.createUserPhone : ''}} </sv>
-        <sv label="调度员">{{ i?.goodsResource?.dispatchName }}{{  i?.goodsResource?.dispatchPhone ? "/" + i?.goodsResource?.dispatchPhone : ''}} </sv>
+        <sv label="录单员">{{ i?.createUserName }} {{ i?.createUserPhone ? "/" + i?.createUserPhone : ''}} </sv>
+        <sv label="调度员">{{ i?.goodsResource?.dispatchName }}{{ i?.goodsResource?.dispatchPhone ? "/" +
+          i?.goodsResource?.dispatchPhone : ''}} </sv>
         <sv label="货源编号">{{ i?.goodsResource?.resourceCode }} </sv>
         <sv label="运单号">{{ i?.wayBill?.wayBillCode }}</sv>
         <sv label="承诺付款天数">{{ i?.goodsResource?.paymentDays }}</sv>
@@ -64,12 +57,8 @@
     <div style="width: 60%; margin: 0 auto">
        
       <nz-steps [nzCurrent]="i?.scheduleVOList?.length + 1" nzLabelPlacement="vertical">
-        <nz-step
-          *ngFor="let item of i?.scheduleVOList"
-          [nzTitle]="item.state"
-          [nzSubtitle]="item.stateTime"
-          [nzStatus]="item.displayStatus === 'SHOW' ? 'finish' : 'wait'"
-        ></nz-step>
+        <nz-step *ngFor="let item of i?.scheduleVOList" [nzTitle]="item.state" [nzSubtitle]="item.stateTime"
+          [nzStatus]="item.displayStatus === 'SHOW' ? 'finish' : 'wait'"></nz-step>
       </nz-steps>
     </div>
   </div>
@@ -82,9 +71,11 @@
     </sv>
   </sv-container>
   <sv-container col="2">
-    <sv label="货物数量"> {{i?.goodsInfoList?.[0]?.weight}}吨,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件 </sv>
+    <sv label="货物数量">
+      {{i?.goodsInfoList?.[0]?.weight}}吨,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件 </sv>
     <sv label="用车需求">{{ i?.carModel }}{{ i?.carLength ? "/" + i?.carLength : ''}} </sv>
-    <sv label="承运司机"> {{ i?.driverName }}{{i?.driverPhone ? "/" + i?.driverPhone : ''}}{{ i?.carNo ? "/" + i?.carNo : ''}} </sv>
+    <sv label="承运司机"> {{ i?.driverName }}{{i?.driverPhone ? "/" + i?.driverPhone : ''}}{{ i?.carNo ? "/" + i?.carNo :
+      ''}} </sv>
     <sv label="车型车长载重"> {{ i?.driverCarModelLabel }},{{ i?.driverCarLengthLabel }}米,{{ i?.driverCarWeight }}吨 </sv>
     <!-- <sv label="计划装货时间">
       {{ i?.loadPlanTime }}
@@ -93,14 +84,14 @@
       {{ i?.unloadPlanTime }}
     </sv> -->
     <sv label="接单数量"> {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方 </sv>
-    <sv *ngIf="i?.billStatus =='3' || i?.billStatus =='4' || i?.billStatus =='5'" label="装货数量"> {{ i?.loadWeight }}吨，{{ i?.loadVolume }}方</sv>
-    <sv *ngIf="i?.billStatus =='4' || i?.billStatus =='5'" label="卸货数量"> {{ i?.settlementWeight }}吨,{{ i?.settlementVolume }}方</sv>
+    <sv *ngIf="i?.billStatus =='3' || i?.billStatus =='4' || i?.billStatus =='5'" label="装货数量"> {{ i?.loadWeight }}吨，{{
+      i?.loadVolume }}方</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"
-      >装货卸货信息
-      <span class="ml-sm text-sm"
-        >(
+    <h4 class="text-md">装货卸货信息
+      <span class="ml-sm text-sm">(
         <label>{{ i?.loadingCount || '一' }}装</label>
         <label>{{ i?.unloadingCount || '一' }}卸</label>
       </span>
@@ -114,7 +105,7 @@
               <div class="handling-info-icon loading-bg">装</div>
               <div class="info">
                 <h4>装货地：{{ item?.province }}{{ item.city }}{{ item.area }}{{ item.detailedAddress }}</h4>
-                <p>联系人：{{ item.appUserName }}{{  item.contractTelephone ? "/" + item.contractTelephone : '' }}</p>
+                <p>联系人：{{ item.appUserName }}{{ item.contractTelephone ? "/" + item.contractTelephone : '' }}</p>
               </div>
             </div>
           </div>
@@ -127,7 +118,7 @@
               <div class="handling-info-icon unloaing-bg">卸</div>
               <div class="info">
                 <h4>卸货地：{{ item?.province }}{{ item.city }}{{ item.area }}{{ item.detailedAddress }}</h4>
-                <p>联系人：{{ item.appUserName }}{{   item.contractTelephone ? "/" + item.contractTelephone : ''}}</p>
+                <p>联系人：{{ item.appUserName }}{{ item.contractTelephone ? "/" + item.contractTelephone : ''}}</p>
               </div>
             </div>
           </div>
@@ -137,11 +128,12 @@
   </div>
 </nz-card>
 <nz-card nzTitle="运费信息" #distannce3>
-  <h2>{{i?.freightPrice}}{{i?.freightTypeLabel}}（{{ i?.settlementBasisLabel ? i?.settlementBasisLabel + '，' :' ' }}{{i?.ruleLabel}}）</h2>
+  <h2>{{i?.freightPrice}}{{i?.freightTypeLabel}}（{{ i?.settlementBasisLabel ? i?.settlementBasisLabel + '，' :' '
+    }}{{i?.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="prices" let-item let-index="index">
-      {{ item.price + item.surcharge  | currency }}
+      {{ item.price + item.surcharge | currency }}
     </ng-template>
     <ng-template st-row="price" let-item let-index="index">
       {{ item.price | currency }}
@@ -152,26 +144,30 @@
   </st>
   <div>
     <div>
-      总计：<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span> （运费{{ i?.totalFreight | currency }}，
+      总计：<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span> （运费{{ i?.totalFreight |
+      currency }}，
       附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2)}}%）
     </div>
   </div>
-  <div *ngIf ="i?.payeePhone && i?.payeePhone !== i?.driverPhone">车队长：{{ i?.payeeName }}{{   i?.payeePhone ? "/" +  i?.payeePhone : ''}}</div>
+  <div *ngIf="i?.payeePhone && i?.payeePhone !== i?.driverPhone">车队长：{{ i?.payeeName }}{{ i?.payeePhone ? "/" +
+    i?.payeePhone : ''}}</div>
 </nz-card>
 
 <nz-card nzTitle="附件信息" #distannce4>
   <sv-container>
     <sv label="协议附件">
-      <a *ngIf = "i?.contractContent?.contractContent" (click)="agreement('1')">查看附件</a> &nbsp;&nbsp;&nbsp;&nbsp;
-      <a *ngIf = "i?.supplementContent?.contractContent" (click)="agreement('2')">补充协议</a>
+      <a *ngIf="i?.contractContent?.contractContent" (click)="agreement('1')">查看附件</a> &nbsp;&nbsp;&nbsp;&nbsp;
+      <a *ngIf="i?.supplementContent?.contractContent" (click)="agreement('2')">补充协议</a>
     </sv>
   </sv-container>
   <sv-container col="2" class="mt-md">
     <sv label="装货凭证">
-      <app-imagelist *ngIf="i?.loadingLadingBillFilePath || i?.loadingPeopleVehiclesGoodsFilePath" [imgList]="[i?.loadingLadingBillFilePath, i?.loadingPeopleVehiclesGoodsFilePath]"> </app-imagelist>
+      <app-imagelist *ngIf="i?.loadingLadingBillFilePath || i?.loadingPeopleVehiclesGoodsFilePath"
+        [imgList]="[i?.loadingLadingBillFilePath, i?.loadingPeopleVehiclesGoodsFilePath]"> </app-imagelist>
     </sv>
     <sv label="卸货凭证">
-      <app-imagelist *ngIf="i?.unloadingLadingBillFilePath || i?.unloadingPeopleVehiclesGoodsFilePath " [imgList]="[i?.unloadingLadingBillFilePath, i?.unloadingPeopleVehiclesGoodsFilePath]"> </app-imagelist>
+      <app-imagelist *ngIf="i?.unloadingLadingBillFilePath || i?.unloadingPeopleVehiclesGoodsFilePath "
+        [imgList]="[i?.unloadingLadingBillFilePath, i?.unloadingPeopleVehiclesGoodsFilePath]"> </app-imagelist>
     </sv>
   </sv-container>
 </nz-card>
@@ -183,7 +179,8 @@
     <sv label="回单类型" *ngIf="i?.supplementaryInformationVO?.stateReceipt">
       {{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }}
     </sv>
-    <sv label="联系人" *ngIf="i?.supplementaryInformationVO?.stateReceipt"> {{ i?.supplementaryInformationVO?.receiptUserName }} / {{ i?.supplementaryInformationVO?.phon }} </sv>
+    <sv label="联系人" *ngIf="i?.supplementaryInformationVO?.stateReceipt"> {{
+      i?.supplementaryInformationVO?.receiptUserName }} / {{ i?.supplementaryInformationVO?.phon }} </sv>
     <sv label="所在地区" *ngIf="i?.supplementaryInformationVO?.stateReceipt">
       {{ i?.supplementaryInformationVO?.area }}
     </sv>
@@ -206,11 +203,13 @@
     <nz-card nzTitle="轨迹信息" style="width: 100%" [nzExtra]="extraTemplate" #distannce5>
       <div nz-row>
         <div nz-col [nzSpan]="12">
-          <st [scroll]="{y: '500px'}" style="min-height: 600px;" #st [data]="addressItems" [columns]="logColumns2" [ps]="0" [page]="{ show: false, showSize: false }">
+          <st [scroll]="{y: '500px'}" style="min-height: 600px;" #st [data]="addressItems" [columns]="logColumns2"
+            [ps]="0" [page]="{ show: false, showSize: false }">
           </st>
         </div>
         <div nz-col [nzSpan]="12">
-          <amap-path-simplifier [mapWidth]="'100%'" [pois]="pois" [mapHeight]="'600px'" [mapList]="mapList"></amap-path-simplifier>
+          <amap-path-simplifier [mapWidth]="'100%'" [pois]="pois" [mapHeight]="'600px'" [mapList]="mapList">
+          </amap-path-simplifier>
         </div>
       </div>
     </nz-card>
@@ -222,8 +221,13 @@
     </ng-template>
   </div>
 </nz-card>
+<<<<<<< HEAD
 <nz-card>
   <nz-tabset >
+=======
+<nz-card *ngIf="!route?.snapshot?.queryParams?.sts && abnormalList.length > 0">
+  <nz-tabset>
+>>>>>>> 6a150ee3a3c20c6bb0c0de19a1e105a166194445
     <nz-tab nzTitle="风险异常检测">
      <div  *ngIf="!route?.snapshot?.queryParams?.sts && abnormalList.length > 0">
       <div>
@@ -237,17 +241,24 @@
      </div>
     </nz-tab>
     <nz-tab nzTitle="异常预警">
+<<<<<<< HEAD
       <st  #st [data]="warringList" [columns]="logColumns2" [ps]="0" [page]="{ show: false, showSize: false }">
       </st>
+=======
+      <st #st [data]="service.$api_get_order_abnormalWarning" [columns]="logColumns3"
+        [res]="{ reName: { list: 'data' } }" [req]="{params:{id:route.snapshot.params.id}}"
+        [page]="{ show: false, showSize: false }"> </st>
+>>>>>>> 6a150ee3a3c20c6bb0c0de19a1e105a166194445
     </nz-tab>
     <nz-tab nzTitle="操作日志">
-      <st  #st [data]="addressItems" [columns]="logColumns2" [ps]="0" [page]="{ show: false, showSize: false }">
+      <st #st [data]="addressItems" [columns]="logColumns2" [ps]="0" [page]="{ show: false, showSize: false }">
       </st>
     </nz-tab>
   </nz-tabset>
 </nz-card>
 
-<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" [nzTitle]="modalTitle"  (nzOnOk)="handleOK()" nzWidth="1000px" (nzOnCancel)="handleCancel()">
+<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" [nzTitle]="modalTitle" (nzOnOk)="handleOK()"
+  nzWidth="1000px" (nzOnCancel)="handleCancel()">
   <ng-container *nzModalContent>
     <div *ngIf="!modalcontent">暂无附件信息</div>
     <div [innerHTML]="modalcontent"></div>
@@ -256,4 +267,4 @@
     <button nz-button nzType="primary" (click)="handleOK()" [disabled]="">取消</button>
     <button nz-button nzType="default" (click)="handleCancel()">确定 </button>
   </ng-template>
-</nz-modal>
+</nz-modal>
\ No newline at end of file
diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts
index b37b16ff..c2598a65 100644
--- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts
+++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts
@@ -41,6 +41,10 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
     { title: '时间', index: 'parkBte' },
     { title: '地点', index: 'parkAdr' }
   ];
+  logColumns3: STColumn[] = [
+    { title: '时间', index: 'warningTime' },
+    { title: '异常预警类型', index: 'warningTypeLabel' }
+  ];
   logColumns: STColumn[] = [
     { title: '款项', index: 'expenseCodeLabel' },
     { title: '小计（元）', render: 'prices' },
@@ -68,7 +72,7 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
   constructor(
     public route: ActivatedRoute,
     private msgSrv: NzMessageService,
-    private service: OrderManagementService,
+    public service: OrderManagementService,
     private router: Router,
     private modal: NzModalService
   ) {}
diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
index 73e04d2a..df43a137 100644
--- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/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-04-13 15:56:55
+ * @LastEditTime : 2022-04-13 17:54:13
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -21,22 +21,12 @@
     </div>
     <div nz-row style="display: flex; justify-content: end" class="mb-xs">
       <div nz-col>
-        <button
-          (click)="cancellation()"
-          nz-button
+        <button (click)="cancellation()" nz-button
           *ngIf="i.billStatus == '4' || i.billStatus == '5' || i.billStatus == '2' || i.billStatus == '3' || i.billStatus == '1'"
-          acl
-          [acl-ability]="['ORDER-VEHICLE-DETAIL-cancelAnOrder']"
-          >取消订单</button
-        >
-        <button
-          nz-button
-          (click)="changeOrder()"
-          *ngIf="i.billStatus == '4' || i.billStatus == '5' || i.billStatus == '2' || i.billStatus == '3'"
-          acl
-          [acl-ability]="['ORDER-VEHICLE-DETAIL-modifyOrder']"
-          >修改订单</button
-        >
+          acl [acl-ability]="['ORDER-VEHICLE-DETAIL-cancelAnOrder']">取消订单</button>
+        <button nz-button (click)="changeOrder()"
+          *ngIf="i.billStatus == '4' || i.billStatus == '5' || i.billStatus == '2' || i.billStatus == '3'" acl
+          [acl-ability]="['ORDER-VEHICLE-DETAIL-modifyOrder']">修改订单</button>
       </div>
     </div>
     <div>
@@ -46,8 +36,8 @@
         <sv label="所属项目">{{ i?.goodsResource?.enterpriseProjectName }}</sv>
         <sv label="服务类型">{{ i?.goodsResource?.serviceTypeLabel }}</sv>
         <sv label="录单员">{{ i?.createUserName }} {{ i?.createUserPhone ? '/' + i?.createUserPhone : '' }} </sv>
-        <sv label="调度员"
-          >{{ i?.goodsResource?.dispatchName }}{{ i?.goodsResource?.dispatchPhone ? '/' + i?.goodsResource?.dispatchPhone : '' }}
+        <sv label="调度员">{{ i?.goodsResource?.dispatchName }}{{ i?.goodsResource?.dispatchPhone ? '/' +
+          i?.goodsResource?.dispatchPhone : '' }}
         </sv>
         <sv label="外部订单号">{{ i?.externalBillCode }}</sv>
         <sv label="货源编号">{{ i?.goodsResource?.resourceCode }} </sv>
@@ -70,13 +60,9 @@
     <div style="width: 60%; margin: 0 auto">
        
       <nz-steps [nzCurrent]="i?.scheduleVOList?.length + 1" nzLabelPlacement="vertical">
-        <nz-step
-          *ngFor="let item of i?.scheduleVOList"
-          [nzTitle]="item.state"
-          [nzSubtitle]="item.stateTime"
+        <nz-step *ngFor="let item of i?.scheduleVOList" [nzTitle]="item.state" [nzSubtitle]="item.stateTime"
           [nzDescription]="item.cancelReason ? '取消原因：' + item.cancelReason : ''"
-          [nzStatus]="item.displayStatus === 'SHOW' ? 'finish' : 'wait'"
-        ></nz-step>
+          [nzStatus]="item.displayStatus === 'SHOW' ? 'finish' : 'wait'"></nz-step>
       </nz-steps>
     </div>
   </div>
@@ -93,16 +79,16 @@
     </sv>
   </sv-container>
   <sv-container col="2">
-    <sv label="货物数量"> {{i?.goodsInfoList?.[0]?.weight}}吨,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件 </sv>
+    <sv label="货物数量">
+      {{i?.goodsInfoList?.[0]?.weight}}吨,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件 </sv>
     <sv label="用车需求">{{ i?.carModel }}{{ i?.carLength ? '/' + i?.carLength : '' }}</sv>
-    <sv label="承运司机"> {{ i?.driverName }}{{ i?.driverPhone ? '/' + i?.driverPhone : '' }}{{ i?.carNo ? '/' + i?.carNo : '' }} </sv>
+    <sv label="承运司机"> {{ i?.driverName }}{{ i?.driverPhone ? '/' + i?.driverPhone : '' }}{{ i?.carNo ? '/' + i?.carNo :
+      '' }} </sv>
     <sv label="车型车长载重"> {{ i?.driverCarModelLabel }},{{ i?.driverCarLengthLabel }}米,{{ i?.driverCarWeight }}吨 </sv>
   </sv-container>
   <div class="mt-md">
-    <h4 class="text-md"
-      >装货卸货信息
-      <span class="ml-sm text-sm"
-        >(
+    <h4 class="text-md">装货卸货信息
+      <span class="ml-sm text-sm">(
         <label>{{ i?.loadingCount }}装</label>
         <label>{{ i?.unloadingCount }}卸</label>
         )
@@ -167,10 +153,12 @@
     </ng-template>
   </st>
   <div>
-    总计：<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span> （运费{{ i?.totalFreight | currency }}，
+    总计：<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span> （运费{{ i?.totalFreight |
+    currency }}，
     附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2) }}% ）
   </div>
-  <div *ngIf ="i?.payeePhone && i?.payeePhone !== i?.driverPhone">车队长：{{ i?.payeeName }}{{ i?.payeePhone ? '/' + i?.payeePhone : '' }}</div>
+  <div *ngIf="i?.payeePhone && i?.payeePhone !== i?.driverPhone">车队长：{{ i?.payeeName }}{{ i?.payeePhone ? '/' +
+    i?.payeePhone : '' }}</div>
 </nz-card>
 
 <nz-card nzTitle="附件信息" #distannce4>
@@ -185,7 +173,8 @@
       <app-imagelist [imgList]="[i?.loadingLadingBillFilePath, i?.loadingPeopleVehiclesGoodsFilePath]"> </app-imagelist>
     </sv>
     <sv label="卸货凭证">
-      <app-imagelist [imgList]="[i?.unloadingLadingBillFilePath, i?.unloadingPeopleVehiclesGoodsFilePath]"> </app-imagelist>
+      <app-imagelist [imgList]="[i?.unloadingLadingBillFilePath, i?.unloadingPeopleVehiclesGoodsFilePath]">
+      </app-imagelist>
     </sv>
   </sv-container>
 </nz-card>
@@ -222,19 +211,13 @@
     <nz-card nzTitle="轨迹信息" style="width: 100%" [nzExtra]="extraTemplate" #distannce5>
       <div nz-row>
         <div nz-col [nzSpan]="12">
-          <st
-            [scroll]="{ y: '500px' }"
-            style="min-height: 600px"
-            #st
-            [data]="addressItems"
-            [columns]="logColumns2"
-            [ps]="0"
-            [page]="{ show: false, showSize: false }"
-          >
+          <st [scroll]="{ y: '500px' }" style="min-height: 600px" #st [data]="addressItems" [columns]="logColumns2"
+            [ps]="0" [page]="{ show: false, showSize: false }">
           </st>
         </div>
         <div nz-col [nzSpan]="12">
-          <amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [mapList]="mapList" [pois]="pois"></amap-path-simplifier>
+          <amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [mapList]="mapList" [pois]="pois">
+          </amap-path-simplifier>
         </div>
       </div>
     </nz-card>
@@ -259,21 +242,17 @@
       </div>
     </nz-tab>
     <nz-tab nzTitle="异常预警">
-      <st #st [data]="warringList" [columns]="logColumns2" [ps]="0" [page]="{ show: false, showSize: false }"> </st>
+      <st #st [data]="service.$api_get_order_abnormalWarning" [columns]="logColumns3"
+        [res]="{ reName: { list: 'data' } }" [req]="{params:{id:route.snapshot.params.id}}"
+        [page]="{ show: false, showSize: false }"> </st>
     </nz-tab>
     <nz-tab nzTitle="操作日志">
       <st #st [data]="addressItems" [columns]="logColumns2" [ps]="0" [page]="{ show: false, showSize: false }"> </st>
     </nz-tab>
   </nz-tabset>
 </nz-card>
-<nz-modal
-  [(nzVisible)]="isVisible"
-  nzWidth="1000px"
-  [nzFooter]="nzModalFooter"
-  [nzTitle]="modalTitle"
-  (nzOnOk)="handleOK()"
-  (nzOnCancel)="handleCancel()"
->
+<nz-modal [(nzVisible)]="isVisible" nzWidth="1000px" [nzFooter]="nzModalFooter" [nzTitle]="modalTitle"
+  (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">
   <ng-container *nzModalContent>
     <div *ngIf="!modalcontent">暂无附件信息</div>
     <div [innerHTML]="modalcontent"></div>
@@ -282,4 +261,4 @@
     <button nz-button nzType="primary" (click)="handleOK()" [disabled]="">取消</button>
     <button nz-button nzType="default" (click)="handleCancel()">确定 </button>
   </ng-template>
-</nz-modal>
+</nz-modal>
\ No newline at end of file
diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts
index ea0423ce..f15f9bde 100644
--- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts
+++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts
@@ -47,6 +47,10 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
     { title: '时间', index: 'parkBte' },
     { title: '地点', index: 'parkAdr' }
   ];
+  logColumns3: STColumn[] = [
+    { title: '时间', index: 'warningTime' },
+    { title: '异常预警类型', index: 'warningTypeLabel' }
+  ];
   logColumns: STColumn[] = [
     { title: '款项', index: 'expenseCodeLabel' },
     { title: '小计（元）', render: 'prices' },
@@ -62,7 +66,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
   constructor(
     public route: ActivatedRoute,
     private msgSrv: NzMessageService,
-    private service: OrderManagementService,
+    public service: OrderManagementService,
     private router: Router,
     private modal: NzModalService
   ) {}
@@ -81,8 +85,10 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
             markerLabel: '装',
             color: 'blue',
             position: [res.startingPoint.longitude, res.startingPoint.latitude],
-            title: `发货地：${res.startingPoint.province}${res.startingPoint.city}${res.startingPoint.area || ''}${res.startingPoint.detailedAddress}`,
-            time: '计划出发时间：' +res.loadPlanTime
+            title: `发货地：${res.startingPoint.province}${res.startingPoint.city}${res.startingPoint.area || ''}${
+              res.startingPoint.detailedAddress
+            }`,
+            time: '计划出发时间：' + res.loadPlanTime
           },
           {
             markerLabel: '卸',
diff --git a/src/app/routes/order-management/services/order-management.service.ts b/src/app/routes/order-management/services/order-management.service.ts
index ea53eff2..c63771cd 100644
--- a/src/app/routes/order-management/services/order-management.service.ts
+++ b/src/app/routes/order-management/services/order-management.service.ts
@@ -188,6 +188,7 @@ export class OrderManagementService extends ShipperBaseService {
 
   //  查询异常预警表
   $api_get_abnormalWarning = `/api/sdc/abnormalWarning/list/page`;
+  $api_get_order_abnormalWarning = `/api/sdc/abnormalWarning/getAbnormalWarningByBillId`;
 
   //  异步导出运营后台大宗订单列表
   $api_get_asyncExportBulkList = `/api/sdc/billOperate/asyncExportBulkList`;