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

解决冲突

Browse Source
This commit is contained in:
wangshiming
2022-03-01 14:04:28 +08:00
parent b9f582e383
commit adbe2a402f
12 changed files with 39 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts
View File

@ -124,10 +124,10 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
searchLoadingText: '搜索中...',
allowClear: true,
onSearch: (q: any) => {
console.log(q)
if (!!q) {
let str =q.replace(/^\s+|\s+$/g,"");
if (str) {
return this.service
.request(this.service.$api_enterpriceList, { enterpriseName: q})
.request(this.service.$api_enterpriceList, { enterpriseName: str})
.pipe(map((res: any) => (res as any[]).map((i) => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
.toPromise();
} else {

5
src/app/routes/waybill-management/components/bulk/bulk.component.ts
View File

@ -96,9 +96,10 @@ tabs = {
allowClear: true,
onSearch: (q: any) => {
console.log(q)
if (!!q) {
let str =q.replace(/^\s+|\s+$/g,"");
if (str) {
return this.service
.request(this.service.$api_enterpriceList, { enterpriseName: q})
.request(this.service.$api_enterpriceList, { enterpriseName: str})
.pipe(map((res: any) => (res as any[]).map((i) => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
.toPromise();
} else {

6
src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
View File

@ -93,10 +93,10 @@ export class WaybillManagementVehicleComponent implements OnInit {
searchLoadingText: '搜索中...',
allowClear: true,
onSearch: (q: any) => {
console.log(q)
if (!!q) {
let str =q.replace(/^\s+|\s+$/g,"");
if (str) {
return this.service
.request(this.service.$api_enterpriceList, { enterpriseName: q})
.request(this.service.$api_enterpriceList, { enterpriseName: str})
.pipe(map((res: any) => (res as any[]).map((i) => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
.toPromise();
} else {