dev前台代码
上一版本: 5b419c5a | 补丁 | 提交 | 忽略空白
lu
2025-02-28 3e2c9c862ebc0cd1c99947fb031dc2efdf7980a0 
布局
已修改5个文件
367 ■■■■■ 文件已修改
DevApp/Gs.DevApp/App.config 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs 236 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs 65 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 DevApp/Gs.DevApp/App.config


@@ -28,8 +28,8 @@


        </assemblyBinding>


    </runtime>


    <appSettings>


         <add key="WebApiUrl" value="http://localhost:5263/" />


        <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />--> 


         <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->


        <add key="WebApiUrl" value="http://192.168.1.145:81/" /> 


        <add key="LogPath" value="logs" />


        <add key="ProductName" value="广深科技 G-MES V2.0" />


        <add key="PageSize" value="50" />




 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs


@@ -45,8 +45,8 @@


            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();


            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();


            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();


            this.spc1 = new DevExpress.XtraEditors.SplitContainerControl();


            this.gcMain = new DevExpress.XtraGrid.GridControl();


            this.split1 = new DevExpress.XtraEditors.SplitContainerControl();


            this.gcMain1 = new DevExpress.XtraGrid.GridControl();


            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();


            this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();


@@ -65,8 +65,8 @@


            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.pageBar1 = new UserControls.Data.UcPageBar();


            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();


            this.spc2 = new DevExpress.XtraEditors.SplitContainerControl();


            this.lay2 = new DevExpress.XtraLayout.LayoutControl();


            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();


            this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();


            this.txt_fCustomerIDTxt = new DevExpress.XtraEditors.TextEdit();


            this.lbGuid = new System.Windows.Forms.Label();


            this.txt_salesId = new Gs.DevApp.UserControl.UcLookSales();


@@ -149,22 +149,22 @@


            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();


            this.xtraTabControl1.SuspendLayout();


            this.xtraTabPage1.SuspendLayout();


            ((System.ComponentModel.ISupportInitialize)(this.spc1)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.spc1.Panel1)).BeginInit();


            this.spc1.Panel1.SuspendLayout();


            ((System.ComponentModel.ISupportInitialize)(this.spc1.Panel2)).BeginInit();


            this.spc1.SuspendLayout();


            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();


            this.split1.Panel1.SuspendLayout();


            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();


            this.split1.SuspendLayout();


            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();


            this.xtraTabPage2.SuspendLayout();


            ((System.ComponentModel.ISupportInitialize)(this.spc2)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.spc2.Panel1)).BeginInit();


            this.spc2.Panel1.SuspendLayout();


            ((System.ComponentModel.ISupportInitialize)(this.spc2.Panel2)).BeginInit();


            this.spc2.Panel2.SuspendLayout();


            this.spc2.SuspendLayout();


            ((System.ComponentModel.ISupportInitialize)(this.lay2)).BeginInit();


            this.lay2.SuspendLayout();


            ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();


            this.splitMx1.Panel1.SuspendLayout();


            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit();


            this.splitMx1.Panel2.SuspendLayout();


            this.splitMx1.SuspendLayout();


            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();


            this.layoutMx1.SuspendLayout();


            ((System.ComponentModel.ISupportInitialize)(this.txt_fCustomerIDTxt.Properties)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_fSaleOrgIdTxt.Properties)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_fDate.Properties)).BeginInit();


