车辆对接
This commit is contained in:
		| @ -10,6 +10,7 @@ import { ConfirReceiptComponent } from '../../modal/bulk/confir-receipt/confir-r | ||||
| import { SureDepartComponent } from '../../modal/bulk/sure-depart/sure-depart.component'; | ||||
| import { SureArriveComponent } from '../../modal/bulk/sure-arrive/sure-arrive.component'; | ||||
| import { of } from 'rxjs'; | ||||
| import { ShipperBaseService } from '@shared'; | ||||
|  | ||||
|  | ||||
| @Component({ | ||||
| @ -82,7 +83,7 @@ export class OrderManagementBulkComponent implements OnInit { | ||||
|     count: 0, | ||||
|   }, | ||||
|   ]; | ||||
|   constructor(public service: OrderManagementService, private modal: NzModalService) { } | ||||
|   constructor(public service: OrderManagementService, private modal: NzModalService,public service2: ShipperBaseService) { } | ||||
|  | ||||
|   /** | ||||
|  * 查询参数 | ||||
| @ -112,37 +113,37 @@ export class OrderManagementBulkComponent implements OnInit { | ||||
|     this.schema = { | ||||
|       properties: { | ||||
|         _$expand: { type: 'boolean', ui: { hidden: true } }, | ||||
|         no: { | ||||
|         billCode: { | ||||
|           type: 'string', | ||||
|           title: '订单号', | ||||
|           title: '订单号' | ||||
|         }, | ||||
|         no2: { | ||||
|         resourceCode: { | ||||
|           type: 'string', | ||||
|           title: '货源编号' | ||||
|         }, | ||||
|         no1: { | ||||
|         shipperAppUserId: { | ||||
|           type: 'string', | ||||
|           title: '货主' | ||||
|         }, | ||||
|         no3: { | ||||
|         loadingPlace: { | ||||
|           type: 'string', | ||||
|           title: '装货地', | ||||
|           ui: { | ||||
|             visibleIf: { | ||||
|               _$expand: (value: boolean) => value, | ||||
|             }, | ||||
|               _$expand: (value: boolean) => value | ||||
|             } | ||||
|           } | ||||
|         }, | ||||
|         no4: { | ||||
|         dischargePlace: { | ||||
|           type: 'string', | ||||
|           title: '卸货地', | ||||
|           ui: { | ||||
|             visibleIf: { | ||||
|               _$expand: (value: boolean) => value, | ||||
|             }, | ||||
|               _$expand: (value: boolean) => value | ||||
|             } | ||||
|           } | ||||
|         }, | ||||
|         brandId: { | ||||
|         driverId: { | ||||
|           title: '承运司机', | ||||
|           type: 'string', | ||||
|           ui: { | ||||
| @ -153,29 +154,45 @@ export class OrderManagementBulkComponent implements OnInit { | ||||
|             onSearch: (q: any) => { | ||||
|               if (!!q) { | ||||
|                 return this.service | ||||
|                   .request(this.service.$api_get_getDriverInfo, { keyword: q, | ||||
|                   model: 1, type: 1 }) | ||||
|                   .pipe(map((res) => (res as any[]).map((i) => ({ label: i.name, value: i.id } as SFSchemaEnum)))) | ||||
|                   .request(this.service.$api_get_getDriverInfo, { keyword: q, model: 1, type: 1 }) | ||||
|                   .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, | ||||
|               _$expand: (value: boolean) => value | ||||
|             } | ||||
|           } as SFSelectWidgetSchema | ||||
|         }, | ||||
|         no9: { | ||||
|           type: 'string', | ||||
|  | ||||
|         carNo: {  | ||||
|           title: '车牌号', | ||||
|           type: 'string', | ||||
|           ui: { | ||||
|             widget: 'select', | ||||
|             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([]); | ||||
|               } | ||||
|             }, | ||||
|             visibleIf: { | ||||
|               _$expand: (value: boolean) => value, | ||||
|             }, | ||||
|           } | ||||
|         }, | ||||
|         payeeId: { | ||||
|           } as SFSelectWidgetSchema, | ||||
|          }, | ||||
|          payeeId: { | ||||
|           title: '车队长', | ||||
|           type: 'string', | ||||
|           ui: { | ||||
| @ -195,22 +212,17 @@ export class OrderManagementBulkComponent implements OnInit { | ||||
|               } | ||||
|             }, | ||||
|             visibleIf: { | ||||
|               expand: (value: boolean) => value, | ||||
|               _$expand: (value: boolean) => value, | ||||
|             }, | ||||
|           } as SFSelectWidgetSchema, | ||||
|         },  | ||||
|         sex: { | ||||
|         paymentstatus: { | ||||
|           title: '支付状态', | ||||
|           type: 'string', | ||||
|           default: 0, | ||||
|           enum: [ | ||||
|             { label: '未知', value: 0 }, | ||||
|             { label: '男', value: 1 }, | ||||
|             { label: '女', value: 2 }, | ||||
|             { label: '保密', value: 3 }, | ||||
|           ], | ||||
|           ui: { | ||||
|             widget: 'select', | ||||
|             widget: 'dict-select', | ||||
|             params: { dictKey: 'payment:status' }, | ||||
|             containAllLable:true, | ||||
|             visibleIf: { | ||||
|               _$expand: (value: boolean) => value, | ||||
|             }, | ||||
| @ -224,24 +236,28 @@ export class OrderManagementBulkComponent implements OnInit { | ||||
|             mode: 'range', | ||||
|             format: 'yyyy-MM-dd', | ||||
|             visibleIf: { | ||||
|               _$expand: (value: boolean) => value, | ||||
|             }, | ||||
|           } as SFDateWidgetSchema, | ||||
|               _$expand: (value: boolean) => value | ||||
|             } | ||||
|           } as SFDateWidgetSchema | ||||
|         }, | ||||
|         appId: { | ||||
|         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, | ||||
|             }, | ||||
|             allowClear: true, | ||||
|             asyncData: () => this.getCatalogueMember(), | ||||
|           }, | ||||
|         }, | ||||
|         appId2: { | ||||
|         enterpriseInfoName: { | ||||
|           type: 'string', | ||||
|           title: '网络货运人', | ||||
|           ui: { | ||||
| @ -251,23 +267,10 @@ export class OrderManagementBulkComponent implements OnInit { | ||||
|               _$expand: (value: boolean) => value, | ||||
|             }, | ||||
|             allowClear: true, | ||||
|             asyncData: () => this.getCatalogueMember(), | ||||
|             asyncData: () => this.service2.getNetworkFreightForwarder(), | ||||
|           }, | ||||
|         }, | ||||
|         appId3: { | ||||
|           type: 'string', | ||||
|           title: '结算依据', | ||||
|           ui: { | ||||
|             widget: 'dict-select', | ||||
|             params: { dictKey: 'goodresource:settlement:type' }, | ||||
|             containAllLable:true, | ||||
|             placeholder: '请选择', | ||||
|             visibleIf: { | ||||
|               _$expand: (value: boolean) => value, | ||||
|             }, | ||||
|           }, | ||||
|         }, | ||||
|         appId4: { | ||||
|         goodsName: { | ||||
|           type: 'string', | ||||
|           title: '货物名称', | ||||
|           ui: { | ||||
| @ -294,7 +297,7 @@ export class OrderManagementBulkComponent implements OnInit { | ||||
|           } as SFSelectWidgetSchema, | ||||
|         }, | ||||
|       }, | ||||
|       type: 'object', | ||||
|       type: 'object' | ||||
|     }; | ||||
|     this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } }; | ||||
|   } | ||||
| @ -351,71 +354,70 @@ export class OrderManagementBulkComponent implements OnInit { | ||||
|         title: '订单号', | ||||
|         width: '100px', | ||||
|         className: 'text-center', | ||||
|         render: 'goodsId' | ||||
|         render: 'billCode' | ||||
|       }, | ||||
|       { | ||||
|         title: '运费明细', | ||||
|         width: '100px', | ||||
|         index: 'externalSn', | ||||
|         className: 'text-center', | ||||
|         render: 'mybidDetailInfo', | ||||
|       }, | ||||
|       { title: '网络货运人', index: 'externalSn', width: '120px', className: 'text-center' }, | ||||
|       { title: '托运人', index: 'externalSn', width: '120px', className: 'text-center' }, | ||||
|       { title: '关联运单号', index: 'externalSn', width: '120px', className: 'text-center' }, | ||||
|       { title: '货源编号', index: 'externalSn', width: '120px', className: 'text-center' }, | ||||
|       { title: '装货地', index: 'linkUrl', width: '120px', className: 'text-center' }, | ||||
|       { title: '网络货运人', index: 'enterpriseInfoName', width: '120px', className: 'text-center' }, | ||||
|       { title: '托运人', index: 'enterpriseProjectName', width: '120px', className: 'text-center' }, | ||||
|       { title: '关联运单号', index: 'wayBillCode', width: '120px', className: 'text-center' }, | ||||
|       { title: '货源编号', index: 'resourceCode', width: '120px', className: 'text-center' }, | ||||
|       { title: '装货地', index: 'loadingAddressArr', width: '120px', className: 'text-center' }, | ||||
|       { | ||||
|         title: '卸货地', | ||||
|         className: 'text-center', | ||||
|         width: '120px', | ||||
|         index: 'unloadingAddressArr' | ||||
|       }, | ||||
|       { | ||||
|         title: '货物信息', | ||||
|         className: 'text-center', | ||||
|         width: '120px', | ||||
|       },  | ||||
|       { | ||||
|         render: 'goodsName' | ||||
|       }, { | ||||
|         title: '运费单价', | ||||
|         className: 'text-center', | ||||
|         width: '120px', | ||||
|         index: 'freightPrice' | ||||
|       }, | ||||
|       { | ||||
|         title: '接单数量', | ||||
|         className: 'text-center', | ||||
|         width: '120px', | ||||
|         index: 'goodsNumber', | ||||
|         width: '100px', | ||||
|       }, | ||||
|       { | ||||
|         title: '结算重量', | ||||
|         className: 'text-center', | ||||
|         width: '120px', | ||||
|       }, | ||||
|       { | ||||
|         title: '接单重量', | ||||
|         className: 'text-center', | ||||
|         width: '120px', | ||||
|         index: 'settlementWeight', | ||||
|         width: '100px', | ||||
|       }, | ||||
|       { | ||||
|         title: '承运司机', | ||||
|         className: 'text-center', | ||||
|         width: '120px', | ||||
|         render: 'feiong' | ||||
|         index: 'driverName', | ||||
|         width: '100px', | ||||
|       }, | ||||
|       { | ||||
|         title: '收款人', | ||||
|         className: 'text-center', | ||||
|         width: '120px', | ||||
|         index: 'payeeName', | ||||
|         width: '100px', | ||||
|       }, | ||||
|       { | ||||
|         title: '装卸货时间', | ||||
|         width: '170px', | ||||
|         className: 'text-center', | ||||
|         width: '120px', | ||||
|         render: 'enStatusStr27878' | ||||
|         render: 'loadingTime' | ||||
|       }, | ||||
|       { | ||||
|         title: '创建时间', | ||||
|         className: 'text-center', | ||||
|         width: '120px', | ||||
|     | ||||
|         index: 'createTime', | ||||
|       }, | ||||
|       { | ||||
|         title: '操作', | ||||
| @ -472,7 +474,7 @@ export class OrderManagementBulkComponent implements OnInit { | ||||
|         className: 'text-center', | ||||
|         index: 'three',  | ||||
|       }, | ||||
|       { title: '状态', index: 'externalSn',  className: 'text-center' }, | ||||
|       { title: '状态', render: 'externalSn',  className: 'text-center' }, | ||||
|       { | ||||
|         title: '操作', | ||||
|         fixed: 'right', | ||||
| @ -485,6 +487,7 @@ export class OrderManagementBulkComponent implements OnInit { | ||||
|           { | ||||
|             text: '撤销', | ||||
|             click: (_record) => this.audit(_record), | ||||
|            iif: item => item.externalSn === '1' || item.externalSn === 1, | ||||
|           }, | ||||
|         ], | ||||
|       }, | ||||
| @ -635,7 +638,8 @@ export class OrderManagementBulkComponent implements OnInit { | ||||
|       nzWidth: '50%', | ||||
|       nzContent: SureDepartComponent, | ||||
|       nzComponentParams: { | ||||
|         i: item | ||||
|         i: item, | ||||
|         Status: 1 | ||||
|       }, | ||||
|       nzFooter: null | ||||
|     }); | ||||
|  | ||||
		Reference in New Issue
	
	Block a user