lu
2025-02-22 363156238c2443d2759e541e65a0f1f148c654ec
调拨
已修改8个文件
334 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/XtraForm1.Designer.cs 84 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/XtraForm1.cs 149 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/showLayOut.Designer.cs 59 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/showLayOut.cs 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
@@ -558,8 +558,7 @@
                    }
                    int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
                    gridView1.FocusedRowHandle = rowHandle;
                    Form parentForm = this.FindForm();
                    UtilityHelper.SetCheckIco(gridView1, "isChk", "qt016", "qt002", picCheckBox, parentForm, _inFieldValue.ToString());
                    UtilityHelper.SetCheckIco(gridView1, "isChk", "qt016", "qt002", picCheckBox, this, _inFieldValue.ToString());
                }
            }
            catch (Exception ex)
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
@@ -655,8 +655,7 @@
                    }
                    int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
                    gridView1.FocusedRowHandle = rowHandle;
                    Form parentForm = this.FindForm();
                    UtilityHelper.SetCheckIco(gridView1, "isSh", "qt016", "qt002", picCheckBox, parentForm, _inFieldValue.ToString());
                    UtilityHelper.SetCheckIco(gridView1, "isSh", "qt016", "qt002", picCheckBox, this, _inFieldValue.ToString());
                }
            }
            catch (Exception ex)
DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs
@@ -1,6 +1,3 @@
using DevExpress.RichEdit.Export;
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraGrid.Views.Grid.ViewInfo;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
@@ -301,9 +301,14 @@
                ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                if (_rtn.rtnCode > 0)
                {
                    lbGuid.Text = _rtn.rtnData;
                    lbGuid.Text = _rtn.rtnData.outGuid;
                    txt_billno.Text = _rtn.rtnData.outNo;
                    toolBarMenu1.isSetBtn = true;
                    UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
                    //List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                    //gvList.Add(gvMx1);
                    //UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gvList);
                    //ucLookHuoZhu1.Enabled = false;
                    toolBarMenu1.currentAction = "";
                }
            }
            catch (Exception ex)
@@ -466,12 +471,15 @@
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
                if (_rtn.rtnCode > 0)
                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                {
                    if (xtraTabControl1.SelectedTabPageIndex == 1)
                    {
                        getModel(lbGuid.Text.Trim());
                    else
                        getPageList(this.pageBar1.CurrentPage);
                    }
                    int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
                    gridView1.FocusedRowHandle = rowHandle;
                    UtilityHelper.SetCheckIco(gridView1, "shState", "shBy", "shDate", picCheckBox, this, _inFieldValue.ToString());
                }
            }
            catch (Exception ex)
DevApp/Gs.DevApp/DevFrm/XtraForm1.Designer.cs
@@ -32,21 +32,27 @@
            this.dockManager1 = new DevExpress.XtraBars.Docking.DockManager(this.components);
            this.dockPanel6 = new DevExpress.XtraBars.Docking.DockPanel();
            this.dockPanel6_Container = new DevExpress.XtraBars.Docking.ControlContainer();
            this.dockPanel1 = new DevExpress.XtraBars.Docking.DockPanel();
            this.dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer();
            this.panTuo = new DevExpress.XtraEditors.PanelControl();
            this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
            this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
            this.panelControl2 = new DevExpress.XtraEditors.PanelControl();
            this.textEdit2 = new DevExpress.XtraEditors.TextEdit();
            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
            this.lbMsg = new DevExpress.XtraEditors.LabelControl();
            this.dockPanel1 = new DevExpress.XtraBars.Docking.DockPanel();
            this.dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer();
            ((System.ComponentModel.ISupportInitialize)(this.dockManager1)).BeginInit();
            this.dockPanel6.SuspendLayout();
            this.dockPanel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.panTuo)).BeginInit();
            this.panTuo.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
            this.panelControl1.SuspendLayout();
            this.dockPanel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit();
            this.panelControl2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).BeginInit();
            this.SuspendLayout();
            // 
            // dockManager1
