From b6c12e8cdcaf1891824ebec5d772a3e4ce00bbf0 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 01 三月 2025 14:13:06 +0800
Subject: [PATCH] 销售

---
 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs |   39 ++++++++++++++++++++++++++++-----------
 1 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index aa42348..00da511 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -9,11 +9,9 @@
 using System.Windows.Forms;
 using DevExpress.XtraBars;
 using DevExpress.XtraEditors;
-using DevExpress.XtraEditors.TextEditController;
 using DevExpress.XtraGrid;
 using DevExpress.XtraGrid.Views.Grid;
 using DevExpress.XtraLayout;
-using Gs.DevApp.DevFrm.QC.Models;
 using Gs.DevApp.DevFrm.Rpt;
 using Gs.DevApp.DevFrm.Sys;
 using Gs.DevApp.Entity;
@@ -1047,10 +1045,28 @@
             Form parentForm = this.Parent as Form;
             List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
             //鏌ユ壘gridview,涓婚〉闈�
-            GridControl gcMain = parentForm.Controls.Find("gcMain", true).OfType<GridControl>().FirstOrDefault();
+            GridControl gcMain = parentForm.Controls.Find("gcMain1", true).OfType<GridControl>().FirstOrDefault();
             if (gcMain != null)
             {
                 GridView gv1 = gcMain.MainView as GridView;
+                if (gv1 != null)
+                {
+                    gvList.Add(gv1);
+                }
+            }
+            GridControl mx = parentForm.Controls.Find("gcMx1", true).OfType<GridControl>().FirstOrDefault();
+            if (mx != null)
+            {
+                GridView gv1 = mx.MainView as GridView;
+                if (gv1 != null)
+                {
+                    gvList.Add(gv1);
+                }
+            }
+            GridControl mx2 = parentForm.Controls.Find("gcMx2", true).OfType<GridControl>().FirstOrDefault();
+            if (mx2 != null)
+            {
+                GridView gv1 = mx2.MainView as GridView;
                 if (gv1 != null)
                 {
                     gvList.Add(gv1);
@@ -1066,12 +1082,7 @@
         {
             Form parentForm = this.Parent as Form;
             List<DevExpress.XtraLayout.LayoutControl> layList = new List<DevExpress.XtraLayout.LayoutControl>();
-            //DevExpress.XtraLayout.LayoutControl lay1 = parentForm.Controls.Find("lay1", true).OfType<DevExpress.XtraLayout.LayoutControl>().FirstOrDefault();
-            //if (lay1 != null)
-            //{
-            //    layList.Add(lay1);
-            //}
-            DevExpress.XtraLayout.LayoutControl lay2 = parentForm.Controls.Find("lay2", true).OfType<DevExpress.XtraLayout.LayoutControl>().FirstOrDefault();
+            DevExpress.XtraLayout.LayoutControl lay2 = parentForm.Controls.Find("layoutMx1", true).OfType<DevExpress.XtraLayout.LayoutControl>().FirstOrDefault();
             if (lay2 != null)
             {
                 layList.Add(lay2);
@@ -1087,8 +1098,8 @@
         {
             Form parentForm = this.Parent as Form;
             List<DevExpress.XtraEditors.SplitContainerControl> spcList = new List<DevExpress.XtraEditors.SplitContainerControl>();
-            DevExpress.XtraEditors.SplitContainerControl spc1 = parentForm.Controls.Find("spc1", true).OfType<DevExpress.XtraEditors.SplitContainerControl>().FirstOrDefault();
-            DevExpress.XtraEditors.SplitContainerControl spc2 = parentForm.Controls.Find("spc2", true).OfType<DevExpress.XtraEditors.SplitContainerControl>().FirstOrDefault();
+            DevExpress.XtraEditors.SplitContainerControl spc1 = parentForm.Controls.Find("split1", true).OfType<DevExpress.XtraEditors.SplitContainerControl>().FirstOrDefault();
+            DevExpress.XtraEditors.SplitContainerControl spc2 = parentForm.Controls.Find("splitMx1", true).OfType<DevExpress.XtraEditors.SplitContainerControl>().FirstOrDefault();
             if (spc1 != null)
             {
                 spcList.Add(spc1);
@@ -1162,11 +1173,17 @@
                         {
                             string controlId = john["controlId"].ToString();
                             string controlXml = john["controlXml"].ToString();
+                           // string splitterPosition = john["splitterPosition"].ToString();
                             byte[] byteArray = Encoding.UTF8.GetBytes(controlXml);
                             using (var stream = new MemoryStream(byteArray))
                             {
                                 spt.RestoreLayoutFromStream(stream);
                             }
+                            spt.Horizontal = false;
+                            spt.Panel1.AutoScroll = false;
+                            spt.Panel2.AutoScroll = false;
+                            spt.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+                            //   spt.SplitterPosition = int.Parse( splitterPosition);
                         }
                     }
                 }

--
Gitblit v1.9.3