-
+
-
@@ -174,7 +174,7 @@
-
+
diff --git a/ServiceHost/wwwroot/AssetsAdminNew/EmployeesDocument/js/EmployeeList.js b/ServiceHost/wwwroot/AssetsAdminNew/EmployeesDocument/js/EmployeeList.js
index 1630fd64..3eb7d49c 100644
--- a/ServiceHost/wwwroot/AssetsAdminNew/EmployeesDocument/js/EmployeeList.js
+++ b/ServiceHost/wwwroot/AssetsAdminNew/EmployeesDocument/js/EmployeeList.js
@@ -1,5 +1,5 @@
var pageIndexJs = 0;
-var pageIndex = 0;
+var indexPage = 0;
var mode = 'active';
var searchName = '';
@@ -12,7 +12,8 @@ $(document).ready(function () {
$(this).addClass('active');
$('.btn-clear-filter').addClass('disable');
pageIndexJs = 0;
- pageIndex = 0;
+ indexPage = 0;
+ n = 1;
$('#personnelDocumentsAjax').html('');
$('.employeeName').val('');
loadPersonnelDocuments(mode, searchName = '');
@@ -35,6 +36,8 @@ $(document).on('click', '.btn-uploadingPD, .btn-uploadingPD-mobile', function ()
$(document).on('click', '.btn-search-click, .btn-search-click-mobile', function () {
pageIndexJs = 0;
+ indexPage = 0;
+ n = 1;
$('#personnelDocumentsAjax').html('');
$('.btn-clear-filter').removeClass('disable');
searchName = $('.employeeName').val().trim();
@@ -46,6 +49,8 @@ $(document).on('click', '.btn-search-click, .btn-search-click-mobile', function
});
$(document).on('click', '.btn-clear-filter', function () {
pageIndexJs = 0;
+ indexPage = 0;
+ n = 1;
$('#personnelDocumentsAjax').html('');
$('.btn-clear-filter').addClass('disable');
$('.employeeName').val('');
@@ -95,14 +100,15 @@ function loadPersonnelDocuments(mode, searchName) {
dataType: 'json',
type: 'GET',
url: employeeDocumentsAjaxLoadData,
- data: { workshopId: workshopId, searchMode: mode, employeeName: searchName, 'pageIndex': pageIndex },
+ data: { workshopId: workshopId, searchMode: mode, employeeName: searchName, 'pageIndex': pageIndexJs },
headers: { "RequestVerificationToken": antiForgeryToken },
success: function (response) {
var personnelDocumentsData = response.data;
if (response.isSuccedded) {
personnelDocumentsData.forEach(function (item) {
- var n = pageIndexJs + 1;
+ var n = indexPage + 1;
+ indexPage++;
html += `
`;
-
- pageIndexJs++;
-
});
-
- pageIndexJs = pageIndex + response.pageIndex;
- pageIndex = pageIndexJs;
+
+ pageIndexJs += response.pageIndex;
$('#personnelDocumentsAjax').append(html);
} else {
html += `
diff --git a/ServiceHost/wwwroot/AssetsClient/pages/EmployeesDocument/js/Index.js b/ServiceHost/wwwroot/AssetsClient/pages/EmployeesDocument/js/Index.js
index b5cd00b9..6d0a7791 100644
--- a/ServiceHost/wwwroot/AssetsClient/pages/EmployeesDocument/js/Index.js
+++ b/ServiceHost/wwwroot/AssetsClient/pages/EmployeesDocument/js/Index.js
@@ -1,5 +1,5 @@
var pageIndexJs = 0;
-var pageIndex = 0;
+var indexPage = 0;
var mode = 'active';
var searchName = '';
@@ -12,7 +12,8 @@ $(document).ready(function () {
$(this).addClass('active');
$('.btn-clear-filter').addClass('disable');
pageIndexJs = 0;
- pageIndex = 0;
+ indexPage = 0;
+ n = 1;
$('#personnelDocumentsAjax').html('');
$('.employeeName').val('');
loadPersonnelDocuments(mode, searchName = '');
@@ -42,10 +43,12 @@ $(document).on('click', '.btn-uploadingPD, .btn-uploadingPD-mobile', function ()
$(document).on('click', '.btn-search-click, .btn-search-click-mobile', function () {
pageIndexJs = 0;
+ indexPage = 0;
+ n = 1;
$('#personnelDocumentsAjax').html('');
$('.btn-clear-filter').removeClass('disable');
searchName = $('.employeeName').val().trim();
- if (searchName == "") {
+ if (searchName === "") {
$('.btn-clear-filter').addClass('disable');
}
$('#searchModal').modal('hide');
@@ -53,6 +56,8 @@ $(document).on('click', '.btn-search-click, .btn-search-click-mobile', function
});
$(document).on('click', '.btn-clear-filter', function () {
pageIndexJs = 0;
+ indexPage = 0;
+ n = 1;
$('#personnelDocumentsAjax').html('');
$('.btn-clear-filter').addClass('disable');
$('.employeeName').val('');
@@ -102,14 +107,15 @@ function loadPersonnelDocuments(mode, searchName) {
dataType: 'json',
type: 'GET',
url: employeeDocumentsAjaxLoadData,
- data: { searchMode: mode, employeeName: searchName, 'pageIndex': pageIndex },
+ data: { searchMode: mode, employeeName: searchName, 'pageIndex': pageIndexJs },
headers: { "RequestVerificationToken": antiForgeryToken },
success: function (response) {
var personnelDocumentsData = response.data;
if (response.isSuccedded) {
personnelDocumentsData.forEach(function (item) {
- var n = pageIndexJs + 1;
+ var n = indexPage + 1;
+ indexPage++;
html += `
- ${n}
+ ${n++}
${item.employeeId}
@@ -344,11 +350,9 @@ function loadPersonnelDocuments(mode, searchName) {