@@ -90,11 +96,29 @@
            this.dockPanel6_Container.Size = new System.Drawing.Size(190, 164);
            this.dockPanel6_Container.TabIndex = 0;
            // 
            // dockPanel1
            //
            this.dockPanel1.Controls.Add(this.dockPanel1_Container);
            this.dockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right;
            this.dockPanel1.ID = new System.Guid("8abce80a-c8c2-4696-95f4-0ce4b3b63096");
            this.dockPanel1.Location = new System.Drawing.Point(677, 0);
            this.dockPanel1.Name = "dockPanel1";
            this.dockPanel1.OriginalSize = new System.Drawing.Size(237, 200);
            this.dockPanel1.Size = new System.Drawing.Size(237, 553);
            this.dockPanel1.Text = "dockPanel1";
            //
            // dockPanel1_Container
            //
            this.dockPanel1_Container.Location = new System.Drawing.Point(6, 32);
            this.dockPanel1_Container.Name = "dockPanel1_Container";
            this.dockPanel1_Container.Size = new System.Drawing.Size(227, 517);
            this.dockPanel1_Container.TabIndex = 0;
            //
            // panTuo
            // 
            this.panTuo.Controls.Add(this.textEdit1);
            this.panTuo.Controls.Add(this.labelControl1);
            this.panTuo.Location = new System.Drawing.Point(74, 52);
            this.panTuo.Location = new System.Drawing.Point(56, 18);
            this.panTuo.Name = "panTuo";
            this.panTuo.Size = new System.Drawing.Size(276, 100);
            this.panTuo.TabIndex = 0;
@@ -116,11 +140,36 @@
            // 
            // panelControl1
            // 
            this.panelControl1.Controls.Add(this.panelControl2);
            this.panelControl1.Controls.Add(this.panTuo);
            this.panelControl1.Location = new System.Drawing.Point(46, 69);
            this.panelControl1.Name = "panelControl1";
            this.panelControl1.Size = new System.Drawing.Size(482, 310);
            this.panelControl1.TabIndex = 4;
            //
            // panelControl2
            //
            this.panelControl2.Controls.Add(this.textEdit2);
            this.panelControl2.Controls.Add(this.labelControl2);
            this.panelControl2.Location = new System.Drawing.Point(56, 159);
            this.panelControl2.Name = "panelControl2";
            this.panelControl2.Size = new System.Drawing.Size(276, 100);
            this.panelControl2.TabIndex = 1;
            //
            // textEdit2
            //
            this.textEdit2.Location = new System.Drawing.Point(108, 26);
            this.textEdit2.Name = "textEdit2";
            this.textEdit2.Size = new System.Drawing.Size(125, 24);
            this.textEdit2.TabIndex = 1;
            //
            // labelControl2
            //
            this.labelControl2.Location = new System.Drawing.Point(20, 34);
            this.labelControl2.Name = "labelControl2";
            this.labelControl2.Size = new System.Drawing.Size(81, 18);
            this.labelControl2.TabIndex = 0;
            this.labelControl2.Text = "labelControl2";
            // 
            // lbMsg
            // 
@@ -129,24 +178,6 @@
            this.lbMsg.Size = new System.Drawing.Size(81, 18);
            this.lbMsg.TabIndex = 5;
            this.lbMsg.Text = "labelControl2";
            //
            // dockPanel1
            //
            this.dockPanel1.Controls.Add(this.dockPanel1_Container);
            this.dockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right;
            this.dockPanel1.ID = new System.Guid("8abce80a-c8c2-4696-95f4-0ce4b3b63096");
            this.dockPanel1.Location = new System.Drawing.Point(714, 0);
            this.dockPanel1.Name = "dockPanel1";
            this.dockPanel1.OriginalSize = new System.Drawing.Size(200, 200);
            this.dockPanel1.Size = new System.Drawing.Size(200, 553);
            this.dockPanel1.Text = "dockPanel1";
            //
            // dockPanel1_Container
            //
            this.dockPanel1_Container.Location = new System.Drawing.Point(6, 32);
            this.dockPanel1_Container.Name = "dockPanel1_Container";
            this.dockPanel1_Container.Size = new System.Drawing.Size(190, 517);
            this.dockPanel1_Container.TabIndex = 0;
            // 
            // XtraForm1
            // 
