diff --git a/Models/RoReport/form_1_2.cs b/Models/RoReport/form_1_2.cs index b695055..2d04a0b 100644 --- a/Models/RoReport/form_1_2.cs +++ b/Models/RoReport/form_1_2.cs @@ -63,6 +63,45 @@ namespace rmutr_report.Models.RoThree public string budget_year_name_th { get; set; } public List form_1_2_images { get; set; } public List form_1_2_images_2 { get; set; } + + // New2570 spec — header-level + public int? request_count { get; set; } + public string division_name { get; set; } + public string overall_reason { get; set; } + + // New2570 spec — signer (ผู้ขอ) + public string signer_type { get; set; } + public string signer_name { get; set; } + public string signer_position { get; set; } + + // New2570 spec — approver (หัวหน้าหน่วยงาน) + public string approver_decision { get; set; } + public string approver_reason { get; set; } + public string approver_name { get; set; } + public string approver_admin_position { get; set; } + + public List form_1_2_positions { get; set; } + } + + public class form_1_2_positions + { + [Key] public Guid? form_1_2_position_uid { get; set; } + public Guid? form_1_2_uid { get; set; } + public int? row { get; set; } + + public string old_position_no { get; set; } + public string old_position_name { get; set; } + public string old_qualification { get; set; } + public string old_division_name { get; set; } + public string old_workload { get; set; } + + public string new_position_no { get; set; } + public string new_position_name { get; set; } + public string new_qualification { get; set; } + public string new_division_name { get; set; } + public string new_workload { get; set; } + + public string reason { get; set; } } public class t_form_1_2_images diff --git a/wwwroot/reports/change_position_offer_request_form.frx b/wwwroot/reports/change_position_offer_request_form.frx index c8675b5..1de16bc 100644 --- a/wwwroot/reports/change_position_offer_request_form.frx +++ b/wwwroot/reports/change_position_offer_request_form.frx @@ -84,22 +84,22 @@ - + - + - + - + - + @@ -113,37 +113,37 @@ - - + + - - + + - - + + - - + + - - + + - +