From e72f34545b96332b8bff76294b7d397630139d9c Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期六, 13 九月 2025 16:06:22 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 583 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 319 insertions(+), 264 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 56d4c84..795fa49 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 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();
+ 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();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_Womdaa));
- 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();
+ 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();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -142,6 +142,7 @@
this.txt_isQiTao = new DevExpress.XtraEditors.CheckEdit();
this.txt_daa018 = new DevExpress.XtraEditors.TextEdit();
this.txt_daa025 = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.txt_daa021 = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem41 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -159,16 +160,17 @@
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
this.txt_daa015label = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem46 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem48 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem40 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem49 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -201,6 +203,7 @@
this.gvMx1dab020 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1dab022 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1dab023 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn58 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabPage6 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx6 = new DevExpress.XtraGrid.GridControl();
this.gvMx6 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -304,6 +307,7 @@
this.gridColumn43 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn35 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn55 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabPage4 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx100 = new DevExpress.XtraEditors.SplitContainerControl();
this.layMx100 = new DevExpress.XtraDataLayout.DataLayoutControl();
@@ -378,6 +382,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_isQiTao.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa018.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa025.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_daa021.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).BeginInit();
@@ -395,16 +400,17 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa015label)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem46)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem48)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem49)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -627,7 +633,7 @@
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Tag = "query_a.jabs";
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 0;
+ this.gridColumn5.VisibleIndex = 28;
this.gridColumn5.Width = 50;
//
// gridColumn7
@@ -639,7 +645,7 @@
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Tag = "query_a.jabs";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 1;
+ this.gridColumn7.VisibleIndex = 0;
this.gridColumn7.Width = 50;
//
// gridColumn10
@@ -651,7 +657,7 @@
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Tag = "query_a.jabs";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 2;
+ this.gridColumn10.VisibleIndex = 1;
this.gridColumn10.Width = 50;
//
// gridColumn12
@@ -663,7 +669,7 @@
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Tag = "query_a.jabs";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 3;
+ this.gridColumn12.VisibleIndex = 2;
this.gridColumn12.Width = 50;
//
// gridColumn6
@@ -675,7 +681,7 @@
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Tag = "query_a.jabs";
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 4;
+ this.gridColumn6.VisibleIndex = 3;
this.gridColumn6.Width = 50;
//
// gridColumn27
@@ -698,7 +704,7 @@
this.gv_daa018.OptionsColumn.AllowEdit = false;
this.gv_daa018.Tag = "query_a.daa018";
this.gv_daa018.Visible = true;
- this.gv_daa018.VisibleIndex = 5;
+ this.gv_daa018.VisibleIndex = 4;
this.gv_daa018.Width = 90;
//
// gridColoun100
@@ -722,7 +728,7 @@
this.gv_daa001.OptionsColumn.AllowEdit = false;
this.gv_daa001.Tag = "query_a.daa001";
this.gv_daa001.Visible = true;
- this.gv_daa001.VisibleIndex = 6;
+ this.gv_daa001.VisibleIndex = 5;
this.gv_daa001.Width = 120;
//
// gv_daa021
@@ -735,7 +741,7 @@
this.gv_daa021.OptionsColumn.AllowEdit = false;
this.gv_daa021.Tag = "query_a.daa021";
this.gv_daa021.Visible = true;
- this.gv_daa021.VisibleIndex = 7;
+ this.gv_daa021.VisibleIndex = 6;
this.gv_daa021.Width = 100;
//
// gridColumn3
@@ -1011,7 +1017,7 @@
this.gridColumn25.MinWidth = 25;
this.gridColumn25.Name = "gridColumn25";
this.gridColumn25.Visible = true;
- this.gridColumn25.VisibleIndex = 28;
+ this.gridColumn25.VisibleIndex = 7;
this.gridColumn25.Width = 94;
//
// gridColumn52
@@ -1092,6 +1098,7 @@
this.layoutMx1.Controls.Add(this.txt_isQiTao);
this.layoutMx1.Controls.Add(this.txt_daa018);
this.layoutMx1.Controls.Add(this.txt_daa025);
+ this.layoutMx1.Controls.Add(this.txt_daa021);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem29,
@@ -1099,7 +1106,7 @@
this.layoutControlItem41});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1059, 277, 812, 500);
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(797, 526, 812, 500);
this.layoutMx1.Root = this.Root;
this.layoutMx1.Size = new System.Drawing.Size(1650, 192);
this.layoutMx1.TabIndex = 0;
@@ -1124,10 +1131,10 @@
//
// txt_daa009
//
- this.txt_daa009.Location = new System.Drawing.Point(114, 155);
+ this.txt_daa009.Location = new System.Drawing.Point(521, 155);
this.txt_daa009.Name = "txt_daa009";
this.txt_daa009.Properties.Appearance.Options.UseFont = true;
- this.txt_daa009.Size = new System.Drawing.Size(708, 24);
+ this.txt_daa009.Size = new System.Drawing.Size(301, 24);
this.txt_daa009.StyleController = this.layoutMx1;
this.txt_daa009.TabIndex = 240;
this.txt_daa009.Tag = "";
@@ -1254,7 +1261,7 @@
//
// txt_daa029
//
- this.txt_daa029.Location = new System.Drawing.Point(114, 68);
+ this.txt_daa029.Location = new System.Drawing.Point(114, 97);
this.txt_daa029.Name = "txt_daa029";
this.txt_daa029.Properties.Appearance.Options.UseFont = true;
this.txt_daa029.Size = new System.Drawing.Size(301, 24);
@@ -1284,7 +1291,7 @@
//
// txt_daa003
//
- this.txt_daa003.Location = new System.Drawing.Point(114, 97);
+ this.txt_daa003.Location = new System.Drawing.Point(114, 126);
this.txt_daa003.Name = "txt_daa003";
this.txt_daa003.Properties.Appearance.Options.UseFont = true;
this.txt_daa003.Size = new System.Drawing.Size(301, 24);
@@ -1304,7 +1311,7 @@
//
// txt_daa004
//
- this.txt_daa004.Location = new System.Drawing.Point(114, 126);
+ this.txt_daa004.Location = new System.Drawing.Point(114, 155);
this.txt_daa004.Name = "txt_daa004";
this.txt_daa004.Properties.Appearance.Options.UseFont = true;
this.txt_daa004.Size = new System.Drawing.Size(301, 24);
@@ -1367,6 +1374,15 @@
this.txt_daa025.StyleController = this.layoutMx1;
this.txt_daa025.TabIndex = 479;
//
+ // txt_daa021
+ //
+ this.txt_daa021.Location = new System.Drawing.Point(114, 68);
+ this.txt_daa021.Name = "txt_daa021";
+ this.txt_daa021.Size = new System.Drawing.Size(301, 24);
+ this.txt_daa021.StyleController = this.layoutMx1;
+ this.txt_daa021.TabIndex = 480;
+ this.txt_daa021.Tag = "readonly";
+ //
// layoutControlItem29
//
this.layoutControlItem29.Control = this.lbGuid;
@@ -1420,50 +1436,51 @@
this.layoutControlItem12,
this.layoutControlItem16,
this.layoutControlItem9,
- this.layoutControlItem13,
- this.layoutControlItem19,
- this.layoutControlItem17,
- this.layoutControlItem28,
this.txt_daa015label,
this.layoutControlItem14,
this.layoutControlItem46,
this.layoutControlItem48,
this.layoutControlItem40,
- this.layoutControlItem27});
+ this.layoutControlItem27,
+ this.layoutControlItem28,
+ this.layoutControlItem17,
+ this.layoutControlItem19,
+ this.layoutControlItem13,
+ this.layoutControlItem49});
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;
+ 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;
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;
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ 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;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4,
- rowDefinition5,
- rowDefinition6});
+ rowDefinition12,
+ rowDefinition13,
+ rowDefinition14,
+ rowDefinition15,
+ rowDefinition16,
+ rowDefinition17});
this.Root.Size = new System.Drawing.Size(1650, 192);
this.Root.TextVisible = false;
//
@@ -1605,47 +1622,6 @@
this.layoutControlItem9.Text = "闇�姹傚崟鍙�";
this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
//
- // layoutControlItem13
- //
- this.layoutControlItem13.Control = this.txt_daa029;
- this.layoutControlItem13.Location = new System.Drawing.Point(0, 56);
- this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem13.Size = new System.Drawing.Size(407, 29);
- this.layoutControlItem13.Text = "浜у搧缂栫爜";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem19
- //
- this.layoutControlItem19.Control = this.txt_daa003;
- this.layoutControlItem19.Location = new System.Drawing.Point(0, 85);
- this.layoutControlItem19.Name = "layoutControlItem19";
- this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem19.Size = new System.Drawing.Size(407, 29);
- this.layoutControlItem19.Text = "浜у搧鍚嶇О";
- this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem17
- //
- this.layoutControlItem17.Control = this.txt_daa004;
- this.layoutControlItem17.Location = new System.Drawing.Point(0, 114);
- this.layoutControlItem17.Name = "layoutControlItem17";
- this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem17.Size = new System.Drawing.Size(407, 29);
- this.layoutControlItem17.Text = "浜у搧瑙勬牸";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem28
- //
- this.layoutControlItem28.Control = this.txt_daa009;
- this.layoutControlItem28.Location = new System.Drawing.Point(0, 143);
- this.layoutControlItem28.Name = "layoutControlItem28";
- this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem28.Size = new System.Drawing.Size(814, 29);
- this.layoutControlItem28.Text = "宸ュ崟澶囨敞";
- this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
- //
// txt_daa015label
//
this.txt_daa015label.Control = this.txt_daa015;
@@ -1712,6 +1688,57 @@
this.layoutControlItem27.Size = new System.Drawing.Size(409, 29);
this.layoutControlItem27.Text = "鐢熶骇绫诲瀷";
this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem28
+ //
+ this.layoutControlItem28.Control = this.txt_daa009;
+ this.layoutControlItem28.Location = new System.Drawing.Point(407, 143);
+ this.layoutControlItem28.Name = "layoutControlItem28";
+ this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem28.Size = new System.Drawing.Size(407, 29);
+ this.layoutControlItem28.Text = "宸ュ崟澶囨敞";
+ this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem17
+ //
+ this.layoutControlItem17.Control = this.txt_daa004;
+ this.layoutControlItem17.Location = new System.Drawing.Point(0, 143);
+ this.layoutControlItem17.Name = "layoutControlItem17";
+ this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem17.Size = new System.Drawing.Size(407, 29);
+ this.layoutControlItem17.Text = "浜у搧瑙勬牸";
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem19
+ //
+ this.layoutControlItem19.Control = this.txt_daa003;
+ this.layoutControlItem19.Location = new System.Drawing.Point(0, 114);
+ this.layoutControlItem19.Name = "layoutControlItem19";
+ this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem19.Size = new System.Drawing.Size(407, 29);
+ this.layoutControlItem19.Text = "浜у搧鍚嶇О";
+ this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.txt_daa029;
+ this.layoutControlItem13.Location = new System.Drawing.Point(0, 85);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem13.Size = new System.Drawing.Size(407, 29);
+ this.layoutControlItem13.Text = "浜у搧缂栫爜";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem49
+ //
+ this.layoutControlItem49.Control = this.txt_daa021;
+ this.layoutControlItem49.Location = new System.Drawing.Point(0, 56);
+ this.layoutControlItem49.Name = "layoutControlItem49";
+ this.layoutControlItem49.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem49.Size = new System.Drawing.Size(407, 29);
+ this.layoutControlItem49.Text = "浠诲姟鍗曞彿";
+ this.layoutControlItem49.TextSize = new System.Drawing.Size(90, 18);
//
// tabMx
//
@@ -1784,7 +1811,8 @@
this.gvMx1dab019,
this.gvMx1dab020,
this.gvMx1dab022,
- this.gvMx1dab023});
+ this.gvMx1dab023,
+ this.gridColumn58});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1807,7 +1835,7 @@
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
this.gridColumn13.VisibleIndex = 0;
- this.gridColumn13.Width = 94;
+ this.gridColumn13.Width = 89;
//
// gvMx1dab001
//
@@ -1819,7 +1847,7 @@
this.gvMx1dab001.Tag = "query_a.dab001";
this.gvMx1dab001.Visible = true;
this.gvMx1dab001.VisibleIndex = 1;
- this.gvMx1dab001.Width = 94;
+ this.gvMx1dab001.Width = 89;
//
// gvMx1dab003
//
@@ -1831,7 +1859,7 @@
this.gvMx1dab003.Tag = "query_a.dab003";
this.gvMx1dab003.Visible = true;
this.gvMx1dab003.VisibleIndex = 2;
- this.gvMx1dab003.Width = 94;
+ this.gvMx1dab003.Width = 89;
//
// gvMx1dab004
//
@@ -1842,8 +1870,8 @@
this.gvMx1dab004.Name = "gvMx1dab004";
this.gvMx1dab004.Tag = "query_a.dab004";
this.gvMx1dab004.Visible = true;
- this.gvMx1dab004.VisibleIndex = 3;
- this.gvMx1dab004.Width = 94;
+ this.gvMx1dab004.VisibleIndex = 4;
+ this.gvMx1dab004.Width = 89;
//
// gvMx1dab005
//
@@ -1854,8 +1882,8 @@
this.gvMx1dab005.Name = "gvMx1dab005";
this.gvMx1dab005.Tag = "query_a.dab005";
this.gvMx1dab005.Visible = true;
- this.gvMx1dab005.VisibleIndex = 4;
- this.gvMx1dab005.Width = 94;
+ this.gvMx1dab005.VisibleIndex = 5;
+ this.gvMx1dab005.Width = 89;
//
// gvMx1dab006
//
@@ -1866,8 +1894,8 @@
this.gvMx1dab006.Name = "gvMx1dab006";
this.gvMx1dab006.Tag = "query_a.dab006";
this.gvMx1dab006.Visible = true;
- this.gvMx1dab006.VisibleIndex = 5;
- this.gvMx1dab006.Width = 94;
+ this.gvMx1dab006.VisibleIndex = 6;
+ this.gvMx1dab006.Width = 89;
//
// gvMx1dab007
//
@@ -1878,8 +1906,8 @@
this.gvMx1dab007.Name = "gvMx1dab007";
this.gvMx1dab007.Tag = "query_a.dab007";
this.gvMx1dab007.Visible = true;
- this.gvMx1dab007.VisibleIndex = 6;
- this.gvMx1dab007.Width = 94;
+ this.gvMx1dab007.VisibleIndex = 7;
+ this.gvMx1dab007.Width = 89;
//
// gridColumn14
//
@@ -1888,8 +1916,8 @@
this.gridColumn14.MinWidth = 25;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 7;
- this.gridColumn14.Width = 94;
+ this.gridColumn14.VisibleIndex = 8;
+ this.gridColumn14.Width = 89;
//
// gvMx1dab014
//
@@ -1900,8 +1928,8 @@
this.gvMx1dab014.Name = "gvMx1dab014";
this.gvMx1dab014.Tag = "query_a.dab014";
this.gvMx1dab014.Visible = true;
- this.gvMx1dab014.VisibleIndex = 8;
- this.gvMx1dab014.Width = 94;
+ this.gvMx1dab014.VisibleIndex = 9;
+ this.gvMx1dab014.Width = 89;
//
// gridColumn15
//
@@ -1910,8 +1938,8 @@
this.gridColumn15.MinWidth = 25;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 9;
- this.gridColumn15.Width = 94;
+ this.gridColumn15.VisibleIndex = 10;
+ this.gridColumn15.Width = 89;
//
// gridColumn16
//
@@ -1920,8 +1948,8 @@
this.gridColumn16.MinWidth = 25;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
- this.gridColumn16.VisibleIndex = 10;
- this.gridColumn16.Width = 94;
+ this.gridColumn16.VisibleIndex = 11;
+ this.gridColumn16.Width = 89;
//
// gvMx1dab012
//
@@ -1932,8 +1960,8 @@
this.gvMx1dab012.Name = "gvMx1dab012";
this.gvMx1dab012.Tag = "query_a.dab012";
this.gvMx1dab012.Visible = true;
- this.gvMx1dab012.VisibleIndex = 11;
- this.gvMx1dab012.Width = 94;
+ this.gvMx1dab012.VisibleIndex = 12;
+ this.gvMx1dab012.Width = 89;
//
// gvMx1dab009
//
@@ -1944,8 +1972,8 @@
this.gvMx1dab009.Name = "gvMx1dab009";
this.gvMx1dab009.Tag = "query_a.dab009";
this.gvMx1dab009.Visible = true;
- this.gvMx1dab009.VisibleIndex = 12;
- this.gvMx1dab009.Width = 94;
+ this.gvMx1dab009.VisibleIndex = 13;
+ this.gvMx1dab009.Width = 246;
//
// gvMx1scrapqty
//
@@ -1976,8 +2004,8 @@
this.gvMx1zyBl.Name = "gvMx1zyBl";
this.gvMx1zyBl.Tag = "query_a.zy_bl";
this.gvMx1zyBl.Visible = true;
- this.gvMx1zyBl.VisibleIndex = 17;
- this.gvMx1zyBl.Width = 94;
+ this.gvMx1zyBl.VisibleIndex = 18;
+ this.gvMx1zyBl.Width = 72;
//
// gvMx1llBl
//
@@ -1988,8 +2016,8 @@
this.gvMx1llBl.Name = "gvMx1llBl";
this.gvMx1llBl.Tag = "query_a.ll_bl";
this.gvMx1llBl.Visible = true;
- this.gvMx1llBl.VisibleIndex = 15;
- this.gvMx1llBl.Width = 94;
+ this.gvMx1llBl.VisibleIndex = 16;
+ this.gvMx1llBl.Width = 58;
//
// gvMx1lpTl
//
@@ -2000,8 +2028,8 @@
this.gvMx1lpTl.Name = "gvMx1lpTl";
this.gvMx1lpTl.Tag = "query_a.lp_tl";
this.gvMx1lpTl.Visible = true;
- this.gvMx1lpTl.VisibleIndex = 16;
- this.gvMx1lpTl.Width = 94;
+ this.gvMx1lpTl.VisibleIndex = 17;
+ this.gvMx1lpTl.Width = 58;
//
// gvMx1dab021
//
@@ -2012,8 +2040,8 @@
this.gvMx1dab021.Name = "gvMx1dab021";
this.gvMx1dab021.Tag = "query_a.dab021";
this.gvMx1dab021.Visible = true;
- this.gvMx1dab021.VisibleIndex = 13;
- this.gvMx1dab021.Width = 94;
+ this.gvMx1dab021.VisibleIndex = 14;
+ this.gvMx1dab021.Width = 58;
//
// gvMx1dab010
//
@@ -2094,8 +2122,18 @@
this.gvMx1dab023.Name = "gvMx1dab023";
this.gvMx1dab023.Tag = "query_a.dab023";
this.gvMx1dab023.Visible = true;
- this.gvMx1dab023.VisibleIndex = 14;
- this.gvMx1dab023.Width = 94;
+ this.gvMx1dab023.VisibleIndex = 15;
+ this.gvMx1dab023.Width = 58;
+ //
+ // gridColumn58
+ //
+ this.gridColumn58.Caption = "棰嗘枡杩涘害";
+ this.gridColumn58.FieldName = "barbl";
+ this.gridColumn58.MinWidth = 25;
+ this.gridColumn58.Name = "gridColumn58";
+ this.gridColumn58.Visible = true;
+ this.gridColumn58.VisibleIndex = 3;
+ this.gridColumn58.Width = 94;
//
// xtraTabPage6
//
@@ -2268,9 +2306,9 @@
// gcMx7
//
this.gcMx7.Dock = System.Windows.Forms.DockStyle.Fill;
- gridLevelNode1.RelationName = "Level1";
+ gridLevelNode2.RelationName = "Level1";
this.gcMx7.LevelTree.Nodes.AddRange(new DevExpress.XtraGrid.GridLevelNode[] {
- gridLevelNode1});
+ gridLevelNode2});
this.gcMx7.Location = new System.Drawing.Point(0, 0);
this.gcMx7.MainView = this.gvMx7;
this.gcMx7.Name = "gcMx7";
@@ -2503,7 +2541,7 @@
// gridColumn62
//
this.gridColumn62.Caption = "鏁版嵁鐘舵��";
- this.gridColumn62.FieldName = "barCodeRemark";
+ this.gridColumn62.FieldName = "bRemark";
this.gridColumn62.MinWidth = 25;
this.gridColumn62.Name = "gridColumn62";
this.gridColumn62.OptionsColumn.ReadOnly = true;
@@ -2597,17 +2635,17 @@
this.layoutControlItem39});
this.layoutControlGroup3.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup3.Name = "Root";
- columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition5.Width = 100D;
- columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition6.Width = 100D;
+ columnDefinition29.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition29.Width = 100D;
+ columnDefinition30.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition30.Width = 100D;
this.layoutControlGroup3.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition5,
- columnDefinition6});
- rowDefinition7.Height = 100D;
- rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition29,
+ columnDefinition30});
+ rowDefinition18.Height = 100D;
+ rowDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup3.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition7});
+ rowDefinition18});
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;
@@ -2725,29 +2763,29 @@
this.layoutControlItem36});
this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup1.Name = "Root";
- 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;
+ 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;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- 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;
+ 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;
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition8,
- rowDefinition9});
+ rowDefinition19,
+ rowDefinition20});
this.layoutControlGroup1.Size = new System.Drawing.Size(1648, 84);
this.layoutControlGroup1.TextVisible = false;
//
@@ -3046,10 +3084,10 @@
// rptTuoBanNbz
//
this.rptTuoBanNbz.AutoHeight = false;
- editorButtonImageOptions1.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions1.Image")));
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions2.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions2.Image")));
+ editorButtonImageOptions2.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, 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, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", 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);
@@ -3166,29 +3204,29 @@
this.layoutControlItem37});
this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup2.Name = "Root";
- 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;
+ 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;
this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition12,
- columnDefinition13,
- columnDefinition14,
- columnDefinition15,
- columnDefinition16,
- columnDefinition17});
- rowDefinition10.Height = 100D;
- rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition36,
+ columnDefinition37,
+ columnDefinition38,
+ columnDefinition39,
+ columnDefinition40,
+ columnDefinition41});
+ rowDefinition21.Height = 100D;
+ rowDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition10});
+ rowDefinition21});
this.layoutControlGroup2.Size = new System.Drawing.Size(1648, 52);
this.layoutControlGroup2.TextVisible = false;
//
@@ -3278,7 +3316,8 @@
this.gridColumn42,
this.gridColumn43,
this.gridColumn34,
- this.gridColumn35});
+ this.gridColumn35,
+ this.gridColumn55});
this.gvMx3.GridControl = this.gcMx3;
this.gvMx3.Name = "gvMx3";
this.gvMx3.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -3383,6 +3422,16 @@
this.gridColumn35.Visible = true;
this.gridColumn35.VisibleIndex = 5;
this.gridColumn35.Width = 94;
+ //
+ // gridColumn55
+ //
+ this.gridColumn55.Caption = "鏁版嵁鐘舵��";
+ this.gridColumn55.FieldName = "bRemark";
+ this.gridColumn55.MinWidth = 25;
+ this.gridColumn55.Name = "gridColumn55";
+ this.gridColumn55.Visible = true;
+ this.gridColumn55.VisibleIndex = 6;
+ this.gridColumn55.Width = 94;
//
// xtraTabPage4
//
@@ -3510,32 +3559,32 @@
this.layoutControlItem47});
this.layoutControlGroup4.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup4.Name = "Root";
- 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;
+ 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;
this.layoutControlGroup4.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition18,
- columnDefinition19,
- columnDefinition20,
- columnDefinition21,
- columnDefinition22,
- columnDefinition23,
- columnDefinition24});
- rowDefinition11.Height = 100D;
- rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition42,
+ columnDefinition43,
+ columnDefinition44,
+ columnDefinition45,
+ columnDefinition46,
+ columnDefinition47,
+ columnDefinition48});
+ rowDefinition22.Height = 100D;
+ rowDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup4.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition11});
+ rowDefinition22});
this.layoutControlGroup4.Size = new System.Drawing.Size(1648, 52);
this.layoutControlGroup4.TextVisible = false;
//
@@ -3816,6 +3865,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_isQiTao.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa018.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa025.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_daa021.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).EndInit();
@@ -3833,16 +3883,17 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa015label)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem46)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem48)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem49)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -4134,10 +4185,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
private DevExpress.XtraDataLayout.DataLayoutControl layMx100;
private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup4;
private DevExpress.XtraEditors.SimpleButton btnIn;
@@ -4205,5 +4252,13 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn65;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn54;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptTuoBanNbz;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn55;
+ private DevExpress.XtraEditors.TextEdit txt_daa021;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem49;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn58;
}
}
\ No newline at end of file
--
Gitblit v1.9.3