debug: 机械台班界面调整

MainModule/UI/ScGLJGatherView.dfm

@@ -200,7 +200,7 @@ object ScFrmGLJGatherView: TScFrmGLJGatherView
                 Top = 40
                 Width = 145
                 Height = 20
-                ItemHeight = 12
+                ItemHeight = 0
                 TabOrder = 1
                 Visible = False
               end
@@ -209,7 +209,7 @@ object ScFrmGLJGatherView: TScFrmGLJGatherView
                 Top = 39
                 Width = 145
                 Height = 20
-                ItemHeight = 12
+                ItemHeight = 0
                 TabOrder = 3
                 Visible = False
               end
@@ -218,7 +218,7 @@ object ScFrmGLJGatherView: TScFrmGLJGatherView
                 Top = 40
                 Width = 145
                 Height = 20
-                ItemHeight = 12
+                ItemHeight = 0
                 TabOrder = 4
                 Visible = False
               end
@@ -451,7 +451,7 @@ object ScFrmGLJGatherView: TScFrmGLJGatherView
           Width = 145
           Height = 20
           Style = csDropDownList
-          ItemHeight = 12
+          ItemHeight = 0
           TabOrder = 3
           Visible = False
         end

MainModule/UI/ScGLJGatherView.pas

@@ -2760,6 +2760,7 @@ begin
         Col.Width := 50;
         Col.Alignment := taRightJustify;
         Inc(iLastFuelCol);
+        Inc(iFuelColCount);
       end;
     end;
     // 检查有没有多余DLRL列
@@ -2776,19 +2777,19 @@ begin
 
     // 可变费用/机械工列
     Col := sgdMachinePrice.Column(SRG);
-    Col.Title.CaptionAcrossCols := Format('%d|1', [5 + iFuelColCount]);
+    Col.Title.CaptionAcrossCols := Format('%d|1', [4 + iFuelColCount]);
     // 重油列
     Col := sgdMachinePrice.Column(SZY);
-    Col.Title.CaptionAcrossCols := Format('1|%d|1', [2 + iFuelColCount]);
+    Col.Title.CaptionAcrossCols := Format('1|%d|1', [1 + iFuelColCount]);
 
     // 最后再处理合并单元格
     // 折旧费、检修费、维护费、安拆辅助费、合计、机械工
     for I := 4 to 9 do
       zgMachinePrice.Merge(Rect(I, 1, I + 1, 3));
     // 车船税
-    zgMachinePrice.Merge(Rect(12 + iFuelColCount, 1, 13 + iFuelColCount, 3));
+    zgMachinePrice.Merge(Rect(11 + iFuelColCount, 1, 12 + iFuelColCount, 3));
     // 合计
-    zgMachinePrice.Merge(Rect(13 + iFuelColCount, 1, 14 + iFuelColCount, 3));
+    zgMachinePrice.Merge(Rect(12 + iFuelColCount, 1, 13 + iFuelColCount, 3));
 
   finally
     slstCol.Free;