diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.html b/src/app/routes/supply-management/components/vehicle/vehicle.component.html index 082be410..ad829a47 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.html +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.html @@ -1,37 +1,21 @@ -
- -
- +
+ +
+
+ + + +
- - - -
- -
-
- - - - -
-
@@ -40,50 +24,32 @@ --> - - - - - - + + + + + +
- -
- - -
- + +
+ + +
+ {{item.resourceCode}} - - -
车型: {{item?.vehicleDemand?.maxWeight}}
-
车长: {{item?.vehicleDemand?.maxCube}} 米
- - - 抢单 - 指派 +

{{item.resourceTypeLabel}}{{item.serviceTypeLabel}}

 -
{{item.totalAmount}}
+
￥{{item.totalAmount}} +
@@ -106,17 +72,13 @@ size="small"
- +
- + -
+
diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.less b/src/app/routes/supply-management/components/vehicle/vehicle.component.less index 29a5e65b..e3128423 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.less +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.less @@ -1,2 +1,25 @@ -:host { +.expend-options { + margin-top: 0px; +} + + +@media (min-width: 1200px) { + .expend-options { + margin-top: -40px; + max-width : 400px; + position : absolute; + right : 0; + bottom : 30px; + } + +} + +:host::ng-deep { + p { + margin-bottom: 0; + } + + .text-truncate { + white-space: normal; + } } \ No newline at end of file diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts index 78828e09..e4c269d2 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts @@ -16,14 +16,13 @@ import { SupplyManagementUpdateFreightComponent } from '../update-freight/update styleUrls: ['./vehicle.component.less'] }) export class SupplyManagementVehicleComponent implements OnInit { - ui: SFUISchema = {}; ui2: SFUISchema = {}; - schema: SFSchema = {}; + schema: SFSchema = this.initSF(); freightSchema: SFSchema = {}; auditMany = false; isVisible = false; _$expand = false; - + @ViewChild('st') private readonly st!: STComponent; @ViewChild('sf', { static: false }) sf!: SFComponent; @ViewChild('sfFre', { static: false }) sfFre!: SFComponent; @@ -35,134 +34,49 @@ export class SupplyManagementVehicleComponent implements OnInit { stayQuantity: 0 }; resourceStatus: any; - constructor(public service: SupplyManagementService, private modal: NzModalService, private router: Router,private ar: ActivatedRoute) { } + constructor(public service: SupplyManagementService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute) {} /** - * 查询参数 - */ + * 查询参数 + */ get reqParams() { - const a:any = {}; - if(this.resourceStatus) { - a.resourceStatus = this.resourceStatus + const a: any = {}; + if (this.resourceStatus) { + a.resourceStatus = this.resourceStatus; } return { ...a, - ...this.sf?.value, + ...this.sf?.value }; } get selectedRows() { - return this.st?.list.filter((item) => item.checked) || []; + return this.st?.list.filter(item => item.checked) || []; } ngOnInit(): void { - this.initSF(); this.initST(); this.initSFFre(); this.getGoodsSourceStatistical(); } - - /** - * 初始化查询表单 - */ - initSF() { - this.schema = { - properties: { - _$expand: { type: 'boolean', ui: { hidden: true } }, - resourceCode: { - type: 'string', - title: '货源编号', - }, - serviceType: { - title: '服务类型', - type: 'string', - ui: { - widget: 'dict-select', - containsAllLable: true, - params: { dictKey: 'service:type' }, - } as SFSelectWidgetSchema, - }, - goodsName: { - title: '货物名称', - type: 'string', - default: '', - ui: { - widget: 'select', - // asyncData: () =>[] + * 初始化查询表单 + */ - } as SFSelectWidgetSchema, - }, - loadingPlace: { - type: 'string', - title: '装货地', - ui: { - visibleIf: { - _$expand: (value: boolean) => value, - }, - } - }, - dischargePlace: { - type: 'string', - title: '卸货地', - ui: { - visibleIf: { - _$expand: (value: boolean) => value, - }, - } - }, - shipperAppUserName: { - type: 'string', - title: '货主', - ui: { - visibleIf: { - _$expand: (value: boolean) => value, - }, - } - }, - auditStatus: { - title: '审核状态', - type: 'string', - ui: { - widget: 'dict-select', - params: { dictKey: 'goodresource:audit:status' }, - visibleIf: { - _$expand: (value: boolean) => value, - }, - } as SFSelectWidgetSchema, - }, - enterpriseInfoName: { - type: 'string', - title: '网络货运人', - ui: { - widget: 'select', - placeholder: '请选择', - visibleIf: { - _$expand: (value: boolean) => value, - }, - allowClear: true, - // asyncData: () => this.getCatalogueMember(), - }, - }, - }, - type: 'object', - }; - this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } }; - } initSFFre() { this.freightSchema = { properties: { - roleDescription: { - title: '备注', - type: 'string', - maxLength: 50, - ui: { - placeholder: '请输入备注', - widget: 'textarea', - }, - }, - } - }; - this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } }; + roleDescription: { + title: '备注', + type: 'string', + maxLength: 50, + ui: { + placeholder: '请输入备注', + widget: 'textarea' + } + } + } + }; + this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } }; } /** * 初始化数据列表 @@ -176,43 +90,46 @@ export class SupplyManagementVehicleComponent implements OnInit { className: 'text-center', render: 'resourceCode' }, - { title: '服务类型', index: 'serviceTypeLabel', width: '120px', className: 'text-center',render: 'serviceType'}, - { title: '货主', index: 'shipperAppUserName', width: '120px', className: 'text-center' }, + // { + // title: '服务类型', + // index: 'serviceType', + // width: '120px', + // className: 'text-center', + // type: 'enum', + // enum: { '1': '抢单', '2': '指派' } + // }, + { title: '货主', index: 'shipperAppUserNmae', width: '120px' }, { title: '项目名称', index: 'enterpriseProjectName', - className: 'text-center', - width: '120px', + width: '120px' }, { title: '装货地', index: 'loadingAddressArr', - className: 'text-center', - width: '120px', - }, { + width: '120px' + }, + { title: '卸货地', index: 'unloadingAddressArr', - className: 'text-center', - width: '120px', + width: '120px' }, { title: '货物名称', index: 'goodsName', - className: 'text-center', - width: '120px', + width: '120px' }, { title: '货物数量', - className: 'text-center', width: '120px', index: 'goodsNumber', - + format: item => item.goodsNumber.join('/') }, { title: '用车需求', - className: 'text-center', width: '120px', - render: 'vehicleDemand' + format: (item: any) => `

车型: ${item.vehicleDemand?.maxWeight || ''}

车长: ${item.vehicleDemand?.maxCube || ''}米

`, + index: 'vehicleDemand' }, { title: '总费用', @@ -221,11 +138,18 @@ export class SupplyManagementVehicleComponent implements OnInit { index: 'totalAmount', render: 'totalAmount' }, + { + title: '总运费', + className: 'text-center', + width: '120px', + index: '总运费' + }, { title: '附加费', className: 'text-center', width: '120px', index: 'surcharge', + format: item => `￥${item.surcharge}` }, { title: '货源状态', @@ -234,15 +158,16 @@ export class SupplyManagementVehicleComponent implements OnInit { type: 'badge', width: '120px', badge: { - 1: { text: '待接单', color: 'success' }, - 2: { text: '已接单', color: 'warning' }, - }, + '1': { text: '待接单', color: 'warning' }, + '2': { text: '已接单', color: 'success' } + } }, { title: '创建时间', width: '170px', index: 'createTime', className: 'text-center', + type: 'date' }, { title: '审核状态', @@ -253,46 +178,47 @@ export class SupplyManagementVehicleComponent implements OnInit { badge: { '1': { text: '待审核', color: 'warning' }, '2': { text: '审核通过', color: 'success' }, - '3': { text: '不通过', color: 'default' }, - '4': { text: '已取消', color: 'default' }, - }, + '3': { text: '不通过', color: 'error' }, + '4': { text: '已取消', color: 'default' } + } }, { title: '操作', fixed: 'right', - width: '200px', - className: 'text-left', + width: '110px', + className: 'text-center', buttons: [ { text: '货源审核', - click: (_record) => this.audit(_record, 1), - // iif: item => item.auditStatus === 1, + click: _record => this.audit(_record, 1), + iif: item => item.auditStatus === '1' }, { text: '修改货源', - click: (_record) => this.amend(_record), - // iif: item => item.auditStatus === 1 || item.auditStatus === 2, + click: _record => this.amend(_record), + iif: item => item.resourceStatus === '1' }, { text: '修改运费', - click: (_record) => this.updateFreight(_record), + click: _record => this.updateFreight(_record), + iif: item => item.resourceStatus === '1' && item.serviceType === '2' }, { text: '取消货源', - // iif: item => item.auditStatus === 1 || item.auditStatus === 2, - click: (_record) => this.cancleGoodsSource(_record), + click: _record => this.cancleGoodsSource(_record), + iif: item => item.resourceStatus === '1' }, { text: '再下一单', - click: (_record) => this.nextOrder(_record), + click: _record => this.nextOrder(_record) }, { text: '重新指派', - click: (_record) => this.assignedCar(_record), - // iif: item => item.auditStatus === 2, - }, - ], - }, + click: _record => this.assignedCar(_record), + iif: item => item.resourceStatus === '1' && item.serviceType === '2' + } + ] + } ]; } add(): void { @@ -300,21 +226,16 @@ export class SupplyManagementVehicleComponent implements OnInit { // .createStatic(FormEditComponent, { i: { id: 0 } }) // .subscribe(() => this.st.reload()); } + /** - * 查询字段个数 + * 伸缩查询条件 */ - get queryFieldCount(): number { - return Object.keys(this.schema?.properties || {}).length; - } - /** - * 伸缩查询条件 - */ expandToggle(): void { this._$expand = !this._$expand; this.sf?.setValue('/_$expand', this._$expand); } tabChange(item: any) { - console.log(item) + console.log(item); } /** * 重置表单 @@ -324,9 +245,6 @@ export class SupplyManagementVehicleComponent implements OnInit { this._$expand = false; } - - - selectChange(e: number) { console.log(e); this.resourceStatus = e; @@ -345,7 +263,7 @@ export class SupplyManagementVehicleComponent implements OnInit { nzWidth: '400px', nzContent: SupplyManagementUpdateExternalSnComponent, nzComponentParams: { - orderObject: item, + orderObject: item }, nzFooter: null, nzClosable: false @@ -355,9 +273,7 @@ export class SupplyManagementVehicleComponent implements OnInit { /** * 导入货源 */ - importGoodsSource() { - - } + importGoodsSource() {} /** * 修改运费 @@ -368,16 +284,16 @@ export class SupplyManagementVehicleComponent implements OnInit { nzWidth: '40%', nzContent: SupplyManagementUpdateFreightComponent, nzComponentParams: { - i: item, + i: item }, - nzFooter: null, + nzFooter: null }); } /** - * 重新指派 - */ - assignedCar(item: any) { + * 重新指派 + */ + assignedCar(item: any) { const { resourceId } = item; const modalRef = this.modal.create({ nzTitle: '指派熟车', @@ -389,23 +305,22 @@ export class SupplyManagementVehicleComponent implements OnInit { // url: this.service.$api_save_assign_vehicle, params: { resourceId } }, - nzFooter: null, - + nzFooter: null }); - modalRef.afterClose.subscribe((result) => { + modalRef.afterClose.subscribe(result => { if (result) { this.st.reload(); } }); } - /** - * 审核 - */ + /** + * 审核 + */ audit(value: any, status?: any) { - console.log(value) - console.log(status) - if(status === 2) { + console.log(value); + console.log(status); + if (status === 2) { this.auditMany = true; } else { this.auditMany = false; @@ -413,59 +328,139 @@ export class SupplyManagementVehicleComponent implements OnInit { this.isVisible = true; } /** - * 审核关闭弹窗 - */ + * 审核关闭弹窗 + */ handleCancel(type: any) { - this.isVisible = false + this.isVisible = false; } - /** - * 审核通过按钮 - */ - handleOK() { - - } - /** - * 跳转修改货源 - */ + /** + * 审核通过按钮 + */ + handleOK() {} + /** + * 跳转修改货源 + */ amend(item: any) { - console.log(item) + console.log(item); this.router.navigate(['/supply-management/vehicle-amend', item.id], { queryParams: { sta: 1 - }, - }) + } + }); } nextOrder(item: any) { - this.router.navigate(['/supply-management/vehicle-amend', item.id,],{ + this.router.navigate(['/supply-management/vehicle-amend', item.id], { queryParams: { sta: 2 - }, - }) + } + }); } - /** + /** * 取消货源 */ - cancleGoodsSource(record: any) { - this.modal.confirm({ - nzTitle: '确定取消货源吗?', - nzContent: `取消后不可恢复，谨慎操作`, - nzOnOk: () => - this.service.request(this.service.$api_cancle_goods_source, [record.id]).subscribe((res) => { - if (res === true) { - this.service.msgSrv.success('操作成功！'); - this.st?.reload(); - this.getGoodsSourceStatistical(); + cancleGoodsSource(record: any) { + this.modal.confirm({ + nzTitle: '确定取消货源吗?', + nzContent: `取消后不可恢复，谨慎操作`, + nzOnOk: () => + this.service.request(this.service.$api_cancle_goods_source, [record.id]).subscribe(res => { + if (res === true) { + this.service.msgSrv.success('操作成功！'); + this.st?.reload(); + this.getGoodsSourceStatistical(); + } + }) + }); + } + // 获取货源状态统计 + getGoodsSourceStatistical() { + this.service.request(this.service.$api_get_goods_resource_statistical, { resourceType: 1 }).subscribe(res => { + if (res) { + console.log(res); + this.tabs = res; + } + }); + } + + private initSF(): SFSchema { + return { + properties: { + _$expand: { type: 'boolean', ui: { hidden: true } }, + resourceCode: { + type: 'string', + title: '货源编号', + ui: { placeholder: '请输入' } + }, + loadingPlace: { + type: 'string', + title: '装货地', + ui: { + placeholder: '请输入' + } + }, + dischargePlace: { + type: 'string', + title: '卸货地', + ui: { placeholder: '请输入' } + }, + shipperAppUserName: { + type: 'string', + title: '货主', + ui: { + visibleIf: { + _$expand: (value: boolean) => value } - }), - }) - } - // 获取货源状态统计 - getGoodsSourceStatistical() { - this.service.request(this.service.$api_get_goods_resource_statistical, { resourceType: 1 }).subscribe(res => { - if (res) { - console.log(res) - this.tabs = res; + } + }, + goodsName: { + title: '所属项目', + type: 'string', + default: '', + ui: { + widget: 'select', + visibleIf: { + _$expand: (value: boolean) => value + } + // asyncData: () =>[] + } as SFSelectWidgetSchema + }, + serviceType: { + title: '服务类型', + type: 'string', + ui: { + widget: 'dict-select', + containsAllLable: true, + params: { dictKey: 'service:type' }, + visibleIf: { + _$expand: (value: boolean) => value + } + } as SFSelectWidgetSchema + }, + auditStatus: { + title: '审核状态', + type: 'string', + ui: { + widget: 'dict-select', + params: { dictKey: 'goodresource:audit:status' }, + visibleIf: { + _$expand: (value: boolean) => value + } + } as SFSelectWidgetSchema + }, + enterpriseInfoName: { + type: 'string', + title: '网络货运人', + ui: { + widget: 'select', + placeholder: '请选择', + visibleIf: { + _$expand: (value: boolean) => value + }, + allowClear: true + // asyncData: () => this.getCatalogueMember(), + } } - }) - } + } + }; + } }