changes client , supplier form details : kdk
This commit is contained in:
parent
165228342c
commit
44173dbdb6
@ -263,13 +263,15 @@ export class PdReportComponent implements OnInit {
|
|||||||
export() {
|
export() {
|
||||||
this.pdTrigerService.pdReportExportExcel().subscribe((blob: HttpResponse<Blob>) => {
|
this.pdTrigerService.pdReportExportExcel().subscribe((blob: HttpResponse<Blob>) => {
|
||||||
if (blob) {
|
if (blob) {
|
||||||
|
console.log(blob);
|
||||||
let datass = blob.headers.get('content-disposition');
|
let datass = blob.headers.get('content-disposition');
|
||||||
let fileName = datass.split(/"/)[1];
|
let fileName = datass.split(/"/)[1];
|
||||||
this.notifier.notify('success', 'Your Changes Updated.!');
|
this.notifier.notify('success', 'Your Changes Updated.!');
|
||||||
const blobs = new Blob([blob],
|
const blobs = new Blob([blob.body],
|
||||||
{ type: 'application/vnd.ms-excel' });
|
{ type: 'application/vnd.ms-excel' });
|
||||||
const file = new File([blobs], fileName,
|
const file = new File([blobs], fileName,
|
||||||
{ type: 'application/vnd.ms-excel' });
|
{ type: 'application/vnd.ms-excel' });
|
||||||
|
console.log(file);
|
||||||
importedSaveAs(file);
|
importedSaveAs(file);
|
||||||
} else {
|
} else {
|
||||||
this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
|
this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
|
||||||
|
|||||||
@ -17,7 +17,9 @@
|
|||||||
<mat-card style="margin: 12px;">
|
<mat-card style="margin: 12px;">
|
||||||
<h6 style="margin: 12px;">Raw Material #{{l+1}}</h6>
|
<h6 style="margin: 12px;">Raw Material #{{l+1}}</h6>
|
||||||
<div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
|
<div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
|
||||||
|
<pre>{{m_manufacturingProducts[0] | json}}</pre>
|
||||||
<mat-form-field style="width:30%">
|
<mat-form-field style="width:30%">
|
||||||
|
<!--{{m_manufacturingProducts[0] | json}}-->
|
||||||
<mat-select placeholder="Manufacturing Product Name" formControlName="manufacturing_product_name">
|
<mat-select placeholder="Manufacturing Product Name" formControlName="manufacturing_product_name">
|
||||||
<mat-option *ngFor="let pm of m_manufacturingProducts[0]" [value]="pm.name">{{ pm.name }}</mat-option>
|
<mat-option *ngFor="let pm of m_manufacturingProducts[0]" [value]="pm.name">{{ pm.name }}</mat-option>
|
||||||
</mat-select>
|
</mat-select>
|
||||||
|
|||||||
@ -168,31 +168,36 @@ export class ClientInfoComponent implements OnInit {
|
|||||||
// Load form details for manufacturing
|
// Load form details for manufacturing
|
||||||
let arr = record.filter(data => data.type_of_activity_id == 1);
|
let arr = record.filter(data => data.type_of_activity_id == 1);
|
||||||
if (arr.length > 0) {
|
if (arr.length > 0) {
|
||||||
let api_main_raw_materials = Object.keys(dataForm.main_raw_materials).map(function (key) {
|
// let api_main_raw_materials = Object.keys(dataForm.main_raw_materials).map(function (key) {
|
||||||
return dataForm.main_raw_materials[key];
|
// return dataForm.main_raw_materials[key];
|
||||||
});
|
// });
|
||||||
|
let api_main_raw_materials = dataForm.manufacturing_details[0].main_raw_materials;
|
||||||
|
|
||||||
this.initManufacturingProductsDetails(api_main_raw_materials);
|
this.initManufacturingProductsDetails(api_main_raw_materials);
|
||||||
this._supplierQuesFrom.controls['manufacturing_details']['controls'][0].controls['main_raw_materials_total_payments_percent_on_credit'].setValue(dataForm.main_raw_materials_total_payments_percent_on_credit || null);
|
this._supplierQuesFrom.controls['manufacturing_details']['controls'][0].controls['main_raw_materials_total_payments_percent_on_credit'].setValue(dataForm.manufacturing_details[0].main_raw_materials_total_payments_percent_on_credit || null);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Load form details for the wholeshale trading details
|
// Load form details for the wholeshale trading details
|
||||||
let arr1 = record.filter(data => data.type_of_activity_id == 3);
|
let arr1 = record.filter(data => data.type_of_activity_id == 3);
|
||||||
if (arr1.length > 0) {
|
if (arr1.length > 0) {
|
||||||
let api_trading_products = Object.keys(dataForm.trading_products).map(function (key) {
|
// let api_trading_products = Object.keys(dataForm.trading_products).map(function (key) {
|
||||||
return dataForm.trading_products[key];
|
// return dataForm.trading_products[key];
|
||||||
});
|
// });
|
||||||
|
let api_trading_products = dataForm.trade_details[0].trading_products;
|
||||||
|
|
||||||
this.initTradingProductsDetails(api_trading_products);
|
this.initTradingProductsDetails(api_trading_products);
|
||||||
this._supplierQuesFrom.controls['trade_details']['controls'][0].controls['trading_products_total_payments_percent_on_credit'].setValue(dataForm.trading_products_total_payments_percent_on_credit || null);
|
this._supplierQuesFrom.controls['trade_details']['controls'][0].controls['trading_products_total_payments_percent_on_credit'].setValue(dataForm.trade_details[0].trading_products_total_payments_percent_on_credit || null);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Load form details for the service provider prduct details
|
// Load form details for the service provider prduct details
|
||||||
let arr2 = record.filter(data => data.type_of_activity_id == 4);
|
let arr2 = record.filter(data => data.type_of_activity_id == 4);
|
||||||
if (arr2.length > 0) {
|
if (arr2.length > 0) {
|
||||||
let api_service_provider_products = Object.keys(dataForm.service_products).map(function (key) {
|
// let api_service_provider_products = Object.keys(dataForm.service_products).map(function (key) {
|
||||||
return dataForm.service_products[key];
|
// return dataForm.service_products[key];
|
||||||
});
|
// });
|
||||||
|
let api_service_provider_products = dataForm.service_provider_details[0].service_products;
|
||||||
this.initServiceProviderProductsDetails(api_service_provider_products);
|
this.initServiceProviderProductsDetails(api_service_provider_products);
|
||||||
this._supplierQuesFrom.controls['service_provider_details']['controls'][0].controls['service_products_total_payments_percent_on_credit'].setValue(dataForm.service_products_total_payments_percent_on_credit || null);
|
this._supplierQuesFrom.controls['service_provider_details']['controls'][0].controls['service_products_total_payments_percent_on_credit'].setValue(dataForm.service_provider_details[0].service_products_total_payments_percent_on_credit || null);
|
||||||
}
|
}
|
||||||
// Load form details for the retail trading details
|
// Load form details for the retail trading details
|
||||||
let arr3 = record.filter(data => data.type_of_activity_id == 2);
|
let arr3 = record.filter(data => data.type_of_activity_id == 2);
|
||||||
@ -218,7 +223,7 @@ export class ClientInfoComponent implements OnInit {
|
|||||||
let arr1 = record.filter(data => data.type_of_activity_id == 3);
|
let arr1 = record.filter(data => data.type_of_activity_id == 3);
|
||||||
if (arr1.length > 0) {
|
if (arr1.length > 0) {
|
||||||
this.initTradingProductsDetails(null);
|
this.initTradingProductsDetails(null);
|
||||||
this._supplierQuesFrom.controls['trade_details']['controls'][0].controls['trading_products_total_payments_percent_on_credit'].setValue(dataForm.trading_products_total_payments_percent_on_credit || null);
|
this._supplierQuesFrom.controls['trade_details']['controls'][0].controls['trading_products_total_payments_percent_on_credit'].setValue(null);
|
||||||
}
|
}
|
||||||
let arr2 = record.filter(data => data.type_of_activity_id == 4);
|
let arr2 = record.filter(data => data.type_of_activity_id == 4);
|
||||||
if (arr2.length > 0) {
|
if (arr2.length > 0) {
|
||||||
@ -226,7 +231,7 @@ export class ClientInfoComponent implements OnInit {
|
|||||||
return dataForm.service_products[key];
|
return dataForm.service_products[key];
|
||||||
});
|
});
|
||||||
this.initServiceProviderProductsDetails(api_service_provider_products);
|
this.initServiceProviderProductsDetails(api_service_provider_products);
|
||||||
this._supplierQuesFrom.controls['service_provider_details']['controls'][0].controls['service_products_total_payments_percent_on_credit'].setValue(dataForm.service_products_total_payments_percent_on_credit || null);
|
this._supplierQuesFrom.controls['service_provider_details']['controls'][0].controls['service_products_total_payments_percent_on_credit'].setValue(null);
|
||||||
}
|
}
|
||||||
// Load form details for the retail trading details
|
// Load form details for the retail trading details
|
||||||
let arr3 = record.filter(data => data.type_of_activity_id == 2);
|
let arr3 = record.filter(data => data.type_of_activity_id == 2);
|
||||||
@ -340,7 +345,7 @@ export class ClientInfoComponent implements OnInit {
|
|||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
return this._formBuilder.group({
|
return this._formBuilder.group({
|
||||||
manufacturing_product_name: [records.manufacturing_raw_material_name || null],
|
manufacturing_product_name: [records.manufacturing_product_name || null],
|
||||||
manufacturing_client_name: [records.manufacturing_client_name || null],
|
manufacturing_client_name: [records.manufacturing_client_name || null],
|
||||||
manufacturing_contact_person_name: [records.manufacturing_contact_person_name || null],
|
manufacturing_contact_person_name: [records.manufacturing_contact_person_name || null],
|
||||||
manufacturing_contact_person_mobile_number: [records.manufacturing_contact_person_mobile_number || null],
|
manufacturing_contact_person_mobile_number: [records.manufacturing_contact_person_mobile_number || null],
|
||||||
|
|||||||
@ -132,19 +132,22 @@ export class SupplierInfoComponent implements OnInit {
|
|||||||
});
|
});
|
||||||
let arr = record.filter(data => data.type_of_activity_id == 1);
|
let arr = record.filter(data => data.type_of_activity_id == 1);
|
||||||
if(arr.length > 0) {
|
if(arr.length > 0) {
|
||||||
let api_main_raw_materials = Object.keys(dataForm.main_raw_materials).map(function (key) {
|
// let api_main_raw_materials = Object.keys(dataForm.main_raw_materials).map(function (key) {
|
||||||
return dataForm.main_raw_materials[key];
|
// return dataForm.main_raw_materials[key];
|
||||||
});
|
// });
|
||||||
|
let api_main_raw_materials = dataForm.manufacturing_details[0].main_raw_materials;
|
||||||
|
|
||||||
this.initManufacturingProductsDetails(api_main_raw_materials);
|
this.initManufacturingProductsDetails(api_main_raw_materials);
|
||||||
this._supplierQuesFrom.controls['manufacturing_details']['controls'][0].controls['main_raw_materials_total_payments_percent_on_credit'].setValue(dataForm.main_raw_materials_total_payments_percent_on_credit || null);
|
this._supplierQuesFrom.controls['manufacturing_details']['controls'][0].controls['main_raw_materials_total_payments_percent_on_credit'].setValue(dataForm.manufacturing_details[0].main_raw_materials_total_payments_percent_on_credit || null);
|
||||||
}
|
}
|
||||||
let arr1 = record.filter(data => data.type_of_activity_id == 2 || 3);
|
let arr1 = record.filter(data => data.type_of_activity_id == 2 || 3);
|
||||||
if(arr1.length > 0) {
|
if(arr1.length > 0) {
|
||||||
let api_trading_products = Object.keys(dataForm.trading_products).map(function (key) {
|
// let api_trading_products = Object.keys(dataForm.trading_products).map(function (key) {
|
||||||
return dataForm.trading_products[key];
|
// return dataForm.trading_products[key];
|
||||||
});
|
// });
|
||||||
|
let api_trading_products = dataForm.trade_details[0].trading_products;
|
||||||
this.initTradingProductsDetails(api_trading_products);
|
this.initTradingProductsDetails(api_trading_products);
|
||||||
this._supplierQuesFrom.controls['trade_details']['controls'][0].controls['trading_products_total_payments_percent_on_credit'].setValue(dataForm.trading_products_total_payments_percent_on_credit || null);
|
this._supplierQuesFrom.controls['trade_details']['controls'][0].controls['trading_products_total_payments_percent_on_credit'].setValue(dataForm.trade_details[0].trading_products_total_payments_percent_on_credit || null);
|
||||||
}
|
}
|
||||||
this.noRecordsFound = true;
|
this.noRecordsFound = true;
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user