From 9bc40fced0c12015cede6b5e54cafe8074e7f92f Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 14 Dec 2021 10:11:10 +0800 Subject: [PATCH] fix bug --- .../components/vehicle/vehicle.component.ts | 129 +++++++++--------- .../vehicle/components/list/list.component.ts | 4 +- 2 files changed, 65 insertions(+), 68 deletions(-) diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts index 70cb334a..a56f072c 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -48,11 +48,6 @@ export class OrderManagementVehicleComponent implements OnInit { type: 5, count: 0, }, - { - name: '待接单', - type: 5, - count: 0, - }, { name: '待发车', type: 5, @@ -118,7 +113,7 @@ export class OrderManagementVehicleComponent implements OnInit { }, no1: { type: 'string', - title: '托运人' + title: '货主' }, no3: { type: 'string', @@ -158,7 +153,7 @@ export class OrderManagementVehicleComponent implements OnInit { }, no10: { type: 'string', - title: '收款人', + title: '车队长', ui: { visibleIf: { _$expand: (value: boolean) => value, @@ -207,6 +202,57 @@ export class OrderManagementVehicleComponent implements OnInit { asyncData: () => this.getCatalogueMember(), }, }, + sex3: { + title: '网络货运人', + type: 'string', + default: 0, + enum: [ + { label: '未知', value: 0 }, + { label: '男', value: 1 }, + { label: '女', value: 2 }, + { label: '保密', value: 3 }, + ], + ui: { + widget: 'select', + visibleIf: { + _$expand: (value: boolean) => value, + }, + } as SFSelectWidgetSchema, + }, + sex4: { + title: '货物名称', + type: 'string', + default: 0, + enum: [ + { label: '未知', value: 0 }, + { label: '男', value: 1 }, + { label: '女', value: 2 }, + { label: '保密', value: 3 }, + ], + ui: { + widget: 'select', + visibleIf: { + _$expand: (value: boolean) => value, + }, + } as SFSelectWidgetSchema, + }, + sex5: { + title: '服务类型', + type: 'string', + default: 0, + enum: [ + { label: '未知', value: 0 }, + { label: '男', value: 1 }, + { label: '女', value: 2 }, + { label: '保密', value: 3 }, + ], + ui: { + widget: 'select', + visibleIf: { + _$expand: (value: boolean) => value, + }, + } as SFSelectWidgetSchema, + }, }, type: 'object', }; @@ -219,18 +265,22 @@ export class OrderManagementVehicleComponent implements OnInit { initST() { this.columns = [ { title: '', type: 'checkbox', width: '50px', className: 'text-center' }, + { - title: '运单号', + title: '订单号', width: '100px', className: 'text-center', render: 'goodsId' }, { - title: '货源编号', + title: '运费明细', width: '100px', 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: 'linkUrl', width: '120px', className: 'text-center' }, { title: '装货地', index: 'linkUrl', width: '120px', className: 'text-center' }, { title: '卸货地', @@ -238,38 +288,16 @@ export class OrderManagementVehicleComponent implements OnInit { width: '120px', }, { - title: '货物名称', + title: '货物信息', className: 'text-center', width: '120px', }, { - title: '重量/体积', - className: 'text-center', - width: '120px', - }, - { title: '承运司机', className: 'text-center', width: '120px', }, { - title: '车牌号', - className: 'text-center', - width: '120px', - }, - { - title: '出价', - className: 'text-center', - width: '120px', - render: 'enStatusStr27878' - }, - { - title: '浮动费用', - className: 'text-center', - width: '120px', - render: 'feiong' - }, - { - title: '成交金额', + title: '承运司机', className: 'text-center', width: '120px', }, @@ -286,7 +314,7 @@ export class OrderManagementVehicleComponent implements OnInit { }, }, { - title: '支付状态', + title: '装卸货时间', width: '170px', className: 'text-center', }, @@ -294,37 +322,6 @@ export class OrderManagementVehicleComponent implements OnInit { title: '创建时间', className: 'text-center', index: 'enStatusStr3', - type: 'badge', - width: '100px', - badge: { - 正常: { text: '正常', color: 'success' }, - 冻结: { text: '冻结', color: 'warning' }, - 废弃: { text: '废弃', color: 'default' }, - }, - }, - { - title: '异常原因', - className: 'text-center', - index: 'enStatusStr3', - type: 'badge', - width: '100px', - badge: { - 正常: { text: '正常', color: 'success' }, - 冻结: { text: '冻结', color: 'warning' }, - 废弃: { text: '废弃', color: 'default' }, - }, - }, - { - title: '运单状态', - className: 'text-center', - index: 'enStatusStr3', - type: 'badge', - width: '100px', - badge: { - 正常: { text: '正常', color: 'success' }, - 冻结: { text: '冻结', color: 'warning' }, - 废弃: { text: '废弃', color: 'default' }, - }, }, { title: '操作', diff --git a/src/app/routes/vehicle/components/list/list.component.ts b/src/app/routes/vehicle/components/list/list.component.ts index 71e06b6f..49c92904 100644 --- a/src/app/routes/vehicle/components/list/list.component.ts +++ b/src/app/routes/vehicle/components/list/list.component.ts @@ -123,7 +123,7 @@ export class VehicleComponentsListComponent implements OnInit { title: '是否挂靠', ui: { widget: 'dict-select', - params: { dictKey: 'CarColor' }, + params: { dictKey: 'Whether' }, visibleIf: { expand: (value: boolean) => value, }, @@ -158,7 +158,7 @@ export class VehicleComponentsListComponent implements OnInit { }, }, }; - this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 }, enter: () => this.st.load() } }; + this.ui = { '*': { spanLabelFixed: 130, grid: { span: 8, gutter: 4 }, enter: () => this.st.load() } }; } initST() {