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

Update source code

Browse Source
This commit is contained in:
nakorn
2022-05-09 14:47:12 +07:00
parent ccef30e588
commit 804bb7d9f2
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Models/external_linkage/external_linkageService.cs
View File

@@ -321,7 +321,7 @@ namespace TodoAPI2.Models
var i = new external_linkageViewModel(); var i = new external_linkageViewModel();
i.external_id = 2; i.external_id = 2;
i.external_code = "Y"; i.external_code = "Y";
i.external_name = "อนุมัติและส่งต่อ"; i.external_name = "อนุมัติและส่งเงินเดือน";
result.Add(i); result.Add(i);
//var j = new external_linkageViewModel(); //var j = new external_linkageViewModel();

16
Views/eva_adjust_postponement_quotaView/eva_adjust_postponement_quota_d.cshtml
View File

@@ -75,9 +75,9 @@
<select class="form-control" id="eva_adjust_quota_update_status_quota_status" iLabel="สถานะการปรับเลื่อนเงินเดือน" iRequire="true" iGroup="eva_adjust_quota_update_status"></select> <select class="form-control" id="eva_adjust_quota_update_status_quota_status" iLabel="สถานะการปรับเลื่อนเงินเดือน" iRequire="true" iGroup="eva_adjust_quota_update_status"></select>
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4" style="display:none;">
<label id="lab_eva_adjust_quota_update_status_quota_status_submit_to" for="eva_adjust_quota_update_status_quota_status_submit_to">ส่งต่อไปให้</label> <label id="lab_eva_adjust_quota_update_status_quota_status_submit_to" for="eva_adjust_quota_update_status_quota_status_submit_to">ส่งต่อไปให้</label>
<select class="form-control" id="eva_adjust_quota_update_status_quota_status_submit_to" iLabel="ส่งต่อไปให้" iRequire="true" iGroup="eva_adjust_quota_update_status"></select> <select class="form-control" id="eva_adjust_quota_update_status_quota_status_submit_to" iLabel="ส่งต่อไปให้" iRequire="false" iGroup="eva_adjust_quota_update_status"></select>
</div> </div>
</div> </div>
@@ -114,7 +114,7 @@
<div class="modal-dialog modal-lg" role="document"> <div class="modal-dialog modal-lg" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h5 class="modal-title" id="report_xModelLabel">พิมพ์ บันทึกข้อความ</h5> <h5 class="modal-title" id="report_xModelLabel">พิมพ์ วงเงินที่กันไว้</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"> <button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span> <span aria-hidden="true">&times;</span>
</button> </button>
@@ -235,11 +235,13 @@
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<button style="display:none;" class="btn btn-info" type="button" onclick="javascript:CalculateRemainQuota(true)">คำนวณค่าครองชีพใหม่ ตามเกณฑ์เงินเดือน 13,285</button> <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 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:eva_adjust_quota_update_status_GoEdit(getUrlParameter('id'), true);">อนุมัติและส่งเงินเดือน</button>
<span id="statusapprove" class="thesubmit"></span> <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> <!--
<span id="statusfinalapprove" class="thesubmit2"></span> <button class="btn btn-info thesubmit2" onclick="javascript:eva_adjust_quota_update_final_status_GoEdit(getUrlParameter('id'), true);">อนุมัติและแสดงแก่พนักงาน</button>
<span id="statusfinalapprove" class="thesubmit2"></span>
-->
</div> </div>
</div> </div>
</div> </div>

5
wwwroot/js/eva_create_evaluation_detail_history/eva_create_evaluation_detail_history.js
View File

@@ -168,8 +168,9 @@ var eva_create_evaluation_detail_history_setupTable = function (result) {
"language": { "language": {
"url": appsite + "/DataTables-1.10.16/thai.json" "url": appsite + "/DataTables-1.10.16/thai.json"
}, },
"paging": true, "paging": false,
"searching": false "searching": false,
"ordering": false
}); });
endLoad(); endLoad();
}; };