diff --git a/wwwroot/reports/budget_summary_report.frx b/wwwroot/reports/budget_summary_report.frx
index cd7ed84..e73558e 100644
--- a/wwwroot/reports/budget_summary_report.frx
+++ b/wwwroot/reports/budget_summary_report.frx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="03/01/2023 13:13:10" ReportInfo.Modified="05/24/2023 16:49:18" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="03/01/2023 13:13:10" ReportInfo.Modified="05/25/2023 15:03:36" ReportInfo.CreatorVersion="2021.1.0.0">
   <Dictionary>
     <BusinessObjectDataSource Name="budget_summary_report" ReferenceName="budget_summary_report" DataType="null" Enabled="true">
       <Column Name="budget_year" DataType="System.String"/>
@@ -600,9 +600,9 @@
       </DataBand>
     </DataBand>
   </ReportPage>
-  <ReportPage Name="ค่าใช้จ่ายดำเนินงาน" PaperWidth="300" Watermark.Font="Arial, 60pt">
-    <ReportTitleBand Name="ReportTitle1" Width="1058.4" Height="94.5">
-      <TextObject Name="Text1" Width="1048.95" Height="28.35" Text="ข้อเสนองบประมาณรายจ่ายประจำปีงบประมาณ พ.ศ. [budget_summary_report.set_request_year]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
+  <ReportPage Name="ค่าใช้จ่ายดำเนินงาน" PaperWidth="320" Watermark.Font="Arial, 60pt">
+    <ReportTitleBand Name="ReportTitle1" Width="1134" Height="94.5">
+      <TextObject Name="Text1" Width="1134" Height="28.35" Text="ข้อเสนองบประมาณรายจ่ายประจำปีงบประมาณ พ.ศ. [budget_summary_report.set_request_year]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
       <TableObject Name="Table9" Left="-9450" Top="-9450" Width="1247.4" Height="85.05">
         <TableColumn Name="Column45" Width="75.6"/>
         <TableColumn Name="Column46" Width="236.25"/>
@@ -627,14 +627,14 @@
           <TableCell Name="Cell54" Border.Lines="All" Text="คำชี้แจง&#13;&#10;หน้า" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
         </TableRow>
       </TableObject>
-      <TableObject Name="Table10" Top="37.8" Width="1048.95" Height="56.7">
+      <TableObject Name="Table10" Top="37.8" Width="1134" Height="56.7">
         <TableColumn Name="Column55" Width="56.7"/>
         <TableColumn Name="Column56" Width="349.65"/>
-        <TableColumn Name="Column57" Width="132.3"/>
-        <TableColumn Name="Column58" Width="132.3"/>
-        <TableColumn Name="Column59" Width="132.3"/>
-        <TableColumn Name="Column60" Width="132.3"/>
-        <TableColumn Name="Column61" Width="113.4"/>
+        <TableColumn Name="Column57" Width="151.2"/>
+        <TableColumn Name="Column58" Width="151.2"/>
+        <TableColumn Name="Column59" Width="151.2"/>
+        <TableColumn Name="Column60" Width="151.2"/>
+        <TableColumn Name="Column61" Width="122.85"/>
         <TableRow Name="Row10" Height="56.7">
           <TableCell Name="Cell55" Border.Lines="All" Text="ลำดับ&#13;&#10;ที่" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
           <TableCell Name="Cell56" Border.Lines="All" Text="รายการงบประมาณ/กิจกรรม" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
@@ -645,32 +645,32 @@
           <TableCell Name="Cell61" Border.Lines="All" Text="รวมทั้งสิ้น&#13;&#10;(บาท)" HorzAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
         </TableRow>
       </TableObject>
