解决冲突

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

@@ -412,9 +412,9 @@ export class OrderManagementBulkComponent implements OnInit {
         className: 'text-right',
         render: 'mybidDetailInfo'
       },
-      { title: '网络货运人', index: 'enterpriseInfoName', width: '220px', className: 'text-left' },
+      { title: '网络货运人', index: 'enterpriseInfoName', width: '250px', className: 'text-left' },
-      { title: '货主', index: 'shipperAppUserName', width: '220px', className: 'text-left' },
+      { title: '货主', index: 'shipperAppUserName', width: '250px', className: 'text-left' },
-      { title: '所属项目', index: 'enterpriseProjectName', width: '220px', className: 'text-left' },
+      { title: '所属项目', index: 'enterpriseProjectName', width: '250px', className: 'text-left' },
       { title: '关联运单号', index: 'wayBillCode', width: '180px', className: 'text-left' },
       { title: '货源编号', index: 'resourceCode', width: '180px', className: 'text-left' },
       { title: '装货地', index: 'loadingAddressArr', width: '180px', className: 'text-left' },
@@ -477,7 +477,7 @@ export class OrderManagementBulkComponent implements OnInit {
       {
         title: '操作',
         fixed: 'right',
-        width: '120px',
+        width: '130px',
         className: 'text-left',
         buttons: [
           {

src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-12 10:52:50
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-21 20:16:13
+ * @LastEditTime : 2022-02-24 15:57:34
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\receipts-audit\\receipts-audit.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -68,14 +68,24 @@
         {{ item.freightPrice | currency }}
       </ng-template>
       <ng-template st-row="loadingLadingBillFilePath" let-item let-index="index">
-        <div>
+        <div class="imgBox">
-          <span><img style="height: 60px; padding-right: 5px" [src]="item.loadingLadingBillFilePath" alt="" /></span>
+          <div *ngIf="item.loadingLadingBillFilePath">
-          <span><img style="height: 60px" [src]="item.loadingPeopleVehiclesGoodsFilePath" alt="" /></span>
+            <app-imagelist style="width: 40px" [imgList]="[item.loadingLadingBillFilePath]"> </app-imagelist>
+          </div>
+          <div *ngIf="item.loadingPeopleVehiclesGoodsFilePath">
+            <app-imagelist style="width: 40px" [imgList]="[item.loadingPeopleVehiclesGoodsFilePath]"> </app-imagelist>
+          </div>
         </div>
       </ng-template>
       <ng-template st-row="unloadingLadingBillFilePath" let-item let-index="index">
-        <span><img style="height: 60px; padding-right: 5px" [src]="item.unloadingLadingBillFilePath" alt="" /></span>
+        <div class="imgBox">
-        <span><img style="height: 60px" [src]="item.unloadingPeopleVehiclesGoodsFilePath" alt="" /></span>
+        <div *ngIf="item.unloadingLadingBillFilePath">
+          <app-imagelist style="width: 40px" [imgList]="[item.unloadingLadingBillFilePath]"> </app-imagelist>
+        </div>
+        <div *ngIf="item.unloadingPeopleVehiclesGoodsFilePath">
+          <app-imagelist style="width: 40px" [imgList]="[item.unloadingPeopleVehiclesGoodsFilePath]"> </app-imagelist>
+        </div>
+        </div>
       </ng-template>
       <ng-template st-row="loadingTime" let-item let-index="index">
         <div *ngIf="item?.loadingTime">装 | {{ item?.loadingTime }}</div>

src/app/routes/order-management/components/receipts-audit/receipts-audit.component.less

@@ -10,4 +10,13 @@
           line-height:32px; 
           background-color: #d7d7d7;
      }
+     ::ng-deep {
+        .imgBox {
+          display: flex;
+          img {
+              width: 60px !important; 
+          }
+      }
+      }
  }
+ 

src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts

@@ -277,9 +277,9 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
         className: 'text-right',
         render: 'mybidDetailInfo'
       },
-      { title: '网络货运人', index: 'enterpriseInfoName', width: '220px', className: 'text-left' },
+      { title: '网络货运人', index: 'enterpriseInfoName', width: '250px', className: 'text-left' },
-      { title: '货主', index: 'shipperAppUserName', width: '220px', className: 'text-left' },
+      { title: '货主', index: 'shipperAppUserName', width: '250px', className: 'text-left' },
-      { title: '所属项目', index: 'enterpriseProjectName', width: '220px', className: 'text-left' },
+      { title: '所属项目', index: 'enterpriseProjectName', width: '250px', className: 'text-left' },
       { title: '货源编号', index: 'resourceCode', width: '180px', className: 'text-left' },
       { title: '装货地', index: 'loadingAddressArr', width: '180px', className: 'text-left' },
       {

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

@@ -249,7 +249,7 @@ export class OrderManagementRiskComponent implements OnInit {
         index: 'abnormalCause'
       },
       { title: '托运人', index: 'shipperName', width: '200px', className: 'text-left' },
-      { title: '网络货运人', index: 'enterpriseInfoName', width: '220px', className: 'text-left' },
+      { title: '网络货运人', index: 'enterpriseInfoName', width: '250px', className: 'text-left' },
       {
         title: '运费明细',
         className: 'text-right',
@@ -295,7 +295,7 @@ export class OrderManagementRiskComponent implements OnInit {
       {
         title: '运输信息',
         className: 'text-left',
-        width: '200px',
+        width: '280px',
         render: 'timeer'
       },
       {

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

@@ -365,8 +365,8 @@ resourceStatus: any;
         className: 'text-right',
         render: 'mybidDetailInfo',
       },
-      { title: '网络货运人', index: 'enterpriseInfoName', width: '220px', className: 'text-left' },
+      { title: '网络货运人', index: 'enterpriseInfoName', width: '250px', className: 'text-left' },
-      { title: '货主', index: 'shipperAppUserName', width: '220px', className: 'text-left' },
+      { title: '货主', index: 'shipperAppUserName', width: '250px', className: 'text-left' },
       { title: '关联运单号', index: 'wayBillCode', width: '170px', className: 'text-left' },
       { title: '货源编号', index: 'resourceCode', width: '170px', className: 'text-left' },
       { title: '装货地', index: 'loadingAddressArr', width: '180px', className: 'text-left' },
@@ -408,7 +408,7 @@ resourceStatus: any;
       {
         title: '操作',
         fixed: 'right',
-        width: '120px',
+        width: '130px',
         className: 'text-left',
         buttons: [