@@ -236,42 +236,42 @@


            // 


            // xtraTabPage1


            // 


            this.xtraTabPage1.Controls.Add(this.spc1);


            this.xtraTabPage1.Controls.Add(this.split1);


            this.xtraTabPage1.Name = "xtraTabPage1";


            this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);


            this.xtraTabPage1.Text = "数据列表";


            // 


            // spc1


            // split1


            // 


            this.spc1.Dock = System.Windows.Forms.DockStyle.Fill;


            this.spc1.Horizontal = false;


            this.spc1.Location = new System.Drawing.Point(0, 0);


            this.spc1.Name = "spc1";


            this.split1.Dock = System.Windows.Forms.DockStyle.Fill;


            this.split1.Horizontal = false;


            this.split1.Location = new System.Drawing.Point(0, 0);


            this.split1.Name = "split1";


            // 


            // spc1.Panel1


            // split1.Panel1


            // 


            this.spc1.Panel1.AutoScroll = true;


            this.spc1.Panel1.Controls.Add(this.gcMain);


            this.spc1.Panel1.Controls.Add(this.pageBar1);


            this.spc1.Panel1.Text = "Panel1";


            this.split1.Panel1.AutoScroll = true;


            this.split1.Panel1.Controls.Add(this.gcMain1);


            this.split1.Panel1.Controls.Add(this.pageBar1);


            this.split1.Panel1.Text = "Panel1";


            // 


            // spc1.Panel2


            // split1.Panel2


            // 


            this.spc1.Panel2.Text = "Panel2";


            this.spc1.Size = new System.Drawing.Size(1126, 570);


            this.spc1.SplitterPosition = 406;


            this.spc1.TabIndex = 0;


            this.split1.Panel2.Text = "Panel2";


            this.split1.Size = new System.Drawing.Size(1126, 570);


            this.split1.SplitterPosition = 553;


            this.split1.TabIndex = 0;


            // 


            // gcMain


            // gcMain1


            // 


            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;


            this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);


            this.gcMain.Location = new System.Drawing.Point(0, 0);


            this.gcMain.MainView = this.gridView1;


            this.gcMain.Name = "gcMain";


            this.gcMain.Size = new System.Drawing.Size(1126, 367);


            this.gcMain.TabIndex = 2;


            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {


            this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;


            this.gcMain1.Font = new System.Drawing.Font("Tahoma", 10F);


            this.gcMain1.Location = new System.Drawing.Point(0, 0);


            this.gcMain1.MainView = this.gridView1;


            this.gcMain1.Name = "gcMain1";


            this.gcMain1.Size = new System.Drawing.Size(1126, 514);


            this.gcMain1.TabIndex = 2;


            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {


            this.gridView1});


            // 


            // gridView1


@@ -294,7 +294,7 @@


            this.gv_fNote,


            this.gv_fApproverStaus,


            this.gridColumn2});


            this.gridView1.GridControl = this.gcMain;


            this.gridView1.GridControl = this.gcMain1;


            this.gridView1.IndicatorWidth = 50;


            this.gridView1.Name = "gridView1";


            this.gridView1.OptionsFind.ShowSearchNavButtons = false;


@@ -511,7 +511,7 @@


            // 


            this.pageBar1.CurrentPage = 1;


            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;


            this.pageBar1.Location = new System.Drawing.Point(0, 367);


            this.pageBar1.Location = new System.Drawing.Point(0, 514);


            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);


            this.pageBar1.Name = "pageBar1";


            this.pageBar1.RecordCount = 0;