-      <TableObject Name="Table11" Left="406.35" Top="66.15" Width="132.3" Height="28.35">
-        <TableColumn Name="Column62" Width="56.7"/>
+      <TableObject Name="Table11" Left="557.55" Top="66.15" Width="151.2" Height="28.35">
+        <TableColumn Name="Column62" Width="75.6"/>
         <TableColumn Name="Column63" Width="75.6"/>
         <TableRow Name="Row11" Height="28.35">
           <TableCell Name="Cell62" Border.Lines="All" Text="จำนวน" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
           <TableCell Name="Cell63" Border.Lines="All" Text="หน่วยนับ" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
         </TableRow>
       </TableObject>
-      <TableObject Name="Table12" Left="538.65" Top="66.15" Width="132.3" Height="28.35">
-        <TableColumn Name="Column64" Width="56.7"/>
+      <TableObject Name="Table12" Left="406.35" Top="66.15" Width="151.2" Height="28.35">
+        <TableColumn Name="Column64" Width="75.6"/>
         <TableColumn Name="Column65" Width="75.6"/>
         <TableRow Name="Row12" Height="28.35">
           <TableCell Name="Cell64" Border.Lines="All" Text="จำนวน" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
           <TableCell Name="Cell65" Border.Lines="All" Text="หน่วยนับ" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
         </TableRow>
       </TableObject>
-      <TableObject Name="Table13" Left="670.95" Top="66.15" Width="132.3" Height="28.35">
-        <TableColumn Name="Column66" Width="56.7"/>
+      <TableObject Name="Table13" Left="708.75" Top="66.15" Width="151.2" Height="28.35">
+        <TableColumn Name="Column66" Width="75.6"/>
         <TableColumn Name="Column67" Width="75.6"/>
         <TableRow Name="Row13" Height="28.35">
           <TableCell Name="Cell66" Border.Lines="All" Text="เงิน" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
           <TableCell Name="Cell67" Border.Lines="All" Text="บาท" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
         </TableRow>
       </TableObject>
-      <TableObject Name="Table14" Left="803.25" Top="66.15" Width="132.3" Height="28.35">
-        <TableColumn Name="Column68" Width="56.7"/>
+      <TableObject Name="Table14" Left="859.95" Top="66.15" Width="151.2" Height="28.35">
+        <TableColumn Name="Column68" Width="75.6"/>
         <TableColumn Name="Column69" Width="75.6"/>
         <TableRow Name="Row14" Height="28.35">
           <TableCell Name="Cell68" Border.Lines="All" Text="จำนวน" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
@@ -678,20 +678,20 @@
         </TableRow>
       </TableObject>
     </ReportTitleBand>
-    <DataBand Name="Data3" Top="101.06" Width="1058.4">
-      <DataBand Name="Data4" Top="107.61" Width="1058.4" Height="85.05" DataSource="group_header">
-        <TableObject Name="Table64" Width="1048.95" Height="85.05">
+    <DataBand Name="Data3" Top="101.06" Width="1134">
+      <DataBand Name="Data4" Top="107.61" Width="1134" Height="85.05" DataSource="group_header">
+        <TableObject Name="Table64" Width="1134" Height="85.05">
           <TableColumn Name="Column381" Width="56.7"/>
           <TableColumn Name="Column382" Width="349.65"/>
-          <TableColumn Name="Column383" Width="56.7"/>
+          <TableColumn Name="Column383" Width="75.6"/>
           <TableColumn Name="Column384" Width="75.6"/>
-          <TableColumn Name="Column385" Width="56.7"/>
+          <TableColumn Name="Column385" Width="75.6"/>
           <TableColumn Name="Column386" Width="75.6"/>
-          <TableColumn Name="Column387" Width="56.7"/>
+          <TableColumn Name="Column387" Width="75.6"/>
           <TableColumn Name="Column388" Width="75.6"/>
-          <TableColumn Name="Column389" Width="56.7"/>
+          <TableColumn Name="Column389" Width="75.6"/>
           <TableColumn Name="Column390" Width="75.6"/>
