From 251b40ece6a3e53ca37c9c83a1c74b4477cb1141 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 4 Jan 2022 14:01:36 +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/vehicle/vehicle.component.ts | 10 -------- .../components/bulk/bulk.component.ts | 24 +++++++++++++++---- .../components/vehicle/vehicle.component.ts | 10 ++++---- .../services/supply-management.service.ts | 4 ++-- 4 files changed, 27 insertions(+), 21 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 7382eefe..49ab06fa 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -627,16 +627,6 @@ resourceStatus: any; nzContent: VehicleModifyRateComponent, nzComponentParams: { data: { ids: params } }, nzFooter: null, - // nzOnOk: sin => { - // this.service.request(this.service.$api_change_bulk, { billId: item.id, ...sin.sf.value }).subscribe(res => { - // if (res) { - // this.service.msgSrv.success('变更运费成功'); - // modal.destroy(); - // this.st.reload(); - // } - // }); - // return false; - // } }); modal.afterClose.subscribe((result) => { if (result) { diff --git a/src/app/routes/supply-management/components/bulk/bulk.component.ts b/src/app/routes/supply-management/components/bulk/bulk.component.ts index d50adc8b..ce8be3f3 100644 --- a/src/app/routes/supply-management/components/bulk/bulk.component.ts +++ b/src/app/routes/supply-management/components/bulk/bulk.component.ts @@ -1,10 +1,11 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; import { STColumn, STComponent } from '@delon/abc/st'; -import { SFComponent, SFDateWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; +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'; import { SupplyManagementService } from '../../services/supply-management.service'; import { SupplyManagementQrcodePageComponent } from '../qrcode-page/qrcode-page.component'; @@ -138,14 +139,29 @@ export class SupplyManagementBulkComponent implements OnInit { asyncData: () => this.service2.getNetworkFreightForwarder(), }, }, - no4: { + shipperAppUserId: { type: 'string', title: '货主', ui: { + widget: 'select', + serverSearch: true, + searchDebounceTime: 300, + searchLoadingText: '搜索中...', visibleIf: { - _$expand: (value: boolean) => value, + _$expand: (value: boolean) => value }, - } + onSearch: (q: any) => { + console.log(q) + if (!!q) { + return this.service + .request(this.service.$api_enterpriceList, { enterpriseName: q}) + .pipe(map((res: any) => (res as any[]).map((i) => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum)))) + .toPromise(); + } else { + return of([]); + } + }, + } as SFSelectWidgetSchema, }, }, type: 'object', 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 6bcab2e2..4d37b56c 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts @@ -302,12 +302,12 @@ export class SupplyManagementVehicleComponent implements OnInit { title: '所属项目', ui: { widget: 'select', - placeholder: '请选择', - asyncData: () => this.shipperSrv.getEnterpriseProject(), visibleIf: { - _$expand: (value: boolean) => value - } - } + _$expand: (value: boolean) => value, + }, + asyncData: () => + this.shipperSrv.getEnterpriseProject() + } as SFSelectWidgetSchema, }, serviceType: { title: '服务类型', diff --git a/src/app/routes/supply-management/services/supply-management.service.ts b/src/app/routes/supply-management/services/supply-management.service.ts index 3350d79a..fa3d959e 100644 --- a/src/app/routes/supply-management/services/supply-management.service.ts +++ b/src/app/routes/supply-management/services/supply-management.service.ts @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-03 11:10:14 - * @LastEditTime: 2021-12-28 19:53:40 + * @LastEditTime: 2022-01-04 13:27:16 * @LastEditors: Please set LastEditors * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath: \tms-obc-web\src\app\routes\supply-management\services\supply-management.service.ts @@ -39,7 +39,7 @@ export class SupplyManagementService extends BaseService { $api_get_catalogue_member = `/user?_allow_anonymous=true`; $api_get_listModifyPrice = `/api/sdc/goodsInfo/listModifyPrice`; $api_update_price = `/api/sdc/goodsInfo/modifyPrice`; // 根据货物ID修改单价 - $api_get_goods_resource_statistical = `/api/sdc/goodsResourceOperate/StatisticalStatus`; // 统计整车、大宗货源状态数量 + $api_get_goods_resource_statistical = `/api/sdc/goodsResourceOperate/statisticalStatus`; // 统计整车、大宗货源状态数量 // 获取货主企业列表 public $api_getList = '/api/mdc/cuc/enterpriseInfo/cargoOwner/getList?_allow_anonymous=true'; // 获取货主企业列表