diff --git a/CompanyManagment.App.Contracts/InsuranceList/InsuranceListViewModel.cs b/CompanyManagment.App.Contracts/InsuranceList/InsuranceListViewModel.cs index 4a31820e..c85541d3 100644 --- a/CompanyManagment.App.Contracts/InsuranceList/InsuranceListViewModel.cs +++ b/CompanyManagment.App.Contracts/InsuranceList/InsuranceListViewModel.cs @@ -40,4 +40,6 @@ public class InsuranceListViewModel /// نوع تاییدیه کارفرما /// public InsuranceListEmployerApprovalStatus EmployerApprovalStatus { get; set; } + + public string ArchiveCode { get; set; } } \ No newline at end of file diff --git a/CompanyManagment.EFCore/Repository/InsuranceListRepository.cs b/CompanyManagment.EFCore/Repository/InsuranceListRepository.cs index a92e51f7..0ecbe40a 100644 --- a/CompanyManagment.EFCore/Repository/InsuranceListRepository.cs +++ b/CompanyManagment.EFCore/Repository/InsuranceListRepository.cs @@ -416,7 +416,8 @@ public class InsuranceListRepository : RepositoryBase, IIns DebtDone = result.insurance.Debt.IsDone, EmployerApproved = result.insurance.EmployerApproval.IsDone, InspectionDone = result.insurance.Inspection.IsDone, - EmployerApprovalStatus = result.insurance.EmployerApproval.Status + EmployerApprovalStatus = result.insurance.EmployerApproval.Status, + ArchiveCode = result.workshop.ArchiveCode, }); query = searchModel.Status switch diff --git a/ServiceHost/wwwroot/AssetsAdmin/page/InsuranceList/js/Index.js b/ServiceHost/wwwroot/AssetsAdmin/page/InsuranceList/js/Index.js index 42cb73e7..d6b11d57 100644 --- a/ServiceHost/wwwroot/AssetsAdmin/page/InsuranceList/js/Index.js +++ b/ServiceHost/wwwroot/AssetsAdmin/page/InsuranceList/js/Index.js @@ -551,7 +551,7 @@ function generateButtons(item, pathDSKKAR00, pathDSKWOR00) { // Confirm List and Print Button if (hasPermission_80215) { html += ` - +