-          <TableColumn Name="Column391" Width="113.4"/>
+          <TableColumn Name="Column391" Width="122.85"/>
           <TableRow Name="Row64" Height="28.35">
             <TableCell Name="Cell381" Border.Lines="All" Fill.Color="DarkSeaGreen" Text="[Row#]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
             <TableCell Name="Cell382" Border.Lines="All" Fill.Color="DarkSeaGreen" Text="[budget_summary_report.group_header.list_1]" AutoShrink="FontSize" AutoShrinkMinSize="11" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
@@ -732,19 +732,19 @@
             <TableCell Name="Cell413" Border.Lines="All" Fill.Color="192, 255, 255" Text="[budget_summary_report.group_header.total_amount_2]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
           </TableRow>
         </TableObject>
-        <DataBand Name="Data37" Top="199.22" Width="1058.4" Height="28.35" DataSource="header">
-          <TableObject Name="Table65" Width="1048.95" Height="28.35">
+        <DataBand Name="Data37" Top="199.22" Width="1134" Height="28.35" DataSource="header">
+          <TableObject Name="Table65" Width="1134" Height="28.35">
             <TableColumn Name="Column392" Width="56.7"/>
             <TableColumn Name="Column393" Width="349.65"/>
-            <TableColumn Name="Column394" Width="56.7"/>
+            <TableColumn Name="Column394" Width="75.6"/>
             <TableColumn Name="Column395" Width="75.6"/>
-            <TableColumn Name="Column396" Width="56.7"/>
+            <TableColumn Name="Column396" Width="75.6"/>
             <TableColumn Name="Column397" Width="75.6"/>
-            <TableColumn Name="Column398" Width="56.7"/>
+            <TableColumn Name="Column398" Width="75.6"/>
             <TableColumn Name="Column399" Width="75.6"/>
-            <TableColumn Name="Column400" Width="56.7"/>
+            <TableColumn Name="Column400" Width="75.6"/>
             <TableColumn Name="Column401" Width="75.6"/>
-            <TableColumn Name="Column402" Width="113.4"/>
+            <TableColumn Name="Column402" Width="122.85"/>
             <TableRow Name="Row67" Height="28.35">
               <TableCell Name="Cell414" Border.Lines="All" Fill.Color="255, 224, 192" Text="[budget_summary_report.group_header.header.rowno]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
               <TableCell Name="Cell415" Border.Lines="All" Fill.Color="255, 224, 192" Text="[budget_summary_report.group_header.header.header]" AutoShrink="FontSize" AutoShrinkMinSize="11" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold" TextFill.Color="Blue"/>
@@ -759,19 +759,19 @@
               <TableCell Name="Cell424" Border.Lines="All" Fill.Color="255, 224, 192" Text="[budget_summary_report.group_header.header.budget_amount]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
             </TableRow>
           </TableObject>
-          <DataBand Name="Data38" Top="234.13" Width="1058.4" Height="28.35" DataSource="data_proposals">
-            <TableObject Name="Table66" Width="1048.95" Height="28.35">
+          <DataBand Name="Data38" Top="234.13" Width="1134" Height="28.35" DataSource="data_proposals">
+            <TableObject Name="Table66" Width="1134" Height="28.35">
               <TableColumn Name="Column403" Width="56.7"/>
               <TableColumn Name="Column404" Width="349.65"/>
-              <TableColumn Name="Column405" Width="56.7"/>
+              <TableColumn Name="Column405" Width="75.6"/>
               <TableColumn Name="Column406" Width="75.6"/>
-              <TableColumn Name="Column407" Width="56.7"/>
+              <TableColumn Name="Column407" Width="75.6"/>
               <TableColumn Name="Column408" Width="75.6"/>
-              <TableColumn Name="Column409" Width="56.7"/>
+              <TableColumn Name="Column409" Width="75.6"/>
               <TableColumn Name="Column410" Width="75.6"/>
