ในการแก้ไข จะไม่อนุญาตให้นำเข้าไฟล์ใหม่ หากต้องการนำเข้าใหม่ ให้ลบรอบการปรับเงินเดือนออก และสร้างรอบการปรับเงินเดือน ใหม่อีกครั้ง
+
diff --git a/wwwroot/js/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migration.js b/wwwroot/js/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migration.js
index 7a84d1b..1c9da8e 100644
--- a/wwwroot/js/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migration.js
+++ b/wwwroot/js/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migration.js
@@ -41,7 +41,7 @@ function eva_adjust_postponement_detail_migration_FeedDataToForm(data) {
$("#eva_adjust_postponement_detail_migration_migration_total_score").val(data.migration_total_score);
$("#eva_adjust_postponement_detail_migration_migration_eva_result").val(data.migration_eva_result);
DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_detail_migration_org_at_this_time"), data, "id", "external_name", "item_org_at_this_time", data.org_at_this_time);
-
+ $("#eva_adjust_postponement_detail_migration_order_at_this_time").val(data.order_at_this_time);
}
@@ -68,7 +68,7 @@ function eva_adjust_postponement_detail_migration_GetFromForm() {
eva_adjust_postponement_detail_migrationObject.migration_total_score = $("#eva_adjust_postponement_detail_migration_migration_total_score").val();
eva_adjust_postponement_detail_migrationObject.migration_eva_result = $("#eva_adjust_postponement_detail_migration_migration_eva_result").val();
eva_adjust_postponement_detail_migrationObject.org_at_this_time = $("#eva_adjust_postponement_detail_migration_org_at_this_time").val();
-
+ eva_adjust_postponement_detail_migrationObject.order_at_this_time = $("#eva_adjust_postponement_detail_migration_order_at_this_time").val();
return eva_adjust_postponement_detail_migrationObject;
}
diff --git a/wwwroot/js/eva_adjust_postponement_migration/eva_adjust_postponement_migration_d.js b/wwwroot/js/eva_adjust_postponement_migration/eva_adjust_postponement_migration_d.js
index 0dd90cf..e5c13cf 100644
--- a/wwwroot/js/eva_adjust_postponement_migration/eva_adjust_postponement_migration_d.js
+++ b/wwwroot/js/eva_adjust_postponement_migration/eva_adjust_postponement_migration_d.js
@@ -17,7 +17,7 @@ function eva_adjust_postponement_migration_FeedDataToForm(data) {
$("#eva_adjust_postponement_migration_command_no").val(data.command_no);
DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_migration_managed_by"), data, "id", "fullname", "item_managed_by", data.managed_by);
feedFileToControl(data.imported_file, data.imported_fileDisplay, "eva_adjust_postponement_migration_imported_file", "file");
- //console.log(data.item_managed_by);
+ DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_migration_report_type"), data, "id", "external_name", "item_report_type", data.report_type);
}
function eva_adjust_postponement_migration_GetFromForm() {
@@ -39,7 +39,7 @@ function eva_adjust_postponement_migration_GetFromForm() {
} else {
eva_adjust_postponement_migrationObject.imported_file = "";
}
-
+ eva_adjust_postponement_migrationObject.report_type = $("#eva_adjust_postponement_migration_report_type").val();
return eva_adjust_postponement_migrationObject;
}