diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html index d5836c874..98c3e5155 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html @@ -19,7 +19,7 @@ - + @@ -42,7 +42,7 @@ -

Estimated Value

+

Actual Values as per Customer

- +
-
- + - + +
-
+
-->
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts index cc0166ca1..4f3f7963f 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts @@ -50,7 +50,7 @@ public m_paymentModeType= []; // 'name': 'Combination of Both' // }, // ]; -public m_freqOfPurchase= []; +//public m_freqOfPurchase= []; // public m_freqOfPurchase= [ // { // 'id': "1", @@ -95,24 +95,24 @@ public m_freqOfPurchase= []; } ngOnInit() { - this.getM_FreqOfPurchase(); + // this.getM_FreqOfPurchase(); this.getM_PaymentModeType(); this.getPdSupplierFormDetails(); } // ================== - getM_FreqOfPurchase() { - this.pdTrigerService.getAllMasterDatas('FREQUENCY').subscribe( - data => { - this.m_freqOfPurchase = data.records.filter(data => data.isactive == 1); - }, - error => { + //getM_FreqOfPurchase() { + // this.pdTrigerService.getAllMasterDatas('FREQUENCY').subscribe( + // data => { + // this.m_freqOfPurchase = data.records.filter(data => data.isactive == 1); + // }, + // error => { // this.notifier.notify('warning', 'No Category Records Found.!'); // this.m_assets_type = "No Category Records Found."; - } - ) - } + /// } + // ) + // } getM_PaymentModeType() { this.pdTrigerService.getAllMasterDatas('PAYMENTMODE').subscribe( @@ -183,8 +183,8 @@ apiLoadFinish: boolean = false; payment_mode: ['', Validators.compose([Validators.required])], per_of_immediate_advance_payment:[''], credit_period:[''], - frequency_of_purchase: ['', Validators.compose([Validators.required])], - freq_purchase_others_text_value: [''] + // frequency_of_purchase: ['', Validators.compose([Validators.required])], + // freq_purchase_others_text_value: [''] }); } @@ -196,8 +196,8 @@ apiLoadFinish: boolean = false; payment_mode: [data.payment_mode, Validators.compose([Validators.required])], per_of_immediate_advance_payment:[data.per_of_immediate_advance_payment || ''], credit_period:[data.credit_period || ''], - frequency_of_purchase: [data.frequency_of_purchase, Validators.compose([Validators.required])], - freq_purchase_others_text_value: [data.freq_purchase_others_text_value || ''] + //frequency_of_purchase: [data.frequency_of_purchase, Validators.compose([Validators.required])], + //freq_purchase_others_text_value: [data.freq_purchase_others_text_value || ''] }); } @@ -213,9 +213,9 @@ apiLoadFinish: boolean = false; mobile_number: val.mobile_number, payment_mode: val.payment_mode, per_of_immediate_advance_payment: val.per_of_immediate_advance_payment, - credit_period: val.credit_period, - frequency_of_purchase: val.frequency_of_purchase, - freq_purchase_others_text_value: val.freq_purchase_others_text_value + credit_period: val.credit_period + // frequency_of_purchase: val.frequency_of_purchase, + // freq_purchase_others_text_value: val.freq_purchase_others_text_value }; const control = this._supplierQuesFrom.controls['supplier_details']; control.push(this.initDetailsWithdata(vals)); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html index 27cc7d8da..311b63ac8 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html @@ -24,12 +24,12 @@ - - +
@@ -56,6 +56,9 @@ {{ (formButton.form_name.length>17)? (formButton.form_name | slice:0:17)+'..':(formButton.form_name) }} + + +