From c2e1de823e648ca7e62bc868d8aaf9ad5c65a287 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 14 九月 2025 09:17:28 +0800
Subject: [PATCH] 到货单版本冲突
---
DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.Designer.cs | 213 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 135 insertions(+), 78 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.Designer.cs
index 7700281..15f5c7f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.Designer.cs
@@ -34,6 +34,7 @@
DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
@@ -42,15 +43,17 @@
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+ this.btnOutput = new DevExpress.XtraEditors.SimpleButton();
this.ucLookOrg1 = new Gs.DevApp.UserControl.UcLookOrg();
this.dateEdit1 = new DevExpress.XtraEditors.DateEdit();
this.dateEdit2 = new DevExpress.XtraEditors.DateEdit();
this.btnQuery = new DevExpress.XtraEditors.SimpleButton();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
- this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.gcMain1 = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -60,6 +63,7 @@
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.rptBtnView = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
@@ -76,10 +80,11 @@
((System.ComponentModel.ISupportInitialize)(this.dateEdit2.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dateEdit2.Properties.CalendarTimeProperties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rptBtnView)).BeginInit();
@@ -90,6 +95,7 @@
this.splitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitContainerControl1.Horizontal = false;
this.splitContainerControl1.Location = new System.Drawing.Point(0, 0);
+ this.splitContainerControl1.Margin = new System.Windows.Forms.Padding(4);
this.splitContainerControl1.Name = "splitContainerControl1";
//
// splitContainerControl1.Panel1
@@ -102,64 +108,82 @@
this.splitContainerControl1.Panel2.Controls.Add(this.gcMain1);
this.splitContainerControl1.Panel2.Text = "Panel2";
this.splitContainerControl1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitContainerControl1.Size = new System.Drawing.Size(1397, 590);
- this.splitContainerControl1.SplitterPosition = 43;
+ this.splitContainerControl1.Size = new System.Drawing.Size(1746, 721);
+ this.splitContainerControl1.SplitterPosition = 53;
this.splitContainerControl1.TabIndex = 0;
//
// layoutControl1
//
+ this.layoutControl1.Controls.Add(this.btnOutput);
this.layoutControl1.Controls.Add(this.ucLookOrg1);
this.layoutControl1.Controls.Add(this.dateEdit1);
this.layoutControl1.Controls.Add(this.dateEdit2);
this.layoutControl1.Controls.Add(this.btnQuery);
this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutControl1.Location = new System.Drawing.Point(0, 0);
+ this.layoutControl1.Margin = new System.Windows.Forms.Padding(4);
this.layoutControl1.Name = "layoutControl1";
this.layoutControl1.Root = this.Root;
- this.layoutControl1.Size = new System.Drawing.Size(1397, 43);
+ this.layoutControl1.Size = new System.Drawing.Size(1746, 53);
this.layoutControl1.TabIndex = 0;
this.layoutControl1.Text = "layoutControl1";
+ //
+ // btnOutput
+ //
+ this.btnOutput.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.viewmergeddata_16x16;
+ this.btnOutput.Location = new System.Drawing.Point(1074, 12);
+ this.btnOutput.Margin = new System.Windows.Forms.Padding(4);
+ this.btnOutput.Name = "btnOutput";
+ this.btnOutput.Size = new System.Drawing.Size(183, 32);
+ this.btnOutput.StyleController = this.layoutControl1;
+ this.btnOutput.TabIndex = 8;
+ this.btnOutput.Text = "瀵煎嚭";
+ this.btnOutput.Click += new System.EventHandler(this.btnOutput_Click);
//
// ucLookOrg1
//
this.ucLookOrg1.IsReadly = false;
- this.ucLookOrg1.Location = new System.Drawing.Point(84, 12);
+ this.ucLookOrg1.Location = new System.Drawing.Point(96, 12);
+ this.ucLookOrg1.Margin = new System.Windows.Forms.Padding(5);
this.ucLookOrg1.Name = "ucLookOrg1";
- this.ucLookOrg1.Size = new System.Drawing.Size(224, 24);
+ this.ucLookOrg1.Size = new System.Drawing.Size(287, 28);
this.ucLookOrg1.TabIndex = 7;
//
// dateEdit1
//
this.dateEdit1.EditValue = null;
- this.dateEdit1.Location = new System.Drawing.Point(384, 12);
+ this.dateEdit1.Location = new System.Drawing.Point(471, 12);
+ this.dateEdit1.Margin = new System.Windows.Forms.Padding(4);
this.dateEdit1.Name = "dateEdit1";
this.dateEdit1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.dateEdit1.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.dateEdit1.Size = new System.Drawing.Size(124, 24);
+ this.dateEdit1.Size = new System.Drawing.Size(162, 28);
this.dateEdit1.StyleController = this.layoutControl1;
this.dateEdit1.TabIndex = 4;
//
// dateEdit2
//
this.dateEdit2.EditValue = null;
- this.dateEdit2.Location = new System.Drawing.Point(584, 12);
+ this.dateEdit2.Location = new System.Drawing.Point(721, 12);
+ this.dateEdit2.Margin = new System.Windows.Forms.Padding(4);
this.dateEdit2.Name = "dateEdit2";
this.dateEdit2.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.dateEdit2.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.dateEdit2.Size = new System.Drawing.Size(124, 24);
+ this.dateEdit2.Size = new System.Drawing.Size(162, 28);
this.dateEdit2.StyleController = this.layoutControl1;
this.dateEdit2.TabIndex = 5;
//
// btnQuery
//
this.btnQuery.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.viewmergeddata_16x16;
- this.btnQuery.Location = new System.Drawing.Point(712, 12);
+ this.btnQuery.Location = new System.Drawing.Point(887, 12);
+ this.btnQuery.Margin = new System.Windows.Forms.Padding(4);
this.btnQuery.Name = "btnQuery";
- this.btnQuery.Size = new System.Drawing.Size(146, 27);
+ this.btnQuery.Size = new System.Drawing.Size(183, 32);
this.btnQuery.StyleController = this.layoutControl1;
this.btnQuery.TabIndex = 6;
this.btnQuery.Text = "纭畾鏌ヨ";
@@ -169,84 +193,100 @@
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
this.Root.GroupBordersVisible = false;
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem4,
this.layoutControlItem2,
this.layoutControlItem1,
- this.layoutControlItem3});
+ this.layoutControlItem3,
+ this.layoutControlItem5,
+ this.layoutControlItem4});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Absolute;
- columnDefinition1.Width = 300D;
+ columnDefinition1.Width = 375D;
columnDefinition2.SizeType = System.Windows.Forms.SizeType.Absolute;
- columnDefinition2.Width = 200D;
+ columnDefinition2.Width = 250D;
columnDefinition3.SizeType = System.Windows.Forms.SizeType.Absolute;
- columnDefinition3.Width = 200D;
+ columnDefinition3.Width = 250D;
columnDefinition4.SizeType = System.Windows.Forms.SizeType.Absolute;
- columnDefinition4.Width = 150D;
- columnDefinition5.SizeType = System.Windows.Forms.SizeType.AutoSize;
- columnDefinition5.Width = 506D;
+ columnDefinition4.Width = 187D;
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Absolute;
+ columnDefinition5.Width = 187D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.AutoSize;
+ columnDefinition6.Width = 451D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
columnDefinition1,
columnDefinition2,
columnDefinition3,
columnDefinition4,
- columnDefinition5});
+ columnDefinition5,
+ columnDefinition6});
rowDefinition1.Height = 100D;
rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition1});
- this.Root.Size = new System.Drawing.Size(1376, 51);
+ this.Root.Size = new System.Drawing.Size(1720, 56);
this.Root.TextVisible = false;
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.dateEdit2;
+ this.layoutControlItem2.Location = new System.Drawing.Point(625, 0);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem2.Size = new System.Drawing.Size(250, 36);
+ this.layoutControlItem2.Text = "缁撴潫鏃堕棿";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // layoutControlItem1
+ //
+ this.layoutControlItem1.Control = this.dateEdit1;
+ this.layoutControlItem1.Location = new System.Drawing.Point(375, 0);
+ this.layoutControlItem1.Name = "layoutControlItem1";
+ this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem1.Size = new System.Drawing.Size(250, 36);
+ this.layoutControlItem1.Text = "寮�濮嬫椂闂�";
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // layoutControlItem3
+ //
+ this.layoutControlItem3.Control = this.btnQuery;
+ this.layoutControlItem3.Location = new System.Drawing.Point(875, 0);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem3.Size = new System.Drawing.Size(187, 36);
+ this.layoutControlItem3.Text = "纭畾鏌ヨ";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem3.TextVisible = false;
+ //
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.btnOutput;
+ this.layoutControlItem5.Location = new System.Drawing.Point(1062, 0);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 4;
+ this.layoutControlItem5.Size = new System.Drawing.Size(187, 36);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem5.TextVisible = false;
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.ucLookOrg1;
this.layoutControlItem4.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.Size = new System.Drawing.Size(300, 31);
+ this.layoutControlItem4.Size = new System.Drawing.Size(375, 36);
this.layoutControlItem4.Text = "閫夋嫨缁勭粐";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem2
- //
- this.layoutControlItem2.Control = this.dateEdit2;
- this.layoutControlItem2.Location = new System.Drawing.Point(500, 0);
- this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem2.Size = new System.Drawing.Size(200, 31);
- this.layoutControlItem2.Text = "缁撴潫鏃堕棿";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem1
- //
- this.layoutControlItem1.Control = this.dateEdit1;
- this.layoutControlItem1.Location = new System.Drawing.Point(300, 0);
- this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem1.Size = new System.Drawing.Size(200, 31);
- this.layoutControlItem1.Text = "寮�濮嬫椂闂�";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem3
- //
- this.layoutControlItem3.Control = this.btnQuery;
- this.layoutControlItem3.Location = new System.Drawing.Point(700, 0);
- this.layoutControlItem3.Name = "layoutControlItem3";
- this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem3.Size = new System.Drawing.Size(150, 31);
- this.layoutControlItem3.Text = "纭畾鏌ヨ";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem3.TextVisible = false;
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 22);
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Margin = new System.Windows.Forms.Padding(4);
this.gcMain1.Name = "gcMain1";
this.gcMain1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.rptBtnView});
- this.gcMain1.Size = new System.Drawing.Size(1397, 535);
+ this.gcMain1.Size = new System.Drawing.Size(1746, 653);
this.gcMain1.TabIndex = 0;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -261,7 +301,9 @@
this.gridColumn5,
this.gridColumn6,
this.gridColumn7,
+ this.gridColumn9,
this.gridColumn8});
+ this.gridView1.DetailHeight = 428;
this.gridView1.GridControl = this.gcMain1;
this.gridView1.Name = "gridView1";
//
@@ -269,81 +311,91 @@
//
this.gridColumn1.Caption = "鐗╂枡闀夸唬鐮�";
this.gridColumn1.FieldName = "itemNo";
- this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.MinWidth = 31;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 0;
- this.gridColumn1.Width = 94;
+ this.gridColumn1.Width = 117;
//
// gridColumn2
//
this.gridColumn2.Caption = "鐗╂枡鍚嶇О";
this.gridColumn2.FieldName = "itemName";
- this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.MinWidth = 31;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 1;
- this.gridColumn2.Width = 94;
+ this.gridColumn2.Width = 117;
//
// gridColumn3
//
this.gridColumn3.Caption = "瑙勬牸鍨嬪彿";
this.gridColumn3.FieldName = "itemModel";
- this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.MinWidth = 31;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 2;
- this.gridColumn3.Width = 94;
+ this.gridColumn3.Width = 117;
//
// gridColumn4
//
this.gridColumn4.Caption = "鍗曚綅";
this.gridColumn4.FieldName = "dwName";
- this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.MinWidth = 31;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 3;
- this.gridColumn4.Width = 94;
+ this.gridColumn4.Width = 117;
//
// gridColumn5
//
this.gridColumn5.Caption = "璁″垝璁㈠崟閲�";
this.gridColumn5.FieldName = "jhddQty";
- this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.MinWidth = 31;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 4;
- this.gridColumn5.Width = 94;
+ this.gridColumn5.Width = 117;
//
// gridColumn6
//
this.gridColumn6.Caption = "寤鸿鍒拌揣鎴栧畬宸ユ棩鏈�";
this.gridColumn6.FieldName = "dhDate";
- this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.MinWidth = 31;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 5;
- this.gridColumn6.Width = 94;
+ this.gridColumn6.Width = 117;
//
// gridColumn7
//
this.gridColumn7.Caption = "渚涘簲鍟�";
this.gridColumn7.FieldName = "gysName";
- this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.MinWidth = 31;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 6;
- this.gridColumn7.Width = 94;
+ this.gridColumn7.Width = 117;
+ //
+ // gridColumn9
+ //
+ this.gridColumn9.Caption = "瓒呴噰姣斾緥";
+ this.gridColumn9.FieldName = "lossPercent";
+ this.gridColumn9.MinWidth = 30;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.Visible = true;
+ this.gridColumn9.VisibleIndex = 7;
+ this.gridColumn9.Width = 94;
//
// gridColumn8
//
this.gridColumn8.Caption = "鏌ョ湅璇︾粏";
this.gridColumn8.ColumnEdit = this.rptBtnView;
- this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.MinWidth = 31;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 7;
- this.gridColumn8.Width = 94;
+ this.gridColumn8.VisibleIndex = 8;
+ this.gridColumn8.Width = 117;
//
// rptBtnView
//
@@ -358,10 +410,11 @@
//
// WomShjh
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1397, 590);
+ this.ClientSize = new System.Drawing.Size(1746, 721);
this.Controls.Add(this.splitContainerControl1);
+ this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "WomShjh";
this.Text = "閫佽揣璁″垝";
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).EndInit();
@@ -377,10 +430,11 @@
((System.ComponentModel.ISupportInitialize)(this.dateEdit2.Properties.CalendarTimeProperties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.dateEdit2.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.rptBtnView)).EndInit();
@@ -409,9 +463,12 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptBtnView;
private UserControl.UcLookOrg ucLookOrg1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+ private DevExpress.XtraEditors.SimpleButton btnOutput;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
}
}
\ No newline at end of file
--
Gitblit v1.9.3