diff --git a/Models/budget/durable_articles_three.cs b/Models/budget/durable_articles_three.cs index dfbf28a..3080a83 100644 --- a/Models/budget/durable_articles_three.cs +++ b/Models/budget/durable_articles_three.cs @@ -36,11 +36,11 @@ namespace rmutr_report.Models public string quantity_user_teaching { get; set; } public string quantity_user_training { get; set; } public string description_included { get; set; } - public string description_more1 { get; set; } - public string description_more2 { get; set; } - public string image_description1 { get; set; } - public string image_description2 { get; set; } - //public List specification_data { get; set; } + // public string description_more1 { get; set; } + // public string description_more2 { get; set; } + // public string image_description1 { get; set; } + // public string image_description2 { get; set; } + public List descript_more { get; set; } public string specification { get; set; } // public string quantity_specification { get; set; } // public decimal? unit_price_specification { get; set; } @@ -54,9 +54,11 @@ namespace rmutr_report.Models public string other_clarifications { get; set; } public List quotation { get; set; } //public string analysis_durable { get; set; } - public List analysis { get; set; } - public string investment_budget_analysis { get; set; } - public List investment { get; set; } + //public List analysis { get; set; } + //public string investment_budget_analysis { get; set; } + public string cases { get; set; } + public List invest_detail { get; set; } + //public string show_cases { get; set; } // public string text1 { get; set; } // public string text2 { get; set; } @@ -83,6 +85,12 @@ namespace rmutr_report.Models public string detail { get; set; } } + public class descript_more + { + public string descript { get; set; } + public string image_description { get; set; } + + } // public class specification_datas // { // public string specification { get; set; } @@ -130,22 +138,26 @@ namespace rmutr_report.Models public class quotations { public string company { get; set; } + public string url_file { get; set; } + public decimal? limit_price { get; set; } } - public class analysis_durables - { - public string list { get; set; } - } + // public class analysis_durables + // { + // public string list { get; set; } + // } public class investment_budget_analysis { - public string cases { get; set; } - public List detail { get; set; } + public string list { get; set; } + public string answer { get; set; } + public string remark { get; set; } + //public List detail { get; set; } } - public class investment_budget_analysis_details - { - - public string list { get; set; } - } + // public class investment_budget_analysis_details + // { + // + // public string list { get; set; } + // } } \ No newline at end of file diff --git a/wwwroot/reports/durable_articles_three.frx b/wwwroot/reports/durable_articles_three.frx index bd5a416..034d167 100644 --- a/wwwroot/reports/durable_articles_three.frx +++ b/wwwroot/reports/durable_articles_three.frx @@ -1,5 +1,5 @@  - + @@ -32,17 +32,13 @@ - - - - - + @@ -52,6 +48,10 @@ + + + + @@ -78,15 +78,13 @@ + + - + - - - - - - + + @@ -168,11 +166,11 @@ - + - + @@ -220,15 +218,15 @@ - + - - - - + + + + @@ -271,7 +269,7 @@ - + @@ -304,7 +302,7 @@ - + @@ -338,7 +336,7 @@ - + @@ -359,29 +357,23 @@ - + - - + + + + - + - - - - - - - - - - - - - + + + + +