From 1c8df1e24fcf4a18c1d96ec6f6821d24313d73aa Mon Sep 17 00:00:00 2001 From: lu <123456> Date: 星期六, 26 七月 2025 15:49:14 +0800 Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient --- DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs | 379 ++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 282 insertions(+), 97 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs index 60d9d73..e8cfecc 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs @@ -39,6 +39,7 @@ DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject(); @@ -141,7 +142,13 @@ this.txt_fapprovedate = new DevExpress.XtraEditors.TextEdit(); this.txt_wjStatus = new DevExpress.XtraEditors.CheckEdit(); this.txt_chkStatus = new DevExpress.XtraEditors.CheckEdit(); - this.txt_fSrcType = new DevExpress.XtraEditors.TextEdit(); + this.txt_source = new DevExpress.XtraEditors.TextEdit(); + this.txt_fCloserId = new DevExpress.XtraEditors.TextEdit(); + this.txt_fCloseDate = new DevExpress.XtraEditors.TextEdit(); + this.txt_fCloseStatusTxt = new DevExpress.XtraEditors.TextEdit(); + this.txt_qt028 = new DevExpress.XtraEditors.TextEdit(); + this.txt_qt027 = new DevExpress.XtraEditors.TextEdit(); + this.txt_qt026 = new DevExpress.XtraEditors.CheckEdit(); this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -158,9 +165,15 @@ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); @@ -248,7 +261,13 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_fapprovedate.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_wjStatus.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_chkStatus.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_fSrcType.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_source.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fCloserId.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fCloseDate.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fCloseStatusTxt.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt028.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt027.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt026.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); @@ -265,9 +284,15 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); @@ -327,6 +352,7 @@ // 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"; @@ -340,8 +366,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 = 558; + this.split1.SplitterPosition = 0; this.split1.TabIndex = 0; // // gcMain1 @@ -590,8 +617,6 @@ this.gridColumn40.FieldNameSortGroup = "fCloserId"; this.gridColumn40.MinWidth = 25; this.gridColumn40.Name = "gridColumn40"; - this.gridColumn40.Visible = true; - this.gridColumn40.VisibleIndex = 16; this.gridColumn40.Width = 94; // // gridColumn41 @@ -600,8 +625,6 @@ this.gridColumn41.FieldNameSortGroup = "fCloseDate"; this.gridColumn41.MinWidth = 25; this.gridColumn41.Name = "gridColumn41"; - this.gridColumn41.Visible = true; - this.gridColumn41.VisibleIndex = 17; this.gridColumn41.Width = 94; // // gridColumn42 @@ -622,7 +645,7 @@ // // gridColumn44 // - this.gridColumn44.Caption = "鐢宠缁勭粐Id"; + this.gridColumn44.Caption = "鐢宠缁勭粐ID"; this.gridColumn44.FieldName = "fapporgid"; this.gridColumn44.MinWidth = 25; this.gridColumn44.Name = "gridColumn44"; @@ -635,7 +658,7 @@ this.gridColumn45.MinWidth = 25; this.gridColumn45.Name = "gridColumn45"; this.gridColumn45.Visible = true; - this.gridColumn45.VisibleIndex = 18; + this.gridColumn45.VisibleIndex = 16; this.gridColumn45.Width = 94; // // gridColumn46 @@ -645,7 +668,7 @@ this.gridColumn46.MinWidth = 25; this.gridColumn46.Name = "gridColumn46"; this.gridColumn46.Visible = true; - this.gridColumn46.VisibleIndex = 19; + this.gridColumn46.VisibleIndex = 17; this.gridColumn46.Width = 94; // // gridColumn47 @@ -655,7 +678,7 @@ this.gridColumn47.MinWidth = 25; this.gridColumn47.Name = "gridColumn47"; this.gridColumn47.Visible = true; - this.gridColumn47.VisibleIndex = 20; + this.gridColumn47.VisibleIndex = 18; this.gridColumn47.Width = 94; // // gridColumn48 @@ -665,7 +688,7 @@ this.gridColumn48.MinWidth = 25; this.gridColumn48.Name = "gridColumn48"; this.gridColumn48.Visible = true; - this.gridColumn48.VisibleIndex = 21; + this.gridColumn48.VisibleIndex = 19; this.gridColumn48.Width = 94; // // gridColumn49 @@ -675,22 +698,22 @@ this.gridColumn49.MinWidth = 25; this.gridColumn49.Name = "gridColumn49"; this.gridColumn49.Visible = true; - this.gridColumn49.VisibleIndex = 22; + this.gridColumn49.VisibleIndex = 20; this.gridColumn49.Width = 94; // // gridColumn50 // - this.gridColumn50.Caption = "婧愬崟绫诲瀷"; - this.gridColumn50.FieldName = "fSrcType"; + this.gridColumn50.Caption = "鏉ユ簮"; + this.gridColumn50.FieldName = "source"; this.gridColumn50.MinWidth = 25; this.gridColumn50.Name = "gridColumn50"; this.gridColumn50.Visible = true; - this.gridColumn50.VisibleIndex = 23; + this.gridColumn50.VisibleIndex = 21; this.gridColumn50.Width = 94; // // gv_id // - this.gv_id.Caption = "涓婚敭Guid"; + this.gv_id.Caption = "涓婚敭GUID"; this.gv_id.FieldName = "id"; this.gv_id.MinWidth = 25; this.gv_id.Name = "gv_id"; @@ -731,8 +754,9 @@ // this.splitMx1.Panel2.Controls.Add(this.tabMx); this.splitMx1.Panel2.Text = "Panel2"; + this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.splitMx1.Size = new System.Drawing.Size(1126, 570); - this.splitMx1.SplitterPosition = 169; + this.splitMx1.SplitterPosition = 192; this.splitMx1.TabIndex = 0; // // layoutMx1 @@ -754,22 +778,28 @@ this.layoutMx1.Controls.Add(this.txt_fapprovedate); this.layoutMx1.Controls.Add(this.txt_wjStatus); this.layoutMx1.Controls.Add(this.txt_chkStatus); - this.layoutMx1.Controls.Add(this.txt_fSrcType); + this.layoutMx1.Controls.Add(this.txt_source); + this.layoutMx1.Controls.Add(this.txt_fCloserId); + this.layoutMx1.Controls.Add(this.txt_fCloseDate); + this.layoutMx1.Controls.Add(this.txt_fCloseStatusTxt); + this.layoutMx1.Controls.Add(this.txt_qt028); + this.layoutMx1.Controls.Add(this.txt_qt027); + this.layoutMx1.Controls.Add(this.txt_qt026); this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem16}); this.layoutMx1.Location = new System.Drawing.Point(0, 0); this.layoutMx1.Name = "layoutMx1"; - this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(729, 412, 812, 500); + this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(643, 489, 812, 500); this.layoutMx1.Root = this.Root; - this.layoutMx1.Size = new System.Drawing.Size(1126, 169); + this.layoutMx1.Size = new System.Drawing.Size(1126, 192); this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; // // txt_djtype // this.txt_djtype.EditValue = "鏍囧噯鐩存帴璋冩嫧鍗�(ZJDB01_SYS)"; - this.txt_djtype.Location = new System.Drawing.Point(390, 131); + this.txt_djtype.Location = new System.Drawing.Point(390, 126); this.txt_djtype.Name = "txt_djtype"; this.txt_djtype.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); @@ -790,7 +820,7 @@ // // txt_fRemarks // - this.txt_fRemarks.Location = new System.Drawing.Point(114, 131); + this.txt_fRemarks.Location = new System.Drawing.Point(114, 126); this.txt_fRemarks.Name = "txt_fRemarks"; this.txt_fRemarks.Properties.Appearance.Options.UseFont = true; this.txt_fRemarks.Size = new System.Drawing.Size(170, 24); @@ -800,7 +830,7 @@ // txt_fOwnerTypeInIdHead // this.txt_fOwnerTypeInIdHead.EditValue = "缁勭粐(BD_OwnerOrg)"; - this.txt_fOwnerTypeInIdHead.Location = new System.Drawing.Point(390, 101); + this.txt_fOwnerTypeInIdHead.Location = new System.Drawing.Point(390, 97); this.txt_fOwnerTypeInIdHead.Name = "txt_fOwnerTypeInIdHead"; this.txt_fOwnerTypeInIdHead.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); @@ -815,7 +845,7 @@ // // txt_fCreateDate // - this.txt_fCreateDate.Location = new System.Drawing.Point(666, 41); + this.txt_fCreateDate.Location = new System.Drawing.Point(666, 40); this.txt_fCreateDate.Name = "txt_fCreateDate"; this.txt_fCreateDate.Properties.Appearance.Options.UseFont = true; this.txt_fCreateDate.Size = new System.Drawing.Size(170, 24); @@ -826,7 +856,7 @@ // txt_fOwnerTypeIdHead // this.txt_fOwnerTypeIdHead.EditValue = "缁勭粐(BD_OwnerOrg)"; - this.txt_fOwnerTypeIdHead.Location = new System.Drawing.Point(390, 71); + this.txt_fOwnerTypeIdHead.Location = new System.Drawing.Point(390, 68); this.txt_fOwnerTypeIdHead.Name = "txt_fOwnerTypeIdHead"; this.txt_fOwnerTypeIdHead.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); @@ -842,7 +872,7 @@ // txt_fBusinessType // this.txt_fBusinessType.EditValue = "鏍囧噯(NORMAL)"; - this.txt_fBusinessType.Location = new System.Drawing.Point(114, 71); + this.txt_fBusinessType.Location = new System.Drawing.Point(114, 68); this.txt_fBusinessType.Name = "txt_fBusinessType"; this.txt_fBusinessType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); @@ -856,7 +886,7 @@ // txt_fTransferDirect // this.txt_fTransferDirect.EditValue = "-璇烽�夋嫨-"; - this.txt_fTransferDirect.Location = new System.Drawing.Point(114, 101); + this.txt_fTransferDirect.Location = new System.Drawing.Point(114, 97); this.txt_fTransferDirect.Name = "txt_fTransferDirect"; this.txt_fTransferDirect.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); @@ -892,7 +922,7 @@ // txt_ftranstype // this.txt_ftranstype.EditValue = "缁勭粐鍐呰皟鎷�(InnerOrgTransfer)"; - this.txt_ftranstype.Location = new System.Drawing.Point(390, 41); + this.txt_ftranstype.Location = new System.Drawing.Point(390, 40); this.txt_ftranstype.Name = "txt_ftranstype"; this.txt_ftranstype.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); @@ -915,7 +945,7 @@ // txt_fBillTypeID // this.txt_fBillTypeID.EditValue = "鏍囧噯璋冩嫧鐢宠鍗�(DBSQD01_SYS)"; - this.txt_fBillTypeID.Location = new System.Drawing.Point(114, 41); + this.txt_fBillTypeID.Location = new System.Drawing.Point(114, 40); 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)}); @@ -938,7 +968,7 @@ // // txt_fapprovedate // - this.txt_fapprovedate.Location = new System.Drawing.Point(942, 41); + this.txt_fapprovedate.Location = new System.Drawing.Point(942, 40); this.txt_fapprovedate.Name = "txt_fapprovedate"; this.txt_fapprovedate.Properties.Appearance.Options.UseFont = true; this.txt_fapprovedate.Size = new System.Drawing.Size(172, 24); @@ -948,7 +978,7 @@ // // txt_wjStatus // - this.txt_wjStatus.Location = new System.Drawing.Point(564, 71); + this.txt_wjStatus.Location = new System.Drawing.Point(564, 155); this.txt_wjStatus.Name = "txt_wjStatus"; this.txt_wjStatus.Properties.Caption = "瀹岀粨鏍囪瘑"; this.txt_wjStatus.Size = new System.Drawing.Size(272, 24); @@ -958,7 +988,7 @@ // // txt_chkStatus // - this.txt_chkStatus.Location = new System.Drawing.Point(840, 71); + this.txt_chkStatus.Location = new System.Drawing.Point(840, 68); this.txt_chkStatus.Name = "txt_chkStatus"; this.txt_chkStatus.Properties.Caption = "瀹℃牳鐘舵��"; this.txt_chkStatus.Size = new System.Drawing.Size(274, 24); @@ -966,14 +996,69 @@ this.txt_chkStatus.TabIndex = 388; this.txt_chkStatus.Tag = "readonly"; // - // txt_fSrcType + // txt_source // - this.txt_fSrcType.Location = new System.Drawing.Point(666, 101); - this.txt_fSrcType.Name = "txt_fSrcType"; - this.txt_fSrcType.Size = new System.Drawing.Size(170, 24); - this.txt_fSrcType.StyleController = this.layoutMx1; - this.txt_fSrcType.TabIndex = 390; - this.txt_fSrcType.Tag = "readonly"; + this.txt_source.Location = new System.Drawing.Point(390, 155); + this.txt_source.Name = "txt_source"; + this.txt_source.Size = new System.Drawing.Size(170, 24); + this.txt_source.StyleController = this.layoutMx1; + this.txt_source.TabIndex = 390; + this.txt_source.Tag = "readonly"; + // + // txt_fCloserId + // + this.txt_fCloserId.Location = new System.Drawing.Point(666, 97); + this.txt_fCloserId.Name = "txt_fCloserId"; + this.txt_fCloserId.Size = new System.Drawing.Size(170, 24); + this.txt_fCloserId.StyleController = this.layoutMx1; + this.txt_fCloserId.TabIndex = 392; + this.txt_fCloserId.Tag = "readonly"; + // + // txt_fCloseDate + // + this.txt_fCloseDate.Location = new System.Drawing.Point(666, 126); + this.txt_fCloseDate.Name = "txt_fCloseDate"; + this.txt_fCloseDate.Size = new System.Drawing.Size(170, 24); + this.txt_fCloseDate.StyleController = this.layoutMx1; + this.txt_fCloseDate.TabIndex = 393; + this.txt_fCloseDate.Tag = "readonly"; + // + // txt_fCloseStatusTxt + // + this.txt_fCloseStatusTxt.Location = new System.Drawing.Point(666, 68); + this.txt_fCloseStatusTxt.Name = "txt_fCloseStatusTxt"; + this.txt_fCloseStatusTxt.Size = new System.Drawing.Size(170, 24); + this.txt_fCloseStatusTxt.StyleController = this.layoutMx1; + this.txt_fCloseStatusTxt.TabIndex = 394; + this.txt_fCloseStatusTxt.Tag = "readonly"; + // + // txt_qt028 + // + this.txt_qt028.Location = new System.Drawing.Point(942, 97); + this.txt_qt028.Name = "txt_qt028"; + this.txt_qt028.Size = new System.Drawing.Size(172, 24); + this.txt_qt028.StyleController = this.layoutMx1; + this.txt_qt028.TabIndex = 395; + this.txt_qt028.Tag = "readonly"; + // + // txt_qt027 + // + this.txt_qt027.Location = new System.Drawing.Point(942, 126); + this.txt_qt027.Name = "txt_qt027"; + this.txt_qt027.Size = new System.Drawing.Size(172, 24); + this.txt_qt027.StyleController = this.layoutMx1; + this.txt_qt027.TabIndex = 396; + this.txt_qt027.Tag = "readonly"; + // + // txt_qt026 + // + this.txt_qt026.Location = new System.Drawing.Point(840, 155); + this.txt_qt026.Name = "txt_qt026"; + this.txt_qt026.Properties.Caption = "鍞悗瀹℃牳鐘舵��"; + this.txt_qt026.Size = new System.Drawing.Size(274, 24); + this.txt_qt026.StyleController = this.layoutMx1; + this.txt_qt026.TabIndex = 397; + this.txt_qt026.Tag = "readonly"; // // layoutControlItem16 // @@ -1006,9 +1091,15 @@ this.layoutControlItem14, this.layoutControlItem19, this.layoutControlItem15, - this.layoutControlItem17, this.layoutControlItem12, - this.layoutControlItem11}); + this.layoutControlItem21, + this.layoutControlItem20, + this.layoutControlItem22, + this.layoutControlItem23, + this.layoutControlItem24, + this.layoutControlItem25, + this.layoutControlItem11, + this.layoutControlItem17}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -1034,13 +1125,16 @@ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition5.Height = 100D; rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition6.Height = 100D; + rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition1, rowDefinition2, rowDefinition3, rowDefinition4, - rowDefinition5}); - this.Root.Size = new System.Drawing.Size(1126, 169); + rowDefinition5, + rowDefinition6}); + this.Root.Size = new System.Drawing.Size(1126, 192); this.Root.TextVisible = false; // // layoutControlItem1 @@ -1048,7 +1142,7 @@ this.layoutControlItem1.Control = this.txt_fBillNo; this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Size = new System.Drawing.Size(276, 29); + this.layoutControlItem1.Size = new System.Drawing.Size(276, 28); this.layoutControlItem1.Text = "鐢宠鍗曞彿"; this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18); // @@ -1058,7 +1152,7 @@ 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, 29); + this.layoutControlItem2.Size = new System.Drawing.Size(276, 28); this.layoutControlItem2.Text = "鐢宠缁勭粐"; this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18); // @@ -1068,60 +1162,60 @@ 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, 29); - this.layoutControlItem3.Text = "鐢宠浜�"; + this.layoutControlItem3.Size = new System.Drawing.Size(276, 28); + this.layoutControlItem3.Text = "鐢宠浜哄憳"; this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem4 // this.layoutControlItem4.Control = this.txt_fBillTypeID; - this.layoutControlItem4.Location = new System.Drawing.Point(0, 29); + this.layoutControlItem4.Location = new System.Drawing.Point(0, 28); this.layoutControlItem4.Name = "layoutControlItem4"; this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem4.Size = new System.Drawing.Size(276, 30); + this.layoutControlItem4.Size = new System.Drawing.Size(276, 28); this.layoutControlItem4.Text = "鐢宠绫诲瀷"; this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem5 // this.layoutControlItem5.Control = this.txt_ftranstype; - this.layoutControlItem5.Location = new System.Drawing.Point(276, 29); + this.layoutControlItem5.Location = new System.Drawing.Point(276, 28); this.layoutControlItem5.Name = "layoutControlItem5"; this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem5.Size = new System.Drawing.Size(276, 30); + this.layoutControlItem5.Size = new System.Drawing.Size(276, 28); this.layoutControlItem5.Text = "璋冩嫧绫诲瀷 "; this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem6 // this.layoutControlItem6.Control = this.txt_fCreateDate; - this.layoutControlItem6.Location = new System.Drawing.Point(552, 29); + this.layoutControlItem6.Location = new System.Drawing.Point(552, 28); this.layoutControlItem6.Name = "layoutControlItem6"; this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem6.Size = new System.Drawing.Size(276, 30); + this.layoutControlItem6.Size = new System.Drawing.Size(276, 28); this.layoutControlItem6.Text = "鐢宠鏃堕棿"; this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem7 // this.layoutControlItem7.Control = this.txt_fBusinessType; - this.layoutControlItem7.Location = new System.Drawing.Point(0, 59); + this.layoutControlItem7.Location = new System.Drawing.Point(0, 56); this.layoutControlItem7.Name = "layoutControlItem7"; this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem7.Size = new System.Drawing.Size(276, 30); + this.layoutControlItem7.Size = new System.Drawing.Size(276, 29); this.layoutControlItem7.Text = "涓氬姟绫诲瀷"; this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem8 // this.layoutControlItem8.Control = this.txt_fOwnerTypeIdHead; - this.layoutControlItem8.Location = new System.Drawing.Point(276, 59); + this.layoutControlItem8.Location = new System.Drawing.Point(276, 56); this.layoutControlItem8.Name = "layoutControlItem8"; this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem8.Size = new System.Drawing.Size(276, 30); + this.layoutControlItem8.Size = new System.Drawing.Size(276, 29); this.layoutControlItem8.Text = "璋冨嚭璐т富绫诲瀷"; this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18); // @@ -1131,18 +1225,18 @@ this.layoutControlItem9.Location = new System.Drawing.Point(828, 0); this.layoutControlItem9.Name = "layoutControlItem9"; this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem9.Size = new System.Drawing.Size(278, 29); - this.layoutControlItem9.Text = "瀹℃牳浜�"; + this.layoutControlItem9.Size = new System.Drawing.Size(278, 28); + this.layoutControlItem9.Text = "瀹℃牳浜哄憳"; this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem10 // this.layoutControlItem10.Control = this.txt_fapprovedate; - this.layoutControlItem10.Location = new System.Drawing.Point(828, 29); + this.layoutControlItem10.Location = new System.Drawing.Point(828, 28); this.layoutControlItem10.Name = "layoutControlItem10"; this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem10.Size = new System.Drawing.Size(278, 30); + this.layoutControlItem10.Size = new System.Drawing.Size(278, 28); this.layoutControlItem10.Tag = "readonly"; this.layoutControlItem10.Text = "瀹℃牳鏃堕棿"; this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18); @@ -1150,79 +1244,146 @@ // layoutControlItem13 // this.layoutControlItem13.Control = this.txt_fTransferDirect; - this.layoutControlItem13.Location = new System.Drawing.Point(0, 89); + this.layoutControlItem13.Location = new System.Drawing.Point(0, 85); this.layoutControlItem13.Name = "layoutControlItem13"; this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem13.Size = new System.Drawing.Size(276, 30); + this.layoutControlItem13.Size = new System.Drawing.Size(276, 29); this.layoutControlItem13.Text = "璋冩嫧鏂瑰悜"; this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem14 // this.layoutControlItem14.Control = this.txt_fOwnerTypeInIdHead; - this.layoutControlItem14.Location = new System.Drawing.Point(276, 89); + this.layoutControlItem14.Location = new System.Drawing.Point(276, 85); this.layoutControlItem14.Name = "layoutControlItem14"; this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem14.Size = new System.Drawing.Size(276, 30); + this.layoutControlItem14.Size = new System.Drawing.Size(276, 29); this.layoutControlItem14.Text = "璋冨叆璐т富绫诲瀷"; this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem19 // this.layoutControlItem19.Control = this.txt_djtype; - this.layoutControlItem19.Location = new System.Drawing.Point(276, 119); + this.layoutControlItem19.Location = new System.Drawing.Point(276, 114); this.layoutControlItem19.Name = "layoutControlItem19"; this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem19.Size = new System.Drawing.Size(276, 30); + this.layoutControlItem19.Size = new System.Drawing.Size(276, 29); this.layoutControlItem19.Text = "鍗曟嵁绫诲瀷"; this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem15 // this.layoutControlItem15.Control = this.txt_fRemarks; - this.layoutControlItem15.Location = new System.Drawing.Point(0, 119); + this.layoutControlItem15.Location = new System.Drawing.Point(0, 114); this.layoutControlItem15.Name = "layoutControlItem15"; this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem15.Size = new System.Drawing.Size(276, 30); + this.layoutControlItem15.Size = new System.Drawing.Size(276, 29); this.layoutControlItem15.Text = "鐢宠澶囨敞"; this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem17 - // - this.layoutControlItem17.Control = this.txt_fSrcType; - this.layoutControlItem17.Location = new System.Drawing.Point(552, 89); - this.layoutControlItem17.Name = "layoutControlItem17"; - this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem17.Size = new System.Drawing.Size(276, 30); - this.layoutControlItem17.Text = "婧愬崟绫诲瀷"; - this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem12 // this.layoutControlItem12.Control = this.txt_chkStatus; - this.layoutControlItem12.Location = new System.Drawing.Point(828, 59); + this.layoutControlItem12.Location = new System.Drawing.Point(828, 56); this.layoutControlItem12.Name = "layoutControlItem12"; this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem12.Size = new System.Drawing.Size(278, 30); + this.layoutControlItem12.Size = new System.Drawing.Size(278, 29); this.layoutControlItem12.Text = "瀹℃牳鐘舵��"; this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem12.TextVisible = false; // + // layoutControlItem21 + // + this.layoutControlItem21.Control = this.txt_fCloseDate; + this.layoutControlItem21.Location = new System.Drawing.Point(552, 114); + this.layoutControlItem21.Name = "layoutControlItem21"; + this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 4; + this.layoutControlItem21.Size = new System.Drawing.Size(276, 29); + this.layoutControlItem21.Text = "鍏抽棴鏃堕棿"; + this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem20 + // + this.layoutControlItem20.Control = this.txt_fCloserId; + this.layoutControlItem20.Location = new System.Drawing.Point(552, 85); + this.layoutControlItem20.Name = "layoutControlItem20"; + this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem20.Size = new System.Drawing.Size(276, 29); + this.layoutControlItem20.Text = "鍏抽棴浜哄憳"; + this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem22 + // + this.layoutControlItem22.Control = this.txt_fCloseStatusTxt; + this.layoutControlItem22.Location = new System.Drawing.Point(552, 56); + this.layoutControlItem22.Name = "layoutControlItem22"; + this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem22.Size = new System.Drawing.Size(276, 29); + this.layoutControlItem22.Text = "鍏抽棴鐘舵��"; + this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem23 + // + this.layoutControlItem23.Control = this.txt_qt028; + this.layoutControlItem23.Location = new System.Drawing.Point(828, 85); + this.layoutControlItem23.Name = "layoutControlItem23"; + this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem23.Size = new System.Drawing.Size(278, 29); + this.layoutControlItem23.Text = "鍞悗瀹℃牳浜哄憳"; + this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem24 + // + this.layoutControlItem24.Control = this.txt_qt027; + this.layoutControlItem24.Location = new System.Drawing.Point(828, 114); + this.layoutControlItem24.Name = "layoutControlItem24"; + this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 4; + this.layoutControlItem24.Size = new System.Drawing.Size(278, 29); + this.layoutControlItem24.Text = "鍞悗瀹℃牳鏃堕棿"; + this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem25 + // + this.layoutControlItem25.Control = this.txt_qt026; + this.layoutControlItem25.Location = new System.Drawing.Point(828, 143); + this.layoutControlItem25.Name = "layoutControlItem25"; + this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 5; + this.layoutControlItem25.Size = new System.Drawing.Size(278, 29); + this.layoutControlItem25.Text = "鍞悗瀹℃牳鐘舵��"; + this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem25.TextVisible = false; + // // layoutControlItem11 // this.layoutControlItem11.Control = this.txt_wjStatus; - this.layoutControlItem11.Location = new System.Drawing.Point(552, 59); + this.layoutControlItem11.Location = new System.Drawing.Point(552, 143); this.layoutControlItem11.Name = "layoutControlItem11"; this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem11.Size = new System.Drawing.Size(276, 30); + this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 5; + this.layoutControlItem11.Size = new System.Drawing.Size(276, 29); this.layoutControlItem11.Text = "瀹岀粨鏍囪瘑"; this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem11.TextVisible = false; + // + // layoutControlItem17 + // + this.layoutControlItem17.Control = this.txt_source; + this.layoutControlItem17.Location = new System.Drawing.Point(276, 143); + this.layoutControlItem17.Name = "layoutControlItem17"; + this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 5; + this.layoutControlItem17.Size = new System.Drawing.Size(276, 29); + this.layoutControlItem17.Text = "婧愬崟绫诲瀷"; + this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18); // // tabMx // @@ -1230,7 +1391,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, 389); + this.tabMx.Size = new System.Drawing.Size(1126, 366); this.tabMx.TabIndex = 3; this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1}); @@ -1239,7 +1400,7 @@ // this.tabMxPage1.Controls.Add(this.gcMx1); this.tabMxPage1.Name = "tabMxPage1"; - this.tabMxPage1.Size = new System.Drawing.Size(1124, 357); + this.tabMxPage1.Size = new System.Drawing.Size(1124, 334); this.tabMxPage1.Text = "璋冩嫧鐢宠鏄庣粏"; // // gcMx1 @@ -1260,7 +1421,7 @@ this.rptDrHz, this.rptDcHz, this.btnTest1}); - this.gcMx1.Size = new System.Drawing.Size(1124, 357); + this.gcMx1.Size = new System.Drawing.Size(1124, 334); this.gcMx1.TabIndex = 1; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); @@ -1496,7 +1657,7 @@ // this.gvMx1bld008.AppearanceCell.Options.UseFont = true; this.gvMx1bld008.Caption = "宸叉壂鏁伴噺"; - this.gvMx1bld008.FieldName = "ysNum"; + this.gvMx1bld008.FieldName = "sQty"; this.gvMx1bld008.MinWidth = 50; this.gvMx1bld008.Name = "gvMx1bld008"; this.gvMx1bld008.OptionsColumn.ReadOnly = true; @@ -1862,7 +2023,13 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_fapprovedate.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_wjStatus.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_chkStatus.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_fSrcType.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_source.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fCloserId.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fCloseDate.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fCloseStatusTxt.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt028.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt027.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt026.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); @@ -1879,9 +2046,15 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); @@ -2024,16 +2197,28 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn48; private DevExpress.XtraGrid.Columns.GridColumn gridColumn49; private DevExpress.XtraGrid.Columns.GridColumn gridColumn50; - private DevExpress.XtraEditors.TextEdit txt_fSrcType; + private DevExpress.XtraEditors.TextEdit txt_source; private DevExpress.XtraEditors.ComboBoxEdit txt_djtype; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; private DevExpress.XtraGrid.Columns.GridColumn gv_id; private DevExpress.Utils.ToolTipController tips; private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit btnTest1; + private DevExpress.XtraEditors.TextEdit txt_fCloserId; + private DevExpress.XtraEditors.TextEdit txt_fCloseDate; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20; + private DevExpress.XtraEditors.TextEdit txt_fCloseStatusTxt; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22; + private DevExpress.XtraEditors.TextEdit txt_qt028; + private DevExpress.XtraEditors.TextEdit txt_qt027; + private DevExpress.XtraEditors.CheckEdit txt_qt026; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17; } } \ No newline at end of file -- Gitblit v1.9.3