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:00:53 +08:00
parent c56013d9ea
commit b9f582e383
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts
View File

@ -110,9 +110,10 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
searchDebounceTime: 300, searchDebounceTime: 300,
searchLoadingText: '搜索中...', searchLoadingText: '搜索中...',
onSearch: (q: any) => { onSearch: (q: any) => {
if (!!q) { let str =q.replace(/^\s+|\s+$/g,"");
if (str) {
return this.service return this.service
.request(this.service.$api_enterpriceList, { enterpriseName: q }) .request(this.service.$api_enterpriceList, { enterpriseName: str })
.pipe(map(res => (res as any[]).map(i => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum)))) .pipe(map(res => (res as any[]).map(i => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
.toPromise(); .toPromise();
} else { } else {
@ -120,7 +121,10 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
} }
}, },
change: (q: any) => { change: (q: any) => {
this.getRegionCode(q); let str =q.replace(/^\s+|\s+$/g,"");
if (str) {
this.getRegionCode(str);
}
}, },
} as SFSelectWidgetSchema } as SFSelectWidgetSchema
}, },

10
src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts
View File

@ -121,9 +121,10 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
searchLoadingText: '搜索中...', searchLoadingText: '搜索中...',
allowClear: true, allowClear: true,
onSearch: (q: any) => { onSearch: (q: any) => {
if (!!q) { let str =q.replace(/^\s+|\s+$/g,"");
if (str) {
return this.service 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)))) .pipe(map((res: any[]) => (res as any[]).map(i => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
.toPromise(); .toPromise();
} else { } else {
@ -131,7 +132,10 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
} }
}, },
change: (q: any) => { change: (q: any) => {
this.getRegionCode(q); let str =q.replace(/^\s+|\s+$/g,"");
if (str) {
this.getRegionCode(str);
}
} }
} as SFSelectWidgetSchema } as SFSelectWidgetSchema
}, },