@@ -521,59 +521,59 @@


            // 


            // xtraTabPage2


            // 


            this.xtraTabPage2.Controls.Add(this.spc2);


            this.xtraTabPage2.Controls.Add(this.splitMx1);


            this.xtraTabPage2.Name = "xtraTabPage2";


            this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);


            this.xtraTabPage2.Text = "数据详细";


            // 


            // spc2


            // splitMx1


            // 


            this.spc2.Dock = System.Windows.Forms.DockStyle.Fill;


            this.spc2.Horizontal = false;


            this.spc2.Location = new System.Drawing.Point(0, 0);


            this.spc2.Name = "spc2";


            this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;


            this.splitMx1.Horizontal = false;


            this.splitMx1.Location = new System.Drawing.Point(0, 0);


            this.splitMx1.Name = "splitMx1";


            // 


            // spc2.Panel1


            // splitMx1.Panel1


            // 


            this.spc2.Panel1.Controls.Add(this.lay2);


            this.spc2.Panel1.Text = "Panel1";


            this.splitMx1.Panel1.Controls.Add(this.layoutMx1);


            this.splitMx1.Panel1.Text = "Panel1";


            // 


            // spc2.Panel2


            // splitMx1.Panel2


            // 


            this.spc2.Panel2.Controls.Add(this.tabMx);


            this.spc2.Panel2.Text = "Panel2";


            this.spc2.Size = new System.Drawing.Size(1126, 570);


            this.spc2.SplitterPosition = 144;


            this.spc2.TabIndex = 0;


            this.splitMx1.Panel2.Controls.Add(this.tabMx);


            this.splitMx1.Panel2.Text = "Panel2";


            this.splitMx1.Size = new System.Drawing.Size(1126, 570);


            this.splitMx1.SplitterPosition = 144;


            this.splitMx1.TabIndex = 0;


            // 


            // lay2


            // layoutMx1


            // 


            this.lay2.AutoScroll = false;


            this.lay2.Controls.Add(this.txt_fCustomerIDTxt);


            this.lay2.Controls.Add(this.lbGuid);


            this.lay2.Controls.Add(this.txt_salesId);


            this.lay2.Controls.Add(this.txt_fSaleOrgIdTxt);


            this.lay2.Controls.Add(this.txt_fDate);


            this.lay2.Controls.Add(this.txt_id);


            this.lay2.Controls.Add(this.txt_fNote);


            this.lay2.Controls.Add(this.txt_fBillTypeID);


            this.lay2.Controls.Add(this.txt_billNo);


            this.lay2.Controls.Add(this.txt_fCreatorId);


            this.lay2.Controls.Add(this.txt_fSalesManIDTxt);


            this.lay2.Controls.Add(this.txt_fApproveDate);


            this.lay2.Controls.Add(this.txt_fCreateDate);


            this.lay2.Controls.Add(this.txt_fApproverID);


            this.lay2.Controls.Add(this.txt_fApproverStaus);


            this.lay2.Dock = System.Windows.Forms.DockStyle.Fill;


            this.lay2.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {


            this.layoutMx1.AutoScroll = false;


            this.layoutMx1.Controls.Add(this.txt_fCustomerIDTxt);


            this.layoutMx1.Controls.Add(this.lbGuid);


            this.layoutMx1.Controls.Add(this.txt_salesId);


            this.layoutMx1.Controls.Add(this.txt_fSaleOrgIdTxt);


            this.layoutMx1.Controls.Add(this.txt_fDate);


            this.layoutMx1.Controls.Add(this.txt_id);


            this.layoutMx1.Controls.Add(this.txt_fNote);


            this.layoutMx1.Controls.Add(this.txt_fBillTypeID);


            this.layoutMx1.Controls.Add(this.txt_billNo);


            this.layoutMx1.Controls.Add(this.txt_fCreatorId);


            this.layoutMx1.Controls.Add(this.txt_fSalesManIDTxt);


            this.layoutMx1.Controls.Add(this.txt_fApproveDate);


            this.layoutMx1.Controls.Add(this.txt_fCreateDate);


            this.layoutMx1.Controls.Add(this.txt_fApproverID);


            this.layoutMx1.Controls.Add(this.txt_fApproverStaus);


            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;


            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {


            this.layoutControlItem15});


            this.lay2.Location = new System.Drawing.Point(0, 0);


            this.lay2.Name = "lay2";


            this.lay2.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(962, 492, 812, 500);


            this.lay2.Root = this.Root;


            this.lay2.Size = new System.Drawing.Size(1126, 144);


            this.lay2.TabIndex = 0;


            this.lay2.Text = "layoutControl1";


            this.layoutMx1.Location = new System.Drawing.Point(0, 0);


            this.layoutMx1.Name = "layoutMx1";


            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(962, 492, 812, 500);


            this.layoutMx1.Root = this.Root;


            this.layoutMx1.Size = new System.Drawing.Size(1126, 144);


            this.layoutMx1.TabIndex = 0;


            this.layoutMx1.Text = "layoutControl1";


            // 


            // txt_fCustomerIDTxt


            // 


@@ -582,7 +582,7 @@


            this.txt_fCustomerIDTxt.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);


            this.txt_fCustomerIDTxt.Properties.Appearance.Options.UseFont = true;


            this.txt_fCustomerIDTxt.Size = new System.Drawing.Size(194, 28);


            this.txt_fCustomerIDTxt.StyleController = this.lay2;


            this.txt_fCustomerIDTxt.StyleController = this.layoutMx1;


            this.txt_fCustomerIDTxt.TabIndex = 368;


            this.txt_fCustomerIDTxt.Tag = "readonly";


            // 