@@ -160,13 +191,17 @@
            this.Text = "XtraForm1";
            ((System.ComponentModel.ISupportInitialize)(this.dockManager1)).EndInit();
            this.dockPanel6.ResumeLayout(false);
            this.dockPanel1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.panTuo)).EndInit();
            this.panTuo.ResumeLayout(false);
            this.panTuo.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
            this.panelControl1.ResumeLayout(false);
            this.dockPanel1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).EndInit();
            this.panelControl2.ResumeLayout(false);
            this.panelControl2.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).EndInit();
            this.ResumeLayout(false);
            this.PerformLayout();
@@ -183,5 +218,8 @@
        private DevExpress.XtraEditors.LabelControl lbMsg;
        private DevExpress.XtraBars.Docking.DockPanel dockPanel1;
        private DevExpress.XtraBars.Docking.ControlContainer dockPanel1_Container;
        private DevExpress.XtraEditors.PanelControl panelControl2;
        private DevExpress.XtraEditors.TextEdit textEdit2;
        private DevExpress.XtraEditors.LabelControl labelControl2;
    }
}
DevApp/Gs.DevApp/DevFrm/XtraForm1.cs
@@ -14,11 +14,10 @@
{
    public partial class XtraForm1 : DevExpress.XtraEditors.XtraForm
    {
        private bool isDragging = false;
        private Point dragCursorPoint;
        private Point dragPanelPoint;
        private Control dragSourceContainer;
        public XtraForm1()
        {
            InitializeComponent();
@@ -27,19 +26,40 @@
            this.Size = new Size(800, 600);
            // 添加鼠标事件处理程序
            panTuo.MouseDown += new MouseEventHandler(DraggablePanel_MouseDown);
            panTuo.MouseMove += new MouseEventHandler(DraggablePanel_MouseMove);
            panTuo.MouseUp += new MouseEventHandler(DraggablePanel_MouseUp);
            // 遍历 parentPanel 中的所有子控件
            foreach (Control control in panelControl1.Controls)
            {
                // 检查当前控件是否是一个 Panel
                if (control is PanelControl panel)
                {
                    // 在这里对子 Panel 执行操作
                    // 例如,打印出子 Panel 的名字(如果有设置 Name 属性)
                    Console.WriteLine(panel.Name ?? "无名Panel");
                    // 或者你可以调用其他方法,传递这个 panel 作为参数
                    // SomeMethod(panel);
                    control.MouseDown += new MouseEventHandler(DraggablePanel_MouseDown);
                    control.MouseMove += new MouseEventHandler(DraggablePanel_MouseMove);
                    control.MouseUp += new MouseEventHandler(DraggablePanel_MouseUp);
                }
            }
        }
        private void DraggablePanel_MouseDown(object sender, MouseEventArgs e)
        {
            if (e.Button == MouseButtons.Left)
            {
                // 从事件参数 DragEventArgs 中获取被拖动的元素
                PanelControl _soucePanel = (PanelControl)sender;
                isDragging = true;
                dragCursorPoint = Cursor.Position;
                dragPanelPoint = panTuo.Location;
                panTuo.Cursor = Cursors.SizeAll;
                dragPanelPoint = _soucePanel.Location;
                _soucePanel.Cursor = Cursors.SizeAll;
                dragSourceContainer = _soucePanel.Parent;
            }
        }
@@ -47,43 +67,85 @@
        {
            if (isDragging)
            {
                panTuo.Location = new Point(
                    dragPanelPoint.X + Cursor.Position.X - dragCursorPoint.X,
                    dragPanelPoint.Y + Cursor.Position.Y - dragCursorPoint.Y);
                Point newLocation = panTuo.Location;
                Rectangle bounds = panelControl1.Bounds;
                lbMsg.Text = panTuo.Location.ToString() + "-" + bounds.ToString();
                if (IsOutsideBounds(panTuo, panelControl1))
                PanelControl _soucePanel = (PanelControl)sender;
                string _mmm = dragSourceContainer.Name.ToString();
                if (_mmm == "panelControl1")
                {
                    lbMsg.Text = "超了";
                     panelControl1.Controls.Remove(panTuo);
                    dockPanel1.Controls.Add(panTuo);
                    panTuo.Location = new Point(
                       Math.Max(0, Math.Min(dockPanel1.Width - panTuo.Width, newLocation.X - dockPanel1.Location.X)),
                       Math.Max(0, Math.Min(dockPanel1.Height - panTuo.Height, newLocation.Y - dockPanel1.Location.Y)));
                    _soucePanel.Location = new Point(
                       dragPanelPoint.X + Cursor.Position.X - dragCursorPoint.X,
                       dragPanelPoint.Y + Cursor.Position.Y - dragCursorPoint.Y);
                    Point newLocation = _soucePanel.Location;
                    Rectangle bounds = panelControl1.Bounds;
                    if (IsOutsideBounds(_soucePanel, panelControl1))
                    {
                        lbMsg.Text = _soucePanel.Location.ToString() + "-" + bounds.ToString() + ":pp" + _mmm;
                        panelControl1.Controls.Remove(_soucePanel);
                        dockPanel1.Controls.Add(_soucePanel);
                         RefreshControls();
                        _soucePanel.Location = new Point(
                           Math.Max(0, Math.Min(dockPanel1.Width - _soucePanel.Width, newLocation.X - dockPanel1.Location.X)),
                           Math.Max(0, Math.Min(dockPanel1.Height - _soucePanel.Height, newLocation.Y - dockPanel1.Location.Y)));
                    }
                    else
                    {
                        lbMsg.Text = _soucePanel.Location.ToString() + "-" + bounds.ToString() + ":pp" + _mmm;
                    }
                    return;
                }
                else
                if (_mmm == "dockPanel1_Container")
                {
                    lbMsg.Text = panTuo.Location.ToString() + "-" + bounds.ToString();
                    _soucePanel.Location = new Point(
                       dragPanelPoint.X + Cursor.Position.X - dragCursorPoint.X,
                       dragPanelPoint.Y + Cursor.Position.Y - dragCursorPoint.Y);
                    Point newLocation = _soucePanel.Location;
                    Rectangle bounds = dockPanel1.Bounds;
                    if (IsOutsideBounds(_soucePanel, dockPanel1))
                    {
                        lbMsg.Text = _soucePanel.Location.ToString() + "-" + bounds.ToString() + ":pp" + _mmm;
                        dockPanel1.Controls.Remove(_soucePanel);
                        panelControl1.Controls.Add(_soucePanel);
                        RefreshControls();
                        _soucePanel.Location = new Point(
                           Math.Max(0, Math.Min(panelControl1.Width - _soucePanel.Width, newLocation.X - panelControl1.Location.X)),
                           Math.Max(0, Math.Min(panelControl1.Height - _soucePanel.Height, newLocation.Y - panelControl1.Location.Y)));
                    }
                    else
                    {
                        lbMsg.Text = _soucePanel.Location.ToString() + "-" + bounds.ToString() + ":pp" + _mmm;
                    }
                    return;
                }
            }
        }
        public static bool IsOutsideBounds(Control child, Control parent)
        public static bool IsOutsideBounds(Control childControl, Control parentControl)
        {
            // 获取控件相对于其父容器的位置和大小
            Rectangle childBounds = new Rectangle(child.Location, child.Size);
            Rectangle parentBounds = new Rectangle(Point.Empty, parent.ClientSize); // 使用ClientSize获取容器的工作区大小
            int _w = childControl.Width / 2;
            int _h = childControl.Height / 2;
            // 获取父控件的客户区矩形(相对于父控件自己)
            Rectangle parentClientRect = parentControl.ClientRectangle;
            // 注意:这里我们假设child是parent的直接子控件,因此child.Location是相对于parent的。
            // 如果child不是parent的直接子控件,你需要先找到child相对于parent的相对位置。
            // 获取子控件相对于父控件的位置和尺寸
            Rectangle childRectRelativeToParent = childControl.Bounds;
            // 检查childBounds是否超出了parentBounds的任何一个边界
            return !parentBounds.Contains(childBounds);
            // 检查子控件的左边界是否超出了父控件的左边界
            if (childRectRelativeToParent.Left < parentClientRect.Left - _w)
                return true;
            // 检查子控件的右边界是否超出了父控件的右边界
            if (childRectRelativeToParent.Right > parentClientRect.Right + _w)
                return true;
            // 检查子控件的顶边界是否超出了父控件的顶边界
            if (childRectRelativeToParent.Top < parentClientRect.Top - _h)
                return true;
            // 检查子控件的底边界是否超出了父控件的底边界
            if (childRectRelativeToParent.Bottom > parentClientRect.Bottom + _h)
                return true;
            // 如果子控件的所有边界都在父控件的边界内,则返回false
            return false;
        }
        private void DraggablePanel_MouseUp(object sender, MouseEventArgs e)
@@ -91,10 +153,25 @@
            if (e.Button == MouseButtons.Left)
            {
                isDragging = false;
                dragSourceContainer = panTuo.Parent;
            }
        }
        /// <summary>
        /// 对控件中的项进行排列
        /// </summary>
        private void RefreshControls()
        {
            int y = 0;
            foreach (PanelControl btn in dockPanel1_Container.Controls)
            {
                btn.Left = 0;
                btn.Top = y;
                y += btn.Height + 15;
            }
        }
    }
}
DevApp/Gs.DevApp/UserControl/showLayOut.Designer.cs
@@ -30,11 +30,10 @@
        {
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(showLayOut));
            this.panel1 = new System.Windows.Forms.Panel();
            this.btnHf = new DevExpress.XtraEditors.SimpleButton();
            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
            this.txt_layOut = new DevExpress.XtraEditors.ComboBoxEdit();
            this.btnCancel = new DevExpress.XtraEditors.SimpleButton();
            this.btnSave = new DevExpress.XtraEditors.SimpleButton();
            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
            this.panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_layOut.Properties)).BeginInit();
            this.SuspendLayout();
