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

Merge branch 'lxx' into 'develop'

Browse Source 
Lxx

See merge request tms-ui/tms-obc-web!9
This commit is contained in:
刘孝星
2022-04-09 17:21:52 +08:00
parent 5fe34208af 64492576aa
commit 0f985a5d21
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts
View File

@ -325,11 +325,11 @@ export class DatatableOrderReportingComponent implements OnInit {
{ title: '司机姓名', index: 'driverName', className: 'text-center', width: '150px' }, { title: '司机姓名', index: 'driverName', className: 'text-center', width: '150px' },
{ title: '司机手机号码', index: 'driverPhone', className: 'text-center', width: '200px' }, { title: '司机手机号码', index: 'driverPhone', className: 'text-center', width: '200px' },
{ title: '司机身份证号', index: 'driverIdentityNo', className: 'text-center', width: '150px' }, { title: '司机身份证号', index: 'driverIdentityNo', className: 'text-center', width: '150px' },
{ title: '货物信息', render: 'goodsInfoList', className: 'text-center', width: '180px' }, { title: '货物信息', render: 'goodsName', className: 'text-center', width: '180px' },
{ title: '实际承运人名称', index: 'carrierName', className: 'text-center', width: '150px' }, { title: '实际承运人名称', index: 'carrierName', className: 'text-center', width: '150px' },
{ title: '实际承运人证件号码', index: 'carrierIdentityNo', className: 'text-center', width: '200px' }, { title: '实际承运人证件号码', index: 'carrierIdentityNo', className: 'text-center', width: '200px' },
{ title: '实际承运人道路运输许可证号', render: 'payeeName', className: 'text-center', width: '150px' }, { title: '实际承运人道路运输许可证号', render: 'roadTransportNo', className: 'text-center', width: '150px' },
{ title: '车辆轨迹', render: 'car', className: 'text-center', width: '250px' }, { title: '车辆轨迹', render: 'car', className: 'text-center', width: '250px' },
{ title: '司机轨迹', render: 'driver', className: 'text-center', width: '150px' }, { title: '司机轨迹', render: 'driver', className: 'text-center', width: '150px' },

2
src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts
View File

@ -81,7 +81,7 @@ export class OrderManagementComplaintDetailComponent implements OnInit {
change: (value, orgData) => console.log(value, orgData), change: (value, orgData) => console.log(value, orgData),
} as SFSelectWidgetSchema, } as SFSelectWidgetSchema,
}, },
handlerIdLabel: { complainantIdLabel: {
title: '司机', title: '司机',
type: 'string', type: 'string',
maxLength: 30, maxLength: 30,

14
src/app/routes/order-management/components/complaint/complaint.component.ts
View File

@ -154,12 +154,14 @@ export class OrderManagementComplaintComponent implements OnInit {
}, },
{ title: '托运方', index: 'shipperAppUserName', width: '200px', className: 'text-center' }, { title: '托运方', index: 'shipperAppUserName', width: '200px', className: 'text-center' },
{ title: '司机', index: 'driverName', width: '120px', className: 'text-center' }, { title: '司机', index: 'driverName', width: '120px', className: 'text-center' },
{ // {
title: '投诉原因', // title: '投诉原因',
className: 'text-center', // className: 'text-center',
width: '170px', // width: '170px',
render: 'complaintCauseLabel' // render: 'complaintCauseLabel'
}, // },
{ title: '投诉原因',iif: value => this.selectedMainTabStatus == '1', index: 'shpComplaintCauseLabel', className: 'text-center',width: '170px', },
{ title: '投诉原因',iif: value => this.selectedMainTabStatus == '2', index: 'drvComplaintCauseLabel', className: 'text-center',width: '170px', },
{ {
title: '投诉状态', title: '投诉状态',
className: 'text-center', className: 'text-center',