diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html index 74c1eeb94..1267f20f7 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html @@ -57,7 +57,7 @@ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts index 09d349ac7..41e1ba1d2 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts @@ -452,6 +452,15 @@ export class AddPdComponent implements OnInit, OnDestroy { this._PDtriggerForm.controls['fk_lender_id'].setValidators([Validators.required]); this._PDtriggerForm.controls['fk_lender_id'].updateValueAndValidity(); + if(this.sales_and_credit_enable){ + this._PDtriggerForm.controls['lender_sales_person'].setValidators(Validators.compose([Validators.required])) + this._PDtriggerForm.controls['lender_sales_person'].updateValueAndValidity(); + this._PDtriggerForm.controls['lender_credit_person'].setValidators(Validators.compose([Validators.required])) + this._PDtriggerForm.controls['lender_credit_person'].updateValueAndValidity(); + this._PDtriggerForm.controls['imgc_fin_institute'].setValidators(Validators.compose([Validators.required])) + this._PDtriggerForm.controls['imgc_fin_institute'].updateValueAndValidity(); + } + // if(formValue.fk_product_id != '4'){ @@ -508,6 +517,14 @@ export class AddPdComponent implements OnInit, OnDestroy { this._PDtriggerForm.controls['fk_product_id'].clearValidators(); this._PDtriggerForm.controls['fk_product_id'].updateValueAndValidity(); + this._PDtriggerForm.controls['lender_credit_person'].clearValidators(); + this._PDtriggerForm.controls['lender_credit_person'].updateValueAndValidity(); + + this._PDtriggerForm.controls['lender_sales_person'].clearValidators(); + this._PDtriggerForm.controls['lender_sales_person'].updateValueAndValidity(); + + this._PDtriggerForm.controls['imgc_fin_institute'].clearValidators(); + this._PDtriggerForm.controls['imgc_fin_institute'].updateValueAndValidity(); // if(this._PDtriggerForm.controls.fk_product_id.value != '4'){ // this._PDtriggerForm.controls['fk_subproduct_id'].clearValidators(); // this._PDtriggerForm.controls['fk_subproduct_id'].updateValueAndValidity(); @@ -559,7 +576,7 @@ export class AddPdComponent implements OnInit, OnDestroy { } else { - if ((formValue.lender_contact_mobile == '' || formValue.lender_contact_mobile == null) && (formValue.lender_stdcode == '' || formValue.lender_stdcode == null && formValue.lender_landline == '' || formValue.lender_landline == null)) { + if ((formValue.lender_contact_mobile == '' || formValue.lender_contact_mobile == null) && (formValue.lender_stdcode == '' || formValue.lender_stdcode == null && formValue.lender_landline == '' || formValue.lender_landline == null) && !this.sales_and_credit_enable) { this.notifier.notify('warning', 'Either Mobile or Landline Need.!'); return; } @@ -569,8 +586,6 @@ export class AddPdComponent implements OnInit, OnDestroy { return; } else { - console.log(this._PDtriggerForm.value) - return this.disableAfterSubmit = true; let lender_landline_no; @@ -793,12 +808,9 @@ export class AddPdComponent implements OnInit, OnDestroy { if(lender_filter=="IMGC"){ this.sales_and_credit_enable=true; + this._PDtriggerForm.controls['lender_contact_person'].setValue(null) this._PDtriggerForm.controls['lender_contact_person'].clearValidators() this._PDtriggerForm.controls['lender_contact_person'].updateValueAndValidity() - - this._PDtriggerForm.controls['lender_sales_person'].setValidators(Validators.compose([Validators.required])) - this._PDtriggerForm.controls['lender_credit_person'].setValidators(Validators.compose([Validators.required])) - this._PDtriggerForm.controls['imgc_fin_institute'].setValidators(Validators.compose([Validators.required])) let param={fk_lender_id:this._PDtriggerForm.value.fk_lender_id,pd_branch_id:this._PDtriggerForm.value.pd_branch_id} @@ -808,10 +820,11 @@ export class AddPdComponent implements OnInit, OnDestroy { if(records.length >0){ this.sales_and_credit_person.sales_person=records.filter(val=>val.role_type == "SALES") this.sales_and_credit_person.credit_person=records.filter(val=>val.role_type == "CREDIT") - console.log(this.sales_and_credit_person); } } else{ + this._PDtriggerForm.controls['lender_sales_person'].setValue(null) + this._PDtriggerForm.controls['lender_credit_person'].setValue(null) this.sales_and_credit_person=[] this.notifier.notify("warning",result['msg']) } @@ -820,19 +833,20 @@ export class AddPdComponent implements OnInit, OnDestroy { } else{ this.sales_and_credit_enable=false; - this._PDtriggerForm.controls['lender_sales_person'].setValue("") + this._PDtriggerForm.controls['lender_sales_person'].setValue(null) this._PDtriggerForm.controls['lender_sales_person'].clearValidators() this._PDtriggerForm.controls['lender_sales_person'].updateValueAndValidity() - this._PDtriggerForm.controls['lender_credit_person'].setValue("") + this._PDtriggerForm.controls['lender_credit_person'].setValue(null) this._PDtriggerForm.controls['lender_credit_person'].clearValidators() this._PDtriggerForm.controls['lender_credit_person'].updateValueAndValidity() - this._PDtriggerForm.controls['imgc_fin_institute'].setValue("") + this._PDtriggerForm.controls['imgc_fin_institute'].setValue(null) this._PDtriggerForm.controls['imgc_fin_institute'].clearValidators() this._PDtriggerForm.controls['imgc_fin_institute'].updateValueAndValidity() this._PDtriggerForm.controls['lender_contact_person'].setValidators(Validators.compose([Validators.required])) + this._PDtriggerForm.controls['lender_contact_person'].updateValueAndValidity(); } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html index 39f787b72..975a885ff 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html @@ -78,8 +78,8 @@ - -
{{details.pd_sno}}
+ +
{{details.pd_sno}}
{{details.pd_type_name}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html index 0ba87a1b0..e804cbdb0 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html @@ -78,8 +78,8 @@ - -
{{details.pd_sno}}
+ +
{{details.pd_sno}}
{{details.pd_type_name}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html index 311312ffa..c03da11cb 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html @@ -75,8 +75,8 @@
- -
{{details.pd_sno}}
+ +
{{details.pd_sno}}
{{details.pd_type_name}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html index 955c66eee..ef1a1a974 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html @@ -77,8 +77,8 @@
- -
{{details.pd_sno}}
+ +
{{details.pd_sno}}
{{details.pd_type_name}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html index e319ed3c1..f584b7104 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html @@ -75,8 +75,8 @@
- -
{{details.pd_sno}}
+ +
{{details.pd_sno}}
{{details.pd_type_name}}