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

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

@@ -104,10 +104,9 @@
     </span>
   </div>
   <div nz-row [nzGutter]="24">
-    <div nz-col [nzSpan]="12">
+    <div class="handling-col" nz-col [nzSpan]="12">
       <div class="handling-info p-md">
         <ng-container *ngFor="let item of i?.unLoadingPlaceList">
-
           <div class="flex" *ngIf="item.type === '1'">
             <div class="loading-row">
               <div class="handling-info-icon loading-bg">装</div>
@@ -121,7 +120,7 @@
         </ng-container>
       </div>
     </div>
-    <div nz-col [nzSpan]="12">
+    <div class="handling-col" nz-col [nzSpan]="12">
       <div class="handling-info p-md">
         <ng-container *ngFor="let item of i?.unLoadingPlaceList">
           <div class="flex" *ngIf="item.type === '2'">
@@ -176,9 +175,7 @@
 结算依据为2时，装货时间不为空，显示运费信息，否则隐藏
   [hidden]="!(i?.settlementBasis ==='1' && i?.unloadTime) && !(i?.settlementBasis ==='2' && i?.loadTime)"
  -->
-<nz-card #distannce3
-
-  [nzBorderless]="true" class="mb0">
+<nz-card #distannce3 [nzBorderless]="true" class="mb0">
   <div class="font-weight-blod text-md detail-title">
     <a class="sign"></a>
     <span>运费信息</span>

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

@@ -134,8 +134,8 @@
     <div class="handling-col" nz-col [nzSpan]="12">
       <div class="handling-info p-md">
         <ng-container *ngFor="let item of i?.unLoadingPlaceList">
-          <div class="flex" *ngFor="let item of i?.unLoadingPlaceList">
-            <div *ngIf="item.type === '2'" class="loading-row">
+          <div class="flex" *ngIf="item.type === '2'">
+            <div class="loading-row">
               <div class="handling-info-icon unloaing-bg">卸</div>
               <div class="info">
                 <h4>卸货地：{{ item?.province }}{{ item.city }}{{ item.area }}{{ item.detailedAddress }}</h4>