From c26069c9418efe9f9c0f963f43fb98b8a7440adf Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期六, 01 三月 2025 10:10:25 +0800 Subject: [PATCH] 销售 --- DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs | 347 +++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 214 insertions(+), 133 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..719e16d 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,7 +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.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.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -94,10 +98,12 @@ 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(); @@ -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,7 +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.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.layoutControlItem15)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); @@ -190,10 +198,12 @@ ((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(); @@ -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 = 482; 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, 443); 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, 443); this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); this.pageBar1.Name = "pageBar1"; this.pageBar1.RecordCount = 0; @@ -553,7 +582,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,7 +591,10 @@ 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}); @@ -577,11 +608,11 @@ // // txt_fCustomerIDTxt // - this.txt_fCustomerIDTxt.Location = new System.Drawing.Point(90, 108); + this.txt_fCustomerIDTxt.Location = new System.Drawing.Point(99, 108); 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"; @@ -597,143 +628,158 @@ // 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, 44); 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, 44); 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, 76); 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, 44); 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, 76); 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, 44); 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, 76); 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, 108); + 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; + // + // txt_shf + // + this.txt_shf.Location = new System.Drawing.Point(375, 108); + 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, 108); + 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, 76); + 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; // // layoutControlItem15 // @@ -762,10 +808,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; @@ -804,8 +852,8 @@ 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.Text = "鐢宠缂栧彿"; + this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem3 // @@ -815,7 +863,7 @@ this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem3.Size = new System.Drawing.Size(276, 32); this.layoutControlItem3.Text = "鍗曟嵁绫诲瀷"; - this.layoutControlItem3.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem4 // @@ -825,7 +873,7 @@ this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem4.Size = new System.Drawing.Size(276, 32); this.layoutControlItem4.Text = "閿�鍞鍗�"; - this.layoutControlItem4.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem5 // @@ -836,7 +884,7 @@ this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem5.Size = new System.Drawing.Size(276, 32); this.layoutControlItem5.Text = "閿�鍞粍缁�"; - this.layoutControlItem5.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem6 // @@ -847,7 +895,7 @@ this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem6.Size = new System.Drawing.Size(276, 32); this.layoutControlItem6.Text = "鍒涘缓浜�"; - this.layoutControlItem6.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem7 // @@ -858,7 +906,7 @@ 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 // @@ -867,8 +915,8 @@ 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 // @@ -879,7 +927,7 @@ 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 // @@ -889,7 +937,7 @@ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem10.Size = new System.Drawing.Size(278, 32); this.layoutControlItem10.Text = "瀹℃牳浜�"; - this.layoutControlItem10.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem13 // @@ -898,19 +946,8 @@ 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 // @@ -919,7 +956,7 @@ this.layoutControlItem1.Name = "layoutControlItem1"; this.layoutControlItem1.Size = new System.Drawing.Size(276, 32); this.layoutControlItem1.Text = "涓婚敭GUID"; - this.layoutControlItem1.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem11 // @@ -930,19 +967,53 @@ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem11.Size = new System.Drawing.Size(278, 32); 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, 96); + 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, 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(75, 18); + // + // layoutControlItem17 + // + this.layoutControlItem17.Control = this.txt_shName; + this.layoutControlItem17.Location = new System.Drawing.Point(552, 96); + 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, 64); + 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 // @@ -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,7 +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.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.layoutControlItem15)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); @@ -1532,10 +1605,12 @@ ((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); @@ -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; } } \ No newline at end of file -- Gitblit v1.9.3