-              <TableColumn Name="Column411" Width="56.7"/>
+              <TableColumn Name="Column411" Width="75.6"/>
               <TableColumn Name="Column412" Width="75.6"/>
-              <TableColumn Name="Column413" Width="113.4"/>
+              <TableColumn Name="Column413" Width="122.85"/>
               <TableRow Name="Row68" Height="28.35">
                 <TableCell Name="Cell425" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
                 <TableCell Name="Cell426" Border.Lines="All" Text="[budget_summary_report.group_header.header.data_proposals.list]" AutoShrink="FontSize" AutoShrinkMinSize="11" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold" TextFill.Color="Red"/>
@@ -779,26 +779,26 @@
                 <TableCell Name="Cell428" Border.Lines="All" Text="[budget_summary_report.group_header.header.data_proposals.target_group_unit]" AutoShrink="FontSize" AutoShrinkMinSize="11" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold" TextFill.Color="Red"/>
                 <TableCell Name="Cell429" Border.Lines="All" Text="[budget_summary_report.group_header.header.data_proposals.time_count]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="11" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold" TextFill.Color="Red"/>
                 <TableCell Name="Cell430" Border.Lines="All" Text="[budget_summary_report.group_header.header.data_proposals.time_unit]" AutoShrink="FontSize" AutoShrinkMinSize="11" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold" TextFill.Color="Red"/>
-                <TableCell Name="Cell431" Border.Lines="All" Text="[budget_summary_report.group_header.header.data_proposals.budget_count]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="11" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold" TextFill.Color="Red"/>
+                <TableCell Name="Cell431" Border.Lines="All" Text="[budget_summary_report.group_header.header.data_proposals.budget_count]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="10" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold" TextFill.Color="Red"/>
                 <TableCell Name="Cell432" Border.Lines="All" Text="[budget_summary_report.group_header.header.data_proposals.budget_unit]" AutoShrink="FontSize" AutoShrinkMinSize="11" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold" TextFill.Color="Red"/>
                 <TableCell Name="Cell433" Border.Lines="All" Text="[budget_summary_report.group_header.header.data_proposals.quantity]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="11" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold" TextFill.Color="Red"/>
                 <TableCell Name="Cell434" Border.Lines="All" Text="[budget_summary_report.group_header.header.data_proposals.quantity_unit]" AutoShrink="FontSize" AutoShrinkMinSize="11" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold" TextFill.Color="Red"/>
                 <TableCell Name="Cell435" Border.Lines="All" Text="[budget_summary_report.group_header.header.data_proposals.budget_amount]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold" TextFill.Color="Red"/>
               </TableRow>
             </TableObject>
-            <DataBand Name="Data39" Top="269.04" Width="1058.4" Height="28.35" DataSource="data_sub_proposals">
-              <TableObject Name="Table67" Width="1048.95" Height="28.35">
+            <DataBand Name="Data39" Top="269.04" Width="1134" Height="28.35" DataSource="data_sub_proposals">
+              <TableObject Name="Table67" Width="1134" Height="28.35">
                 <TableColumn Name="Column414" Width="56.7"/>
                 <TableColumn Name="Column415" Width="349.65"/>
-                <TableColumn Name="Column416" Width="56.7"/>
+                <TableColumn Name="Column416" Width="75.6"/>
                 <TableColumn Name="Column417" Width="75.6"/>
-                <TableColumn Name="Column418" Width="56.7"/>
+                <TableColumn Name="Column418" Width="75.6"/>
                 <TableColumn Name="Column419" Width="75.6"/>
-                <TableColumn Name="Column420" Width="56.7"/>
+                <TableColumn Name="Column420" Width="75.6"/>
                 <TableColumn Name="Column421" Width="75.6"/>
-                <TableColumn Name="Column422" Width="56.7"/>
+                <TableColumn Name="Column422" Width="75.6"/>
                 <TableColumn Name="Column423" Width="75.6"/>
