diff --git a/Models/RoReport/form_1_2.cs b/Models/RoReport/form_1_2.cs index f3e1200..35fcee3 100644 --- a/Models/RoReport/form_1_2.cs +++ b/Models/RoReport/form_1_2.cs @@ -55,6 +55,11 @@ namespace rmutr_report.Models.RoThree public string new_position { get; set; } // + public Guid? budget_project_uid { get; set; } + public Guid? budget_plan_uid { get; set; } + public string new_qualification { get; set; } + public string new_salaray { get; set; } + 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; } } diff --git a/Models/RoReport/form_1_3.cs b/Models/RoReport/form_1_3.cs index 846522d..2ccd248 100644 --- a/Models/RoReport/form_1_3.cs +++ b/Models/RoReport/form_1_3.cs @@ -55,6 +55,11 @@ namespace rmutr_report.Models.RoThree // public string another_document_remark { get; set; } + // + public string budget_year { get; set; } + public string agency_category_name { get; set; } + public Guid? budget_project_uid { get; set; } + public Guid? budget_plan_uid { get; set; } public List form_1_3_details { get; set; } } @@ -124,6 +129,8 @@ namespace rmutr_report.Models.RoThree // public int? row { get; set; } + // + public decimal? quantity { get; set; } public List files { get; set; } } diff --git a/wwwroot/reports/change_position_offer_request_form.frx b/wwwroot/reports/change_position_offer_request_form.frx index 1acf4f4..5711be9 100644 --- a/wwwroot/reports/change_position_offer_request_form.frx +++ b/wwwroot/reports/change_position_offer_request_form.frx @@ -1,5 +1,5 @@  - + @@ -22,6 +22,8 @@ + + @@ -103,7 +105,7 @@ - + diff --git a/wwwroot/reports/new_rate_offer_request_form.frx b/wwwroot/reports/new_rate_offer_request_form.frx index 2e57897..5e341cf 100644 --- a/wwwroot/reports/new_rate_offer_request_form.frx +++ b/wwwroot/reports/new_rate_offer_request_form.frx @@ -1,5 +1,5 @@  - + @@ -21,6 +21,8 @@ + + @@ -42,6 +44,7 @@ + @@ -125,7 +128,7 @@ - +