Selaa lähdekoodia

批量插入子后项,部位,可以删除行

MaiXinRong 6 vuotta sitten
vanhempi
commit
e8aca89d80
5 muutettua tiedostoa jossa 35 lisäystä ja 2 poistoa
  1. 11 0
      Forms/BatchInsertBillsFrm.dfm
  2. 15 1
      Forms/BatchInsertBillsFrm.pas
  3. 7 0
      Forms/MainFrm.dfm
  4. 1 0
      Forms/MainFrm.pas
  5. 1 1
      Units/MCacheTree.pas

+ 11 - 0
Forms/BatchInsertBillsFrm.dfm

@@ -319,6 +319,10 @@ object BatchInsertBillsForm: TBatchInsertBillsForm
         Visible = True
       end
       item
+        Item = MainForm.dxbtnDeleteRow
+        Visible = True
+      end
+      item
         Item = MainForm.dxbtnRemapedPaste
         Visible = True
       end>
@@ -408,6 +412,7 @@ object BatchInsertBillsForm: TBatchInsertBillsForm
     Top = 139
   end
   object alBatchInsertBills: TActionList
+    Images = MainForm.Images
     Left = 203
     Top = 99
     object actnInsertCol: TAction
@@ -415,6 +420,12 @@ object BatchInsertBillsForm: TBatchInsertBillsForm
       OnExecute = actnInsertColExecute
       OnUpdate = actnInsertColUpdate
     end
+    object actnDeleteRow: TAction
+      Caption = #21024#38500
+      ImageIndex = 6
+      OnExecute = actnDeleteRowExecute
+      OnUpdate = actnDeleteRowUpdate
+    end
   end
   object dxpmBills: TdxBarPopupMenu
     BarManager = MainForm.dxBarManager

+ 15 - 1
Forms/BatchInsertBillsFrm.pas

@@ -39,6 +39,7 @@ type
     alBatchInsertBills: TActionList;
     actnInsertCol: TAction;
     dxpmBills: TdxBarPopupMenu;
+    actnDeleteRow: TAction;
     procedure zgPositionCustomPaste(Sender: TObject; ABounds: TRect;
       ASourSheet: TZjSheet);
     procedure zgBillsCustomPaste(Sender: TObject; ABounds: TRect;
@@ -58,6 +59,8 @@ type
       Shift: TShiftState; X, Y: Integer);
     procedure actnInsertColUpdate(Sender: TObject);
     procedure FormResize(Sender: TObject);
+    procedure actnDeleteRowExecute(Sender: TObject);
+    procedure actnDeleteRowUpdate(Sender: TObject);
   private
     FInsertType: TInsertType;
     FBillsCompileData: TBillsCompileData;
@@ -456,8 +459,9 @@ end;
 
 procedure TBatchInsertBillsForm.dxpmInsertBillsPopup(Sender: TObject);
 begin
-  dxpmInsertBills.ItemLinks[5].Visible := (dxpmInsertBills.Tag = 1);
+  dxpmInsertBills.ItemLinks[6].Visible := (dxpmInsertBills.Tag = 1);
   SetDxBtnAction(actnInsertCol, MainForm.dxbtnInsertCol);
+  SetDxBtnAction(actnDeleteRow, MainForm.dxbtnDeleteRow);
 end;
 
 procedure TBatchInsertBillsForm.actnInsertColExecute(Sender: TObject);
@@ -495,4 +499,14 @@ begin
   pnlBills.Height := Trunc((pnlPositon_Bills.Height - pnlOther.Height)/22*9);
 end;
 
+procedure TBatchInsertBillsForm.actnDeleteRowExecute(Sender: TObject);
+begin
+  zgPosition.DeleteRow(zgPosition.CurRow);
+end;
+
+procedure TBatchInsertBillsForm.actnDeleteRowUpdate(Sender: TObject);
+begin
+  TAction(Sender).Visible := dxpmInsertBills.Tag = 0;
+end;
+
 end.

+ 7 - 0
Forms/MainFrm.dfm

@@ -1216,6 +1216,13 @@ object MainForm: TMainForm
       Action = actnExportBillsPosExcelData
       Category = 2
     end
+    object dxbtnDeleteRow: TdxBarButton
+      Caption = #21024#38500
+      Category = 2
+      Hint = #21024#38500
+      Visible = ivAlways
+      ImageIndex = 6
+    end
   end
   object Images: TImageList
     DrawingStyle = dsTransparent

+ 1 - 0
Forms/MainFrm.pas

@@ -182,6 +182,7 @@ type
     actnExportBillsJson: TAction;
     dxbtnExportBillsPosExcelData: TdxBarButton;
     actnExportBillsPosExcelData: TAction;
+    dxbtnDeleteRow: TdxBarButton;
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
     procedure jtsProjectsChange(Sender: TObject; NewTab: Integer;

+ 1 - 1
Units/MCacheTree.pas

@@ -635,7 +635,7 @@ begin
     if AutoSort then
       NextSibling := FindNextSibling(ACode);
   end
-  else if (AName = '其他费用项目') or (AName = '建设期贷款利息') or (Pos('公路功能以外的工程费用', AName) >= 0) then
+  else if (AName = '其他费用项目') or (AName = '建设期贷款利息') or (Pos('公路功能以外的工程费用', AName) > 0) then
     Parent := TBillsCacheNode(Root)
   else
     Parent := TBillsCacheNode(FLastBlankNode);