@@ -609,7 +609,7 @@


            this.txt_fSaleOrgIdTxt.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);


            this.txt_fSaleOrgIdTxt.Properties.Appearance.Options.UseFont = true;


            this.txt_fSaleOrgIdTxt.Size = new System.Drawing.Size(194, 28);


            this.txt_fSaleOrgIdTxt.StyleController = this.lay2;


            this.txt_fSaleOrgIdTxt.StyleController = this.layoutMx1;


            this.txt_fSaleOrgIdTxt.TabIndex = 365;


            this.txt_fSaleOrgIdTxt.Tag = "readonly";


            // 


@@ -620,7 +620,7 @@


            this.txt_fDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);


            this.txt_fDate.Properties.Appearance.Options.UseFont = true;


            this.txt_fDate.Size = new System.Drawing.Size(194, 28);


            this.txt_fDate.StyleController = this.lay2;


            this.txt_fDate.StyleController = this.layoutMx1;


            this.txt_fDate.TabIndex = 240;


            this.txt_fDate.Tag = "readonly";


            // 


@@ -631,7 +631,7 @@


            this.txt_id.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);


            this.txt_id.Properties.Appearance.Options.UseFont = true;


            this.txt_id.Size = new System.Drawing.Size(194, 28);


            this.txt_id.StyleController = this.lay2;


            this.txt_id.StyleController = this.layoutMx1;


            this.txt_id.TabIndex = 211;


            this.txt_id.Tag = "readonly";


            // 


@@ -642,7 +642,7 @@


            this.txt_fNote.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);


            this.txt_fNote.Properties.Appearance.Options.UseFont = true;


            this.txt_fNote.Size = new System.Drawing.Size(194, 28);


            this.txt_fNote.StyleController = this.lay2;


            this.txt_fNote.StyleController = this.layoutMx1;


            this.txt_fNote.TabIndex = 243;


            // 


            // txt_fBillTypeID


@@ -656,7 +656,7 @@


            "标准销售出库单(XSCKD01_SYS)"});


            this.txt_fBillTypeID.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;


            this.txt_fBillTypeID.Size = new System.Drawing.Size(194, 24);


            this.txt_fBillTypeID.StyleController = this.lay2;


            this.txt_fBillTypeID.StyleController = this.layoutMx1;


            this.txt_fBillTypeID.TabIndex = 362;


            // 


            // txt_billNo


@@ -666,7 +666,7 @@


            this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);


            this.txt_billNo.Properties.Appearance.Options.UseFont = true;


            this.txt_billNo.Size = new System.Drawing.Size(194, 28);


            this.txt_billNo.StyleController = this.lay2;


            this.txt_billNo.StyleController = this.layoutMx1;


            this.txt_billNo.TabIndex = 211;


            this.txt_billNo.Tag = "readonly";


            // 


@@ -677,7 +677,7 @@


            this.txt_fCreatorId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);


            this.txt_fCreatorId.Properties.Appearance.Options.UseFont = true;


            this.txt_fCreatorId.Size = new System.Drawing.Size(194, 28);


            this.txt_fCreatorId.StyleController = this.lay2;


            this.txt_fCreatorId.StyleController = this.layoutMx1;


            this.txt_fCreatorId.TabIndex = 219;


            this.txt_fCreatorId.Tag = "readonly";


            // 


@@ -688,7 +688,7 @@


            this.txt_fSalesManIDTxt.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);


            this.txt_fSalesManIDTxt.Properties.Appearance.Options.UseFont = true;


            this.txt_fSalesManIDTxt.Size = new System.Drawing.Size(194, 28);


            this.txt_fSalesManIDTxt.StyleController = this.lay2;


            this.txt_fSalesManIDTxt.StyleController = this.layoutMx1;


            this.txt_fSalesManIDTxt.TabIndex = 231;


            this.txt_fSalesManIDTxt.Tag = "readonly";


            // 


@@ -699,7 +699,7 @@


            this.txt_fApproveDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);


            this.txt_fApproveDate.Properties.Appearance.Options.UseFont = true;


            this.txt_fApproveDate.Size = new System.Drawing.Size(196, 28);


            this.txt_fApproveDate.StyleController = this.lay2;


            this.txt_fApproveDate.StyleController = this.layoutMx1;


            this.txt_fApproveDate.TabIndex = 228;


            this.txt_fApproveDate.Tag = "readonly";


            // 


