From 47a5dfedad1d4db072db281ac1dfbae8578c704f Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 26 Apr 2022 14:05:17 +0800 Subject: [PATCH] fix bug --- .../components/edit/edit.component.ts | 36 ++++++++----------- .../rebate-setting/add/add.component.html | 4 +-- 2 files changed, 17 insertions(+), 23 deletions(-) diff --git a/src/app/routes/partner/channel-sales/components/edit/edit.component.ts b/src/app/routes/partner/channel-sales/components/edit/edit.component.ts index b5891ac0..c563ff9b 100644 --- a/src/app/routes/partner/channel-sales/components/edit/edit.component.ts +++ b/src/app/routes/partner/channel-sales/components/edit/edit.component.ts @@ -48,28 +48,21 @@ export class ParterChannelSalesEditComponent implements OnInit { if (res) { let value1 = Object.assign({}, res); delete value1.employeeVO; - console.log(value1); - console.log(this.record); - let value = res.employeeVO; - console.log(value); - List.push({ label: value.empName + '/' + value.empNo, value: value.empNo }); - console.log(List); + setTimeout(() => { + if (this.sf) { + console.log(this.sf.getProperty('/employeeVO')!.schema); - setTimeout(() => { - if (this.sf) { - console.log(this.sf.getProperty('/employeeVO')!.schema); - - this.sf.getProperty('/employeeVO')!.schema.enum = List; - this.sf.getProperty('/employeeVO')!.widget.reset(List); - } - if (value.empNo) { - this.sf.setValue('/employeeVO', value.empNo); - this.currentOAItem = value; - this.sf.setValue('/phoneNumber', res.telephone); - } - }); + this.sf.getProperty('/employeeVO')!.schema.enum = List; + this.sf.getProperty('/employeeVO')!.widget.reset(List); + } + if (value.empNo) { + this.sf.setValue('/employeeVO', value.empNo); + this.currentOAItem = value; + this.sf.setValue('/phoneNumber', res.telephone); + } + }) this.record = value1; } }); @@ -212,9 +205,10 @@ export class ParterChannelSalesEditComponent implements OnInit { } save() { this.sf.validator({ emitError: true }); + if (!this.sf.valid) return; - let params = { - ...this.sf.value + let params: any= { + ...this.sf.value, } delete params.telephone this.service.request(this.service.$api_save, { ...params, employeeVO: this.currentOAItem }).subscribe(res => { diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html index 0482f6e6..f0be7aff 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-02-24 20:09:49 * @LastEditors : Shiming - * @LastEditTime : 2022-04-26 10:53:50 + * @LastEditTime : 2022-04-26 14:04:41 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -61,7 +61,7 @@ -