From 17354d05ec08e75a851c6d2de9ef326be59d1da8 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 17 Dec 2021 17:36:35 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/risk/risk.component.html | 12 +- .../components/risk/risk.component.ts | 48 ++--- .../components/vehicle/vehicle.component.ts | 195 +++++++----------- .../components/audit/audit.component.ts | 12 +- .../components/list/list.component.html | 13 +- .../vehicle/components/list/list.component.ts | 12 +- .../vehicle/services/vehicle.service.ts | 9 +- 7 files changed, 137 insertions(+), 164 deletions(-) diff --git a/src/app/routes/order-management/components/risk/risk.component.html b/src/app/routes/order-management/components/risk/risk.component.html index 62d75772..869a7ab7 100644 --- a/src/app/routes/order-management/components/risk/risk.component.html +++ b/src/app/routes/order-management/components/risk/risk.component.html @@ -38,10 +38,14 @@ - - - - + + + + + + +
{ + this.st.load(); + }, 500); } /** * 导入货源 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 ba8deba3..df73f13c 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -2,6 +2,7 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { STColumn, STComponent } from '@delon/abc/st'; import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; import { ModalHelper, _HttpClient } from '@delon/theme'; +import { ShipperBaseService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; import { of } from 'rxjs'; import { map } from 'rxjs/operators'; @@ -79,7 +80,7 @@ export class OrderManagementVehicleComponent implements OnInit { count: 0, }, ]; - constructor(public service: SupplyManagementService, private modal: NzModalService) { } + constructor(public service: SupplyManagementService, private modal: NzModalService,public service2: ShipperBaseService,) { } /** * 查询参数 @@ -104,41 +105,50 @@ export class OrderManagementVehicleComponent implements OnInit { /** * 初始化查询表单 */ - initSF() { + initSF() { this.schema = { properties: { _$expand: { type: 'boolean', ui: { hidden: true } }, - no: { + billCode: { type: 'string', - title: '订单号', + title: '订单号' }, - no2: { + resourceCode: { type: 'string', title: '货源编号' }, - no1: { + externalResourceCode: { type: 'string', - title: '货主' + 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: { + // driverName: { + // type: 'string', + // title: '承运司机', + // ui: { + // visibleIf: { + // _$expand: (value: boolean) => value, + // }, + // } + // }, + driverId: { title: '承运司机', type: 'string', ui: { @@ -149,68 +159,72 @@ export class OrderManagementVehicleComponent 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', title: '车牌号', ui: { visibleIf: { - _$expand: (value: boolean) => value, - }, + _$expand: (value: boolean) => value + } } }, - brandId2: { - title: '车队长', + no10: { + type: 'string', + title: '收款人', + ui: { + visibleIf: { + _$expand: (value: boolean) => value + } + } + }, + wayBillType: { + 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([]); - } - }, + widget: 'dict-select', + params: { dictKey: 'goodresourceType' }, + containAllLable: true, visibleIf: { - expand: (value: boolean) => value, - }, - } as SFSelectWidgetSchema, - }, - sex: { - title: '支付状态', + _$expand: (value: boolean) => value + } + } as SFSelectWidgetSchema + }, + shipperId: { + title: '托运人', type: 'string', - default: 0, - enum: [ - { label: '未知', value: 0 }, - { label: '男', value: 1 }, - { label: '女', value: 2 }, - { label: '保密', value: 3 }, - ], + 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, + _$expand: (value: boolean) => value }, - } as SFSelectWidgetSchema, + allowClear: true, + asyncData: () => this.service2.getNetworkFreightForwarder() + } }, createTime: { title: '创建时间', @@ -220,72 +234,12 @@ export class OrderManagementVehicleComponent implements OnInit { mode: 'range', format: 'yyyy-MM-dd', visibleIf: { - _$expand: (value: boolean) => value, - }, - } as SFDateWidgetSchema, - }, - appId: { - type: 'string', - title: '是否风险单', - ui: { - widget: 'select', - placeholder: '请选择', - visibleIf: { - _$expand: (value: boolean) => value, - }, - allowClear: true, - 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, - }, - serviceType: { - title: '服务类型', - type: 'string', - default: '', - ui: { - widget: 'dict-select', - params: { dictKey: 'ServiceType' }, - containAllLable:true, - visibleIf: { - _$expand: (value: boolean) => value, - }, - } as SFSelectWidgetSchema, - }, + _$expand: (value: boolean) => value + } + } as SFDateWidgetSchema + } }, - type: 'object', + type: 'object' }; this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } }; } @@ -296,12 +250,11 @@ export class OrderManagementVehicleComponent implements OnInit { initST() { this.columns = [ { title: '', type: 'checkbox', width: '50px', className: 'text-center' }, - { title: '订单号', width: '100px', className: 'text-center', - render: 'goodsId' + render: 'billCode' }, { title: '运费明细', diff --git a/src/app/routes/vehicle/components/audit/audit.component.ts b/src/app/routes/vehicle/components/audit/audit.component.ts index 8965a3bb..2b94e304 100644 --- a/src/app/routes/vehicle/components/audit/audit.component.ts +++ b/src/app/routes/vehicle/components/audit/audit.component.ts @@ -76,20 +76,26 @@ export class VehicleComponentsAuditComponent implements OnInit { ui: { widget: 'select', serverSearch: true, - searchDebounceTime: 300, + searchDebounceTime: 250, searchLoadingText: '搜索中...', onSearch: (q: any) => { if (!!q) { return this.service - .request(this.service.$api_get_getCarLicenseListByCarNo, { + .request(this.service.$api_get_getCarLicenseListByCarNo_audit, { carNo: q }) - .pipe(map((res: any[]) => (res as any[]).map((i) => ({ label: i.carNo, value: i.carNo } as SFSchemaEnum)))) + .pipe(map((res: any) => (res.records as any[]).map((i) => ( + { label: i.carNo, value: i.carNo + } as SFSchemaEnum) + ) + ) + ) .toPromise(); } else { return of([]); } }, + width: 250 } as SFSelectWidgetSchema, }, carNoColor: { diff --git a/src/app/routes/vehicle/components/list/list.component.html b/src/app/routes/vehicle/components/list/list.component.html index d218f1ec..dbbd6c87 100644 --- a/src/app/routes/vehicle/components/list/list.component.html +++ b/src/app/routes/vehicle/components/list/list.component.html @@ -1,7 +1,7 @@