@@ -42,30 +41,23 @@
            // panel1
            // 
            this.panel1.BackColor = System.Drawing.Color.White;
            this.panel1.Controls.Add(this.labelControl1);
            this.panel1.Controls.Add(this.btnHf);
            this.panel1.Controls.Add(this.txt_layOut);
            this.panel1.Controls.Add(this.btnCancel);
            this.panel1.Controls.Add(this.btnSave);
            this.panel1.Controls.Add(this.labelControl1);
            this.panel1.Controls.Add(this.txt_layOut);
            this.panel1.Font = new System.Drawing.Font("Tahoma", 12F);
            this.panel1.Location = new System.Drawing.Point(11, 12);
            this.panel1.Name = "panel1";
            this.panel1.Size = new System.Drawing.Size(360, 215);
            this.panel1.TabIndex = 2;
            // 
            // btnHf
            // labelControl1
            // 
            this.btnHf.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.btnHf.Appearance.Options.UseFont = true;
            this.btnHf.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
            this.btnHf.Cursor = System.Windows.Forms.Cursors.Hand;
            this.btnHf.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.convert_16x161;
            this.btnHf.Location = new System.Drawing.Point(140, 110);
            this.btnHf.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.btnHf.Name = "btnHf";
            this.btnHf.Size = new System.Drawing.Size(69, 37);
            this.btnHf.TabIndex = 241;
            this.btnHf.Text = "清空";
            this.labelControl1.Location = new System.Drawing.Point(53, 55);
            this.labelControl1.Name = "labelControl1";
            this.labelControl1.Size = new System.Drawing.Size(90, 18);
            this.labelControl1.TabIndex = 242;
            this.labelControl1.Text = "请选择范围:";
            // 
            // txt_layOut
            // 