@@ -710,7 +710,7 @@


            this.txt_fCreateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);


            this.txt_fCreateDate.Properties.Appearance.Options.UseFont = true;


            this.txt_fCreateDate.Size = new System.Drawing.Size(194, 28);


            this.txt_fCreateDate.StyleController = this.lay2;


            this.txt_fCreateDate.StyleController = this.layoutMx1;


            this.txt_fCreateDate.TabIndex = 226;


            this.txt_fCreateDate.Tag = "readonly";


            // 


@@ -721,7 +721,7 @@


            this.txt_fApproverID.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);


            this.txt_fApproverID.Properties.Appearance.Options.UseFont = true;


            this.txt_fApproverID.Size = new System.Drawing.Size(196, 28);


            this.txt_fApproverID.StyleController = this.lay2;


            this.txt_fApproverID.StyleController = this.layoutMx1;


            this.txt_fApproverID.TabIndex = 222;


            this.txt_fApproverID.Tag = "readonly";


            // 


@@ -732,7 +732,7 @@


            this.txt_fApproverStaus.Name = "txt_fApproverStaus";


            this.txt_fApproverStaus.Properties.Caption = "审核状态";


            this.txt_fApproverStaus.Size = new System.Drawing.Size(274, 24);


            this.txt_fApproverStaus.StyleController = this.lay2;


            this.txt_fApproverStaus.StyleController = this.layoutMx1;


            this.txt_fApproverStaus.TabIndex = 371;


            // 


            // layoutControlItem15


@@ -1039,6 +1039,7 @@


            this.repositoryItemSearchLookUpEdit1.Name = "repositoryItemSearchLookUpEdit1";


            this.repositoryItemSearchLookUpEdit1.NullText = "请选择";


            this.repositoryItemSearchLookUpEdit1.PopupView = this.gridView2;


            this.repositoryItemSearchLookUpEdit1.EditValueChanged += new System.EventHandler(this.repositoryItemSearchLookUpEdit1_EditValueChanged);


            // 


            // gridView2


            // 


@@ -1464,6 +1465,7 @@


            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});


            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";


            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;


            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);


            // 


            // picCheckBox


            // 


@@ -1489,22 +1491,22 @@


            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();


            this.xtraTabControl1.ResumeLayout(false);


            this.xtraTabPage1.ResumeLayout(false);


            ((System.ComponentModel.ISupportInitialize)(this.spc1.Panel1)).EndInit();


            this.spc1.Panel1.ResumeLayout(false);


            ((System.ComponentModel.ISupportInitialize)(this.spc1.Panel2)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.spc1)).EndInit();


            this.spc1.ResumeLayout(false);


            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();


            this.split1.Panel1.ResumeLayout(false);


            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();


            this.split1.ResumeLayout(false);


            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();


            this.xtraTabPage2.ResumeLayout(false);


            ((System.ComponentModel.ISupportInitialize)(this.spc2.Panel1)).EndInit();


            this.spc2.Panel1.ResumeLayout(false);


            ((System.ComponentModel.ISupportInitialize)(this.spc2.Panel2)).EndInit();


            this.spc2.Panel2.ResumeLayout(false);


            ((System.ComponentModel.ISupportInitialize)(this.spc2)).EndInit();


            this.spc2.ResumeLayout(false);


            ((System.ComponentModel.ISupportInitialize)(this.lay2)).EndInit();


            this.lay2.ResumeLayout(false);


            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();


            this.splitMx1.Panel1.ResumeLayout(false);


            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit();


            this.splitMx1.Panel2.ResumeLayout(false);


            ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();


            this.splitMx1.ResumeLayout(false);


            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();


            this.layoutMx1.ResumeLayout(false);


            ((System.ComponentModel.ISupportInitialize)(this.txt_fCustomerIDTxt.Properties)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_fSaleOrgIdTxt.Properties)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_fDate.Properties)).EndInit();


