From a26334784d67f86c3616de32af05d20583748d92 Mon Sep 17 00:00:00 2001
From: "DESKTOP-E401PHE\\Administrator" <rightsoft@163.com>
Date: Wed, 15 Oct 2025 15:54:17 +0800
Subject: [PATCH] ~

---
 基础资料维护(BaseInfo.dll)/U_MLXXList.dfm     |  7 +++-
 基础资料维护(BaseInfo.dll)/U_MLXXList.pas     |  3 +-
 基础资料维护(BaseInfo.dll)/U_MLXXListSel.dfm  |  8 +++-
 基础资料维护(BaseInfo.dll)/U_MLXXListSel.pas  |  1 +
 基础资料维护(BaseInfo.dll)/U_MLXXinput.dfm    |  6 +++
 基础资料维护(BaseInfo.dll)/U_MLXXinput.pas    |  3 +-
 .../U_ZdyAttInputCP_CB.dfm                    |  9 ++++-
 .../U_ZdyAttInputCP_CB.pas                    | 37 +++++++++++++++++++
 8 files changed, 69 insertions(+), 5 deletions(-)

diff --git a/基础资料维护(BaseInfo.dll)/U_MLXXList.dfm b/基础资料维护(BaseInfo.dll)/U_MLXXList.dfm
index 8214f9f..be512a1 100644
--- a/基础资料维护(BaseInfo.dll)/U_MLXXList.dfm
+++ b/基础资料维护(BaseInfo.dll)/U_MLXXList.dfm
@@ -209,7 +209,7 @@ object frmMLXXList: TfrmMLXXList
         Width = 94
       end
       object v2Column6: TcxGridDBColumn
-        Caption = #36741#26009#21517#31216
+        Caption = #38754#36741#26009#21517#31216' '
         DataBinding.FieldName = 'MLName'
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
@@ -359,6 +359,11 @@ object frmMLXXList: TfrmMLXXList
         HeaderAlignmentHorz = taCenter
         Width = 60
       end
+      object Tv2Column8: TcxGridDBColumn
+        Caption = #33394#21495
+        DataBinding.FieldName = 'MLSH'
+        Width = 60
+      end
     end
     object cxGridLevel1: TcxGridLevel
       GridView = Tv2
diff --git a/基础资料维护(BaseInfo.dll)/U_MLXXList.pas b/基础资料维护(BaseInfo.dll)/U_MLXXList.pas
index bc7a086..e6776e4 100644
--- a/基础资料维护(BaseInfo.dll)/U_MLXXList.pas
+++ b/基础资料维护(BaseInfo.dll)/U_MLXXList.pas
@@ -32,7 +32,7 @@ type
   FdDy = record
     inc: integer; //¿Í»§¶ËÌ×½Ó×Ö¾ä±ú
     FDdys: string[32]; //¿Í»§¶ËÌ×½Ó×Ö
-    FdDysName: string[32]; //¿Í»§¶ËÌ×½Ó×Ö
+    FdDysName: string[32]; //¿Í»§¶ËÌ×½Ó×Ö                  
   end;
 
   TfrmMLXXList = class(TForm)
@@ -84,6 +84,7 @@ type
     Tv2Column5: TcxGridDBColumn;
     Tv2Column6: TcxGridDBColumn;
     Tv2Column7: TcxGridDBColumn;
+    Tv2Column8: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
diff --git a/基础资料维护(BaseInfo.dll)/U_MLXXListSel.dfm b/基础资料维护(BaseInfo.dll)/U_MLXXListSel.dfm
index 1392afc..f8ca42a 100644
--- a/基础资料维护(BaseInfo.dll)/U_MLXXListSel.dfm
+++ b/基础资料维护(BaseInfo.dll)/U_MLXXListSel.dfm
@@ -222,7 +222,7 @@ object frmMLXXListSel: TfrmMLXXListSel
         Width = 94
       end
       object v2Column6: TcxGridDBColumn
-        Caption = #36741#26009#21517#31216
+        Caption = #38754#36741#26009#21517#31216' '
         DataBinding.FieldName = 'MLName'
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
@@ -380,6 +380,12 @@ object frmMLXXListSel: TfrmMLXXListSel
         Properties.NullStyle = nssUnchecked
         Width = 60
       end
+      object Tv2Column9: TcxGridDBColumn
+        Caption = #33394#21495
+        DataBinding.FieldName = 'MLSH'
+        HeaderAlignmentHorz = taCenter
+        Width = 60
+      end
     end
     object cxGridLevel1: TcxGridLevel
       GridView = Tv2
diff --git a/基础资料维护(BaseInfo.dll)/U_MLXXListSel.pas b/基础资料维护(BaseInfo.dll)/U_MLXXListSel.pas
index 21fc0f9..4e66a53 100644
--- a/基础资料维护(BaseInfo.dll)/U_MLXXListSel.pas
+++ b/基础资料维护(BaseInfo.dll)/U_MLXXListSel.pas
@@ -86,6 +86,7 @@ type
     Tv2Column7: TcxGridDBColumn;
     cxGridLevel1: TcxGridLevel;
     Tv2Column8: TcxGridDBColumn;
