解决冲突

src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts

@@ -33,8 +33,8 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
   columns: STColumn[] = [
     { title: '异常编号', index: 'exceptionCode',width: '180px',className: 'text-left', },
     { title: '关联运单号', index: 'wayBillCode',width: '180px',className: 'text-left', },
-    { title: '网络货运人', index: 'enterpriseInfoName',width: '220px',className: 'text-left', },
-    { title: '货主', index: 'shipperAppUserName' ,width: '220px',className: 'text-left',},
+    { title: '网络货运人', index: 'enterpriseInfoName',width: '250px',className: 'text-left', },
+    { title: '货主', index: 'shipperAppUserName' ,width: '250px',className: 'text-left',},
     { title: '装货地', index: 'loadingAddressArr' ,width: '220px',className: 'text-left',},
     { title: '卸货地', index: 'unloadingAddressArr' ,width: '220px',className: 'text-left',},
     { title: '承运司机', index: 'driver' ,width: '250px',className: 'text-left',},

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

@@ -304,7 +304,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
       {
         title: '货物信息',
         className: 'text-left',
-        width: '180px',
+        width: '250px',
         render: 'goodsInfos'
       },
       {