Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
wangshiming
2021-12-14 19:12:55 +08:00
parent feabfee6aa
commit 553d22a01e
3 changed files with 90 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/app/routes/order-management/components/bulk/bulk.component.ts
View File

@ -1,6 +1,6 @@
import { Component, OnInit, ViewChild } from '@angular/core';
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 { NzModalService } from 'ng-zorro-antd/modal';
import { map } from 'rxjs/operators';
@ -9,6 +9,7 @@ import { UpdateFreightComponent } from '../../modal/bulk/update-freight/update-f
import { ConfirReceiptComponent } from '../../modal/bulk/confir-receipt/confir-receipt.component';
import { SureDepartComponent } from '../../modal/bulk/sure-depart/sure-depart.component';
import { SureArriveComponent } from '../../modal/bulk/sure-arrive/sure-arrive.component';
import { of } from 'rxjs';
@Component({
@ -141,14 +142,29 @@ export class OrderManagementBulkComponent implements OnInit {
},
}
},
no7: {
type: 'string',
brandId: {
title: '承运司机',
type: 'string',
ui: {
visibleIf: {
_$expand: (value: boolean) => value,
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: 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,
},
no9: {
type: 'string',
@ -159,15 +175,30 @@ export class OrderManagementBulkComponent implements OnInit {
},
}
},
no10: {
type: 'string',
brandId2: {
title: '车队长',
type: 'string',
ui: {
visibleIf: {
_$expand: (value: boolean) => value,
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([]);
}
},
}
},
visibleIf: {
expand: (value: boolean) => value,
},
} as SFSelectWidgetSchema,
},
sex: {
title: '支付状态',
type: 'string',

55
src/app/routes/order-management/components/vehicle/vehicle.component.ts
View File

@ -1,8 +1,9 @@
import { Component, OnInit, ViewChild } from '@angular/core';
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 { NzModalService } from 'ng-zorro-antd/modal';
import { of } from 'rxjs';
import { map } from 'rxjs/operators';
import { SupplyManagementService } from '../../services/order-management.service';
@ -133,14 +134,29 @@ export class OrderManagementVehicleComponent implements OnInit {
},
}
},
no7: {
type: 'string',
brandId: {
title: '承运司机',
type: 'string',
ui: {
visibleIf: {
_$expand: (value: boolean) => value,
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: 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,
},
no9: {
type: 'string',
@ -151,15 +167,30 @@ export class OrderManagementVehicleComponent implements OnInit {
},
}
},
no10: {
type: 'string',
brandId2: {
title: '车队长',
type: 'string',
ui: {
visibleIf: {
_$expand: (value: boolean) => value,
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([]);
}
},
}
},
visibleIf: {
expand: (value: boolean) => value,
},
} as SFSelectWidgetSchema,
},
sex: {
title: '支付状态',
type: 'string',

6
src/app/routes/order-management/services/order-management.service.ts
View File

@ -1,8 +1,8 @@
/*
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2021-12-14 10:14:22
* @LastEditors: your name
* @LastEditTime: 2021-12-14 17:48:58
* @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\order-management\services\order-management.service.ts
*/
@ -16,6 +16,8 @@ export class SupplyManagementService extends BaseService {
$api_get_catalogue_member = `/user?_allow_anonymous=true`;
$api_get_bulkPage_list = `/api/sdc/goodsResourceOperate/listBulkPage`;
// 据 手机号/姓名 查询 车队长/司机
$api_get_getDriverInfo = `/api/mdc/cuc/user/getDriverInfo`;
$api_del_driver = ``;
constructor(public injector: Injector) {
super(injector)