From f23d33d0cf77a73d449cd7c38effda9e50c8fda4 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期四, 06 三月 2025 08:13:37 +0800 Subject: [PATCH] 版面 --- DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs | 665 +++++++++++++++++++++++++++++++------------------------ 1 files changed, 373 insertions(+), 292 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs index 4354c20..b5ac9ca 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs @@ -52,7 +52,6 @@ this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_fBillTypeID = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_fSaleOrgId = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gv_fStockOrgId = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_fCreatorId = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_fApproverID = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_fCreateDate = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -63,6 +62,9 @@ this.gv_fNote = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_fApproverStaus = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn33 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn35 = new DevExpress.XtraGrid.Columns.GridColumn(); this.pageBar1 = new UserControls.Data.UcPageBar(); this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); @@ -71,7 +73,6 @@ this.lbGuid = new System.Windows.Forms.Label(); this.txt_salesId = new Gs.DevApp.UserControl.UcLookSales(); this.txt_fSaleOrgIdTxt = new DevExpress.XtraEditors.TextEdit(); - this.txt_fDate = new DevExpress.XtraEditors.TextEdit(); this.txt_id = new DevExpress.XtraEditors.TextEdit(); this.txt_fNote = new DevExpress.XtraEditors.TextEdit(); this.txt_fBillTypeID = new DevExpress.XtraEditors.ComboBoxEdit(); @@ -81,8 +82,10 @@ this.txt_fApproveDate = new DevExpress.XtraEditors.TextEdit(); this.txt_fCreateDate = new DevExpress.XtraEditors.TextEdit(); this.txt_fApproverID = new DevExpress.XtraEditors.TextEdit(); - this.txt_fApproverStaus = new DevExpress.XtraEditors.CheckEdit(); - this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txt_wjStatus = new DevExpress.XtraEditors.CheckEdit(); + this.txt_shf = new DevExpress.XtraEditors.TextEdit(); + this.txt_shName = new DevExpress.XtraEditors.TextEdit(); + this.txt_chkStatus = new DevExpress.XtraEditors.CheckEdit(); this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -94,14 +97,18 @@ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txt_fApproverStaus = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemSearchLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit(); this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView(); @@ -116,15 +123,11 @@ this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1id = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1pid = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1salesDetailId = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1fMustQty = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1fRealQty = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1fEntrynote = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1fseq = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit(); + this.gvMx1fEntrynote = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1fRealQty = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -143,9 +146,12 @@ this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn(); - this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); + this.gvMx1id = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1pid = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1salesDetailId = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1fseq = new DevExpress.XtraGrid.Columns.GridColumn(); this.picCheckBox = new System.Windows.Forms.PictureBox(); + this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -167,7 +173,6 @@ 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(); ((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fNote.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fBillTypeID.Properties)).BeginInit(); @@ -177,8 +182,10 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_fApproveDate.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fCreateDate.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fApproverID.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_fApproverStaus.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_wjStatus.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_shf.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_shName.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_chkStatus.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); @@ -190,21 +197,24 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fApproverStaus)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); this.SuspendLayout(); // // toolBarMenu1 @@ -244,13 +254,13 @@ // split1 // this.split1.Dock = System.Windows.Forms.DockStyle.Fill; + this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2; this.split1.Horizontal = false; this.split1.Location = new System.Drawing.Point(0, 0); this.split1.Name = "split1"; // // split1.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"; @@ -258,8 +268,9 @@ // split1.Panel2 // this.split1.Panel2.Text = "Panel2"; + this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.split1.Size = new System.Drawing.Size(1126, 570); - this.split1.SplitterPosition = 553; + this.split1.SplitterPosition = 51; this.split1.TabIndex = 0; // // gcMain1 @@ -269,7 +280,7 @@ 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.Size = new System.Drawing.Size(1126, 468); this.gcMain1.TabIndex = 2; this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView1}); @@ -283,7 +294,6 @@ this.gv_billNo, this.gv_fBillTypeID, this.gv_fSaleOrgId, - this.gv_fStockOrgId, this.gv_fCreatorId, this.gv_fApproverID, this.gv_fCreateDate, @@ -293,7 +303,10 @@ this.gv_fDate, this.gv_fNote, this.gv_fApproverStaus, - this.gridColumn2}); + this.gridColumn2, + this.gridColumn33, + this.gridColumn34, + this.gridColumn35}); this.gridView1.GridControl = this.gcMain1; this.gridView1.IndicatorWidth = 50; this.gridView1.Name = "gridView1"; @@ -348,7 +361,7 @@ this.gv_fSaleOrgId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_fSaleOrgId.AppearanceCell.Options.UseFont = true; this.gv_fSaleOrgId.Caption = "閿�鍞粍缁� "; - this.gv_fSaleOrgId.FieldName = "fSaleOrgId"; + this.gv_fSaleOrgId.FieldName = "xszzName"; this.gv_fSaleOrgId.MinWidth = 50; this.gv_fSaleOrgId.Name = "gv_fSaleOrgId"; this.gv_fSaleOrgId.OptionsColumn.AllowEdit = false; @@ -356,20 +369,6 @@ this.gv_fSaleOrgId.Visible = true; this.gv_fSaleOrgId.VisibleIndex = 3; this.gv_fSaleOrgId.Width = 94; - // - // gv_fStockOrgId - // - this.gv_fStockOrgId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_fStockOrgId.AppearanceCell.Options.UseFont = true; - this.gv_fStockOrgId.Caption = "鍙戣揣缁勭粐 "; - this.gv_fStockOrgId.FieldName = "fStockOrgId"; - this.gv_fStockOrgId.MinWidth = 50; - this.gv_fStockOrgId.Name = "gv_fStockOrgId"; - this.gv_fStockOrgId.OptionsColumn.AllowEdit = false; - this.gv_fStockOrgId.Tag = "query_a.FStockOrgId"; - this.gv_fStockOrgId.Visible = true; - this.gv_fStockOrgId.VisibleIndex = 4; - this.gv_fStockOrgId.Width = 94; // // gv_fCreatorId // @@ -382,7 +381,7 @@ this.gv_fCreatorId.OptionsColumn.AllowEdit = false; this.gv_fCreatorId.Tag = "query_a.FCreatorId"; this.gv_fCreatorId.Visible = true; - this.gv_fCreatorId.VisibleIndex = 5; + this.gv_fCreatorId.VisibleIndex = 4; this.gv_fCreatorId.Width = 94; // // gv_fApproverID @@ -396,7 +395,7 @@ this.gv_fApproverID.OptionsColumn.AllowEdit = false; this.gv_fApproverID.Tag = "query_a.FApproverID"; this.gv_fApproverID.Visible = true; - this.gv_fApproverID.VisibleIndex = 6; + this.gv_fApproverID.VisibleIndex = 5; this.gv_fApproverID.Width = 94; // // gv_fCreateDate @@ -410,7 +409,7 @@ this.gv_fCreateDate.OptionsColumn.AllowEdit = false; this.gv_fCreateDate.Tag = "query_a.FCreateDate"; this.gv_fCreateDate.Visible = true; - this.gv_fCreateDate.VisibleIndex = 7; + this.gv_fCreateDate.VisibleIndex = 6; this.gv_fCreateDate.Width = 94; // // gv_fApproveDate @@ -424,35 +423,35 @@ this.gv_fApproveDate.OptionsColumn.AllowEdit = false; this.gv_fApproveDate.Tag = "query_a.FApproveDate"; this.gv_fApproveDate.Visible = true; - this.gv_fApproveDate.VisibleIndex = 8; + this.gv_fApproveDate.VisibleIndex = 7; this.gv_fApproveDate.Width = 94; // // gv_fSalesManID // this.gv_fSalesManID.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_fSalesManID.AppearanceCell.Options.UseFont = true; - this.gv_fSalesManID.Caption = "閿�鍞憳 "; + this.gv_fSalesManID.Caption = "閿�鍞憳ID"; this.gv_fSalesManID.FieldName = "fSalesManID"; this.gv_fSalesManID.MinWidth = 50; this.gv_fSalesManID.Name = "gv_fSalesManID"; this.gv_fSalesManID.OptionsColumn.AllowEdit = false; this.gv_fSalesManID.Tag = "query_a.FSalesManID"; this.gv_fSalesManID.Visible = true; - this.gv_fSalesManID.VisibleIndex = 9; + this.gv_fSalesManID.VisibleIndex = 8; this.gv_fSalesManID.Width = 94; // // gv_fCustomerID // this.gv_fCustomerID.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_fCustomerID.AppearanceCell.Options.UseFont = true; - this.gv_fCustomerID.Caption = "瀹㈡埛 "; + this.gv_fCustomerID.Caption = "瀹㈡埛ID"; this.gv_fCustomerID.FieldName = "fCustomerID"; this.gv_fCustomerID.MinWidth = 50; this.gv_fCustomerID.Name = "gv_fCustomerID"; this.gv_fCustomerID.OptionsColumn.AllowEdit = false; this.gv_fCustomerID.Tag = "query_a.FCustomerID"; this.gv_fCustomerID.Visible = true; - this.gv_fCustomerID.VisibleIndex = 10; + this.gv_fCustomerID.VisibleIndex = 9; this.gv_fCustomerID.Width = 94; // // gv_fDate @@ -466,7 +465,7 @@ this.gv_fDate.OptionsColumn.AllowEdit = false; this.gv_fDate.Tag = "query_a.FDate"; this.gv_fDate.Visible = true; - this.gv_fDate.VisibleIndex = 11; + this.gv_fDate.VisibleIndex = 10; this.gv_fDate.Width = 94; // // gv_fNote @@ -480,7 +479,7 @@ this.gv_fNote.OptionsColumn.AllowEdit = false; this.gv_fNote.Tag = "query_a.FNote"; this.gv_fNote.Visible = true; - this.gv_fNote.VisibleIndex = 12; + this.gv_fNote.VisibleIndex = 11; this.gv_fNote.Width = 94; // // gv_fApproverStaus @@ -494,7 +493,7 @@ this.gv_fApproverStaus.OptionsColumn.AllowEdit = false; this.gv_fApproverStaus.Tag = "query_a.FApproverStaus"; this.gv_fApproverStaus.Visible = true; - this.gv_fApproverStaus.VisibleIndex = 13; + this.gv_fApproverStaus.VisibleIndex = 12; this.gv_fApproverStaus.Width = 94; // // gridColumn2 @@ -504,14 +503,44 @@ this.gridColumn2.MinWidth = 25; this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.Visible = true; - this.gridColumn2.VisibleIndex = 14; + this.gridColumn2.VisibleIndex = 13; this.gridColumn2.Width = 94; + // + // gridColumn33 + // + this.gridColumn33.Caption = "閿�鍞憳鍚�"; + this.gridColumn33.FieldName = "xsyName"; + this.gridColumn33.MinWidth = 25; + this.gridColumn33.Name = "gridColumn33"; + this.gridColumn33.Visible = true; + this.gridColumn33.VisibleIndex = 14; + this.gridColumn33.Width = 94; + // + // gridColumn34 + // + this.gridColumn34.Caption = "瀹㈡埛鍚嶇О"; + this.gridColumn34.FieldName = "khName"; + this.gridColumn34.MinWidth = 25; + this.gridColumn34.Name = "gridColumn34"; + this.gridColumn34.Visible = true; + this.gridColumn34.VisibleIndex = 15; + this.gridColumn34.Width = 94; + // + // gridColumn35 + // + this.gridColumn35.Caption = "閿�鍞崟鍙�"; + this.gridColumn35.FieldName = "xsNo"; + this.gridColumn35.MinWidth = 25; + this.gridColumn35.Name = "gridColumn35"; + this.gridColumn35.Visible = true; + this.gridColumn35.VisibleIndex = 16; + this.gridColumn35.Width = 94; // // pageBar1 // this.pageBar1.CurrentPage = 1; this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.pageBar1.Location = new System.Drawing.Point(0, 514); + this.pageBar1.Location = new System.Drawing.Point(0, 468); this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); this.pageBar1.Name = "pageBar1"; this.pageBar1.RecordCount = 0; @@ -535,6 +564,7 @@ // // splitMx1.Panel1 // + this.splitMx1.Panel1.AutoScroll = true; this.splitMx1.Panel1.Controls.Add(this.layoutMx1); this.splitMx1.Panel1.Text = "Panel1"; // @@ -543,7 +573,7 @@ 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.SplitterPosition = 155; this.splitMx1.TabIndex = 0; // // layoutMx1 @@ -553,7 +583,6 @@ 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); @@ -563,189 +592,195 @@ 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.Controls.Add(this.txt_wjStatus); + this.layoutMx1.Controls.Add(this.txt_shf); + this.layoutMx1.Controls.Add(this.txt_shName); + this.layoutMx1.Controls.Add(this.txt_chkStatus); this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; - this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { - this.layoutControlItem15}); 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.Size = new System.Drawing.Size(1126, 155); this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; // // txt_fCustomerIDTxt // - this.txt_fCustomerIDTxt.Location = new System.Drawing.Point(90, 108); + this.txt_fCustomerIDTxt.Location = new System.Drawing.Point(99, 115); this.txt_fCustomerIDTxt.Name = "txt_fCustomerIDTxt"; 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.Size = new System.Drawing.Size(185, 28); this.txt_fCustomerIDTxt.StyleController = this.layoutMx1; this.txt_fCustomerIDTxt.TabIndex = 368; this.txt_fCustomerIDTxt.Tag = "readonly"; // // lbGuid // - this.lbGuid.Location = new System.Drawing.Point(564, 108); + this.lbGuid.Location = new System.Drawing.Point(12, 156); this.lbGuid.Name = "lbGuid"; - this.lbGuid.Size = new System.Drawing.Size(272, 28); + this.lbGuid.Size = new System.Drawing.Size(272, 54); this.lbGuid.TabIndex = 1; this.lbGuid.Visible = false; // // txt_salesId // this.txt_salesId.IsReadly = false; - this.txt_salesId.Location = new System.Drawing.Point(90, 44); + this.txt_salesId.Location = new System.Drawing.Point(99, 47); this.txt_salesId.Name = "txt_salesId"; - this.txt_salesId.Size = new System.Drawing.Size(194, 28); + this.txt_salesId.Size = new System.Drawing.Size(185, 28); this.txt_salesId.TabIndex = 367; // // txt_fSaleOrgIdTxt // - this.txt_fSaleOrgIdTxt.Location = new System.Drawing.Point(366, 44); + this.txt_fSaleOrgIdTxt.Location = new System.Drawing.Point(375, 47); this.txt_fSaleOrgIdTxt.Name = "txt_fSaleOrgIdTxt"; 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.Size = new System.Drawing.Size(185, 28); this.txt_fSaleOrgIdTxt.StyleController = this.layoutMx1; this.txt_fSaleOrgIdTxt.TabIndex = 365; this.txt_fSaleOrgIdTxt.Tag = "readonly"; // - // txt_fDate - // - this.txt_fDate.Location = new System.Drawing.Point(366, 108); - this.txt_fDate.Name = "txt_fDate"; - 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.layoutMx1; - this.txt_fDate.TabIndex = 240; - this.txt_fDate.Tag = "readonly"; - // // txt_id // - this.txt_id.Location = new System.Drawing.Point(90, 12); + this.txt_id.Location = new System.Drawing.Point(99, 12); this.txt_id.Name = "txt_id"; 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.Size = new System.Drawing.Size(185, 28); this.txt_id.StyleController = this.layoutMx1; this.txt_id.TabIndex = 211; this.txt_id.Tag = "readonly"; // // txt_fNote // - this.txt_fNote.Location = new System.Drawing.Point(90, 76); + this.txt_fNote.Location = new System.Drawing.Point(99, 83); this.txt_fNote.Name = "txt_fNote"; 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.Size = new System.Drawing.Size(185, 28); this.txt_fNote.StyleController = this.layoutMx1; this.txt_fNote.TabIndex = 243; // // txt_fBillTypeID // this.txt_fBillTypeID.EditValue = "鏍囧噯閿�鍞嚭搴撳崟(XSCKD01_SYS)"; - this.txt_fBillTypeID.Location = new System.Drawing.Point(642, 12); + this.txt_fBillTypeID.Location = new System.Drawing.Point(651, 12); this.txt_fBillTypeID.Name = "txt_fBillTypeID"; this.txt_fBillTypeID.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.txt_fBillTypeID.Properties.Items.AddRange(new object[] { "鏍囧噯閿�鍞嚭搴撳崟(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.Size = new System.Drawing.Size(185, 24); this.txt_fBillTypeID.StyleController = this.layoutMx1; this.txt_fBillTypeID.TabIndex = 362; // // txt_billNo // - this.txt_billNo.Location = new System.Drawing.Point(366, 12); + this.txt_billNo.Location = new System.Drawing.Point(375, 12); this.txt_billNo.Name = "txt_billNo"; 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.Size = new System.Drawing.Size(185, 28); this.txt_billNo.StyleController = this.layoutMx1; this.txt_billNo.TabIndex = 211; this.txt_billNo.Tag = "readonly"; // // txt_fCreatorId // - this.txt_fCreatorId.Location = new System.Drawing.Point(642, 44); + this.txt_fCreatorId.Location = new System.Drawing.Point(651, 47); this.txt_fCreatorId.Name = "txt_fCreatorId"; 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.Size = new System.Drawing.Size(185, 28); this.txt_fCreatorId.StyleController = this.layoutMx1; this.txt_fCreatorId.TabIndex = 219; this.txt_fCreatorId.Tag = "readonly"; // // txt_fSalesManIDTxt // - this.txt_fSalesManIDTxt.Location = new System.Drawing.Point(366, 76); + this.txt_fSalesManIDTxt.Location = new System.Drawing.Point(375, 83); this.txt_fSalesManIDTxt.Name = "txt_fSalesManIDTxt"; 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.Size = new System.Drawing.Size(185, 28); this.txt_fSalesManIDTxt.StyleController = this.layoutMx1; this.txt_fSalesManIDTxt.TabIndex = 231; this.txt_fSalesManIDTxt.Tag = "readonly"; // // txt_fApproveDate // - this.txt_fApproveDate.Location = new System.Drawing.Point(918, 44); + this.txt_fApproveDate.Location = new System.Drawing.Point(927, 47); this.txt_fApproveDate.Name = "txt_fApproveDate"; 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.Size = new System.Drawing.Size(187, 28); this.txt_fApproveDate.StyleController = this.layoutMx1; this.txt_fApproveDate.TabIndex = 228; this.txt_fApproveDate.Tag = "readonly"; // // txt_fCreateDate // - this.txt_fCreateDate.Location = new System.Drawing.Point(642, 76); + this.txt_fCreateDate.Location = new System.Drawing.Point(651, 83); this.txt_fCreateDate.Name = "txt_fCreateDate"; 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.Size = new System.Drawing.Size(185, 28); this.txt_fCreateDate.StyleController = this.layoutMx1; this.txt_fCreateDate.TabIndex = 226; this.txt_fCreateDate.Tag = "readonly"; // // txt_fApproverID // - this.txt_fApproverID.Location = new System.Drawing.Point(918, 12); + this.txt_fApproverID.Location = new System.Drawing.Point(927, 12); this.txt_fApproverID.Name = "txt_fApproverID"; 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.Size = new System.Drawing.Size(187, 28); this.txt_fApproverID.StyleController = this.layoutMx1; this.txt_fApproverID.TabIndex = 222; this.txt_fApproverID.Tag = "readonly"; // - // txt_fApproverStaus + // txt_wjStatus // - this.txt_fApproverStaus.Enabled = false; - this.txt_fApproverStaus.Location = new System.Drawing.Point(840, 76); - 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.layoutMx1; - this.txt_fApproverStaus.TabIndex = 371; + this.txt_wjStatus.Location = new System.Drawing.Point(840, 115); + this.txt_wjStatus.Name = "txt_wjStatus"; + this.txt_wjStatus.Properties.Caption = "瀹岀粨鐘舵��"; + this.txt_wjStatus.Size = new System.Drawing.Size(274, 24); + this.txt_wjStatus.StyleController = this.layoutMx1; + this.txt_wjStatus.TabIndex = 372; + this.txt_wjStatus.Tag = "readonly"; // - // layoutControlItem15 + // txt_shf // - this.layoutControlItem15.Control = this.lbGuid; - this.layoutControlItem15.Location = new System.Drawing.Point(552, 96); - this.layoutControlItem15.Name = "layoutControlItem15"; - this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem15.Size = new System.Drawing.Size(276, 32); - this.layoutControlItem15.Text = "lbGuid"; - this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem15.TextVisible = false; + this.txt_shf.Location = new System.Drawing.Point(375, 115); + this.txt_shf.Name = "txt_shf"; + this.txt_shf.Size = new System.Drawing.Size(185, 24); + this.txt_shf.StyleController = this.layoutMx1; + this.txt_shf.TabIndex = 373; + this.txt_shf.Tag = "readonly"; + // + // txt_shName + // + this.txt_shName.Location = new System.Drawing.Point(651, 115); + this.txt_shName.Name = "txt_shName"; + this.txt_shName.Size = new System.Drawing.Size(185, 24); + this.txt_shName.StyleController = this.layoutMx1; + this.txt_shName.TabIndex = 374; + this.txt_shName.Tag = "readonly"; + // + // txt_chkStatus + // + this.txt_chkStatus.Location = new System.Drawing.Point(840, 83); + this.txt_chkStatus.Name = "txt_chkStatus"; + this.txt_chkStatus.Properties.Caption = "瀹℃牳鐘舵��"; + this.txt_chkStatus.Size = new System.Drawing.Size(274, 24); + this.txt_chkStatus.StyleController = this.layoutMx1; + this.txt_chkStatus.TabIndex = 375; + this.txt_chkStatus.Tag = "readonly"; // // Root // @@ -762,10 +797,12 @@ this.layoutControlItem9, this.layoutControlItem10, this.layoutControlItem13, - this.layoutControlItem14, this.layoutControlItem1, this.layoutControlItem11, - this.layoutControlItem16}); + this.layoutControlItem12, + this.layoutControlItem14, + this.layoutControlItem17, + this.txt_fApproverStaus}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -794,7 +831,7 @@ rowDefinition2, rowDefinition3, rowDefinition4}); - this.Root.Size = new System.Drawing.Size(1126, 148); + this.Root.Size = new System.Drawing.Size(1126, 155); this.Root.TextVisible = false; // // layoutControlItem2 @@ -803,9 +840,9 @@ this.layoutControlItem2.Location = new System.Drawing.Point(276, 0); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem2.Size = new System.Drawing.Size(276, 32); - this.layoutControlItem2.Text = "鍗曟嵁缂栧彿"; - this.layoutControlItem2.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem2.Size = new System.Drawing.Size(276, 35); + this.layoutControlItem2.Text = "鐢宠缂栧彿"; + this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem3 // @@ -813,73 +850,73 @@ this.layoutControlItem3.Location = new System.Drawing.Point(552, 0); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem3.Size = new System.Drawing.Size(276, 32); + this.layoutControlItem3.Size = new System.Drawing.Size(276, 35); this.layoutControlItem3.Text = "鍗曟嵁绫诲瀷"; - this.layoutControlItem3.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem4 // this.layoutControlItem4.Control = this.txt_salesId; - this.layoutControlItem4.Location = new System.Drawing.Point(0, 32); + this.layoutControlItem4.Location = new System.Drawing.Point(0, 35); this.layoutControlItem4.Name = "layoutControlItem4"; this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem4.Size = new System.Drawing.Size(276, 32); + this.layoutControlItem4.Size = new System.Drawing.Size(276, 36); this.layoutControlItem4.Text = "閿�鍞鍗�"; - this.layoutControlItem4.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem5 // this.layoutControlItem5.Control = this.txt_fSaleOrgIdTxt; - this.layoutControlItem5.Location = new System.Drawing.Point(276, 32); + this.layoutControlItem5.Location = new System.Drawing.Point(276, 35); this.layoutControlItem5.Name = "layoutControlItem5"; this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem5.Size = new System.Drawing.Size(276, 32); + this.layoutControlItem5.Size = new System.Drawing.Size(276, 36); this.layoutControlItem5.Text = "閿�鍞粍缁�"; - this.layoutControlItem5.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem6 // this.layoutControlItem6.Control = this.txt_fCreatorId; - this.layoutControlItem6.Location = new System.Drawing.Point(552, 32); + this.layoutControlItem6.Location = new System.Drawing.Point(552, 35); this.layoutControlItem6.Name = "layoutControlItem6"; this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem6.Size = new System.Drawing.Size(276, 32); + this.layoutControlItem6.Size = new System.Drawing.Size(276, 36); this.layoutControlItem6.Text = "鍒涘缓浜�"; - this.layoutControlItem6.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem7 // this.layoutControlItem7.Control = this.txt_fCreateDate; - this.layoutControlItem7.Location = new System.Drawing.Point(552, 64); + this.layoutControlItem7.Location = new System.Drawing.Point(552, 71); this.layoutControlItem7.Name = "layoutControlItem7"; this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem7.Size = new System.Drawing.Size(276, 32); this.layoutControlItem7.Text = "鍒涘缓鏃ユ湡"; - this.layoutControlItem7.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem8 // this.layoutControlItem8.Control = this.txt_fNote; - this.layoutControlItem8.Location = new System.Drawing.Point(0, 64); + this.layoutControlItem8.Location = new System.Drawing.Point(0, 71); this.layoutControlItem8.Name = "layoutControlItem8"; this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem8.Size = new System.Drawing.Size(276, 32); - this.layoutControlItem8.Text = "澶囨敞"; - this.layoutControlItem8.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem8.Text = "鐢宠澶囨敞"; + this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem9 // this.layoutControlItem9.Control = this.txt_fSalesManIDTxt; - this.layoutControlItem9.Location = new System.Drawing.Point(276, 64); + this.layoutControlItem9.Location = new System.Drawing.Point(276, 71); this.layoutControlItem9.Name = "layoutControlItem9"; this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem9.Size = new System.Drawing.Size(276, 32); this.layoutControlItem9.Text = "閿�鍞憳"; - this.layoutControlItem9.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem9.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem10 // @@ -887,62 +924,85 @@ this.layoutControlItem10.Location = new System.Drawing.Point(828, 0); this.layoutControlItem10.Name = "layoutControlItem10"; this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem10.Size = new System.Drawing.Size(278, 32); + this.layoutControlItem10.Size = new System.Drawing.Size(278, 35); this.layoutControlItem10.Text = "瀹℃牳浜�"; - this.layoutControlItem10.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem13 // this.layoutControlItem13.Control = this.txt_fCustomerIDTxt; - this.layoutControlItem13.Location = new System.Drawing.Point(0, 96); + this.layoutControlItem13.Location = new System.Drawing.Point(0, 103); this.layoutControlItem13.Name = "layoutControlItem13"; this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem13.Size = new System.Drawing.Size(276, 32); - this.layoutControlItem13.Text = "瀹㈡埛"; - this.layoutControlItem13.TextSize = new System.Drawing.Size(66, 18); - // - // layoutControlItem14 - // - this.layoutControlItem14.Control = this.txt_fDate; - this.layoutControlItem14.Location = new System.Drawing.Point(276, 96); - this.layoutControlItem14.Name = "layoutControlItem14"; - this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem14.Size = new System.Drawing.Size(276, 32); - this.layoutControlItem14.Text = "鏃ユ湡"; - this.layoutControlItem14.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem13.Text = "瀹㈡埛鍚嶇О"; + this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem1 // this.layoutControlItem1.Control = this.txt_id; this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Size = new System.Drawing.Size(276, 32); + this.layoutControlItem1.Size = new System.Drawing.Size(276, 35); this.layoutControlItem1.Text = "涓婚敭GUID"; - this.layoutControlItem1.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem11 // this.layoutControlItem11.Control = this.txt_fApproveDate; - this.layoutControlItem11.Location = new System.Drawing.Point(828, 32); + this.layoutControlItem11.Location = new System.Drawing.Point(828, 35); this.layoutControlItem11.Name = "layoutControlItem11"; this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem11.Size = new System.Drawing.Size(278, 32); + this.layoutControlItem11.Size = new System.Drawing.Size(278, 36); this.layoutControlItem11.Text = "瀹℃牳鏃ユ湡"; - this.layoutControlItem11.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18); // - // layoutControlItem16 + // layoutControlItem12 // - this.layoutControlItem16.Control = this.txt_fApproverStaus; - this.layoutControlItem16.Location = new System.Drawing.Point(828, 64); - this.layoutControlItem16.Name = "layoutControlItem16"; - this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem16.Size = new System.Drawing.Size(278, 32); - this.layoutControlItem16.Text = "瀹℃牳鐘舵��"; - this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem16.TextVisible = false; + this.layoutControlItem12.Control = this.txt_wjStatus; + this.layoutControlItem12.Location = new System.Drawing.Point(828, 103); + this.layoutControlItem12.Name = "layoutControlItem12"; + this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem12.Size = new System.Drawing.Size(278, 32); + this.layoutControlItem12.Text = "瀹岀粨鏍囪瘑"; + this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem12.TextVisible = false; + // + // layoutControlItem14 + // + this.layoutControlItem14.Control = this.txt_shf; + this.layoutControlItem14.Location = new System.Drawing.Point(276, 103); + this.layoutControlItem14.Name = "layoutControlItem14"; + this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem14.Size = new System.Drawing.Size(276, 32); + this.layoutControlItem14.Text = "鏀惰揣鏂�"; + this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18); + // + // layoutControlItem17 + // + this.layoutControlItem17.Control = this.txt_shName; + this.layoutControlItem17.Location = new System.Drawing.Point(552, 103); + this.layoutControlItem17.Name = "layoutControlItem17"; + this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem17.Size = new System.Drawing.Size(276, 32); + this.layoutControlItem17.Text = "鏀惰揣浜哄鍚�"; + this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18); + // + // txt_fApproverStaus + // + this.txt_fApproverStaus.Control = this.txt_chkStatus; + this.txt_fApproverStaus.Location = new System.Drawing.Point(828, 71); + this.txt_fApproverStaus.Name = "txt_fApproverStaus"; + this.txt_fApproverStaus.OptionsTableLayoutItem.ColumnIndex = 3; + this.txt_fApproverStaus.OptionsTableLayoutItem.RowIndex = 2; + this.txt_fApproverStaus.Size = new System.Drawing.Size(278, 32); + this.txt_fApproverStaus.Text = "瀹℃牳鏍囪瘑"; + this.txt_fApproverStaus.TextSize = new System.Drawing.Size(0, 0); + this.txt_fApproverStaus.TextVisible = false; // // tabMx // @@ -950,7 +1010,7 @@ this.tabMx.Location = new System.Drawing.Point(0, 0); this.tabMx.Name = "tabMx"; this.tabMx.SelectedTabPage = this.tabMxPage1; - this.tabMx.Size = new System.Drawing.Size(1126, 414); + this.tabMx.Size = new System.Drawing.Size(1126, 403); this.tabMx.TabIndex = 3; this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1}); @@ -959,7 +1019,7 @@ // this.tabMxPage1.Controls.Add(this.gcMx1); this.tabMxPage1.Name = "tabMxPage1"; - this.tabMxPage1.Size = new System.Drawing.Size(1124, 382); + this.tabMxPage1.Size = new System.Drawing.Size(1124, 371); this.tabMxPage1.Text = "鐢宠鏄庣粏"; // // gcMx1 @@ -972,7 +1032,7 @@ this.repositoryItemSearchLookUpEdit1, this.repositoryItemButtonEdit1, this.repositoryItemDateEdit1}); - this.gcMx1.Size = new System.Drawing.Size(1124, 382); + this.gcMx1.Size = new System.Drawing.Size(1124, 371); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); @@ -980,15 +1040,12 @@ // gvMx1 // this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.gvMxDel, this.gridColumn1, - this.gvMx1id, - this.gvMx1pid, - this.gvMx1salesDetailId, this.gvMx1fMustQty, - this.gvMx1fRealQty, - this.gvMx1fEntrynote, - this.gvMx1fseq, this.gridColumn11, + this.gvMx1fEntrynote, + this.gvMx1fRealQty, this.gridColumn12, this.gridColumn13, this.gridColumn14, @@ -1007,13 +1064,37 @@ this.gridColumn27, this.gridColumn28, this.gridColumn29, - this.gvMxDel}); + this.gvMx1id, + this.gvMx1pid, + this.gvMx1salesDetailId, + this.gvMx1fseq}); this.gvMx1.GridControl = this.gcMx1; this.gvMx1.Name = "gvMx1"; this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True; this.gvMx1.OptionsFind.ShowSearchNavButtons = false; this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom; this.gvMx1.OptionsView.ShowGroupPanel = false; + // + // gvMxDel + // + this.gvMxDel.Caption = "绉诲嚭"; + this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1; + this.gvMxDel.MinWidth = 25; + this.gvMxDel.Name = "gvMxDel"; + this.gvMxDel.Visible = true; + this.gvMxDel.VisibleIndex = 0; + this.gvMxDel.Width = 94; + // + // repositoryItemButtonEdit1 + // + this.repositoryItemButtonEdit1.AutoHeight = false; + editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; + editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; + this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + 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); // // gridColumn1 // @@ -1027,7 +1108,7 @@ this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.Tag = "edit"; this.gridColumn1.Visible = true; - this.gridColumn1.VisibleIndex = 0; + this.gridColumn1.VisibleIndex = 1; this.gridColumn1.Width = 94; // // repositoryItemSearchLookUpEdit1 @@ -1038,6 +1119,8 @@ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.repositoryItemSearchLookUpEdit1.Name = "repositoryItemSearchLookUpEdit1"; this.repositoryItemSearchLookUpEdit1.NullText = "璇烽�夋嫨"; + this.repositoryItemSearchLookUpEdit1.PopupFormMinSize = new System.Drawing.Size(900, 0); + this.repositoryItemSearchLookUpEdit1.PopupFormSize = new System.Drawing.Size(900, 0); this.repositoryItemSearchLookUpEdit1.PopupView = this.gridView2; this.repositoryItemSearchLookUpEdit1.EditValueChanged += new System.EventHandler(this.repositoryItemSearchLookUpEdit1_EditValueChanged); // @@ -1148,39 +1231,6 @@ this.gridColumn32.Visible = true; this.gridColumn32.VisibleIndex = 10; // - // gvMx1id - // - this.gvMx1id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gvMx1id.AppearanceCell.Options.UseFont = true; - this.gvMx1id.Caption = "涓婚敭 "; - this.gvMx1id.FieldName = "id"; - this.gvMx1id.MinWidth = 50; - this.gvMx1id.Name = "gvMx1id"; - this.gvMx1id.Tag = "query_a.id"; - this.gvMx1id.Width = 94; - // - // gvMx1pid - // - this.gvMx1pid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gvMx1pid.AppearanceCell.Options.UseFont = true; - this.gvMx1pid.Caption = "涓昏〃guid "; - this.gvMx1pid.FieldName = "pid"; - this.gvMx1pid.MinWidth = 50; - this.gvMx1pid.Name = "gvMx1pid"; - this.gvMx1pid.Tag = "query_a.pid"; - this.gvMx1pid.Width = 94; - // - // gvMx1salesDetailId - // - this.gvMx1salesDetailId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gvMx1salesDetailId.AppearanceCell.Options.UseFont = true; - this.gvMx1salesDetailId.Caption = "SALES_ORDER_DETAIL鐨凣uid "; - this.gvMx1salesDetailId.FieldName = "salesDetailId"; - this.gvMx1salesDetailId.MinWidth = 50; - this.gvMx1salesDetailId.Name = "gvMx1salesDetailId"; - this.gvMx1salesDetailId.Tag = "query_a.SalesDetailId"; - this.gvMx1salesDetailId.Width = 94; - // // gvMx1fMustQty // this.gvMx1fMustQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); @@ -1189,27 +1239,39 @@ this.gvMx1fMustQty.AppearanceCell.Options.UseForeColor = true; this.gvMx1fMustQty.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; this.gvMx1fMustQty.AppearanceHeader.Options.UseForeColor = true; - this.gvMx1fMustQty.Caption = "搴斿彂鏁伴噺 "; + this.gvMx1fMustQty.Caption = "鐢宠鏁伴噺 "; this.gvMx1fMustQty.FieldName = "fMustQty"; this.gvMx1fMustQty.MinWidth = 50; this.gvMx1fMustQty.Name = "gvMx1fMustQty"; this.gvMx1fMustQty.Tag = "yz_quantity_0_edit"; this.gvMx1fMustQty.Visible = true; - this.gvMx1fMustQty.VisibleIndex = 1; + this.gvMx1fMustQty.VisibleIndex = 2; this.gvMx1fMustQty.Width = 94; // - // gvMx1fRealQty + // gridColumn11 // - this.gvMx1fRealQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gvMx1fRealQty.AppearanceCell.Options.UseFont = true; - this.gvMx1fRealQty.Caption = "瀹炲彂鏁伴噺 "; - this.gvMx1fRealQty.FieldName = "fRealQty"; - this.gvMx1fRealQty.MinWidth = 50; - this.gvMx1fRealQty.Name = "gvMx1fRealQty"; - this.gvMx1fRealQty.Tag = "query_a.FRealQty"; - this.gvMx1fRealQty.Visible = true; - this.gvMx1fRealQty.VisibleIndex = 2; - this.gvMx1fRealQty.Width = 94; + this.gridColumn11.AppearanceCell.ForeColor = System.Drawing.Color.Blue; + this.gridColumn11.AppearanceCell.Options.UseForeColor = true; + this.gridColumn11.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; + this.gridColumn11.AppearanceHeader.Options.UseForeColor = true; + this.gridColumn11.Caption = "棰勮鍙戣揣鏃堕棿"; + this.gridColumn11.ColumnEdit = this.repositoryItemDateEdit1; + this.gridColumn11.FieldName = "yjfhDate"; + this.gridColumn11.MinWidth = 25; + this.gridColumn11.Name = "gridColumn11"; + this.gridColumn11.Tag = "edit"; + this.gridColumn11.Visible = true; + this.gridColumn11.VisibleIndex = 3; + this.gridColumn11.Width = 94; + // + // repositoryItemDateEdit1 + // + this.repositoryItemDateEdit1.AutoHeight = false; + this.repositoryItemDateEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemDateEdit1.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemDateEdit1.Name = "repositoryItemDateEdit1"; // // gvMx1fEntrynote // @@ -1225,46 +1287,21 @@ this.gvMx1fEntrynote.Name = "gvMx1fEntrynote"; this.gvMx1fEntrynote.Tag = "edit"; this.gvMx1fEntrynote.Visible = true; - this.gvMx1fEntrynote.VisibleIndex = 3; + this.gvMx1fEntrynote.VisibleIndex = 4; this.gvMx1fEntrynote.Width = 94; // - // gvMx1fseq + // gvMx1fRealQty // - this.gvMx1fseq.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gvMx1fseq.AppearanceCell.Options.UseFont = true; - this.gvMx1fseq.Caption = "鎺掑簭 "; - this.gvMx1fseq.FieldName = "fseq"; - this.gvMx1fseq.MinWidth = 50; - this.gvMx1fseq.Name = "gvMx1fseq"; - this.gvMx1fseq.Tag = "query_a.FSEQ"; - this.gvMx1fseq.Visible = true; - this.gvMx1fseq.VisibleIndex = 4; - this.gvMx1fseq.Width = 94; - // - // gridColumn11 - // - this.gridColumn11.AppearanceCell.ForeColor = System.Drawing.Color.Blue; - this.gridColumn11.AppearanceCell.Options.UseForeColor = true; - this.gridColumn11.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; - this.gridColumn11.AppearanceHeader.Options.UseForeColor = true; - this.gridColumn11.Caption = "棰勮鍙戣揣鏃堕棿"; - this.gridColumn11.ColumnEdit = this.repositoryItemDateEdit1; - this.gridColumn11.FieldName = "yjfhDate"; - this.gridColumn11.MinWidth = 25; - this.gridColumn11.Name = "gridColumn11"; - this.gridColumn11.Tag = "edit"; - this.gridColumn11.Visible = true; - this.gridColumn11.VisibleIndex = 5; - this.gridColumn11.Width = 94; - // - // repositoryItemDateEdit1 - // - this.repositoryItemDateEdit1.AutoHeight = false; - this.repositoryItemDateEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.repositoryItemDateEdit1.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.repositoryItemDateEdit1.Name = "repositoryItemDateEdit1"; + this.gvMx1fRealQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1fRealQty.AppearanceCell.Options.UseFont = true; + this.gvMx1fRealQty.Caption = "瀹炲彂鏁伴噺 "; + this.gvMx1fRealQty.FieldName = "fRealQty"; + this.gvMx1fRealQty.MinWidth = 50; + this.gvMx1fRealQty.Name = "gvMx1fRealQty"; + this.gvMx1fRealQty.Tag = "query_a.FRealQty"; + this.gvMx1fRealQty.Visible = true; + this.gvMx1fRealQty.VisibleIndex = 5; + this.gvMx1fRealQty.Width = 94; // // gridColumn12 // @@ -1446,26 +1483,49 @@ this.gridColumn29.VisibleIndex = 23; this.gridColumn29.Width = 94; // - // gvMxDel + // gvMx1id // - this.gvMxDel.Caption = "绉诲嚭"; - this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1; - this.gvMxDel.MinWidth = 25; - this.gvMxDel.Name = "gvMxDel"; - this.gvMxDel.Visible = true; - this.gvMxDel.VisibleIndex = 24; - this.gvMxDel.Width = 94; + this.gvMx1id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1id.AppearanceCell.Options.UseFont = true; + this.gvMx1id.Caption = "涓婚敭 "; + this.gvMx1id.FieldName = "id"; + this.gvMx1id.MinWidth = 50; + this.gvMx1id.Name = "gvMx1id"; + this.gvMx1id.Tag = "query_a.id"; + this.gvMx1id.Width = 94; // - // repositoryItemButtonEdit1 + // gvMx1pid // - this.repositoryItemButtonEdit1.AutoHeight = false; - editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; - editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; - this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - 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); + this.gvMx1pid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1pid.AppearanceCell.Options.UseFont = true; + this.gvMx1pid.Caption = "涓昏〃guid "; + this.gvMx1pid.FieldName = "pid"; + this.gvMx1pid.MinWidth = 50; + this.gvMx1pid.Name = "gvMx1pid"; + this.gvMx1pid.Tag = "query_a.pid"; + this.gvMx1pid.Width = 94; + // + // gvMx1salesDetailId + // + this.gvMx1salesDetailId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1salesDetailId.AppearanceCell.Options.UseFont = true; + this.gvMx1salesDetailId.Caption = "SALES_ORDER_DETAIL鐨凣uid "; + this.gvMx1salesDetailId.FieldName = "salesDetailId"; + this.gvMx1salesDetailId.MinWidth = 50; + this.gvMx1salesDetailId.Name = "gvMx1salesDetailId"; + this.gvMx1salesDetailId.Tag = "query_a.SalesDetailId"; + this.gvMx1salesDetailId.Width = 94; + // + // gvMx1fseq + // + this.gvMx1fseq.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1fseq.AppearanceCell.Options.UseFont = true; + this.gvMx1fseq.Caption = "鎺掑簭 "; + this.gvMx1fseq.FieldName = "fseq"; + this.gvMx1fseq.MinWidth = 50; + this.gvMx1fseq.Name = "gvMx1fseq"; + this.gvMx1fseq.Tag = "query_a.FSEQ"; + this.gvMx1fseq.Width = 94; // // picCheckBox // @@ -1477,6 +1537,17 @@ this.picCheckBox.TabIndex = 9; this.picCheckBox.TabStop = false; this.picCheckBox.Visible = false; + // + // layoutControlItem15 + // + this.layoutControlItem15.Control = this.lbGuid; + this.layoutControlItem15.Location = new System.Drawing.Point(0, 144); + this.layoutControlItem15.Name = "layoutControlItem15"; + this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4; + this.layoutControlItem15.Size = new System.Drawing.Size(276, 58); + this.layoutControlItem15.Text = "lbGuid"; + this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem15.TextVisible = false; // // Frm_SalesDeliver // @@ -1509,7 +1580,6 @@ 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(); ((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fNote.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fBillTypeID.Properties)).EndInit(); @@ -1519,8 +1589,10 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_fApproveDate.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fCreateDate.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fApproverID.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_fApproverStaus.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_wjStatus.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_shf.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_shName.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_chkStatus.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); @@ -1532,21 +1604,24 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fApproverStaus)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); this.ResumeLayout(false); } @@ -1562,7 +1637,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gv_billNo; private DevExpress.XtraGrid.Columns.GridColumn gv_fBillTypeID; private DevExpress.XtraGrid.Columns.GridColumn gv_fSaleOrgId; - private DevExpress.XtraGrid.Columns.GridColumn gv_fStockOrgId; private DevExpress.XtraGrid.Columns.GridColumn gv_fCreatorId; private DevExpress.XtraGrid.Columns.GridColumn gv_fApproverID; private DevExpress.XtraGrid.Columns.GridColumn gv_fCreateDate; @@ -1634,7 +1708,6 @@ private DevExpress.XtraEditors.ComboBoxEdit txt_fBillTypeID; private System.Windows.Forms.Label lbGuid; private DevExpress.XtraEditors.TextEdit txt_fNote; - private DevExpress.XtraEditors.TextEdit txt_fDate; private DevExpress.XtraEditors.TextEdit txt_fSalesManIDTxt; private DevExpress.XtraEditors.TextEdit txt_fApproveDate; private DevExpress.XtraEditors.TextEdit txt_fCreateDate; @@ -1649,11 +1722,19 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; - private DevExpress.XtraEditors.CheckEdit txt_fApproverStaus; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn33; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn34; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn35; + private DevExpress.XtraEditors.CheckEdit txt_wjStatus; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; + private DevExpress.XtraEditors.TextEdit txt_shf; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; + private DevExpress.XtraEditors.TextEdit txt_shName; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17; + private DevExpress.XtraEditors.CheckEdit txt_chkStatus; + private DevExpress.XtraLayout.LayoutControlItem txt_fApproverStaus; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15; } } \ No newline at end of file -- Gitblit v1.9.3