@@ -76,8 +68,10 @@
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.txt_layOut.Properties.Items.AddRange(new object[] {
            "-请选择-",
            "标准版",
            "个人版"});
            "保存为标准版",
            "保存为个人版",
            "清空标准版",
            "清空个人版"});
            this.txt_layOut.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.txt_layOut.Size = new System.Drawing.Size(149, 24);
            this.txt_layOut.TabIndex = 239;
@@ -89,12 +83,12 @@
            this.btnCancel.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
            this.btnCancel.Cursor = System.Windows.Forms.Cursors.Hand;
            this.btnCancel.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnCancel.ImageOptions.Image")));
            this.btnCancel.Location = new System.Drawing.Point(228, 110);
            this.btnCancel.Location = new System.Drawing.Point(205, 143);
            this.btnCancel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.btnCancel.Name = "btnCancel";
            this.btnCancel.Size = new System.Drawing.Size(69, 37);
            this.btnCancel.TabIndex = 238;
            this.btnCancel.Text = "取消";
            this.btnCancel.Size = new System.Drawing.Size(87, 37);
            this.btnCancel.TabIndex = 244;
            this.btnCancel.Text = "取消 (&C)";
            // 
            // btnSave
            // 
@@ -103,20 +97,12 @@
            this.btnSave.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
            this.btnSave.Cursor = System.Windows.Forms.Cursors.Hand;
            this.btnSave.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnSave.ImageOptions.Image")));
            this.btnSave.Location = new System.Drawing.Point(53, 110);
            this.btnSave.Location = new System.Drawing.Point(53, 143);
            this.btnSave.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.btnSave.Name = "btnSave";
            this.btnSave.Size = new System.Drawing.Size(69, 37);
            this.btnSave.TabIndex = 237;
            this.btnSave.Text = "保存";
            //
            // labelControl1
            //
            this.labelControl1.Location = new System.Drawing.Point(53, 55);
            this.labelControl1.Name = "labelControl1";
            this.labelControl1.Size = new System.Drawing.Size(90, 18);
            this.labelControl1.TabIndex = 242;
            this.labelControl1.Text = "请选择范围:";
            this.btnSave.Size = new System.Drawing.Size(87, 37);
            this.btnSave.TabIndex = 243;
            this.btnSave.Text = "确定 (&L)";
            // 
            // showLayOut
            // 
