车辆对接
This commit is contained in:
wangshiming
@ -10,7 +10,7 @@ import { VehicleConfirReceiptComponent } from '../../modal/vehicle/confir-receip
|
||||
import { VehicleSureArriveComponent } from '../../modal/vehicle/sure-arrive/sure-arrive.component';
|
||||
import { VehicleSureDepartComponent } from '../../modal/vehicle/sure-depart/sure-depart.component';
|
||||
import { VehicleUpdateFreightComponent } from '../../modal/vehicle/update-freight/update-freight.component';
|
||||
import { SupplyManagementService } from '../../services/order-management.service';
|
||||
import { OrderManagementService } from '../../services/order-management.service';
|
||||
|
||||
|
||||
@Component({
|
||||
@ -80,7 +80,7 @@ export class OrderManagementVehicleComponent implements OnInit {
|
||||
count: 0,
|
||||
},
|
||||
];
|
||||
constructor(public service: SupplyManagementService, private modal: NzModalService,public service2: ShipperBaseService,) { }
|
||||
constructor(public service: OrderManagementService, private modal: NzModalService,public service2: ShipperBaseService,) { }
|
||||
|
||||
/**
|
||||
* 查询参数
|
||||
@ -117,9 +117,9 @@ export class OrderManagementVehicleComponent implements OnInit {
|
||||
type: 'string',
|
||||
title: '货源编号'
|
||||
},
|
||||
externalResourceCode: {
|
||||
shipperAppUserId: {
|
||||
type: 'string',
|
||||
title: '外部订单号'
|
||||
title: '货主'
|
||||
},
|
||||
loadingPlace: {
|
||||
type: 'string',
|
||||
@ -139,15 +139,6 @@ export class OrderManagementVehicleComponent implements OnInit {
|
||||
}
|
||||
}
|
||||
},
|
||||
// driverName: {
|
||||
// type: 'string',
|
||||
// title: '承运司机',
|
||||
// ui: {
|
||||
// visibleIf: {
|
||||
// _$expand: (value: boolean) => value,
|
||||
// },
|
||||
// }
|
||||
// },
|
||||
driverId: {
|
||||
title: '承运司机',
|
||||
type: 'string',
|
||||
@ -171,60 +162,67 @@ export class OrderManagementVehicleComponent implements OnInit {
|
||||
}
|
||||
} as SFSelectWidgetSchema
|
||||
},
|
||||
no9: {
|
||||
type: 'string',
|
||||
|
||||
carNo: {
|
||||
title: '车牌号',
|
||||
ui: {
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
}
|
||||
},
|
||||
no10: {
|
||||
type: 'string',
|
||||
title: '收款人',
|
||||
ui: {
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
}
|
||||
},
|
||||
wayBillType: {
|
||||
title: '运单类型',
|
||||
type: 'string',
|
||||
ui: {
|
||||
widget: 'dict-select',
|
||||
params: { dictKey: 'goodresourceType' },
|
||||
containAllLable: true,
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
} as SFSelectWidgetSchema
|
||||
},
|
||||
shipperId: {
|
||||
title: '托运人',
|
||||
type: 'string',
|
||||
ui: {
|
||||
widget: 'dict-select',
|
||||
params: { dictKey: 'BulkFreightUnitPriceType' },
|
||||
containAllLable: true,
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
} as SFSelectWidgetSchema
|
||||
},
|
||||
enterpriseInfoName: {
|
||||
type: 'string',
|
||||
title: '网络货运人',
|
||||
ui: {
|
||||
widget: 'select',
|
||||
placeholder: '请选择',
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
serverSearch: true,
|
||||
searchDebounceTime: 300,
|
||||
searchLoadingText: '搜索中...',
|
||||
onSearch: (q: any) => {
|
||||
if (!!q) {
|
||||
return this.service
|
||||
.request(this.service.$api_get_getCarLicenseListByCarNo, {
|
||||
carNo: q
|
||||
})
|
||||
.pipe(map((res: any[]) => (res as any[]).map((i) => ({ label: i.carNo, value: i.carNo } as SFSchemaEnum))))
|
||||
.toPromise();
|
||||
} else {
|
||||
return of([]);
|
||||
}
|
||||
},
|
||||
allowClear: true,
|
||||
asyncData: () => this.service2.getNetworkFreightForwarder()
|
||||
}
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
} as SFSelectWidgetSchema,
|
||||
},
|
||||
payeeId: {
|
||||
title: '车队长',
|
||||
type: 'string',
|
||||
ui: {
|
||||
widget: 'select',
|
||||
serverSearch: true,
|
||||
searchDebounceTime: 300,
|
||||
searchLoadingText: '搜索中...',
|
||||
onSearch: (q: any) => {
|
||||
if (!!q) {
|
||||
return this.service
|
||||
.request(this.service.$api_get_getDriverInfo, { keyword: q,
|
||||
model: 1, type: 2 })
|
||||
.pipe(map((res) => (res as any[]).map((i) => ({ label: i.name, value: i.id } as SFSchemaEnum))))
|
||||
.toPromise();
|
||||
} else {
|
||||
return of([]);
|
||||
}
|
||||
},
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
} as SFSelectWidgetSchema,
|
||||
},
|
||||
paymentstatus: {
|
||||
title: '支付状态',
|
||||
type: 'string',
|
||||
ui: {
|
||||
widget: 'dict-select',
|
||||
params: { dictKey: 'payment:status' },
|
||||
containAllLable:true,
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
} as SFSelectWidgetSchema,
|
||||
},
|
||||
createTime: {
|
||||
title: '创建时间',
|
||||
@ -237,7 +235,63 @@ export class OrderManagementVehicleComponent implements OnInit {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
} as SFDateWidgetSchema
|
||||
}
|
||||
},
|
||||
isRiskSheet: {
|
||||
type: 'string',
|
||||
title: '是否风险单',
|
||||
default: '0',
|
||||
enum: [
|
||||
{ label: '全部', value: '0' },
|
||||
{ label: '是', value: '1' },
|
||||
{ label: '否', value: '2' }
|
||||
],
|
||||
ui: {
|
||||
widget: 'select',
|
||||
placeholder: '请选择',
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
},
|
||||
},
|
||||
enterpriseInfoName: {
|
||||
type: 'string',
|
||||
title: '网络货运人',
|
||||
ui: {
|
||||
widget: 'select',
|
||||
placeholder: '请选择',
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
allowClear: true,
|
||||
asyncData: () => this.service2.getNetworkFreightForwarder(),
|
||||
},
|
||||
},
|
||||
goodsName: {
|
||||
type: 'string',
|
||||
title: '货物名称',
|
||||
ui: {
|
||||
widget: 'select',
|
||||
placeholder: '请选择',
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
allowClear: true,
|
||||
asyncData: () => this.getCatalogueMember(),
|
||||
},
|
||||
},
|
||||
serviceType: {
|
||||
title: '服务类型',
|
||||
type: 'string',
|
||||
default: '',
|
||||
ui: {
|
||||
widget: 'dict-select',
|
||||
params: { dictKey: 'service:type' },
|
||||
containAllLable:true,
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
} as SFSelectWidgetSchema,
|
||||
},
|
||||
},
|
||||
type: 'object'
|
||||
};
|
||||
@ -260,17 +314,18 @@ export class OrderManagementVehicleComponent implements OnInit {
|
||||
title: '运费明细',
|
||||
width: '100px',
|
||||
className: 'text-center',
|
||||
index: 'externalSn',
|
||||
render: 'billExpenseDetailVOList',
|
||||
},
|
||||
{ title: '网络货运人', index: 'externalSn', width: '120px', className: 'text-center' },
|
||||
{ title: '货主', index: 'externalSn', width: '120px', className: 'text-center' },
|
||||
{ title: '网络货运人', index: 'enterpriseInfoId', width: '120px', className: 'text-center' },
|
||||
{ title: '货主', index: 'shipperAppUserId', width: '120px', className: 'text-center' },
|
||||
{ title: '关联运单号', index: 'linkUrl', width: '120px', className: 'text-center' },
|
||||
{ title: '货源编号', index: 'linkUrl', width: '120px', className: 'text-center' },
|
||||
{ title: '装货地', index: 'linkUrl', width: '120px', className: 'text-center' },
|
||||
{ title: '货源编号', index: 'resourceCode', width: '120px', className: 'text-center' },
|
||||
{ title: '装货地', index: 'loadingPlace', width: '120px', className: 'text-center' },
|
||||
{
|
||||
title: '卸货地',
|
||||
className: 'text-center',
|
||||
width: '120px',
|
||||
index: 'dischargePlace'
|
||||
},
|
||||
{
|
||||
title: '货物信息',
|
||||
@ -280,33 +335,24 @@ export class OrderManagementVehicleComponent implements OnInit {
|
||||
title: '承运司机',
|
||||
className: 'text-center',
|
||||
width: '120px',
|
||||
},
|
||||
{
|
||||
title: '承运司机',
|
||||
className: 'text-center',
|
||||
width: '120px',
|
||||
index: 'driverId'
|
||||
},
|
||||
{
|
||||
title: '收款人',
|
||||
className: 'text-center',
|
||||
index: 'enStatusStr2',
|
||||
type: 'badge',
|
||||
index: 'payeeId',
|
||||
width: '100px',
|
||||
badge: {
|
||||
正常: { text: '正常', color: 'success' },
|
||||
冻结: { text: '冻结', color: 'warning' },
|
||||
废弃: { text: '废弃', color: 'default' },
|
||||
},
|
||||
},
|
||||
{
|
||||
title: '装卸货时间',
|
||||
width: '170px',
|
||||
className: 'text-center',
|
||||
render: 'loadingTime'
|
||||
},
|
||||
{
|
||||
title: '创建时间',
|
||||
className: 'text-center',
|
||||
index: 'enStatusStr3',
|
||||
index: 'createTime',
|
||||
},
|
||||
{
|
||||
title: '操作',
|
||||
|
||||
Reference in New Issue
Block a user