admin/Backend-Api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
MahanCh
2025-05-10 16:41:14 +03:30
parent 0a293dfa8c 802f9a39c5
commit fcea7eed21
14 changed files with 137 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CompanyManagement.Infrastructure.Excel/SalaryAid/SalaryAidImportExcel.cs
View File

@@ -86,7 +86,7 @@ public class SalaryAidImportExcel
worksheet.Cells[3, 4].Text != "مبلغ قابل پرداخت" ||
worksheet.Cells[1, 3].Text != "تاریخ پرداخت" ||
worksheet.Cells[1, 1].Text != "سال محاسبه" ||
worksheet.Cells[1, 2].Text != "ماه محسابه")
worksheet.Cells[1, 2].Text != "ماه محاسبه")
{
result.Errors.Add(new SalaryAidImportExcelError("ساختار فایل اکسل اشتباه است.", 0, SalaryAidExcelColumns.None.ToString()));
return result;

16
ServiceHost/wwwroot/AssetsClient/pages/Fine/css/ModalCreateNewFine.css
View File

@@ -1,4 +1,18 @@
.errored {
.scroll-container-amount {
font-size: 12px;
color: #4f4f4f;
white-space: nowrap;
width: 100%;
overflow: hidden;
cursor: grab;
user-select: none;
}
.scroll-container-amount:active {
cursor: grabbing;
}
.errored {
animation: shake 300ms;
color: #eb3434 !important;
background-color: #fef2f2 !important;

10
ServiceHost/wwwroot/AssetsClient/pages/Fine/js/ModalCreateNewFine.js
View File

@@ -352,9 +352,17 @@ function CheckExistAjax() {
},
success: function (response) {
//if (response.checkout)
var checkoutType = "";
if (response.customizeCheckout) {
checkoutType = "نهایی";
} else if (response.customizeCheckoutTemp) {
checkoutType = "موقت";
}
if (response.customizeCheckout || response.customizeCheckoutTemp) {
swal({
title: "آیا میخواهید ادامه دهید؟",
title: `برای این پرسنل فیش حقوقی غیررسمی ${checkoutType} صادر شده است. در صورت تایید، این فیش حقوقی به صورت خودکار تغییر پیدا میکند.`,
text: "",
type: "warning",
showCancelButton: true,

10
ServiceHost/wwwroot/AssetsClient/pages/Fine/js/ModalEditFine.js
View File

@@ -237,9 +237,17 @@ function CheckExistAjax() {
},
success: function (response) {
//if (response.checkout)
var checkoutType = "";
if (response.customizeCheckout) {
checkoutType = "نهایی";
} else if (response.customizeCheckoutTemp) {
checkoutType = "موقت";
}
if (response.customizeCheckout || response.customizeCheckoutTemp) {
swal({
title: "آیا میخواهید ادامه دهید؟",
title: `برای این پرسنل فیش حقوقی غیررسمی ${checkoutType} صادر شده است. در صورت تایید، این فیش حقوقی به صورت خودکار تغییر پیدا میکند.`,
text: "",
type: "warning",
showCancelButton: true,

16
ServiceHost/wwwroot/AssetsClient/pages/Loan/css/ModalCreateNewLoan.css
View File

@@ -1,4 +1,18 @@
.errored {
.scroll-container-amount {
font-size: 12px;
color: #4f4f4f;
white-space: nowrap;
width: 100%;
overflow: hidden;
cursor: grab;
user-select: none;
}
.scroll-container-amount:active {
cursor: grabbing;
}
.errored {
animation: shake 300ms;
color: #eb3434 !important;
background-color: #fef2f2 !important;

4
ServiceHost/wwwroot/AssetsClient/pages/Loan/css/ModalDetailLoan.css
View File

@@ -62,14 +62,16 @@
border-radius: 30px;
padding: 3px 6px;
width: 160px;
white-space: nowrap;
}
.widthTableBadgeNone {
background-color: #E8E0E0;
color: #BF3737;
border-radius: 30px;
/*padding: 3px 6px;*/
padding: 3px 6px;
width: 160px;
white-space: nowrap;
}

50
ServiceHost/wwwroot/AssetsClient/pages/Loan/js/Index.js
View File

@@ -41,7 +41,7 @@ $(document).ready(function () {
element.val(value);
});
new Cleave(this', {
new Cleave(this, {
delimiters: ['/', '/'],
blocks: [4, 2, 2],
numericOnly: true
@@ -393,8 +393,8 @@ function htmlLoadSimpleListData(loadLoanListData) {
</svg>
</button>
${detailsPermission
?
`<button type="button" class="btn-detail position-relative d-md-flex d-none" style="width: 30px;height: 30px;padding: 0;" onclick="DetailLoan(${item.id})">
?
`<button type="button" class="btn-detail position-relative d-md-flex d-none" style="width: 30px;height: 30px;padding: 0;" onclick="DetailLoan(${item.id})">
<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M4.58325 4.58333C4.58325 3.57081 5.40406 2.75 6.41659 2.75H10.7708C10.8973 2.75 10.9999 2.8526 10.9999 2.97917V7.33333C10.9999 8.34586 11.8207 9.16667 12.8333 9.16667H17.1874C17.314 9.16667 17.4166 9.26924 17.4166 9.39583V17.4167C17.4166 18.4292 16.5958 19.25 15.5833 19.25H6.41659C5.40406 19.25 4.58325 18.4292 4.58325 17.4167V4.58333Z" fill="#58E85B"/>
<path d="M12.4167 7.33392V3.95768L16.2096 7.75058H12.8334C12.6033 7.75058 12.4167 7.56404 12.4167 7.33392Z" fill="#248826" stroke="#248826"/>
@@ -405,8 +405,8 @@ function htmlLoadSimpleListData(loadLoanListData) {
</svg>
<span class="mx-1 d-md-none d-flex">جزئیات</span>
</button>`
:
`<button type="button" class="btn-detail position-relative d-md-flex d-none disable" style="width: 30px;height: 30px;padding: 0;">
:
`<button type="button" class="btn-detail position-relative d-md-flex d-none disable" style="width: 30px;height: 30px;padding: 0;">
<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M4.58325 4.58333C4.58325 3.57081 5.40406 2.75 6.41659 2.75H10.7708C10.8973 2.75 10.9999 2.8526 10.9999 2.97917V7.33333C10.9999 8.34586 11.8207 9.16667 12.8333 9.16667H17.1874C17.314 9.16667 17.4166 9.26924 17.4166 9.39583V17.4167C17.4166 18.4292 16.5958 19.25 15.5833 19.25H6.41659C5.40406 19.25 4.58325 18.4292 4.58325 17.4167V4.58333Z" fill="#58E85B"/>
<path d="M12.4167 7.33392V3.95768L16.2096 7.75058H12.8334C12.6033 7.75058 12.4167 7.56404 12.4167 7.33392Z" fill="#248826" stroke="#248826"/>
@@ -418,8 +418,8 @@ function htmlLoadSimpleListData(loadLoanListData) {
<span class="mx-1 d-md-none d-flex">جزئیات</span>
</button>`}
${deletePermission
?
`<button data-remove-id="${item.id}" type="button" class="btn-delete removeLoan d-md-block d-none">
?
`<button data-remove-id="${item.id}" type="button" class="btn-delete removeLoan d-md-block d-none">
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 22 22" fill="none" stroke="currentColor">
<path d="M8.70825 13.2915L8.70825 10.5415" stroke-width="1.5" stroke-linecap="round" />
<path d="M13.2917 13.2915L13.2917 10.5415" stroke-width="1.5" stroke-linecap="round" />
@@ -428,8 +428,8 @@ function htmlLoadSimpleListData(loadLoanListData) {
</svg>
<span class="mx-1">حذف</span>
</button>`
:
`<button type="button" class="btn-delete removeLoan d-md-block d-none disable">
:
`<button type="button" class="btn-delete removeLoan d-md-block d-none disable">
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 22 22" fill="none" stroke="currentColor">
<path d="M8.70825 13.2915L8.70825 10.5415" stroke-width="1.5" stroke-linecap="round" />
<path d="M13.2917 13.2915L13.2917 10.5415" stroke-width="1.5" stroke-linecap="round" />
@@ -438,7 +438,7 @@ function htmlLoadSimpleListData(loadLoanListData) {
</svg>
<span class="mx-1">حذف</span>
</button>`
}
}
<button type="button" class="btn-operation-more btn-open-div position-relative d-md-none d-block">
<span class="align-items-center d-flex justify-content-center">
<span class="mx-1">عملیات</span>
@@ -492,8 +492,8 @@ function htmlLoadSimpleListData(loadLoanListData) {
</button>
${detailsPermission
?
`<button type="button" class="btn-detail position-relative d-md-none d-flex w-100" onclick="DetailLoan(${item.id})">
?
`<button type="button" class="btn-detail position-relative d-md-none d-flex w-100" onclick="DetailLoan(${item.id})">
<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M4.58325 4.58333C4.58325 3.57081 5.40406 2.75 6.41659 2.75H10.7708C10.8973 2.75 10.9999 2.8526 10.9999 2.97917V7.33333C10.9999 8.34586 11.8207 9.16667 12.8333 9.16667H17.1874C17.314 9.16667 17.4166 9.26924 17.4166 9.39583V17.4167C17.4166 18.4292 16.5958 19.25 15.5833 19.25H6.41659C5.40406 19.25 4.58325 18.4292 4.58325 17.4167V4.58333Z" fill="#58E85B"/>
<path d="M12.4167 7.33392V3.95768L16.2096 7.75058H12.8334C12.6033 7.75058 12.4167 7.56404 12.4167 7.33392Z" fill="#248826" stroke="#248826"/>
@@ -504,8 +504,8 @@ function htmlLoadSimpleListData(loadLoanListData) {
</svg>
<span class="mx-1 d-md-none d-flex">جزئیات</span>
</button>`
:
`<button type="button" class="btn-detail position-relative d-md-none d-flex disable w-100">
:
`<button type="button" class="btn-detail position-relative d-md-none d-flex disable w-100">
<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M4.58325 4.58333C4.58325 3.57081 5.40406 2.75 6.41659 2.75H10.7708C10.8973 2.75 10.9999 2.8526 10.9999 2.97917V7.33333C10.9999 8.34586 11.8207 9.16667 12.8333 9.16667H17.1874C17.314 9.16667 17.4166 9.26924 17.4166 9.39583V17.4167C17.4166 18.4292 16.5958 19.25 15.5833 19.25H6.41659C5.40406 19.25 4.58325 18.4292 4.58325 17.4167V4.58333Z" fill="#58E85B"/>
<path d="M12.4167 7.33392V3.95768L16.2096 7.75058H12.8334C12.6033 7.75058 12.4167 7.56404 12.4167 7.33392Z" fill="#248826" stroke="#248826"/>
@@ -517,8 +517,8 @@ function htmlLoadSimpleListData(loadLoanListData) {
<span class="mx-1 d-md-none d-flex">جزئیات</span>
</button>`}
${deletePermission
?
`<button data-remove-id="${item.id}" type="button" class="btn-delete removeLoan w-100">
?
`<button data-remove-id="${item.id}" type="button" class="btn-delete removeLoan w-100">
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 22 22" fill="none" stroke="currentColor">
<path d="M8.70825 13.2915L8.70825 10.5415" stroke-width="1.5" stroke-linecap="round" />
<path d="M13.2917 13.2915L13.2917 10.5415" stroke-width="1.5" stroke-linecap="round" />
@@ -527,8 +527,8 @@ function htmlLoadSimpleListData(loadLoanListData) {
</svg>
<span class="mx-1">حذف</span>
</button>`
:
`<button type="button" class="btn-delete removeLoan disable w-100">
:
`<button type="button" class="btn-delete removeLoan disable w-100">
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 22 22" fill="none" stroke="currentColor">
<path d="M8.70825 13.2915L8.70825 10.5415" stroke-width="1.5" stroke-linecap="round" />
<path d="M13.2917 13.2915L13.2917 10.5415" stroke-width="1.5" stroke-linecap="round" />
@@ -537,12 +537,12 @@ function htmlLoadSimpleListData(loadLoanListData) {
</svg>
<span class="mx-1">حذف</span>
</button>`
}
}
</div>
</div>
</div>
</div>`;
pageIndexJs++;
});
@@ -805,7 +805,7 @@ function htmlLoadWithEmployeeDataByFullname(loadLoanListData) {
<div class="Rtable-cell--content text-center">${item.personnelCode}</div>
</div>
<div class="Rtable-cell width3">
<div class="Rtable-cell--content">${item.totalAmountFa + " ریال" ?? "-"}</div>
<div class="Rtable-cell--content">${item.totalAmountFa + " ریال" ?? "-"}</div>
</div>
<div class="Rtable-cell d-md-flex d-none width4">
<div class="Rtable-cell--content">${item.amountPerMonth + " ریال"}</div>
@@ -1029,7 +1029,7 @@ function htmlLoadWithEmployeeMobileDataByFullname(loadLoanListData) {
</button>
${detailsPermission
?
`<button type="button" class="btn-detail position-relative d-md-none d-flex w-100" onclick="DetailLoan(${loanItem.id})">
`<button type="button" class="btn-detail position-relative d-md-none d-flex w-100" onclick="DetailLoan(${loanItem.id})">
<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M4.58325 4.58333C4.58325 3.57081 5.40406 2.75 6.41659 2.75H10.7708C10.8973 2.75 10.9999 2.8526 10.9999 2.97917V7.33333C10.9999 8.34586 11.8207 9.16667 12.8333 9.16667H17.1874C17.314 9.16667 17.4166 9.26924 17.4166 9.39583V17.4167C17.4166 18.4292 16.5958 19.25 15.5833 19.25H6.41659C5.40406 19.25 4.58325 18.4292 4.58325 17.4167V4.58333Z" fill="#58E85B"/>
<path d="M12.4167 7.33392V3.95768L16.2096 7.75058H12.8334C12.6033 7.75058 12.4167 7.56404 12.4167 7.33392Z" fill="#248826" stroke="#248826"/>
@@ -1187,7 +1187,7 @@ function htmlLoadWithEmployeeMobileDataByDate(loadLoanListData) {
</div>
<div class="d-flex align-items-center justify-content-between">
<div>مبلغ</div>
<div>${loanItem.totalAmountFa + " ریال" ??"-"}</div>
<div>${loanItem.totalAmountFa + " ریال" ?? "-"}</div>
</div>
<div class="d-flex align-items-center justify-content-between">
<div>مبلغ هر ماه</div>
@@ -1203,7 +1203,7 @@ function htmlLoadWithEmployeeMobileDataByDate(loadLoanListData) {
${detailsPermission
?
`<button type="button" class="btn-detail position-relative d-md-none d-flex w-100" onclick="DetailLoan(${loanItem.id})">
`<button type="button" class="btn-detail position-relative d-md-none d-flex w-100" onclick="DetailLoan(${loanItem.id})">
<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M4.58325 4.58333C4.58325 3.57081 5.40406 2.75 6.41659 2.75H10.7708C10.8973 2.75 10.9999 2.8526 10.9999 2.97917V7.33333C10.9999 8.34586 11.8207 9.16667 12.8333 9.16667H17.1874C17.314 9.16667 17.4166 9.26924 17.4166 9.39583V17.4167C17.4166 18.4292 16.5958 19.25 15.5833 19.25H6.41659C5.40406 19.25 4.58325 18.4292 4.58325 17.4167V4.58333Z" fill="#58E85B"/>
<path d="M12.4167 7.33392V3.95768L16.2096 7.75058H12.8334C12.6033 7.75058 12.4167 7.56404 12.4167 7.33392Z" fill="#248826" stroke="#248826"/>
@@ -1361,7 +1361,7 @@ function removeAjax(id) {
}
function DetailLoan(LoanId) {
var id = Number(LoanId);
var url = `/Client/Company/Loan/Index?id=${id}&handler=Detail`;

16
ServiceHost/wwwroot/AssetsClient/pages/Reward/css/ModalCreateNewReward.css
View File

@@ -1,4 +1,18 @@
.errored {
.scroll-container-amount {
font-size: 12px;
color: #4f4f4f;
white-space: nowrap;
width: 100%;
overflow: hidden;
cursor: grab;
user-select: none;
}
.scroll-container-amount:active {
cursor: grabbing;
}
.errored {
animation: shake 300ms;
color: #eb3434 !important;
background-color: #fef2f2 !important;

10
ServiceHost/wwwroot/AssetsClient/pages/Reward/js/ModalCreateNewReward.js
View File

@@ -205,9 +205,17 @@ function CheckExistAjax() {
},
success: function (response) {
//if (response.checkout)
var checkoutType = "";
if (response.customizeCheckout) {
checkoutType = "نهایی";
} else if (response.customizeCheckoutTemp) {
checkoutType = "موقت";
}
if (response.customizeCheckout || response.customizeCheckoutTemp) {
swal({
title: "آیا میخواهید ادامه دهید؟",
title: `برای این پرسنل فیش حقوقی غیررسمی ${checkoutType} صادر شده است. در صورت تایید، این فیش حقوقی به صورت خودکار تغییر پیدا میکند.`,
text: "",
type: "warning",
showCancelButton: true,

11
ServiceHost/wwwroot/AssetsClient/pages/Reward/js/ModalEditReward.js
View File

@@ -168,10 +168,17 @@ function CheckExistAjax() {
employeeIds: employeeSelect
},
success: function (response) {
//if (response.checkout)
var checkoutType = "";
if (response.customizeCheckout) {
checkoutType = "نهایی";
} else if (response.customizeCheckoutTemp) {
checkoutType = "موقت";
}
if (response.customizeCheckout || response.customizeCheckoutTemp) {
swal({
title: "آیا میخواهید ادامه دهید؟",
title: `برای این پرسنل فیش حقوقی غیررسمی ${checkoutType} صادر شده است. در صورت تایید، این فیش حقوقی به صورت خودکار تغییر پیدا میکند.`,
text: "",
type: "warning",
showCancelButton: true,

11
ServiceHost/wwwroot/AssetsClient/pages/SalaryAid/js/ModalCreateNewSalaryAid.js
View File

@@ -342,10 +342,17 @@ function CheckExistAjax() {
employeeIds: employeeSelect
},
success: function (response) {
//if (response.checkout)
var checkoutType = "";
if (response.customizeCheckout) {
checkoutType = "نهایی";
} else if (response.customizeCheckoutTemp) {
checkoutType = "موقت";
}
if (response.customizeCheckout || response.customizeCheckoutTemp) {
swal({
title: "آیا میخواهید ادامه دهید؟",
title: `برای این پرسنل فیش حقوقی غیررسمی ${checkoutType} صادر شده است. در صورت تایید، این فیش حقوقی به صورت خودکار تغییر پیدا میکند.`,
text: "",
type: "warning",
showCancelButton: true,

10
ServiceHost/wwwroot/AssetsClient/pages/SalaryAid/js/ModalEditSalaryAid.js
View File

@@ -273,9 +273,17 @@ function CheckExistAjax() {
},
success: function (response) {
//if (response.checkout)
var checkoutType = "";
if (response.customizeCheckout) {
checkoutType = "نهایی";
} else if (response.customizeCheckoutTemp) {
checkoutType = "موقت";
}
if (response.customizeCheckout || response.customizeCheckoutTemp) {
swal({
title: "آیا میخواهید ادامه دهید؟",
title: `برای این پرسنل فیش حقوقی غیررسمی ${checkoutType} صادر شده است. در صورت تایید، این فیش حقوقی به صورت خودکار تغییر پیدا میکند.`,
text: "",
type: "warning",
showCancelButton: true,

11
ServiceHost/wwwroot/AssetsClient/pages/SalaryAid/js/ModalImportExcel.js
View File

@@ -762,9 +762,17 @@ function CheckExistAjax() {
},
success: function (response) {
//if (response.checkout)
var checkoutType = "";
if (response.customizeCheckout) {
checkoutType = "نهایی";
} else if (response.customizeCheckoutTemp) {
checkoutType = "موقت";
}
if (response.customizeCheckout || response.customizeCheckoutTemp) {
swal({
title: "آیا میخواهید ادامه دهید؟",
title: `برای این پرسنل فیش حقوقی غیررسمی ${checkoutType} صادر شده است. در صورت تایید، این فیش حقوقی به صورت خودکار تغییر پیدا میکند.`,
text: "",
type: "warning",
showCancelButton: true,
@@ -777,7 +785,6 @@ function CheckExistAjax() {
if (isConfirm) {
SaveDataAjax();
} else {
loading.hide();
$('#createData').removeClass('disable');
}
});

BIN
ServiceHost/wwwroot/Excel/Templates/SalaryAid/SA-Template.xlsx
View File

Binary file not shown.