@@ -141,9 +127,8 @@
        private System.Windows.Forms.Panel panel1;
        private DevExpress.XtraEditors.ComboBoxEdit txt_layOut;
        private DevExpress.XtraEditors.LabelControl labelControl1;
        private DevExpress.XtraEditors.SimpleButton btnCancel;
        private DevExpress.XtraEditors.SimpleButton btnSave;
        private DevExpress.XtraEditors.SimpleButton btnHf;
        private DevExpress.XtraEditors.LabelControl labelControl1;
    }
}
DevApp/Gs.DevApp/UserControl/showLayOut.cs
@@ -19,17 +19,11 @@
            InitializeComponent();
            this.btnCancel.Click += BtnCancel_Click;
            this.btnSave.Click += BtnSave_Click;
            this.btnHf.Click += BtnHf_Click;
        }
        private void BtnHf_Click(object sender, EventArgs e)
        {
            _setLyout(0);
        }
        private void BtnSave_Click(object sender, EventArgs e)
        {
            _setLyout(1);
            _setLyout();
        }
        private void BtnCancel_Click(object sender, EventArgs e)
@@ -38,7 +32,7 @@
        }
        private void _setLyout(int type)
        private void _setLyout()
        {
            //  --col1,100,101,102,103,104,105,1,title&col2,100,101,102,103,104,105,1,title
            if (txt_layOut.SelectedIndex <= 0)
@@ -87,10 +81,9 @@
            }
            var _obj = new
            {
                applyUserGuid = txt_layOut.SelectedIndex,
                layoutLst = sb.ToString(),
                formPath = formNamespace,
                intType = type
                intType = txt_layOut.SelectedIndex,
            };
            try
            {