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/WOM/Frm_Womdaa.resx | 2
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs | 1
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs | 659 +++++++++++++++++---------------------
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 304 ++++++++--------
DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.cs | 2
5 files changed, 454 insertions(+), 514 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
index cfbd179..6ca57b0 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -30,29 +30,29 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition4 = 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();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions6 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject21 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -75,6 +75,10 @@
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -155,23 +159,11 @@
this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabPageReport = new DevExpress.XtraTab.XtraTabPage();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
this.ucRptCgdhd1 = new Gs.DevApp.DevFrm.Rpt.UcRptCgdhd();
- this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.tips = new DevExpress.Utils.ToolTipController(this.components);
-
- this.txt_mxStatue = new DevExpress.XtraEditors.TextEdit();
- this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
-
- this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
-
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -243,10 +235,10 @@
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
- this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = "rpt_InvItem{}";
- this.toolBarMenu1.Size = new System.Drawing.Size(1969, 98);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1552, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = "xlsOut_InvItem{}";
@@ -254,11 +246,10 @@
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
- this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4);
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1969, 736);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1552, 602);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -268,9 +259,8 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
- this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1967, 698);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1550, 570);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -279,7 +269,6 @@
this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
- this.split1.Margin = new System.Windows.Forms.Padding(4);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -292,19 +281,17 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1967, 698);
+ this.split1.Size = new System.Drawing.Size(1550, 570);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
// 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.Size = new System.Drawing.Size(1967, 635);
+ this.gcMain1.Size = new System.Drawing.Size(1550, 519);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -314,7 +301,7 @@
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.AppearancePrint.HeaderPanel.Options.UseTextOptions = true;
this.gridView1.AppearancePrint.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridView1.ColumnPanelRowHeight = 42;
+ this.gridView1.ColumnPanelRowHeight = 34;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.bandedGridColumn1,
this.gv_fType,
@@ -336,9 +323,8 @@
this.gridColumn24,
this.gridColumn25,
this.gridColumn26});
- this.gridView1.DetailHeight = 428;
this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 62;
+ this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.AllowHtmlDrawHeaders = true;
@@ -349,14 +335,14 @@
//
this.bandedGridColumn1.Caption = "鏀舵枡缁勭粐";
this.bandedGridColumn1.FieldName = "receivingOrg";
- this.bandedGridColumn1.MinWidth = 62;
+ this.bandedGridColumn1.MinWidth = 50;
this.bandedGridColumn1.Name = "bandedGridColumn1";
this.bandedGridColumn1.OptionsColumn.AllowEdit = false;
this.bandedGridColumn1.OptionsColumn.ReadOnly = true;
this.bandedGridColumn1.Tag = "org.fnamber";
this.bandedGridColumn1.Visible = true;
this.bandedGridColumn1.VisibleIndex = 0;
- this.bandedGridColumn1.Width = 76;
+ this.bandedGridColumn1.Width = 61;
//
// gv_fType
//
@@ -365,201 +351,229 @@
this.gv_fType.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gv_fType.Caption = "濮斿鏍囪瘑";
this.gv_fType.FieldName = "fType";
- this.gv_fType.MinWidth = 25;
this.gv_fType.Name = "gv_fType";
this.gv_fType.OptionsColumn.AllowEdit = false;
this.gv_fType.Tag = "query_a.f_type";
this.gv_fType.UnboundDataType = typeof(bool);
this.gv_fType.Visible = true;
this.gv_fType.VisibleIndex = 1;
- this.gv_fType.Width = 85;
+ this.gv_fType.Width = 68;
//
// gv_urgentFlag
//
this.gv_urgentFlag.AppearanceCell.Options.UseFont = true;
this.gv_urgentFlag.Caption = "鎬ユ枡鏍囪瘑";
this.gv_urgentFlag.FieldName = "urgentFlagTxt";
- this.gv_urgentFlag.MinWidth = 25;
this.gv_urgentFlag.Name = "gv_urgentFlag";
this.gv_urgentFlag.OptionsColumn.AllowEdit = false;
this.gv_urgentFlag.Tag = "query_a.urgent_flag";
this.gv_urgentFlag.UnboundDataType = typeof(bool);
this.gv_urgentFlag.Visible = true;
this.gv_urgentFlag.VisibleIndex = 2;
- this.gv_urgentFlag.Width = 85;
+ this.gv_urgentFlag.Width = 68;
//
// gv_fstatus
//
this.gv_fstatus.AppearanceCell.Options.UseFont = true;
this.gv_fstatus.Caption = "瀹℃牳鏍囪瘑";
this.gv_fstatus.FieldName = "fstatus";
- this.gv_fstatus.MinWidth = 25;
this.gv_fstatus.Name = "gv_fstatus";
this.gv_fstatus.OptionsColumn.AllowEdit = false;
this.gv_fstatus.Tag = "query_a.fstatus";
this.gv_fstatus.UnboundDataType = typeof(bool);
this.gv_fstatus.Visible = true;
this.gv_fstatus.VisibleIndex = 3;
- this.gv_fstatus.Width = 85;
+ this.gv_fstatus.Width = 68;
//
// gv_billNo
//
this.gv_billNo.AppearanceCell.Options.UseFont = true;
this.gv_billNo.Caption = "鍒拌揣鍗曞彿";
this.gv_billNo.FieldName = "billNo";
- this.gv_billNo.MinWidth = 25;
this.gv_billNo.Name = "gv_billNo";
this.gv_billNo.OptionsColumn.AllowEdit = false;
this.gv_billNo.Tag = "query_a.bill_no";
this.gv_billNo.Visible = true;
this.gv_billNo.VisibleIndex = 4;
- this.gv_billNo.Width = 85;
+ this.gv_billNo.Width = 68;
//
// gv_createBy
//
this.gv_createBy.AppearanceCell.Options.UseFont = true;
this.gv_createBy.Caption = "鍒涘缓浜�";
this.gv_createBy.FieldName = "createBy";
- this.gv_createBy.MinWidth = 25;
this.gv_createBy.Name = "gv_createBy";
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
this.gv_createBy.VisibleIndex = 5;
- this.gv_createBy.Width = 111;
+ this.gv_createBy.Width = 89;
//
// gv_createDate
//
this.gv_createDate.AppearanceCell.Options.UseFont = true;
this.gv_createDate.Caption = "鍒涘缓鏃堕棿";
this.gv_createDate.FieldName = "createDate";
- this.gv_createDate.MinWidth = 25;
this.gv_createDate.Name = "gv_createDate";
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.Tag = "query_a.create_date";
this.gv_createDate.Visible = true;
this.gv_createDate.VisibleIndex = 6;
- this.gv_createDate.Width = 241;
+ this.gv_createDate.Width = 193;
//
// gv_checkUser
//
this.gv_checkUser.AppearanceCell.Options.UseFont = true;
this.gv_checkUser.Caption = "鎻愪氦妫�楠屼汉";
this.gv_checkUser.FieldName = "checkUser";
- this.gv_checkUser.MinWidth = 25;
this.gv_checkUser.Name = "gv_checkUser";
this.gv_checkUser.OptionsColumn.AllowEdit = false;
this.gv_checkUser.Tag = "query_a.check_user";
this.gv_checkUser.Visible = true;
this.gv_checkUser.VisibleIndex = 7;
- this.gv_checkUser.Width = 125;
+ this.gv_checkUser.Width = 100;
//
// gv_checkDate
//
this.gv_checkDate.AppearanceCell.Options.UseFont = true;
this.gv_checkDate.Caption = "鎻愪氦妫�楠屾棩鏈�";
this.gv_checkDate.FieldName = "checkDate";
- this.gv_checkDate.MinWidth = 25;
this.gv_checkDate.Name = "gv_checkDate";
this.gv_checkDate.OptionsColumn.AllowEdit = false;
this.gv_checkDate.Tag = "query_a.check_date";
this.gv_checkDate.Visible = true;
this.gv_checkDate.VisibleIndex = 8;
- this.gv_checkDate.Width = 80;
+ this.gv_checkDate.Width = 64;
//
// gv_suppNo
//
this.gv_suppNo.AppearanceCell.Options.UseFont = true;
this.gv_suppNo.Caption = "渚涘簲鍟嗙紪鍙�";
this.gv_suppNo.FieldName = "suppNo";
- this.gv_suppNo.MinWidth = 25;
this.gv_suppNo.Name = "gv_suppNo";
this.gv_suppNo.OptionsColumn.AllowEdit = false;
this.gv_suppNo.Tag = "query_a.supp_no";
this.gv_suppNo.Visible = true;
this.gv_suppNo.VisibleIndex = 9;
- this.gv_suppNo.Width = 86;
+ this.gv_suppNo.Width = 69;
//
// gridColumn5
//
this.gridColumn5.Caption = "渚涘簲鍟嗗悕绉�";
this.gridColumn5.FieldName = "suppName";
- this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.OptionsColumn.AllowEdit = false;
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 10;
- this.gridColumn5.Width = 87;
+ this.gridColumn5.Width = 70;
//
// gv_remark
//
this.gv_remark.AppearanceCell.Options.UseFont = true;
this.gv_remark.Caption = "澶囨敞";
this.gv_remark.FieldName = "remark";
- this.gv_remark.MinWidth = 25;
this.gv_remark.Name = "gv_remark";
this.gv_remark.OptionsColumn.AllowEdit = false;
this.gv_remark.Tag = "query_a.remark";
this.gv_remark.Visible = true;
this.gv_remark.VisibleIndex = 11;
- this.gv_remark.Width = 112;
+ this.gv_remark.Width = 90;
//
// gridColumn4
//
this.gridColumn4.Caption = "SRM鏍囪瘑";
this.gridColumn4.FieldName = "isSrmChk";
- this.gridColumn4.MinWidth = 31;
+ this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 12;
- this.gridColumn4.Width = 117;
+ this.gridColumn4.Width = 94;
//
// gridColumn11
//
this.gridColumn11.Caption = "涓婚敭GUID";
this.gridColumn11.FieldName = "guid";
- this.gridColumn11.MinWidth = 31;
+ this.gridColumn11.MinWidth = 25;
this.gridColumn11.Name = "gridColumn11";
- this.gridColumn11.Width = 117;
+ this.gridColumn11.Width = 94;
//
// gridColumn7
//
this.gridColumn7.Caption = "SRM鍒拌揣鍗曞彿";
this.gridColumn7.FieldName = "paperBillNo";
- this.gridColumn7.MinWidth = 31;
+ this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 13;
- this.gridColumn7.Width = 117;
+ this.gridColumn7.Width = 94;
//
// gridColumn22
//
this.gridColumn22.Caption = "鍏ュ簱鐘舵��";
this.gridColumn22.FieldName = "mxStatue";
- this.gridColumn22.MinWidth = 30;
+ this.gridColumn22.MinWidth = 24;
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.Visible = true;
this.gridColumn22.VisibleIndex = 14;
- this.gridColumn22.Width = 112;
+ this.gridColumn22.Width = 90;
+ //
+ // gridColumn23
+ //
+ this.gridColumn23.Caption = "鍒拌揣鏁伴噺";
+ this.gridColumn23.FieldName = "鍒拌揣鏁伴噺";
+ this.gridColumn23.MinWidth = 24;
+ this.gridColumn23.Name = "gridColumn23";
+ this.gridColumn23.Visible = true;
+ this.gridColumn23.VisibleIndex = 15;
+ this.gridColumn23.Width = 90;
+ //
+ // gridColumn24
+ //
+ this.gridColumn24.Caption = "妫�楠屾暟閲�";
+ this.gridColumn24.FieldName = "妫�楠屾暟閲�";
+ this.gridColumn24.MinWidth = 24;
+ this.gridColumn24.Name = "gridColumn24";
+ this.gridColumn24.Visible = true;
+ this.gridColumn24.VisibleIndex = 16;
+ this.gridColumn24.Width = 90;
+ //
+ // gridColumn25
+ //
+ this.gridColumn25.Caption = "鍏ュ簱鏁伴噺";
+ this.gridColumn25.FieldName = "鍏ュ簱鏁伴噺";
+ this.gridColumn25.MinWidth = 24;
+ this.gridColumn25.Name = "gridColumn25";
+ this.gridColumn25.Visible = true;
+ this.gridColumn25.VisibleIndex = 17;
+ this.gridColumn25.Width = 90;
+ //
+ // gridColumn26
+ //
+ this.gridColumn26.Caption = "鎵撳嵃鏁伴噺";
+ this.gridColumn26.FieldName = "鎵撳嵃鏁伴噺";
+ this.gridColumn26.MinWidth = 24;
+ this.gridColumn26.Name = "gridColumn26";
+ this.gridColumn26.Visible = true;
+ this.gridColumn26.VisibleIndex = 18;
+ this.gridColumn26.Width = 90;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 635);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
+ this.pageBar1.Location = new System.Drawing.Point(0, 519);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1967, 48);
+ this.pageBar1.Size = new System.Drawing.Size(1550, 39);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// xtraTabPage2
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
- this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1967, 698);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1550, 570);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -567,7 +581,6 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
- this.splitMx1.Margin = new System.Windows.Forms.Padding(4);
this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
@@ -580,8 +593,8 @@
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(1967, 698);
- this.splitMx1.SplitterPosition = 182;
+ this.splitMx1.Size = new System.Drawing.Size(1550, 570);
+ this.splitMx1.SplitterPosition = 149;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -608,20 +621,18 @@
this.layoutControlItem18,
this.layoutControlItem9});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
- this.layoutMx1.Margin = new System.Windows.Forms.Padding(4);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(758, 132, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1967, 182);
+ this.layoutMx1.Size = new System.Drawing.Size(1550, 149);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(1129, 132);
- this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbGuid.Location = new System.Drawing.Point(903, 108);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(369, 34);
+ this.lbGuid.Size = new System.Drawing.Size(295, 28);
this.lbGuid.TabIndex = 1;
this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
@@ -629,53 +640,49 @@
// btnSelect
//
this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.btnSelect.Location = new System.Drawing.Point(12, 132);
- this.btnSelect.Margin = new System.Windows.Forms.Padding(4);
+ this.btnSelect.Location = new System.Drawing.Point(10, 109);
this.btnSelect.Name = "btnSelect";
- this.btnSelect.Size = new System.Drawing.Size(146, 34);
+ this.btnSelect.Size = new System.Drawing.Size(116, 27);
this.btnSelect.StyleController = this.layoutMx1;
this.btnSelect.TabIndex = 443;
this.btnSelect.Text = "閫夋嫨鐗╂枡 ";
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(600, 92);
- this.txt_remark.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_remark.Location = new System.Drawing.Point(478, 76);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(381, 28);
+ this.txt_remark.Size = new System.Drawing.Size(294, 24);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 240;
//
// txt_receiveOrgId
//
this.txt_receiveOrgId.IsReadly = false;
- this.txt_receiveOrgId.Location = new System.Drawing.Point(114, 52);
- this.txt_receiveOrgId.Margin = new System.Windows.Forms.Padding(5);
+ this.txt_receiveOrgId.Location = new System.Drawing.Point(95, 43);
+ this.txt_receiveOrgId.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_receiveOrgId.Name = "txt_receiveOrgId";
- this.txt_receiveOrgId.Size = new System.Drawing.Size(380, 28);
+ this.txt_receiveOrgId.Size = new System.Drawing.Size(294, 24);
this.txt_receiveOrgId.TabIndex = 457;
//
// txtSupplierCode
//
- this.txtSupplierCode.Location = new System.Drawing.Point(600, 52);
- this.txtSupplierCode.Margin = new System.Windows.Forms.Padding(4);
+ this.txtSupplierCode.Location = new System.Drawing.Point(478, 43);
this.txtSupplierCode.Name = "txtSupplierCode";
this.txtSupplierCode.Properties.Appearance.Options.UseFont = true;
this.txtSupplierCode.Properties.Tag = "";
- this.txtSupplierCode.Size = new System.Drawing.Size(381, 28);
+ this.txtSupplierCode.Size = new System.Drawing.Size(294, 24);
this.txtSupplierCode.StyleController = this.layoutMx1;
this.txtSupplierCode.TabIndex = 451;
this.txtSupplierCode.Tag = "readOnly";
//
// txt_billNo
//
- this.txt_billNo.Location = new System.Drawing.Point(114, 12);
- this.txt_billNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_billNo.Location = new System.Drawing.Point(95, 10);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
this.txt_billNo.Properties.Tag = "";
- this.txt_billNo.Size = new System.Drawing.Size(380, 28);
+ this.txt_billNo.Size = new System.Drawing.Size(294, 24);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 213;
this.txt_billNo.Tag = "readOnly";
@@ -683,115 +690,105 @@
// txt_suppId
//
this.txt_suppId.IsReadly = false;
- this.txt_suppId.Location = new System.Drawing.Point(114, 92);
+ this.txt_suppId.Location = new System.Drawing.Point(95, 76);
this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
this.txt_suppId.Name = "txt_suppId";
- this.txt_suppId.Size = new System.Drawing.Size(380, 28);
+ this.txt_suppId.Size = new System.Drawing.Size(294, 24);
this.txt_suppId.TabIndex = 440;
//
// txt_fstatus
//
- this.txt_fstatus.Location = new System.Drawing.Point(1472, 92);
- this.txt_fstatus.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_fstatus.Location = new System.Drawing.Point(1159, 76);
this.txt_fstatus.Name = "txt_fstatus";
this.txt_fstatus.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_fstatus.Size = new System.Drawing.Size(483, 27);
+ this.txt_fstatus.Size = new System.Drawing.Size(381, 24);
this.txt_fstatus.StyleController = this.layoutMx1;
this.txt_fstatus.TabIndex = 458;
this.txt_fstatus.Tag = "readOnly";
//
// txt_fType
//
- this.txt_fType.Location = new System.Drawing.Point(498, 12);
- this.txt_fType.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_fType.Location = new System.Drawing.Point(393, 10);
this.txt_fType.Name = "txt_fType";
this.txt_fType.Properties.Caption = "濮斿鏍囪瘑";
- this.txt_fType.Size = new System.Drawing.Size(483, 27);
+ this.txt_fType.Size = new System.Drawing.Size(379, 24);
this.txt_fType.StyleController = this.layoutMx1;
this.txt_fType.TabIndex = 459;
this.txt_fType.Tag = "readOnly";
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(1087, 12);
- this.txt_createBy.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_createBy.Location = new System.Drawing.Point(861, 10);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(381, 28);
+ this.txt_createBy.Size = new System.Drawing.Size(294, 24);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 461;
this.txt_createBy.Tag = "readOnly";
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(1087, 52);
- this.txt_createDate.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_createDate.Location = new System.Drawing.Point(861, 43);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(381, 28);
+ this.txt_createDate.Size = new System.Drawing.Size(294, 24);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 462;
this.txt_createDate.Tag = "readOnly";
//
// txt_checkUser
//
- this.txt_checkUser.Location = new System.Drawing.Point(1574, 12);
- this.txt_checkUser.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_checkUser.Location = new System.Drawing.Point(1244, 10);
this.txt_checkUser.Name = "txt_checkUser";
this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
- this.txt_checkUser.Size = new System.Drawing.Size(381, 28);
+ this.txt_checkUser.Size = new System.Drawing.Size(296, 24);
this.txt_checkUser.StyleController = this.layoutMx1;
this.txt_checkUser.TabIndex = 463;
this.txt_checkUser.Tag = "readOnly";
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(1574, 52);
- this.txt_checkDate.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_checkDate.Location = new System.Drawing.Point(1244, 43);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(381, 28);
+ this.txt_checkDate.Size = new System.Drawing.Size(296, 24);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 464;
this.txt_checkDate.Tag = "readOnly";
//
// txt_guid
//
- this.txt_guid.Location = new System.Drawing.Point(514, 171);
- this.txt_guid.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_guid.Location = new System.Drawing.Point(411, 140);
this.txt_guid.Name = "txt_guid";
- this.txt_guid.Size = new System.Drawing.Size(239, 28);
+ this.txt_guid.Size = new System.Drawing.Size(191, 24);
this.txt_guid.StyleController = this.layoutMx1;
this.txt_guid.TabIndex = 466;
this.txt_guid.Tag = "readOnly";
//
// txt_paperBillNo
//
- this.txt_paperBillNo.Location = new System.Drawing.Point(1087, 92);
- this.txt_paperBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_paperBillNo.Location = new System.Drawing.Point(861, 76);
this.txt_paperBillNo.Name = "txt_paperBillNo";
- this.txt_paperBillNo.Size = new System.Drawing.Size(381, 28);
+ this.txt_paperBillNo.Size = new System.Drawing.Size(294, 24);
this.txt_paperBillNo.StyleController = this.layoutMx1;
this.txt_paperBillNo.TabIndex = 467;
//
// txt_isSrm
//
- this.txt_isSrm.Location = new System.Drawing.Point(1472, 132);
- this.txt_isSrm.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_isSrm.Location = new System.Drawing.Point(1159, 109);
this.txt_isSrm.Name = "txt_isSrm";
this.txt_isSrm.Properties.Caption = "SRM鏍囪瘑";
- this.txt_isSrm.Size = new System.Drawing.Size(483, 27);
+ this.txt_isSrm.Size = new System.Drawing.Size(381, 24);
this.txt_isSrm.StyleController = this.layoutMx1;
this.txt_isSrm.TabIndex = 468;
this.txt_isSrm.Tag = "readOnly";
//
// txt_mxStatue
//
- this.txt_mxStatue.Location = new System.Drawing.Point(600, 132);
- this.txt_mxStatue.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_mxStatue.Location = new System.Drawing.Point(478, 109);
this.txt_mxStatue.Name = "txt_mxStatue";
this.txt_mxStatue.Properties.Appearance.Options.UseFont = true;
- this.txt_mxStatue.Size = new System.Drawing.Size(381, 28);
+ this.txt_mxStatue.Size = new System.Drawing.Size(294, 24);
this.txt_mxStatue.StyleController = this.layoutMx1;
this.txt_mxStatue.TabIndex = 240;
//
@@ -816,7 +813,7 @@
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 4;
this.layoutControlItem9.Size = new System.Drawing.Size(297, 32);
this.layoutControlItem9.Text = "涓婚敭GUID";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(112, 22);
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
//
// Root
//
@@ -840,105 +837,105 @@
this.layoutControlItem2});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition1.Width = 100D;
- columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition2.Width = 100D;
- columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition3.Width = 100D;
- columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition4.Width = 100D;
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition1,
- columnDefinition2,
- columnDefinition3,
- columnDefinition4});
- rowDefinition1.Height = 100D;
- rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition2.Height = 100D;
- rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition3.Height = 100D;
- rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition4.Height = 100D;
- rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5,
+ columnDefinition6,
+ columnDefinition7,
+ columnDefinition8});
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition7.Height = 100D;
+ rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition8.Height = 100D;
+ rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4});
- this.Root.Size = new System.Drawing.Size(1967, 182);
+ rowDefinition5,
+ rowDefinition6,
+ rowDefinition7,
+ rowDefinition8});
+ this.Root.Size = new System.Drawing.Size(1550, 149);
this.Root.TextVisible = false;
//
// layoutControlItem1
//
this.layoutControlItem1.Control = this.txt_receiveOrgId;
- this.layoutControlItem1.Location = new System.Drawing.Point(0, 40);
+ this.layoutControlItem1.Location = new System.Drawing.Point(0, 33);
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem1.Size = new System.Drawing.Size(486, 40);
+ this.layoutControlItem1.Size = new System.Drawing.Size(383, 33);
this.layoutControlItem1.Text = "鏀舵枡缁勭粐";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 22);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_suppId;
- this.layoutControlItem3.Location = new System.Drawing.Point(0, 80);
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 66);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(486, 40);
+ this.layoutControlItem3.Size = new System.Drawing.Size(383, 33);
this.layoutControlItem3.Text = "閫変緵搴斿晢";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 22);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_createBy;
- this.layoutControlItem11.Location = new System.Drawing.Point(973, 0);
+ this.layoutControlItem11.Location = new System.Drawing.Point(766, 0);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(487, 40);
+ this.layoutControlItem11.Size = new System.Drawing.Size(383, 33);
this.layoutControlItem11.Text = "寤虹珛浜哄憳";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 22);
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_createDate;
- this.layoutControlItem12.Location = new System.Drawing.Point(973, 40);
+ this.layoutControlItem12.Location = new System.Drawing.Point(766, 33);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem12.Size = new System.Drawing.Size(487, 40);
+ this.layoutControlItem12.Size = new System.Drawing.Size(383, 33);
this.layoutControlItem12.Text = "寤虹珛鏃ユ湡";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 22);
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_checkUser;
- this.layoutControlItem13.Location = new System.Drawing.Point(1460, 0);
+ this.layoutControlItem13.Location = new System.Drawing.Point(1149, 0);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(487, 40);
+ this.layoutControlItem13.Size = new System.Drawing.Size(385, 33);
this.layoutControlItem13.Text = "瀹℃牳浜哄憳";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 22);
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_checkDate;
- this.layoutControlItem14.Location = new System.Drawing.Point(1460, 40);
+ this.layoutControlItem14.Location = new System.Drawing.Point(1149, 33);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem14.Size = new System.Drawing.Size(487, 40);
+ this.layoutControlItem14.Size = new System.Drawing.Size(385, 33);
this.layoutControlItem14.Text = "瀹℃牳鏃ユ湡";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 22);
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_fstatus;
- this.layoutControlItem7.Location = new System.Drawing.Point(1460, 80);
+ this.layoutControlItem7.Location = new System.Drawing.Point(1149, 66);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(487, 40);
+ this.layoutControlItem7.Size = new System.Drawing.Size(385, 33);
this.layoutControlItem7.Text = "鎻愪氦妫�楠�";
this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem7.TextVisible = false;
@@ -946,10 +943,10 @@
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_fType;
- this.layoutControlItem8.Location = new System.Drawing.Point(486, 0);
+ this.layoutControlItem8.Location = new System.Drawing.Point(383, 0);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(487, 40);
+ this.layoutControlItem8.Size = new System.Drawing.Size(383, 33);
this.layoutControlItem8.Text = "濮斿鏍囪瘑";
this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem8.TextVisible = false;
@@ -957,34 +954,34 @@
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txtSupplierCode;
- this.layoutControlItem5.Location = new System.Drawing.Point(486, 40);
+ this.layoutControlItem5.Location = new System.Drawing.Point(383, 33);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(487, 40);
+ this.layoutControlItem5.Size = new System.Drawing.Size(383, 33);
this.layoutControlItem5.Text = "渚涘簲鍟嗙紪鐮�";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 22);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_remark;
- this.layoutControlItem17.Location = new System.Drawing.Point(486, 80);
+ this.layoutControlItem17.Location = new System.Drawing.Point(383, 66);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem17.Size = new System.Drawing.Size(487, 40);
+ this.layoutControlItem17.Size = new System.Drawing.Size(383, 33);
this.layoutControlItem17.Text = "鏀舵枡澶囨敞";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 22);
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.btnSelect;
- this.layoutControlItem16.Location = new System.Drawing.Point(0, 120);
- this.layoutControlItem16.MaxSize = new System.Drawing.Size(150, 38);
- this.layoutControlItem16.MinSize = new System.Drawing.Size(25, 38);
+ this.layoutControlItem16.Location = new System.Drawing.Point(0, 99);
+ this.layoutControlItem16.MaxSize = new System.Drawing.Size(120, 31);
+ this.layoutControlItem16.MinSize = new System.Drawing.Size(20, 31);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(486, 42);
+ this.layoutControlItem16.Size = new System.Drawing.Size(383, 34);
this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem16.Text = "閫夋嫨鐗╂枡";
this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
@@ -993,22 +990,22 @@
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_paperBillNo;
- this.layoutControlItem4.Location = new System.Drawing.Point(973, 80);
+ this.layoutControlItem4.Location = new System.Drawing.Point(766, 66);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem4.Size = new System.Drawing.Size(487, 40);
+ this.layoutControlItem4.Size = new System.Drawing.Size(383, 33);
this.layoutControlItem4.Text = "閫佽揣鍗曞彿";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 22);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_isSrm;
- this.layoutControlItem6.Location = new System.Drawing.Point(1460, 120);
+ this.layoutControlItem6.Location = new System.Drawing.Point(1149, 99);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem6.Size = new System.Drawing.Size(487, 42);
+ this.layoutControlItem6.Size = new System.Drawing.Size(385, 34);
this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem6.TextVisible = false;
//
@@ -1017,31 +1014,30 @@
this.layoutControlItem10.Control = this.txt_mxStatue;
this.layoutControlItem10.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem10.CustomizationFormText = "鍏ュ簱鐘舵��";
- this.layoutControlItem10.Location = new System.Drawing.Point(486, 120);
+ this.layoutControlItem10.Location = new System.Drawing.Point(383, 99);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(487, 42);
+ this.layoutControlItem10.Size = new System.Drawing.Size(383, 34);
this.layoutControlItem10.Text = "鍏ュ簱鐘舵��";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 22);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_billNo;
this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.Size = new System.Drawing.Size(486, 40);
+ this.layoutControlItem2.Size = new System.Drawing.Size(383, 33);
this.layoutControlItem2.Text = "鍒拌揣鍗曞彿";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 22);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
//
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabMx.Location = new System.Drawing.Point(0, 0);
- this.tabMx.Margin = new System.Windows.Forms.Padding(4);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1967, 501);
+ this.tabMx.Size = new System.Drawing.Size(1550, 409);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -1049,24 +1045,21 @@
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.gcMx1);
- this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1965, 463);
+ this.tabMxPage1.Size = new System.Drawing.Size(1548, 377);
this.tabMxPage1.Text = "鏀舵枡鏄庣粏";
//
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
- this.gcMx1.Margin = new System.Windows.Forms.Padding(4);
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1,
this.repositoryItemButtonEdit2,
this.rptHistory});
- this.gcMx1.Size = new System.Drawing.Size(1965, 463);
+ this.gcMx1.Size = new System.Drawing.Size(1548, 377);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1109,7 +1102,6 @@
this.gridColumn19,
this.gridColumn20,
this.gridColumn21});
- this.gvMx1.DetailHeight = 428;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1121,55 +1113,55 @@
//
this.gvAbtGuid.Caption = "閲囪喘鏄庣粏GUID";
this.gvAbtGuid.FieldName = "aboutGuid";
- this.gvAbtGuid.MinWidth = 62;
+ this.gvAbtGuid.MinWidth = 50;
this.gvAbtGuid.Name = "gvAbtGuid";
this.gvAbtGuid.OptionsColumn.ReadOnly = true;
- this.gvAbtGuid.Width = 117;
+ this.gvAbtGuid.Width = 94;
//
// gvMx1guid
//
this.gvMx1guid.AppearanceCell.Options.UseFont = true;
this.gvMx1guid.Caption = "鍒拌揣鏄庣粏GUID";
this.gvMx1guid.FieldName = "guid";
- this.gvMx1guid.MinWidth = 87;
+ this.gvMx1guid.MinWidth = 70;
this.gvMx1guid.Name = "gvMx1guid";
this.gvMx1guid.OptionsColumn.ReadOnly = true;
this.gvMx1guid.Tag = "query_a.guid";
- this.gvMx1guid.Width = 125;
+ this.gvMx1guid.Width = 100;
//
// gvMx1ebelnLine
//
this.gvMx1ebelnLine.AppearanceCell.Options.UseFont = true;
this.gvMx1ebelnLine.Caption = "Erp琛孖d";
this.gvMx1ebelnLine.FieldName = "lineK3id";
- this.gvMx1ebelnLine.MinWidth = 112;
+ this.gvMx1ebelnLine.MinWidth = 90;
this.gvMx1ebelnLine.Name = "gvMx1ebelnLine";
this.gvMx1ebelnLine.OptionsColumn.ReadOnly = true;
this.gvMx1ebelnLine.Tag = "query_a.ebeln_line";
- this.gvMx1ebelnLine.Width = 125;
+ this.gvMx1ebelnLine.Width = 100;
//
// gridColumn1
//
this.gridColumn1.Caption = "鐗╂枡ID";
this.gridColumn1.FieldName = "itemId";
- this.gridColumn1.MinWidth = 125;
+ this.gridColumn1.MinWidth = 100;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.ReadOnly = true;
- this.gridColumn1.Width = 125;
+ this.gridColumn1.Width = 100;
//
// gvMx1returnFlag
//
this.gvMx1returnFlag.AppearanceCell.Options.UseFont = true;
this.gvMx1returnFlag.Caption = "閫�璐�";
this.gvMx1returnFlag.FieldName = "returnFlag";
- this.gvMx1returnFlag.MinWidth = 31;
+ this.gvMx1returnFlag.MinWidth = 25;
this.gvMx1returnFlag.Name = "gvMx1returnFlag";
this.gvMx1returnFlag.OptionsColumn.ReadOnly = true;
this.gvMx1returnFlag.Tag = "query_a.return_flag";
this.gvMx1returnFlag.UnboundDataType = typeof(bool);
this.gvMx1returnFlag.Visible = true;
this.gvMx1returnFlag.VisibleIndex = 0;
- this.gvMx1returnFlag.Width = 79;
+ this.gvMx1returnFlag.Width = 63;
//
// gvMx1urgentFlag
//
@@ -1180,113 +1172,113 @@
this.gvMx1urgentFlag.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1urgentFlag.Caption = "鎬ユ枡";
this.gvMx1urgentFlag.FieldName = "urgentFlagTxt";
- this.gvMx1urgentFlag.MinWidth = 31;
+ this.gvMx1urgentFlag.MinWidth = 25;
this.gvMx1urgentFlag.Name = "gvMx1urgentFlag";
this.gvMx1urgentFlag.Tag = "";
this.gvMx1urgentFlag.UnboundDataType = typeof(string);
this.gvMx1urgentFlag.Visible = true;
this.gvMx1urgentFlag.VisibleIndex = 1;
- this.gvMx1urgentFlag.Width = 42;
+ this.gvMx1urgentFlag.Width = 34;
//
// gvMx1isdepsIn
//
this.gvMx1isdepsIn.AppearanceCell.Options.UseFont = true;
this.gvMx1isdepsIn.Caption = "瀹岀粨鏍囪瘑";
this.gvMx1isdepsIn.FieldName = "isdepsIn";
- this.gvMx1isdepsIn.MinWidth = 31;
+ this.gvMx1isdepsIn.MinWidth = 25;
this.gvMx1isdepsIn.Name = "gvMx1isdepsIn";
this.gvMx1isdepsIn.OptionsColumn.ReadOnly = true;
this.gvMx1isdepsIn.Tag = "query_a.isdeps_in";
this.gvMx1isdepsIn.UnboundDataType = typeof(bool);
- this.gvMx1isdepsIn.Width = 62;
+ this.gvMx1isdepsIn.Width = 50;
//
// gvMx1checkStates
//
this.gvMx1checkStates.AppearanceCell.Options.UseFont = true;
this.gvMx1checkStates.Caption = "妫�楠岀姸鎬�";
this.gvMx1checkStates.FieldName = "checkStates";
- this.gvMx1checkStates.MinWidth = 31;
+ this.gvMx1checkStates.MinWidth = 25;
this.gvMx1checkStates.Name = "gvMx1checkStates";
this.gvMx1checkStates.OptionsColumn.ReadOnly = true;
this.gvMx1checkStates.Tag = "query_a.check_states";
this.gvMx1checkStates.Visible = true;
this.gvMx1checkStates.VisibleIndex = 2;
- this.gvMx1checkStates.Width = 82;
+ this.gvMx1checkStates.Width = 66;
//
// gvMx1checkRes
//
this.gvMx1checkRes.AppearanceCell.Options.UseFont = true;
this.gvMx1checkRes.Caption = "妫�楠岀粨鏋�";
this.gvMx1checkRes.FieldName = "checkRes";
- this.gvMx1checkRes.MinWidth = 31;
+ this.gvMx1checkRes.MinWidth = 25;
this.gvMx1checkRes.Name = "gvMx1checkRes";
this.gvMx1checkRes.OptionsColumn.ReadOnly = true;
this.gvMx1checkRes.Tag = "query_a.check_res";
this.gvMx1checkRes.Visible = true;
this.gvMx1checkRes.VisibleIndex = 3;
- this.gvMx1checkRes.Width = 82;
+ this.gvMx1checkRes.Width = 66;
//
// gvMx1ebeln
//
this.gvMx1ebeln.AppearanceCell.Options.UseFont = true;
this.gvMx1ebeln.Caption = "閲囪喘鍗曞彿";
this.gvMx1ebeln.FieldName = "ebeln";
- this.gvMx1ebeln.MinWidth = 150;
+ this.gvMx1ebeln.MinWidth = 120;
this.gvMx1ebeln.Name = "gvMx1ebeln";
this.gvMx1ebeln.OptionsColumn.ReadOnly = true;
this.gvMx1ebeln.Tag = "query_a.ebeln";
this.gvMx1ebeln.Visible = true;
this.gvMx1ebeln.VisibleIndex = 4;
- this.gvMx1ebeln.Width = 161;
+ this.gvMx1ebeln.Width = 129;
//
// gridColumn8
//
this.gridColumn8.Caption = "鐗╂枡缂栧彿";
this.gridColumn8.FieldName = "itemNo";
- this.gridColumn8.MinWidth = 31;
+ this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 5;
- this.gridColumn8.Width = 66;
+ this.gridColumn8.Width = 53;
//
// gvMx1boardStyle
//
this.gvMx1boardStyle.AppearanceCell.Options.UseFont = true;
this.gvMx1boardStyle.Caption = "鐗╂枡鍚嶇О";
this.gvMx1boardStyle.FieldName = "itemName";
- this.gvMx1boardStyle.MinWidth = 31;
+ this.gvMx1boardStyle.MinWidth = 25;
this.gvMx1boardStyle.Name = "gvMx1boardStyle";
this.gvMx1boardStyle.OptionsColumn.ReadOnly = true;
this.gvMx1boardStyle.Tag = "query_a.board_style";
this.gvMx1boardStyle.Visible = true;
this.gvMx1boardStyle.VisibleIndex = 6;
- this.gvMx1boardStyle.Width = 91;
+ this.gvMx1boardStyle.Width = 73;
//
// gvMx1ebelnQty
//
this.gvMx1ebelnQty.AppearanceCell.Options.UseFont = true;
this.gvMx1ebelnQty.Caption = "閲囪喘鏁伴噺";
this.gvMx1ebelnQty.FieldName = "cgsl";
- this.gvMx1ebelnQty.MinWidth = 31;
+ this.gvMx1ebelnQty.MinWidth = 25;
this.gvMx1ebelnQty.Name = "gvMx1ebelnQty";
this.gvMx1ebelnQty.OptionsColumn.ReadOnly = true;
this.gvMx1ebelnQty.Tag = "query_a.ebeln_qty";
this.gvMx1ebelnQty.Visible = true;
this.gvMx1ebelnQty.VisibleIndex = 7;
- this.gvMx1ebelnQty.Width = 80;
+ this.gvMx1ebelnQty.Width = 64;
//
// gvMx1subQty
//
this.gvMx1subQty.AppearanceCell.Options.UseFont = true;
this.gvMx1subQty.Caption = "绱鏈敹閲�";
this.gvMx1subQty.FieldName = "wssl";
- this.gvMx1subQty.MinWidth = 31;
+ this.gvMx1subQty.MinWidth = 25;
this.gvMx1subQty.Name = "gvMx1subQty";
this.gvMx1subQty.OptionsColumn.ReadOnly = true;
this.gvMx1subQty.Tag = "query_a.sub_qty";
this.gvMx1subQty.Visible = true;
this.gvMx1subQty.VisibleIndex = 8;
- this.gvMx1subQty.Width = 80;
+ this.gvMx1subQty.Width = 64;
//
// gvMx1quantity
//
@@ -1297,12 +1289,12 @@
this.gvMx1quantity.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1quantity.Caption = "鏈鏀堕噺";
this.gvMx1quantity.FieldName = "quantity";
- this.gvMx1quantity.MinWidth = 31;
+ this.gvMx1quantity.MinWidth = 25;
this.gvMx1quantity.Name = "gvMx1quantity";
this.gvMx1quantity.Tag = "yz_quantity_0_edit";
this.gvMx1quantity.Visible = true;
this.gvMx1quantity.VisibleIndex = 9;
- this.gvMx1quantity.Width = 80;
+ this.gvMx1quantity.Width = 64;
//
// gvMx1memo
//
@@ -1313,112 +1305,112 @@
this.gvMx1memo.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1memo.Caption = "澶囨敞";
this.gvMx1memo.FieldName = "memo";
- this.gvMx1memo.MinWidth = 62;
+ this.gvMx1memo.MinWidth = 50;
this.gvMx1memo.Name = "gvMx1memo";
this.gvMx1memo.OptionsColumn.ReadOnly = true;
this.gvMx1memo.Tag = "edit";
this.gvMx1memo.Visible = true;
this.gvMx1memo.VisibleIndex = 10;
- this.gvMx1memo.Width = 137;
+ this.gvMx1memo.Width = 110;
//
// gvMx1okRkqty
//
this.gvMx1okRkqty.AppearanceCell.Options.UseFont = true;
this.gvMx1okRkqty.Caption = "绱瀹炴敹";
this.gvMx1okRkqty.FieldName = "yssl";
- this.gvMx1okRkqty.MinWidth = 31;
+ this.gvMx1okRkqty.MinWidth = 25;
this.gvMx1okRkqty.Name = "gvMx1okRkqty";
this.gvMx1okRkqty.OptionsColumn.ReadOnly = true;
this.gvMx1okRkqty.Tag = "query_a.ok_rkqty";
this.gvMx1okRkqty.Visible = true;
this.gvMx1okRkqty.VisibleIndex = 11;
- this.gvMx1okRkqty.Width = 80;
+ this.gvMx1okRkqty.Width = 64;
//
// gvMx1checkDate
//
this.gvMx1checkDate.AppearanceCell.Options.UseFont = true;
this.gvMx1checkDate.Caption = "妫�楠屾棩鏈�";
this.gvMx1checkDate.FieldName = "checkDate";
- this.gvMx1checkDate.MinWidth = 31;
+ this.gvMx1checkDate.MinWidth = 25;
this.gvMx1checkDate.Name = "gvMx1checkDate";
this.gvMx1checkDate.OptionsColumn.ReadOnly = true;
this.gvMx1checkDate.Tag = "query_a.check_date";
- this.gvMx1checkDate.Width = 225;
+ this.gvMx1checkDate.Width = 180;
//
// gridColumn3
//
this.gridColumn3.Caption = "閲囪喘鏃堕棿";
this.gridColumn3.FieldName = "purchaseDate";
- this.gridColumn3.MinWidth = 31;
+ this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.ReadOnly = true;
- this.gridColumn3.Width = 225;
+ this.gridColumn3.Width = 180;
//
// gridColumn9
//
this.gridColumn9.Caption = "閲囪喘鍗曚綅";
this.gridColumn9.FieldName = "cgUnit";
- this.gridColumn9.MinWidth = 31;
+ this.gridColumn9.MinWidth = 25;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.OptionsColumn.ReadOnly = true;
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 14;
- this.gridColumn9.Width = 50;
+ this.gridColumn9.Width = 40;
//
// gridColumn6
//
this.gridColumn6.Caption = "鐗╂枡瑙勬牸";
this.gridColumn6.FieldName = "itemModel";
- this.gridColumn6.MinWidth = 31;
+ this.gridColumn6.MinWidth = 25;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.OptionsColumn.ReadOnly = true;
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 15;
- this.gridColumn6.Width = 149;
+ this.gridColumn6.Width = 119;
//
// gridColumn10
//
this.gridColumn10.Caption = "娆″簭";
this.gridColumn10.FieldName = "workLine";
- this.gridColumn10.MinWidth = 31;
+ this.gridColumn10.MinWidth = 25;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
this.gridColumn10.VisibleIndex = 19;
- this.gridColumn10.Width = 54;
+ this.gridColumn10.Width = 43;
//
// gridColumn12
//
this.gridColumn12.Caption = "閫�鏂欐椂闂�";
this.gridColumn12.FieldName = "returnDate";
- this.gridColumn12.MinWidth = 31;
+ this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
- this.gridColumn12.Width = 31;
+ this.gridColumn12.Width = 25;
//
// gridColumn13
//
this.gridColumn13.Caption = "閫�鏂欎汉";
this.gridColumn13.FieldName = "returnBy";
- this.gridColumn13.MinWidth = 31;
+ this.gridColumn13.MinWidth = 25;
this.gridColumn13.Name = "gridColumn13";
- this.gridColumn13.Width = 31;
+ this.gridColumn13.Width = 25;
//
// gvBtnAlawys
//
this.gvBtnAlawys.Caption = "閫�鏂�";
this.gvBtnAlawys.ColumnEdit = this.repositoryItemButtonEdit2;
- this.gvBtnAlawys.MinWidth = 100;
+ this.gvBtnAlawys.MinWidth = 80;
this.gvBtnAlawys.Name = "gvBtnAlawys";
this.gvBtnAlawys.Visible = true;
this.gvBtnAlawys.VisibleIndex = 22;
- this.gvBtnAlawys.Width = 100;
+ this.gvBtnAlawys.Width = 80;
//
// repositoryItemButtonEdit2
//
this.repositoryItemButtonEdit2.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.edit_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.edit_16x16;
+ editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫�鏂�", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫�鏂�", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
@@ -1427,19 +1419,19 @@
//
this.gvMxDel.Caption = "绉诲嚭";
this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
- this.gvMxDel.MinWidth = 100;
+ this.gvMxDel.MinWidth = 80;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
this.gvMxDel.VisibleIndex = 23;
- this.gvMxDel.Width = 129;
+ this.gvMxDel.Width = 103;
//
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions5.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -1448,57 +1440,57 @@
//
this.gridColumn14.Caption = "鍒ゅ畾缁撴灉";
this.gridColumn14.FieldName = "freceQty";
- this.gridColumn14.MinWidth = 31;
+ this.gridColumn14.MinWidth = 25;
this.gridColumn14.Name = "gridColumn14";
- this.gridColumn14.Width = 117;
+ this.gridColumn14.Width = 94;
//
// gridColumn15
//
this.gridColumn15.Caption = "OA澶勭悊鎰忚";
this.gridColumn15.FieldName = "clyj";
- this.gridColumn15.MinWidth = 31;
+ this.gridColumn15.MinWidth = 25;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
this.gridColumn15.VisibleIndex = 16;
- this.gridColumn15.Width = 111;
+ this.gridColumn15.Width = 89;
//
// gridColumn16
//
this.gridColumn16.Caption = "OA鎸戦�夋暟閲�";
this.gridColumn16.FieldName = "txsl";
- this.gridColumn16.MinWidth = 31;
+ this.gridColumn16.MinWidth = 25;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
this.gridColumn16.VisibleIndex = 17;
- this.gridColumn16.Width = 111;
+ this.gridColumn16.Width = 89;
//
// gridColumn2
//
this.gridColumn2.Caption = "OA閫夊埆绫诲埆";
this.gridColumn2.FieldName = "xblb";
- this.gridColumn2.MinWidth = 31;
+ this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 18;
- this.gridColumn2.Width = 55;
+ this.gridColumn2.Width = 44;
//
// gridColumn17
//
this.gridColumn17.Caption = "鍒拌揣璁板綍";
this.gridColumn17.ColumnEdit = this.rptHistory;
- this.gridColumn17.MinWidth = 31;
+ this.gridColumn17.MinWidth = 25;
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Visible = true;
this.gridColumn17.VisibleIndex = 21;
- this.gridColumn17.Width = 155;
+ this.gridColumn17.Width = 124;
//
// rptHistory
//
this.rptHistory.AutoHeight = false;
- editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.historyitem_16x16;
- editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.historyitem_16x16;
+ editorButtonImageOptions6.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.rptHistory.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "璁板綍", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "璁板綍", -1, true, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptHistory.Name = "rptHistory";
this.rptHistory.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.rptHistory.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptHistory_ButtonClick);
@@ -1507,128 +1499,75 @@
//
this.gridColumn18.Caption = "ErpId";
this.gridColumn18.FieldName = "ebelnK3id";
- this.gridColumn18.MinWidth = 31;
+ this.gridColumn18.MinWidth = 25;
this.gridColumn18.Name = "gridColumn18";
- this.gridColumn18.Width = 117;
+ this.gridColumn18.Width = 94;
//
// gridColumn19
//
this.gridColumn19.Caption = "绱楠岄��";
this.gridColumn19.FieldName = "ljyt";
- this.gridColumn19.MinWidth = 31;
+ this.gridColumn19.MinWidth = 25;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
this.gridColumn19.VisibleIndex = 12;
- this.gridColumn19.Width = 117;
+ this.gridColumn19.Width = 94;
//
// gridColumn20
//
this.gridColumn20.Caption = "绱浠撻��";
this.gridColumn20.FieldName = "ljct";
- this.gridColumn20.MinWidth = 31;
+ this.gridColumn20.MinWidth = 25;
this.gridColumn20.Name = "gridColumn20";
this.gridColumn20.Visible = true;
this.gridColumn20.VisibleIndex = 13;
- this.gridColumn20.Width = 117;
+ this.gridColumn20.Width = 94;
//
// gridColumn21
//
this.gridColumn21.Caption = "娓呯偣鐘舵��";
this.gridColumn21.FieldName = "mxStatue";
- this.gridColumn21.MinWidth = 30;
+ this.gridColumn21.MinWidth = 24;
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.Visible = true;
this.gridColumn21.VisibleIndex = 20;
- this.gridColumn21.Width = 94;
//
// xtraTabPageReport
//
this.xtraTabPageReport.Controls.Add(this.ucRptCgdhd1);
this.xtraTabPageReport.ImageOptions.Image = global::Gs.DevApp.Properties.Resources._3dcolumn_16x16;
+ this.xtraTabPageReport.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.xtraTabPageReport.Name = "xtraTabPageReport";
- this.xtraTabPageReport.Size = new System.Drawing.Size(1573, 570);
+ this.xtraTabPageReport.Size = new System.Drawing.Size(1550, 570);
this.xtraTabPageReport.Text = "鎶ヨ〃";
//
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(1155, 67);
- this.picCheckBox.Margin = new System.Windows.Forms.Padding(4);
+ this.picCheckBox.Location = new System.Drawing.Point(924, 55);
this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(125, 61);
+ this.picCheckBox.Size = new System.Drawing.Size(100, 50);
this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picCheckBox.TabIndex = 6;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
-
// ucRptCgdhd1
//
this.ucRptCgdhd1.Dock = System.Windows.Forms.DockStyle.Fill;
this.ucRptCgdhd1.Location = new System.Drawing.Point(0, 0);
this.ucRptCgdhd1.Name = "ucRptCgdhd1";
- this.ucRptCgdhd1.Size = new System.Drawing.Size(1573, 570);
+ this.ucRptCgdhd1.Size = new System.Drawing.Size(1550, 570);
this.ucRptCgdhd1.TabIndex = 0;
-
- // txt_mxStatue
-
- //
- this.gridColumn23.Caption = "鍒拌揣鏁伴噺";
- this.gridColumn23.FieldName = "鍒拌揣鏁伴噺";
- this.gridColumn23.MinWidth = 30;
- this.gridColumn23.Name = "gridColumn23";
- this.gridColumn23.Visible = true;
- this.gridColumn23.VisibleIndex = 15;
- this.gridColumn23.Width = 112;
- //
- // gridColumn24
- //
- this.gridColumn24.Caption = "妫�楠屾暟閲�";
- this.gridColumn24.FieldName = "妫�楠屾暟閲�";
- this.gridColumn24.MinWidth = 30;
- this.gridColumn24.Name = "gridColumn24";
- this.gridColumn24.Visible = true;
- this.gridColumn24.VisibleIndex = 16;
- this.gridColumn24.Width = 112;
- //
- // gridColumn25
- //
-
- this.layoutControlItem2.Control = this.txt_billNo;
- this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
- this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.Size = new System.Drawing.Size(486, 40);
- this.layoutControlItem2.Text = "鍒拌揣鍗曞彿";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 22);
-
- this.gridColumn25.Caption = "鍏ュ簱鏁伴噺";
- this.gridColumn25.FieldName = "鍏ュ簱鏁伴噺";
- this.gridColumn25.MinWidth = 30;
- this.gridColumn25.Name = "gridColumn25";
- this.gridColumn25.Visible = true;
- this.gridColumn25.VisibleIndex = 17;
- this.gridColumn25.Width = 112;
- //
- // gridColumn26
- //
- this.gridColumn26.Caption = "鎵撳嵃鏁伴噺";
- this.gridColumn26.FieldName = "鎵撳嵃鏁伴噺";
- this.gridColumn26.MinWidth = 30;
- this.gridColumn26.Name = "gridColumn26";
- this.gridColumn26.Visible = true;
- this.gridColumn26.VisibleIndex = 18;
- this.gridColumn26.Width = 112;
-
//
// Frm_MesInvItemArn
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1969, 834);
+ this.ClientSize = new System.Drawing.Size(1552, 682);
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
- this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "Frm_MesInvItemArn";
this.Text = "閲囪喘鍒拌揣鍗�";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -1795,10 +1734,10 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
-
+
private DevExpress.XtraTab.XtraTabPage xtraTabPageReport;
- private Rpt.UcRptCgdhd ucRptCgdhd1;
+
private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
private DevExpress.XtraEditors.TextEdit txt_mxStatue;
@@ -1809,6 +1748,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
-
+ private Rpt.UcRptCgdhd ucRptCgdhd1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
index 24aeadc..6dab6da 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
@@ -172,6 +172,7 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
{
+
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.cs
index 4336c82..4c9991c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.cs
@@ -62,7 +62,7 @@
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
- private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
+ public void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
{
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 795fa49..e7d951d 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -30,48 +30,48 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition25 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition26 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition27 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition28 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition17 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraGrid.GridLevelNode gridLevelNode2 = new DevExpress.XtraGrid.GridLevelNode();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition29 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition30 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition18 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition31 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition32 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition33 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition34 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition35 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition19 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition20 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ 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.XtraGrid.GridLevelNode gridLevelNode1 = new DevExpress.XtraGrid.GridLevelNode();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_Womdaa));
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition36 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition37 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition38 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition39 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition40 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition41 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition21 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition42 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition43 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition44 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition45 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition46 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition47 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition48 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition22 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition17 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition18 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition19 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition21 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition22 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition23 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition24 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -698,7 +698,7 @@
//
this.gv_daa018.AppearanceCell.Options.UseFont = true;
this.gv_daa018.Caption = "宸ュ崟鐘舵��";
- this.gv_daa018.FieldName = "daa018Txt";
+ this.gv_daa018.FieldName = "daa018TxtColor";
this.gv_daa018.MinWidth = 90;
this.gv_daa018.Name = "gv_daa018";
this.gv_daa018.OptionsColumn.AllowEdit = false;
@@ -1449,38 +1449,38 @@
this.layoutControlItem49});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition25.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition25.Width = 100D;
- columnDefinition26.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition26.Width = 100D;
- columnDefinition27.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition27.Width = 100D;
- columnDefinition28.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition28.Width = 100D;
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition25,
- columnDefinition26,
- columnDefinition27,
- columnDefinition28});
- rowDefinition12.Height = 100D;
- rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition13.Height = 100D;
- rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition14.Height = 100D;
- rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition15.Height = 100D;
- rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition16.Height = 100D;
- rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition17.Height = 100D;
- rowDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition4.Height = 100D;
+ 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[] {
- rowDefinition12,
- rowDefinition13,
- rowDefinition14,
- rowDefinition15,
- rowDefinition16,
- rowDefinition17});
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4,
+ rowDefinition5,
+ rowDefinition6});
this.Root.Size = new System.Drawing.Size(1650, 192);
this.Root.TextVisible = false;
//
@@ -2306,9 +2306,9 @@
// gcMx7
//
this.gcMx7.Dock = System.Windows.Forms.DockStyle.Fill;
- gridLevelNode2.RelationName = "Level1";
+ gridLevelNode1.RelationName = "Level1";
this.gcMx7.LevelTree.Nodes.AddRange(new DevExpress.XtraGrid.GridLevelNode[] {
- gridLevelNode2});
+ gridLevelNode1});
this.gcMx7.Location = new System.Drawing.Point(0, 0);
this.gcMx7.MainView = this.gvMx7;
this.gcMx7.Name = "gcMx7";
@@ -2635,17 +2635,17 @@
this.layoutControlItem39});
this.layoutControlGroup3.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup3.Name = "Root";
- columnDefinition29.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition29.Width = 100D;
- columnDefinition30.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition30.Width = 100D;
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
this.layoutControlGroup3.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition29,
- columnDefinition30});
- rowDefinition18.Height = 100D;
- rowDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5,
+ columnDefinition6});
+ rowDefinition7.Height = 100D;
+ rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup3.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition18});
+ rowDefinition7});
this.layoutControlGroup3.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
this.layoutControlGroup3.Size = new System.Drawing.Size(321, 28);
this.layoutControlGroup3.TextVisible = false;
@@ -2763,29 +2763,29 @@
this.layoutControlItem36});
this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup1.Name = "Root";
- columnDefinition31.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition31.Width = 100D;
- columnDefinition32.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition32.Width = 100D;
- columnDefinition33.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition33.Width = 100D;
- columnDefinition34.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition34.Width = 100D;
- columnDefinition35.SizeType = System.Windows.Forms.SizeType.AutoSize;
- columnDefinition35.Width = 328D;
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.Width = 100D;
+ columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition9.Width = 100D;
+ columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition10.Width = 100D;
+ columnDefinition11.SizeType = System.Windows.Forms.SizeType.AutoSize;
+ columnDefinition11.Width = 328D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition31,
- columnDefinition32,
- columnDefinition33,
- columnDefinition34,
- columnDefinition35});
- rowDefinition19.Height = 100D;
- rowDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition20.Height = 100D;
- rowDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7,
+ columnDefinition8,
+ columnDefinition9,
+ columnDefinition10,
+ columnDefinition11});
+ rowDefinition8.Height = 100D;
+ rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition9.Height = 100D;
+ rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition19,
- rowDefinition20});
+ rowDefinition8,
+ rowDefinition9});
this.layoutControlGroup1.Size = new System.Drawing.Size(1648, 84);
this.layoutControlGroup1.TextVisible = false;
//
@@ -3084,10 +3084,10 @@
// rptTuoBanNbz
//
this.rptTuoBanNbz.AutoHeight = false;
- editorButtonImageOptions2.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions2.Image")));
- editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions1.Image")));
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.rptTuoBanNbz.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "鍙樻洿鍐呭寘瑁呮暟閲�", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "鍙樻洿鍐呭寘瑁呮暟閲�", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptTuoBanNbz.Name = "rptTuoBanNbz";
this.rptTuoBanNbz.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.rptTuoBanNbz.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptTuoBanNbz_ButtonClick);
@@ -3204,29 +3204,29 @@
this.layoutControlItem37});
this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup2.Name = "Root";
- columnDefinition36.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition36.Width = 100D;
- columnDefinition37.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition37.Width = 100D;
- columnDefinition38.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition38.Width = 100D;
- columnDefinition39.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition39.Width = 100D;
- columnDefinition40.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition40.Width = 100D;
- columnDefinition41.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition41.Width = 100D;
+ columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition12.Width = 100D;
+ columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition13.Width = 100D;
+ columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition14.Width = 100D;
+ columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition15.Width = 100D;
+ columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition16.Width = 100D;
+ columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition17.Width = 100D;
this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition36,
- columnDefinition37,
- columnDefinition38,
- columnDefinition39,
- columnDefinition40,
- columnDefinition41});
- rowDefinition21.Height = 100D;
- rowDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition12,
+ columnDefinition13,
+ columnDefinition14,
+ columnDefinition15,
+ columnDefinition16,
+ columnDefinition17});
+ rowDefinition10.Height = 100D;
+ rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition21});
+ rowDefinition10});
this.layoutControlGroup2.Size = new System.Drawing.Size(1648, 52);
this.layoutControlGroup2.TextVisible = false;
//
@@ -3559,32 +3559,32 @@
this.layoutControlItem47});
this.layoutControlGroup4.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup4.Name = "Root";
- columnDefinition42.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition42.Width = 100D;
- columnDefinition43.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition43.Width = 100D;
- columnDefinition44.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition44.Width = 100D;
- columnDefinition45.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition45.Width = 100D;
- columnDefinition46.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition46.Width = 100D;
- columnDefinition47.SizeType = System.Windows.Forms.SizeType.Absolute;
- columnDefinition47.Width = 120D;
- columnDefinition48.SizeType = System.Windows.Forms.SizeType.Absolute;
- columnDefinition48.Width = 150D;
+ columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition18.Width = 100D;
+ columnDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition19.Width = 100D;
+ columnDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition20.Width = 100D;
+ columnDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition21.Width = 100D;
+ columnDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition22.Width = 100D;
+ columnDefinition23.SizeType = System.Windows.Forms.SizeType.Absolute;
+ columnDefinition23.Width = 120D;
+ columnDefinition24.SizeType = System.Windows.Forms.SizeType.Absolute;
+ columnDefinition24.Width = 150D;
this.layoutControlGroup4.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition42,
- columnDefinition43,
- columnDefinition44,
- columnDefinition45,
- columnDefinition46,
- columnDefinition47,
- columnDefinition48});
- rowDefinition22.Height = 100D;
- rowDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition18,
+ columnDefinition19,
+ columnDefinition20,
+ columnDefinition21,
+ columnDefinition22,
+ columnDefinition23,
+ columnDefinition24});
+ rowDefinition11.Height = 100D;
+ rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup4.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition22});
+ rowDefinition11});
this.layoutControlGroup4.Size = new System.Drawing.Size(1648, 52);
this.layoutControlGroup4.TextVisible = false;
//
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.resx b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.resx
index 5e5278b..4c755b8 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.resx
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.resx
@@ -118,7 +118,7 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <data name="editorButtonImageOptions2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <data name="editorButtonImageOptions1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAALdEVYdFRpdGxlAE9wZW47Scl3kgAAAxRJREFUOE91
--
Gitblit v1.9.3