thamming_dev01/hrm_eva
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Last commit

Browse Source
This commit is contained in:
nakorn
2022-08-27 11:22:12 +07:00
parent 804bb7d9f2
commit 8f2e0af11b
10 changed files with 109 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Views/eva_adjust_postponement_quotaView/eva_adjust_postponement_quota_d.cshtml
View File

@@ -236,7 +236,8 @@
<div class="col-md-12">
<button style="display:none;" class="btn btn-info" type="button" onclick="javascript:CalculateRemainQuota(true)">คำนวณค่าครองชีพใหม่ ตามเกณฑ์เงินเดือน 13,285</button>
<button type="button" class="btn btn-submit" onclick="javascript:rep_eva_savemessage_DoSearch('pdf')">พิมพ์ วงเงินที่กันไว้</button>
<button class="btn btn-info thesubmit" onclick="javascript:eva_adjust_quota_update_status_GoEdit(getUrlParameter('id'), true);">อนุมัติและส่งเงินเดือน</button>
<button class="btn btn-info thesubmit" onclick="javascript:makeApprove();">อนุมัติและส่งเงินเดือน</button>
<button style="display:none;" class="btn btn-info" onclick="javascript:makeWaiting();">รอพิจารณาเงินเดือน</button>
<span id="statusapprove" class="thesubmit"></span>
<!--
<button class="btn btn-info thesubmit2" onclick="javascript:eva_adjust_quota_update_final_status_GoEdit(getUrlParameter('id'), true);">อนุมัติและแสดงแก่พนักงาน</button>

1
Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d2.cshtml
View File

@@ -735,6 +735,7 @@
}
function Oneva_create_evaluation_detail_review05_supervisor3A_resultChanged(a) {
console.log("Oneva_create_evaluation_detail_review05_supervisor3A_resultChanged = " + $(a).val());
if ($(a).val() == "Y") {
$("#eva_create_evaluation_detail_review05_supervisor3A_remark").attr("iRequire", "false");
$("#eva_create_evaluation_detail_review05_supervisor3A_remark").css('border-color', '');