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

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
Taric Xin
2022-04-28 19:55:18 +08:00
parent 7d25e6c9a1 5e24aac69b
commit f35d7aeb7e
1 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/app/routes/sys-setting/components/close-account/close-account.component.ts
View File

@ -156,21 +156,22 @@ export class CloseAccountComponent implements OnInit {
maxLength: 30, maxLength: 30,
ui: { ui: {
widget: 'select', widget: 'select',
serverSearch: true, // serverSearch: true,
allowClear: true,
searchDebounceTime: 300, searchDebounceTime: 300,
searchLoadingText: '搜索中...', searchLoadingText: '搜索中...',
onSearch: (q: any) => { onSearch: (q: any) => {
let str =q.replace(/^\s+|\s+$/g,""); let str = q?.replace(/^\s+|\s+$/g, '');
if (str) { if (str) {
return this.service return this.service
.request(this.service.$api_enterpriceList, { enterpriseName: str }) .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 => (res as any[]).map(i => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
.toPromise(); .toPromise();
} else { } else {
return of([]); return of([]);
} }
}, },
} as SFSelectWidgetSchema, } as SFSelectWidgetSchema
}, },
}, },
required: ['customerName', 'customerCode', 'networkTransporterId', 'enterpriseId'] required: ['customerName', 'customerCode', 'networkTransporterId', 'enterpriseId']
@ -186,11 +187,26 @@ this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } };
this.service.request(this.service.$api_settlementCustomer_get, {id: value.id}).subscribe((res: any) => { this.service.request(this.service.$api_settlementCustomer_get, {id: value.id}).subscribe((res: any) => {
console.log(res) console.log(res)
if(res) { if(res) {
this.formData = res;
const List: any = []; const List: any = [];
List.push({ label: res.enterpriseName, value: res.enterpriseId }); List.push({ label: value.enterpriseName, value: res.enterpriseId });
// this.sfFre.getProperty('/enterpriseId')!.schema.enum = List;
// console.log(List);
// this.sfFre.getProperty('/enterpriseId')!.widget.reset(List);
// if(res.enterpriseId) {
// this.sfFre.setValue('/enterpriseId', res.enterpriseId);
// }
console.log(this.sfFre.getProperty('/enterpriseId'));
this.formData = res;
setTimeout(() => {
this.sfFre.getProperty('/enterpriseId')!.schema.enum = List; this.sfFre.getProperty('/enterpriseId')!.schema.enum = List;
this.sfFre.getProperty('/enterpriseId')!.widget.reset(List); this.sfFre.getProperty('/enterpriseId')!.widget.reset(List);
if (res?.enterpriseId) {
console.log(res?.enterpriseId);
console.log(res?.enterpriseId);
this.sfFre.setValue('/enterpriseId', res.enterpriseId);
}
})
} }
}) })
this.edit = true; this.edit = true;