@@ -1553,8 +1555,8 @@


        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;


        private System.Windows.Forms.PictureBox picCheckBox;


        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;


        private DevExpress.XtraEditors.SplitContainerControl spc1;


        private DevExpress.XtraGrid.GridControl gcMain;


        private DevExpress.XtraEditors.SplitContainerControl split1;


        private DevExpress.XtraGrid.GridControl gcMain1;


        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;


        private DevExpress.XtraGrid.Columns.GridColumn gv_id;


        private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;


@@ -1573,7 +1575,7 @@


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;


        private UserControls.Data.UcPageBar pageBar1;


        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;


        private DevExpress.XtraEditors.SplitContainerControl spc2;


        private DevExpress.XtraEditors.SplitContainerControl splitMx1;


        private DevExpress.XtraTab.XtraTabControl tabMx;


        private DevExpress.XtraTab.XtraTabPage tabMxPage1;


        private DevExpress.XtraGrid.GridControl gcMx1;


@@ -1621,7 +1623,7 @@


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;


        private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;


        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;


        private DevExpress.XtraLayout.LayoutControl lay2;


        private DevExpress.XtraLayout.LayoutControl layoutMx1;


        private DevExpress.XtraLayout.LayoutControlGroup Root;


        private DevExpress.XtraEditors.TextEdit txt_id;


        private DevExpress.XtraEditors.TextEdit txt_billNo;




 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs


@@ -70,6 +70,17 @@


                    MsgHelper.Warning("提示：" + ex.Message);


                }


            };




            //gridView1.FocusedRowChanged += (s, e) =>


            //{


              


            //    if (gridView1.GetSelectedRows() != null)


            //    {


            //        var selectedRow = gridView1.GetSelectedRows()[0]; // 获取第一个选中行的索引


            //        var checkStatus = gridView1.GetRowCellValue(selectedRow, "guid").ToString(); // 获取指定列的值


            //        getModel(checkStatus);


            //    }


            //};


        }


        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)


        {


@@ -212,7 +223,7 @@


            {


                List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();


                gvList.Add(gvMx1);


                UtilityHelper.ChangeEnableByControl(lay2.Controls, true, gvList);


                UtilityHelper.ChangeEnableByControl(layoutMx1.Controls, true, gvList);


            }


        }


        /// <summary>


@@ -226,7 +237,7 @@


            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);


            List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();


            gridViews.Add(gvMx1);


            UtilityHelper.CleanValueByControl(this.lay2.Controls, true, gridViews);


            UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);


            Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);




        }


@@ -302,7 +313,7 @@


                    toolBarMenu1.isSetBtn = true;


                    List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();


                    gvList.Add(gvMx1);


                    UtilityHelper.ChangeEnableByControl(this.lay2.Controls, false, gvList);


                    UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);


                    toolBarMenu1.currentAction = "";


                }


            }


@@ -341,16 +352,16 @@


                if (dd.rtnCode > 0)


                {


                    DataTable dt = dd.rtnData.list;


                    gcMain.BindingContext = new BindingContext();


                    gcMain1.BindingContext = new BindingContext();


                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;


                    if (dt.Rows.Count > 0)


                    {


                        gcMain.DataSource = dt;


                        gcMain.ForceInitialize();


                        gcMain1.DataSource = dt;


                        gcMain1.ForceInitialize();


                        gridView1.BestFitColumns();


                    }


                    else


                        UtilityHelper.SetDefaultTable(gcMain, gridView1);


                        UtilityHelper.SetDefaultTable(gcMain1, gridView1);


                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;


                    pageBar1.TotalPages = dd.rtnData.pages;//总页


                    pageBar1.CurrentPage = curPage;//当前页


@@ -391,7 +402,7 @@


                    lbGuid.Text = strGuid;


                    List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();


                    gvList.Add(gvMx1);


                    UtilityHelper.SetValueByObj(this.lay2.Controls, dy, isEdit, gvList);


                    UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);


                    JObject _job = JObject.Parse(strJson);


                    JArray array = new JArray();


                    foreach (var a in _job["rtnData"]["list"])


@@ -564,5 +575,7 @@


                }


            }


        }




      


    }


}




 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs


@@ -1730,6 +1730,28 @@


        /// <param name="action"></param>


        public static void SetGridViewParameter(GridView gridView1, PictureBox picCheckBox = null, Form fm = null, string fileName = "checkStatus", string icoName = "", DelegateGetModel action = null)


        {


            gridView1.PopupMenuShowing += (s, e) =>


            {


                if (e.MenuType == DevExpress.XtraGrid.Views.Grid.GridMenuType.Column)


                {


                    GridViewColumnMenu menu = e.Menu as GridViewColumnMenu;


                    if (menu != null)


                    {


                        string[] ary = { "Column Chooser", "Hide This Column", "Clear All Sorting", "Clear Sorting", "Sort Descending", "Sort Ascending", "Best Fit (all columns)" };


                        for (int i = menu.Items.Count - 1; i >= 0; i--)


                        {


                            string _caption = menu.Items[i].Caption;


                            if (!ary.Contains(_caption))


                            {


                                menu.Items.Remove(menu.Items[i]);


                            }


                        }


                    }


                }


            };


            gridView1.OptionsView.ShowGroupPanel = false;


            gridView1.OptionsCustomization.AllowGroup = false;




            gridView1.Appearance.HeaderPanel.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.ControlText;


            gridView1.OptionsView.ColumnAutoWidth = false;//自动调整列宽


            foreach (GridColumn column in gridView1.Columns)


@@ -1890,6 +1912,28 @@


        /// <param name="icoName"></param>


        public static void SetGridViewParameterMx(GridView gridView1)


        {


            gridView1.PopupMenuShowing += (s, e) =>


            {


                if (e.MenuType == DevExpress.XtraGrid.Views.Grid.GridMenuType.Column)


                {


                    GridViewColumnMenu menu = e.Menu as GridViewColumnMenu;


                    if (menu != null)


                    {


                        string[] ary = { "Column Chooser", "Hide This Column", "Clear All Sorting", "Clear Sorting", "Sort Descending", "Sort Ascending", "Best Fit (all columns)" };


                        for (int i = menu.Items.Count - 1; i >= 0; i--)


                        {


                            string _caption = menu.Items[i].Caption;


                            if (!ary.Contains(_caption))


                            {


                                menu.Items.Remove(menu.Items[i]);


                            }


                        }


                    }


                }


            };


            gridView1.OptionsView.ShowGroupPanel = false;


            gridView1.OptionsCustomization.AllowGroup = false;




            // gridView1.OptionsView.Alignment = DataGridViewContentAlignment.MiddleLeft;


            foreach (GridColumn column in gridView1.Columns)


            {


@@ -2040,6 +2084,27 @@


                    }


                    foreach (GridView gridView1 in gvList)


                    {


                        gridView1.PopupMenuShowing += (s, e) =>


                        {


                            if (e.MenuType == DevExpress.XtraGrid.Views.Grid.GridMenuType.Column)


                            {


                                GridViewColumnMenu menu = e.Menu as GridViewColumnMenu;


                                if (menu != null)


                                {


                                    string[] ary = { "Column Chooser", "Hide This Column", "Clear All Sorting", "Clear Sorting", "Sort Descending", "Sort Ascending", "Best Fit (all columns)" };


                                    for (int i = menu.Items.Count - 1; i >= 0; i--)


                                    {


                                        string _caption = menu.Items[i].Caption;


                                        if (!ary.Contains(_caption))


                                        {


                                            menu.Items.Remove(menu.Items[i]);


                                        }


                                    }


                                }


                            }


                        };


                        gridView1.OptionsView.ShowGroupPanel = false;


                        gridView1.OptionsCustomization.AllowGroup = false;


                        JToken john = array.FirstOrDefault(t => t["controlId"].ToString().ToUpper() == gridView1.Name.ToString().Trim().ToUpper());


                        if (john != null)


                        {




 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs


@@ -1047,10 +1047,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 +1084,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 +1100,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);


@@ -1129,6 +1142,8 @@


                    }


                    foreach (GridView gv in gvList)


                    {


                       




                        JToken john = array.FirstOrDefault(t => t["controlId"].ToString().ToUpper() == gv.Name.ToString().Trim().ToUpper());


                        if (john != null)


                        {