Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
wangshiming
2022-02-24 16:02:55 +08:00
parent af019cb962
commit 0e4a6c792b
6 changed files with 38 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -412,9 +412,9 @@ export class OrderManagementBulkComponent implements OnInit {
className: 'text-right',
render: 'mybidDetailInfo'
},
{ title: '网络货运人', index: 'enterpriseInfoName', width: '220px', className: 'text-left' },
{ title: '货主', index: 'shipperAppUserName', width: '220px', className: 'text-left' },
{ title: '所属项目', index: 'enterpriseProjectName', width: '220px', className: 'text-left' },
{ title: '网络货运人', index: 'enterpriseInfoName', width: '250px', className: 'text-left' },
{ title: '货主', index: 'shipperAppUserName', width: '250px', 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: [
{