Sineedge/sparqsineedge
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changes : ps

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2019-02-02 00:00:22 +05:30
parent 0c1f37200d
commit 4c06e0ec99
6 changed files with 118 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ng6-seed/package-lock.json generated
View File

@ -429,9 +429,9 @@
} }
}, },
"@angular/material-moment-adapter": { "@angular/material-moment-adapter": {
"version": "7.1.1", "version": "6.4.7",
"resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-7.1.1.tgz", "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-6.4.7.tgz",
"integrity": "sha512-Ql0yFCuaWnRSSUqkCbeD8kRJ3oPVvl8GgsV20AvOKEpZ2eKvR+kapNbUqW8PTZb/Ovp5xDIaBaFjx5R89U4uxg==", "integrity": "sha512-OGdDtpu/yRioOQXhJFCNuiOF2OgiL9VUj8ewFPi1lDtFGUFfVwU2h3hWkKLn+yuPW+DBVYla11tCNsn5dLElmA==",
"requires": { "requires": {
"tslib": "^1.7.1" "tslib": "^1.7.1"
} }

4
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
View File

@ -61,7 +61,7 @@
<div fxLayout="row nowrap" class="state-margin" *ngIf='!EntityTypeFlag'> <div fxLayout="row nowrap" class="state-margin" *ngIf='!EntityTypeFlag'>
<mat-form-field style="width: 20%;"> <mat-form-field style="width: 20%;">
<input matInput placeholder="Year" formControlName="current_business_experiance_year" (keyup)="getWorkExperience(members.value,i)" required autocomplete="off" (keypress)="keyPress($event)" (change)="checkWithExistBusinessYear($event.target.value,i)" > <input matInput placeholder="Year" formControlName="current_business_experiance_year" (keyup)="getWorkExperience(members.value,i)" required autocomplete="off" (keypress)="keyPress($event)" (change)="checkWithExistBusinessYear($event.target.value,i,members)" >
<mat-hint style="color: red;">{{errorMessage[i]}}</mat-hint> <mat-hint style="color: red;">{{errorMessage[i]}}</mat-hint>
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 21%;"> <mat-form-field style="width: 21%;">
@ -70,7 +70,7 @@
<mat-form-field style="width: 35%;"> <mat-form-field style="width: 35%;">
<input matInput placeholder="Total Work Experience" <input matInput placeholder="Total Work Experience"
formControlName="total_business_experiance" (keypress)="keyPress($event)" (keyup)="getWorkExperience(members.value,i)" autocomplete="off" required> formControlName="total_business_experiance" (keypress)="keyPress($event)" (keyup)="getWorkExperience(members.value,i)" autocomplete="off" required>
<mat-hint style="color: red;" *ngIf="members.value.current_business_experiance_year > members.value.total_business_experiance"> Total Experience is Lower than Experience's Year </mat-hint> <mat-hint style="color: red;" *ngIf="members.value.total_business_experiance != '' && members.value.current_business_experiance_year > members.value.total_business_experiance"> Total Experience is Lower Than The Current Company </mat-hint>
</mat-form-field> </mat-form-field>
</div> </div>
<div fxLayout="row nowrap" *ngIf="members.value.total_business_previous_experience!=undefined && !EntityTypeFlag"> <div fxLayout="row nowrap" *ngIf="members.value.total_business_previous_experience!=undefined && !EntityTypeFlag">

86
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
View File

@ -1091,38 +1091,16 @@ export class BusinessInfoComponent implements OnInit {
this.businessEntityTypeList.section_label = filterList[0].business_entity_type_id!=1 ? filterList[0].section_label : this.generalExistEntityType_other; this.businessEntityTypeList.section_label = filterList[0].business_entity_type_id!=1 ? filterList[0].section_label : this.generalExistEntityType_other;
// console.log(this.businessEntityTypeList.business_entity_type_id+' , '+this.businessEntityTypeList.business_entity_type_name+' , '+this.businessEntityTypeList.section_label); // console.log(this.businessEntityTypeList.business_entity_type_id+' , '+this.businessEntityTypeList.business_entity_type_name+' , '+this.businessEntityTypeList.section_label);
// console.log(this.businessForm.controls.partners['controls']);
// if(this.businessEntityTypeList.business_entity_type_name == 'OPC (One Person Company)' || this.businessEntityTypeList.business_entity_type_name == 'Sole proprietorship'){ // console.log(this.businessForm.controls.partners['controls'].length);
// console.log('condition'); // if(this.businessForm.controls.partners['controls'].length > 1)
// this.EntityTypeFlag = true; // {
// console.log('asd');
// const Partnr: any = <FormArray>this.businessForm.controls['partners'];
// Partnr.partner_other_name.updateValueAndValidity();
// Partnr.partner_other_name.clearValidators();
// // Partnr.partner_other_name.setValue('');
// Partnr.shareholding.setValue('');
// Partnr.started_business.setValue('');
// Partnr.current_business_experiance_year.clearValidators();
// Partnr.current_business_experiance_year.updateValueAndValidity();
// Partnr.current_business_experiance_year.setValue('');
// Partnr.current_business_experiance_month.setValue('');
// Partnr.total_business_experiance.clearValidators();
// Partnr.total_business_experiance.updateValueAndValidity();
// Partnr.total_business_experiance.setValue('');
// Partnr.total_business_previous_experience.clearValidators();
// Partnr.total_business_previous_experience.updateValueAndValidity();
// Partnr.total_business_previous_experience.setValue('');
// Partnr.total_business_previous_experience.setValue('');
// } // }
if(this.businessEntityTypeList.business_entity_type_name == 'OPC (One Person Company)' || this.businessEntityTypeList.business_entity_type_name == 'Sole proprietorship'){
this.EntityTypeFlag = true;
}
// data.records.forEach(val => { // data.records.forEach(val => {
// this.businessEntityTypeList.push(val); // this.businessEntityTypeList.push(val);
// this.sourceNames[val.business_entity_type_id] = val.section_label // this.sourceNames[val.business_entity_type_id] = val.section_label
@ -1332,6 +1310,42 @@ export class BusinessInfoComponent implements OnInit {
// let family: any = []; // let family: any = [];
// console.log(this.businessForm.value); // console.log(this.businessForm.value);
if(this.EntityTypeFlag == true){
let control: any = <FormArray>this.businessForm.controls['partners'];
let control2:any = <FormArray>control.controls[0];
control2.controls['shareholding'].clearValidators();
control2.controls['shareholding'].updateValueAndValidity();
control2.controls['shareholding'].setValue('100');
// control.controls[0].removeControl('shareholding');
// control.controls[0].removeControl('started_business');
// control.controls[0].removeControl('current_business_experiance_year');
// control.controls[0].removeControl('current_business_experiance_month');
// control.controls[0].removeControl('total_business_experiance');
control2.controls['started_business'].setValue('');
control2.controls['current_business_experiance_year'].clearValidators();
control2.controls['current_business_experiance_year'].updateValueAndValidity();
control2.controls['current_business_experiance_year'].setValue('');
control2.controls['current_business_experiance_month'].setValue('');
control2.controls['total_business_experiance'].clearValidators();
control2.controls['total_business_experiance'].updateValueAndValidity();
control2.controls['total_business_experiance'].setValue('');
control2.controls['total_business_previous_experience'].clearValidators();
control2.controls['total_business_previous_experience'].updateValueAndValidity();
control2.controls['total_business_previous_experience'].setValue('0');
}
if (!this.businessForm.valid) { if (!this.businessForm.valid) {
this.notifier.notify('warning',"Please Check All Manatory Fields.."); this.notifier.notify('warning',"Please Check All Manatory Fields..");
return; return;
@ -1357,7 +1371,7 @@ export class BusinessInfoComponent implements OnInit {
let validationFlag : number = 0; let validationFlag : number = 0;
// let shareHoldValidationFlag : number = 0; // let shareHoldValidationFlag : number = 0;
// console.log(records.partners.length); // console.log(records.partners.length);
// console.log(records.partners); console.log(records.partners);
if(records.partners.length > 0){ if(records.partners.length > 0){
let total = records.partners.map(shares => shares.shareholding).reduce((a, b) => a + +b, 0); let total = records.partners.map(shares => shares.shareholding).reduce((a, b) => a + +b, 0);
@ -1366,6 +1380,10 @@ export class BusinessInfoComponent implements OnInit {
return; return;
} }
} }
// console.log('as');
// return;
// if(if(parseInt(datas.total_business_experiance) > parseInt(datas.current_business_experiance_year)) {)
// return; // return;
//type 1: Checking manufacturing_activity_details //type 1: Checking manufacturing_activity_details
@ -1555,9 +1573,11 @@ export class BusinessInfoComponent implements OnInit {
checkTotalEmployee(FormData){ checkTotalEmployee(FormData){
this.businessForm.controls['employees_total'].setValue((+FormData.value.employees_permanent ||0)+(+FormData.value.employees_temporary||0)); this.businessForm.controls['employees_total'].setValue((+FormData.value.employees_permanent ||0)+(+FormData.value.employees_temporary||0));
} }
checkWithExistBusinessYear(e,i){ checkWithExistBusinessYear(e,i,members){
if(e > this.generalExistBusinessYear){ if(e > this.generalExistBusinessYear){
this.errorMessage[i] = "Higher than Business Vintage"; this.errorMessage[i] = "Higher than Business Vintage";
members.controls.current_business_experiance_year.setValue('');
} }
else{ else{
this.errorMessage[i] = ''; this.errorMessage[i] = '';

6
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.scss
View File

@ -18,6 +18,12 @@
margin: 0 2%; margin: 0 2%;
width:26%; width:26%;
} }
// ::ng-deep .mat-option{
// word-wrap: break-word !important;
// white-space: pre-wrap !important;
// }
.address .button { .address .button {
float: right; float: right;
width: 10px; width: 10px;

43
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html
View File

@ -42,30 +42,43 @@
<mat-option *ngFor="let comrelShip of companyRelationShipList" [value]="comrelShip.company_relationship_id"> <mat-option *ngFor="let comrelShip of companyRelationShipList" [value]="comrelShip.company_relationship_id">
{{comrelShip.name}} {{comrelShip.name}}
</mat-option> </mat-option>
<mat-option value="1" > Not Applicable </mat-option> <!-- <mat-option value="1" > Not Applicable </mat-option> -->
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 35%" *ngIf="items.get('person_designation').value == 1">
<input matInput placeholder="Specify Person Designation" formControlName="other_person_designation">
</mat-form-field>
</div> </div>
<div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none">
<mat-form-field style="width: 35%"> <mat-form-field style="width: 35%">
<input matInput placeholder="Contact Person Mobile Number" autocomplete="off" formControlName="manufacturing_contact_person_mobile_number" (keypress)="keyPress($event)" maxlength="10"> <input matInput placeholder="Contact Person Mobile Number" autocomplete="off" formControlName="manufacturing_contact_person_mobile_number" (keypress)="keyPress($event)" maxlength="10">
<mat-error>Enter Valid Mobile Number.</mat-error>
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 15%"> <mat-form-field style="width: 15%">
<input matInput autocomplete="off" placeholder="STD Code" formControlName="person_stdcode" type="text" (keypress)="keyPress($event)"> <input matInput autocomplete="off" placeholder="STD Code" formControlName="person_stdcode" type="text" (keypress)="keyPress($event)">
<mat-error>Enter Valid STD Code Number.</mat-error>
</mat-form-field> &nbsp; - &nbsp; </mat-form-field> &nbsp; - &nbsp;
<mat-form-field style="width: 35%"> <mat-form-field style="width: 35%">
<input matInput autocomplete="off" placeholder="Contact Person Landline Number" formControlName="person_landline" type="text" (keypress)="keyPress($event)"> <input matInput autocomplete="off" placeholder="Contact Person Landline Number" formControlName="person_landline" type="text" (keypress)="keyPress($event)">
<mat-error>Enter Valid LandLine Number.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
<div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none">
<mat-form-field style="width: 45%"> <mat-form-field style="width: 45%">
<mat-select (selectionChange)="selectedPM($event)" placeholder="Payment Type" formControlName="manufacturing_payment_type"> <!-- //(selectionChange)="selectedPM($event)" -->
<mat-select placeholder="Payment Type" formControlName="manufacturing_payment_type">
<mat-option *ngFor="let pm of m_paymentModeType" [value]="pm.id">{{ pm.name }}</mat-option> <mat-option *ngFor="let pm of m_paymentModeType" [value]="pm.id">{{ pm.name }}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 45%" *ngIf="items.get('manufacturing_payment_type').value == 3"> </div>
<input matInput placeholder="No.of days of Credit Provided by Supplier" formControlName="manufacturing_credit_days">
<div fxLayout="row nowrap" *ngIf="items.get('manufacturing_payment_type').value == 3">
<mat-label>No.of days of Credit Provided by Supplier </mat-label>
<mat-form-field style="width: 45%" >
<input matInput placeholder="Days From" formControlName="manufacturing_credit_days_from" type="number">
</mat-form-field>
<mat-form-field style="width: 45%" >
<input matInput placeholder="Days To" formControlName="manufacturing_credit_days_to" type="number">
</mat-form-field> </mat-form-field>
</div> </div>
@ -126,20 +139,26 @@
<mat-option *ngFor="let comrelShip of companyRelationShipList" [value]="comrelShip.company_relationship_id"> <mat-option *ngFor="let comrelShip of companyRelationShipList" [value]="comrelShip.company_relationship_id">
{{comrelShip.name}} {{comrelShip.name}}
</mat-option> </mat-option>
<mat-option value="1" > Not Applicable </mat-option> <!-- <mat-option value="1" > Not Applicable </mat-option> -->
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 35%" *ngIf="items.get('person_designation').value == 1">
<input matInput placeholder="Specify Person Designation" formControlName="other_person_designation">
</mat-form-field>
</div> </div>
<div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none">
<mat-form-field style="width: 35%"> <mat-form-field style="width: 35%">
<input matInput placeholder="Contact Person Mobile Number" autocomplete="off" formControlName="trade_product_contact_person_mobile_number" (keypress)="keyPress($event)" maxlength="10"> <input matInput placeholder="Contact Person Mobile Number" autocomplete="off" formControlName="trade_product_contact_person_mobile_number" (keypress)="keyPress($event)" maxlength="10">
<mat-error>Enter Valid Mobile Number.</mat-error>
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 15%"> <mat-form-field style="width: 15%">
<input matInput autocomplete="off" placeholder="STD Code" formControlName="person_stdcode" type="text" (keypress)="keyPress($event)"> <input matInput autocomplete="off" placeholder="STD Code" formControlName="person_stdcode" type="text" (keypress)="keyPress($event)">
<mat-error>Enter Valid STD Code Number.</mat-error>
</mat-form-field> &nbsp; - &nbsp; </mat-form-field> &nbsp; - &nbsp;
<mat-form-field style="width: 35%"> <mat-form-field style="width: 35%">
<input matInput autocomplete="off" placeholder="Contact Person Landline Number" formControlName="person_landline" type="text" (keypress)="keyPress($event)"> <input matInput autocomplete="off" placeholder="Contact Person Landline Number" formControlName="person_landline" type="text" (keypress)="keyPress($event)">
<mat-error>Enter Valid LandLine Number.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
<div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none">
@ -148,10 +167,20 @@
<mat-option *ngFor="let pm of m_paymentModeType" [value]="pm.id">{{ pm.name }}</mat-option> <mat-option *ngFor="let pm of m_paymentModeType" [value]="pm.id">{{ pm.name }}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 45%" *ngIf="items.get('trade_product_payment_type').value == 3"> </div>
<!-- <mat-form-field style="width: 45%" *ngIf="items.get('trade_product_payment_type').value == 3">
<input matInput placeholder="No.of Days of Credit Provided by Supplier" autocomplete="off" formControlName="trade_product_credit_days" (keypress)="keyPress($event)"> <input matInput placeholder="No.of Days of Credit Provided by Supplier" autocomplete="off" formControlName="trade_product_credit_days" (keypress)="keyPress($event)">
</mat-form-field> -->
<div fxLayout="row nowrap" *ngIf="items.get('trade_product_payment_type').value == 3">
<mat-label>No.of days of Credit Provided by Supplier </mat-label>
<mat-form-field style="width: 45%" >
<input matInput placeholder="Days From" formControlName="trade_product_credit_days_from" type="number">
</mat-form-field>
<mat-form-field style="width: 45%" >
<input matInput placeholder="Days To" formControlName="trade_product_credit_days_to" type="number">
</mat-form-field> </mat-form-field>
</div> </div>
<div align="end"> <div align="end">
<span *ngIf="item.controls.trading_products.controls.length > 1" (click)="removeTradingProduct(l)"> <span *ngIf="item.controls.trading_products.controls.length > 1" (click)="removeTradingProduct(l)">
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" color="primary" matTooltip="Delete" matTooltipPosition="above"><mat-icon>delete</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" color="primary" matTooltip="Delete" matTooltipPosition="above"><mat-icon>delete</mat-icon></button>

21
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts
View File

@ -266,10 +266,12 @@ export class SupplierInfoComponent implements OnInit {
manufacturing_supplier_name: [''], manufacturing_supplier_name: [''],
person_title_name:[''], person_title_name:[''],
person_designation:[''], person_designation:[''],
other_person_designation:[''],
manufacturing_contact_person_name: [''], manufacturing_contact_person_name: [''],
manufacturing_contact_person_mobile_number: ['',Validators.compose([Validators.minLength(10),Validators.maxLength(10)])], manufacturing_contact_person_mobile_number: ['',Validators.compose([Validators.minLength(10),Validators.maxLength(10)])],
manufacturing_payment_type: [''], manufacturing_payment_type: [''],
manufacturing_credit_days: [''], manufacturing_credit_days_from: [''],
manufacturing_credit_days_to:[''],
manufacturing_frequency_of_purchase: [''], manufacturing_frequency_of_purchase: [''],
person_stdcode:['', Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])], person_stdcode:['', Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],
person_landline:['', Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])], person_landline:['', Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])],
@ -281,10 +283,12 @@ export class SupplierInfoComponent implements OnInit {
manufacturing_supplier_name: [records.manufacturing_supplier_name || null], manufacturing_supplier_name: [records.manufacturing_supplier_name || null],
person_title_name:[records.person_title_name || null], person_title_name:[records.person_title_name || null],
person_designation:[records.person_title_name || null], person_designation:[records.person_title_name || null],
other_person_designation:[records.other_person_designation || 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,Validators.compose([Validators.minLength(10),Validators.maxLength(10)])], manufacturing_contact_person_mobile_number: [records.manufacturing_contact_person_mobile_number || null,Validators.compose([Validators.minLength(10),Validators.maxLength(10)])],
manufacturing_payment_type: [records.manufacturing_payment_type || null], manufacturing_payment_type: [records.manufacturing_payment_type || null],
manufacturing_credit_days: [records.manufacturing_credit_days || null], manufacturing_credit_days_from: [records.manufacturing_credit_days_from || null],
manufacturing_credit_days_to:[records.manufacturing_credit_days_to || null],
manufacturing_frequency_of_purchase: [records.manufacturing_frequency_of_purchase || null], manufacturing_frequency_of_purchase: [records.manufacturing_frequency_of_purchase || null],
person_stdcode:[records.person_stdcode || null, Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])], person_stdcode:[records.person_stdcode || null, Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],
person_landline:[records.person_landline || null, Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])], person_landline:[records.person_landline || null, Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])],
@ -309,20 +313,23 @@ export class SupplierInfoComponent implements OnInit {
trade_product_name: [''], trade_product_name: [''],
trade_supplier_name: [''], trade_supplier_name: [''],
person_title_name:[''], person_title_name:[''],
person_designation:[], person_designation:[''],
other_person_designation:[''],
trade_product_contact_person_name: [''], trade_product_contact_person_name: [''],
trade_product_contact_person_mobile_number: ['',Validators.compose([Validators.minLength(10),Validators.maxLength(10)])], trade_product_contact_person_mobile_number: ['',Validators.compose([Validators.minLength(10),Validators.maxLength(10)])],
person_stdcode:[null, Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])], person_stdcode:[null, Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],
person_landline:[null, Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])], person_landline:[null, Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])],
trade_product_payment_type: [''], trade_product_payment_type: [''],
trade_product_frequency_of_purchase: [''], trade_product_frequency_of_purchase: [''],
trade_product_credit_days: [''], trade_product_credit_days_from: [''],
trade_product_credit_days_to: [''],
}) })
} else { } else {
return this._formBuilder.group({ return this._formBuilder.group({
trade_product_name: [records.trade_product_name], trade_product_name: [records.trade_product_name],
person_title_name:[records.person_title_name], person_title_name:[records.person_title_name],
person_designation:[records.person_designation], person_designation:[records.person_designation],
other_person_designation:[records.other_person_designation],
trade_supplier_name: [records.trade_supplier_name], trade_supplier_name: [records.trade_supplier_name],
trade_product_contact_person_name: [records.trade_product_contact_person_name], trade_product_contact_person_name: [records.trade_product_contact_person_name],
trade_product_contact_person_mobile_number: [records.trade_product_contact_person_mobile_number, Validators.compose([Validators.minLength(10),Validators.maxLength(10)])], trade_product_contact_person_mobile_number: [records.trade_product_contact_person_mobile_number, Validators.compose([Validators.minLength(10),Validators.maxLength(10)])],
@ -330,7 +337,8 @@ export class SupplierInfoComponent implements OnInit {
person_landline:[records.person_landline, Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])], person_landline:[records.person_landline, Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])],
trade_product_payment_type: [records.trade_product_payment_type], trade_product_payment_type: [records.trade_product_payment_type],
trade_product_frequency_of_purchase: [records.trade_product_frequency_of_purchase], trade_product_frequency_of_purchase: [records.trade_product_frequency_of_purchase],
trade_product_credit_days: [records.trade_product_credit_days], trade_product_credit_days_from: [records.trade_product_credit_days_from],
trade_product_credit_days_to: [records.trade_product_credit_days_to],
}) })
} }
} }
@ -365,7 +373,8 @@ export class SupplierInfoComponent implements OnInit {
data => { data => {
if (data.dataStatus) { if (data.dataStatus) {
if(type==1){ if(type==1){
this.companyRelationShipList=data.records.filter(item => item.name != 'Others'); this.companyRelationShipList=data.records;
// .filter(item => item.name != 'Others');
} }
if(type==2){ if(type==2){