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

- ประเมิน : เรียงลำดับ

Browse Source 
- ประเมิน : บันทึกแล้วเลขซ้ำ
This commit is contained in:
LAPTOP-KB8JC2K2\acer
2021-09-07 13:36:29 +07:00
parent ccacb814a3
commit a898de8ab2
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs
View File

@@ -310,7 +310,9 @@ namespace TodoAPI2.Models
//fk_external_employee.department_code, //fk_external_employee.department_code,
fk_external_employee.hpt_position_type_id, fk_external_employee.hpt_position_type_id,
fk_external_employee.hpl_position_level_id, fk_external_employee.hpl_position_level_id,
fk_external_employee.employee_no fk_external_employee.employee_no,
fk_planResult.fiscal_year descending,
fk_planResult.theTime descending
select new eva_create_evaluation_detail_processViewModel() select new eva_create_evaluation_detail_processViewModel()
{ {
id = m_eva_create_evaluation_detail_process.id, id = m_eva_create_evaluation_detail_process.id,

2
Models/eva_limit_frame_group/eva_limit_frame_groupService.cs
View File

@@ -203,7 +203,7 @@ namespace TodoAPI2.Models
existingEntity.total_salary = model.total_salary; existingEntity.total_salary = model.total_salary;
existingEntity.total_salary_limit = model.total_salary_limit; existingEntity.total_salary_limit = model.total_salary_limit;
existingEntity.total_salary_limit_rounded = model.total_salary_limit_rounded; existingEntity.total_salary_limit_rounded = model.total_salary_limit_rounded;
existingEntity.remark = model.remark; existingEntity.remark = "";
int j = 1; int j = 1;
foreach (var y in from z in _repository.Context.eva_limit_frame_employee where z.frame_group_guid == model.id orderby z.order_of_data select z) foreach (var y in from z in _repository.Context.eva_limit_frame_employee where z.frame_group_guid == model.id orderby z.order_of_data select z)

2
Views/eva_limit_frame_groupView/eva_limit_frame_group_d.cshtml
View File

@@ -152,7 +152,7 @@
<div class='row'> <div class='row'>
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<label id="lab_eva_limit_frame_group_remark" for="eva_limit_frame_group_remark">หมายเหตุ</label> <label id="lab_eva_limit_frame_group_remark" for="eva_limit_frame_group_remark">หมายเหตุ</label>
<textarea class="form-control" rows="4" cols="50" id="eva_limit_frame_group_remark" iLabel="หมายเหตุ" iRequire="false" iGroup="eva_limit_frame_group"></textarea> <textarea disabled class="form-control" rows="4" cols="50" id="eva_limit_frame_group_remark" iLabel="หมายเหตุ" iRequire="false" iGroup="eva_limit_frame_group"></textarea>
</div> </div>
</div> </div>

1
wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process.js
View File

@@ -179,6 +179,7 @@ var eva_create_evaluation_detail_processTableV;
var eva_create_evaluation_detail_process_setupTable = function (result) { var eva_create_evaluation_detail_process_setupTable = function (result) {
var groupColumn = 6; var groupColumn = 6;
console.log(result);
tmp = '"'; tmp = '"';
eva_create_evaluation_detail_processTableV = $('#eva_create_evaluation_detail_processTable').DataTable({ eva_create_evaluation_detail_processTableV = $('#eva_create_evaluation_detail_processTable').DataTable({