-                <TableColumn Name="Column424" Width="113.4"/>
+                <TableColumn Name="Column424" Width="122.85"/>
                 <TableRow Name="Row69" Height="28.35">
                   <TableCell Name="Cell436" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
                   <TableCell Name="Cell437" Border.Lines="All" Text="[budget_summary_report.group_header.header.data_proposals.data_sub_proposals.list]" AutoShrink="FontSize" AutoShrinkMinSize="11" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
@@ -806,7 +806,7 @@
                   <TableCell Name="Cell439" Border.Lines="All" Text="[budget_summary_report.group_header.header.data_proposals.data_sub_proposals.target_group_unit]" AutoShrink="FontSize" AutoShrinkMinSize="11" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
                   <TableCell Name="Cell440" Border.Lines="All" Text="[budget_summary_report.group_header.header.data_proposals.data_sub_proposals.time_count]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="11" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
                   <TableCell Name="Cell441" Border.Lines="All" Text="[budget_summary_report.group_header.header.data_proposals.data_sub_proposals.time_unit]" AutoShrink="FontSize" AutoShrinkMinSize="11" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
-                  <TableCell Name="Cell442" Border.Lines="All" Text="[budget_summary_report.group_header.header.data_proposals.data_sub_proposals.budget_count]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="11" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
+                  <TableCell Name="Cell442" Border.Lines="All" Text="[budget_summary_report.group_header.header.data_proposals.data_sub_proposals.budget_count]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="10" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
                   <TableCell Name="Cell443" Border.Lines="All" Text="[budget_summary_report.group_header.header.data_proposals.data_sub_proposals.budget_unit]" AutoShrink="FontSize" AutoShrinkMinSize="11" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
                   <TableCell Name="Cell444" Border.Lines="All" Text="[budget_summary_report.group_header.header.data_proposals.data_sub_proposals.quantity]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="11" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
                   <TableCell Name="Cell445" Border.Lines="All" Text="[budget_summary_report.group_header.header.data_proposals.data_sub_proposals.quantity_unit]" AutoShrink="FontSize" AutoShrinkMinSize="11" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
@@ -1396,8 +1396,8 @@
                 </TableCell>
               </TableRow>
             </TableObject>
-            <DataBand Name="Data11" Top="486.39" Width="1625.4" Height="56.7" CanShrink="true" DataSource="durable_articles_detail">
-              <TableObject Name="Table68" Width="1625.4" Height="56.7">
+            <DataBand Name="Data11" Top="486.39" Width="1625.4" Height="85.05" CanShrink="true" DataSource="durable_articles_detail">
+              <TableObject Name="Table68" Width="1625.4" Height="85.05">
                 <TableColumn Name="Column425" Width="75.6"/>
                 <TableColumn Name="Column426" Width="264.6"/>
                 <TableColumn Name="Column427" Width="85.05"/>
@@ -1412,7 +1412,7 @@
                 <TableColumn Name="Column436" Width="85.05"/>
                 <TableColumn Name="Column437" Width="75.6"/>
                 <TableColumn Name="Column438" Width="189"/>
-                <TableRow Name="Row70" Height="56.7">
+                <TableRow Name="Row70" Height="85.05">
                   <TableCell Name="Cell447" Border.Lines="All" Text="[Row#]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 12pt"/>
                   <TableCell Name="Cell448" Border.Lines="All" Text="[budget_summary_report.durable_articles_1.durable_articles_2.durable_articles_3.durable_articles_4.durable_articles_detail.list]" AutoShrink="FontSize" AutoShrinkMinSize="10" VertAlign="Center" Font="TH Sarabun New, 12pt"/>
                   <TableCell Name="Cell449" Border.Lines="All" Text="[budget_summary_report.durable_articles_1.durable_articles_2.durable_articles_3.durable_articles_4.durable_articles_detail.unit]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 12pt"/>