+    Tv2Column9: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
diff --git a/基础资料维护(BaseInfo.dll)/U_MLXXinput.dfm b/基础资料维护(BaseInfo.dll)/U_MLXXinput.dfm
index bae192a..6f61317 100644
--- a/基础资料维护(BaseInfo.dll)/U_MLXXinput.dfm
+++ b/基础资料维护(BaseInfo.dll)/U_MLXXinput.dfm
@@ -178,6 +178,12 @@ object frmMLXXinput: TfrmMLXXinput
         HeaderAlignmentHorz = taCenter
         Width = 60
       end
+      object Tv1Column9: TcxGridDBColumn
+        Caption = #33394#21495
+        DataBinding.FieldName = 'MLSH'
+        HeaderAlignmentHorz = taCenter
+        Width = 60
+      end
     end
     object cxGridLevel1: TcxGridLevel
       GridView = Tv1
diff --git a/基础资料维护(BaseInfo.dll)/U_MLXXinput.pas b/基础资料维护(BaseInfo.dll)/U_MLXXinput.pas
index 2bdf716..cb31493 100644
--- a/基础资料维护(BaseInfo.dll)/U_MLXXinput.pas
+++ b/基础资料维护(BaseInfo.dll)/U_MLXXinput.pas
@@ -60,6 +60,7 @@ type
     ToolButton4: TToolButton;
     OpenDialog1: TOpenDialog;
     CDS_LM: TClientDataSet;
+    Tv1Column9: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
@@ -499,7 +500,7 @@ begin
   except
     WorkBook.Close;
     excelApp.Quit;
-    excelApp := Unassigned;
+    excelApp := Unassigned;                
     WorkBook := Unassigned;
     exit;
   end;
diff --git a/基础资料维护(BaseInfo.dll)/U_ZdyAttInputCP_CB.dfm b/基础资料维护(BaseInfo.dll)/U_ZdyAttInputCP_CB.dfm
index a252080..5fa7258 100644
--- a/基础资料维护(BaseInfo.dll)/U_ZdyAttInputCP_CB.dfm
+++ b/基础资料维护(BaseInfo.dll)/U_ZdyAttInputCP_CB.dfm
@@ -547,6 +547,13 @@ object frmZdyAttInputCP_CB: TfrmZdyAttInputCP_CB
             object V1Column1: TcxGridDBColumn
               Caption = #38754#36741#26009#21517#31216
               DataBinding.FieldName = 'defstr1'
+              PropertiesClassName = 'TcxButtonEditProperties'
+              Properties.Buttons = <
+                item
+                  Default = True
+                  Kind = bkEllipsis
+                end>
+              Properties.OnButtonClick = V1Column1PropertiesButtonClick
               HeaderAlignmentHorz = taCenter
               Width = 100
             end
@@ -1142,7 +1149,7 @@ object frmZdyAttInputCP_CB: TfrmZdyAttInputCP_CB
     Aggregates = <>
     Params = <>
     Left = 212
-    Top = 347
+    Top = 387
   end
   object CDS3: TClientDataSet
     Aggregates = <>
diff --git a/基础资料维护(BaseInfo.dll)/U_ZdyAttInputCP_CB.pas b/基础资料维护(BaseInfo.dll)/U_ZdyAttInputCP_CB.pas
index 585defd..5eda454 100644
--- a/基础资料维护(BaseInfo.dll)/U_ZdyAttInputCP_CB.pas
+++ b/基础资料维护(BaseInfo.dll)/U_ZdyAttInputCP_CB.pas
@@ -193,6 +193,7 @@ type
     procedure CYColorBtnClick(Sender: TObject);
     procedure ToolButton13Click(Sender: TObject);
     procedure ToolButton14Click(Sender: TObject);
+    procedure V1Column1PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
   private
     function savedata(): Boolean;
     function savedatacb(): Boolean;
@@ -1438,5 +1439,41 @@ begin
   jscb();
 end;
 
+procedure TfrmZdyAttInputCP_CB.V1Column1PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
+begin
+  frmMLXXListSel := TfrmMLXXListSel.create(self);
+  with frmMLXXListSel do
+  begin
+    if showmodal = 1 then
+    begin
+      with CDS_HZ do
+      begin                                   
+        DisableControls;
+//        First;
+//        while not eof do
+//        begin                                                  
+          if Fieldbyname('ssel').AsBoolean then
+          begin
+            cds1.edit;
+            cds1.FieldByName('DEFstr1').Value := trim(CDS_HZ.fieldbyname('MLName').AsString);
+            cds1.FieldByName('CBColor').Value := trim(CDS_HZ.fieldbyname('Color').AsString);
+            cds1.FieldByName('defstr4').Value := trim(CDS_HZ.fieldbyname('GYS').AsString);
+            cds1.FieldByName('defstr2').Value := trim(CDS_HZ.fieldbyname('Adultamount').AsString);
+            cds1.FieldByName('defstr3').Value := trim(CDS_HZ.fieldbyname('childamount').AsString);
+            cds1.FieldByName('CBdj').Value := trim(CDS_HZ.fieldbyname('Price').AsString);
+            cds1.post;
+          end;
+
+//          next;
+//        end;
+        EnableControls;
+      end;
+
+      tv1.Controller.EditingController.ShowEdit();
+      free;
+    end;
+  end;
+end;
+
 end.