Commit 65385195 by Nakarin Luankla

Merge branch 'DEV' of https://mygit.myhr.co.th/angular/myAppraisal into DEV

parents 9bd6ff5d 2383320b
...@@ -130,7 +130,7 @@ export class CompanyRegistrationPageComponent { ...@@ -130,7 +130,7 @@ export class CompanyRegistrationPageComponent {
const data = x.data const data = x.data
const match = data.code.toLowerCase().includes(this.search.toLowerCase()) || data.tdesc.toLowerCase().includes(this.search.toLowerCase()) || data.edesc.toLowerCase().includes(this.search.toLowerCase()); const match = data.code.toLowerCase().includes(this.search.toLowerCase()) || data.tdesc.toLowerCase().includes(this.search.toLowerCase()) || data.edesc.toLowerCase().includes(this.search.toLowerCase());
return match; return match;
}).forEach(x => x.check = selectAll); }).forEach(x => (x.check = x.data.code != '100' ? selectAll : false));
this.dataListCheck(); this.dataListCheck();
} }
dataListCheck() { dataListCheck() {
......
...@@ -98,7 +98,7 @@ export class SubEmployeeRegistrationComponent { ...@@ -98,7 +98,7 @@ export class SubEmployeeRegistrationComponent {
const formData = new FormData(); const formData = new FormData();
formData.append('file', this.selectedFile); formData.append('file', this.selectedFile);
this.employee.loading = true this.employee.loading = true
this.fileService.uploadExcel(formData, '').subscribe({ this.fileService.uploadExcel(formData, 'memployee').subscribe({
next: response => { next: response => {
if (response.success) { if (response.success) {
this.showAlert(response.message, 'success') this.showAlert(response.message, 'success')
...@@ -116,7 +116,7 @@ export class SubEmployeeRegistrationComponent { ...@@ -116,7 +116,7 @@ export class SubEmployeeRegistrationComponent {
}) })
} }
downloadFile() { downloadFile() {
const fileName = '.xlsx' const fileName = 'IMPORT_MEMPLOYEE.xlsx'
this.fileService.downloadTemplate(fileName).subscribe({ this.fileService.downloadTemplate(fileName).subscribe({
next: response => { next: response => {
const url = window.URL.createObjectURL(response); const url = window.URL.createObjectURL(response);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment