From 2caa1d97437e4089a7d6547c2efb87c7990b3b16 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 03 八月 2025 08:51:24 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs | 275 +++++++++++++-----------------------------------------
1 files changed, 68 insertions(+), 207 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
index 66a1e9c..155a95d 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
@@ -55,7 +55,6 @@
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_isenabled = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_ftwoChecked = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_foneChecked = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fversion = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_sampleSizeNo = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -63,8 +62,6 @@
this.gv_createName = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_foneCheckor = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_foneCheckdate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_ftwoCheckor = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_ftwoCheckdate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_memo = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
@@ -74,31 +71,25 @@
this.txt_sampleSizeNo = new DevExpress.XtraEditors.TextEdit();
this.txt_sampleSizeName = new DevExpress.XtraEditors.TextEdit();
this.txt_fversion = new DevExpress.XtraEditors.TextEdit();
- this.txt_ftwoCheckdate = new DevExpress.XtraEditors.TextEdit();
this.txt_memo = new DevExpress.XtraEditors.TextEdit();
this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
this.txt_foneCheckdate = new DevExpress.XtraEditors.TextEdit();
- this.txt_ftwoCheckor = new DevExpress.XtraEditors.TextEdit();
this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
this.txt_foneCheckor = new DevExpress.XtraEditors.TextEdit();
this.txt_foneChecked = new DevExpress.XtraEditors.CheckEdit();
- this.txt_ftwoChecked = new DevExpress.XtraEditors.CheckEdit();
this.txt_isenabled = new DevExpress.XtraEditors.CheckEdit();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -237,31 +228,25 @@
((System.ComponentModel.ISupportInitialize)(this.txt_sampleSizeNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_sampleSizeName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fversion.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_ftwoCheckdate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_memo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_foneCheckdate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_ftwoCheckor.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_foneCheckor.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_foneChecked.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_ftwoChecked.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isenabled.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -322,6 +307,7 @@
// split1
//
this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
this.split1.Name = "split1";
@@ -335,8 +321,9 @@
// split1.Panel2
//
this.split1.Panel2.Text = "Panel2";
+ this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.split1.Size = new System.Drawing.Size(1746, 570);
- this.split1.SplitterPosition = 558;
+ this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
// gcMain1
@@ -356,7 +343,6 @@
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gv_guid,
this.gv_isenabled,
- this.gv_ftwoChecked,
this.gv_foneChecked,
this.gv_fversion,
this.gv_sampleSizeNo,
@@ -364,8 +350,6 @@
this.gv_createName,
this.gv_foneCheckor,
this.gv_foneCheckdate,
- this.gv_ftwoCheckor,
- this.gv_ftwoCheckdate,
this.gv_memo});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
@@ -388,28 +372,13 @@
// gv_isenabled
//
this.gv_isenabled.AppearanceCell.Options.UseFont = true;
- this.gv_isenabled.Caption = "鏄惁鏈夋晥";
+ this.gv_isenabled.Caption = "鏄惁鍙敤";
this.gv_isenabled.FieldName = "isenabled";
this.gv_isenabled.MinWidth = 50;
this.gv_isenabled.Name = "gv_isenabled";
this.gv_isenabled.OptionsColumn.AllowEdit = false;
this.gv_isenabled.Tag = "query_a.ISENABLED";
- this.gv_isenabled.Visible = true;
- this.gv_isenabled.VisibleIndex = 0;
this.gv_isenabled.Width = 94;
- //
- // gv_ftwoChecked
- //
- this.gv_ftwoChecked.AppearanceCell.Options.UseFont = true;
- this.gv_ftwoChecked.Caption = "鎵瑰噯鏍囪";
- this.gv_ftwoChecked.FieldName = "ftwoChecked";
- this.gv_ftwoChecked.MinWidth = 50;
- this.gv_ftwoChecked.Name = "gv_ftwoChecked";
- this.gv_ftwoChecked.OptionsColumn.AllowEdit = false;
- this.gv_ftwoChecked.Tag = "query_a.FTWO_CHECKED";
- this.gv_ftwoChecked.Visible = true;
- this.gv_ftwoChecked.VisibleIndex = 1;
- this.gv_ftwoChecked.Width = 94;
//
// gv_foneChecked
//
@@ -421,7 +390,7 @@
this.gv_foneChecked.OptionsColumn.AllowEdit = false;
this.gv_foneChecked.Tag = "query_a.FONE_CHECKED";
this.gv_foneChecked.Visible = true;
- this.gv_foneChecked.VisibleIndex = 2;
+ this.gv_foneChecked.VisibleIndex = 0;
this.gv_foneChecked.Width = 94;
//
// gv_fversion
@@ -433,8 +402,6 @@
this.gv_fversion.Name = "gv_fversion";
this.gv_fversion.OptionsColumn.AllowEdit = false;
this.gv_fversion.Tag = "query_a.FVERSION";
- this.gv_fversion.Visible = true;
- this.gv_fversion.VisibleIndex = 3;
this.gv_fversion.Width = 94;
//
// gv_sampleSizeNo
@@ -447,7 +414,7 @@
this.gv_sampleSizeNo.OptionsColumn.AllowEdit = false;
this.gv_sampleSizeNo.Tag = "query_a.SAMPLE_SIZE_NO";
this.gv_sampleSizeNo.Visible = true;
- this.gv_sampleSizeNo.VisibleIndex = 4;
+ this.gv_sampleSizeNo.VisibleIndex = 1;
this.gv_sampleSizeNo.Width = 150;
//
// gv_sampleSizeName
@@ -460,7 +427,7 @@
this.gv_sampleSizeName.OptionsColumn.AllowEdit = false;
this.gv_sampleSizeName.Tag = "query_a.SAMPLE_SIZE_NAME";
this.gv_sampleSizeName.Visible = true;
- this.gv_sampleSizeName.VisibleIndex = 5;
+ this.gv_sampleSizeName.VisibleIndex = 2;
this.gv_sampleSizeName.Width = 94;
//
// gv_createName
@@ -473,7 +440,7 @@
this.gv_createName.OptionsColumn.AllowEdit = false;
this.gv_createName.Tag = "query_a.CREATE_NAME";
this.gv_createName.Visible = true;
- this.gv_createName.VisibleIndex = 6;
+ this.gv_createName.VisibleIndex = 4;
this.gv_createName.Width = 94;
//
// gv_foneCheckor
@@ -486,7 +453,7 @@
this.gv_foneCheckor.OptionsColumn.AllowEdit = false;
this.gv_foneCheckor.Tag = "query_a.FONE_CHECKOR";
this.gv_foneCheckor.Visible = true;
- this.gv_foneCheckor.VisibleIndex = 7;
+ this.gv_foneCheckor.VisibleIndex = 5;
this.gv_foneCheckor.Width = 94;
//
// gv_foneCheckdate
@@ -499,34 +466,8 @@
this.gv_foneCheckdate.OptionsColumn.AllowEdit = false;
this.gv_foneCheckdate.Tag = "query_a.FONE_CHECKDATE";
this.gv_foneCheckdate.Visible = true;
- this.gv_foneCheckdate.VisibleIndex = 8;
+ this.gv_foneCheckdate.VisibleIndex = 6;
this.gv_foneCheckdate.Width = 200;
- //
- // gv_ftwoCheckor
- //
- this.gv_ftwoCheckor.AppearanceCell.Options.UseFont = true;
- this.gv_ftwoCheckor.Caption = "鎵瑰噯浜�";
- this.gv_ftwoCheckor.FieldName = "ftwoCheckor";
- this.gv_ftwoCheckor.MinWidth = 50;
- this.gv_ftwoCheckor.Name = "gv_ftwoCheckor";
- this.gv_ftwoCheckor.OptionsColumn.AllowEdit = false;
- this.gv_ftwoCheckor.Tag = "query_a.FTWO_CHECKOR";
- this.gv_ftwoCheckor.Visible = true;
- this.gv_ftwoCheckor.VisibleIndex = 9;
- this.gv_ftwoCheckor.Width = 94;
- //
- // gv_ftwoCheckdate
- //
- this.gv_ftwoCheckdate.AppearanceCell.Options.UseFont = true;
- this.gv_ftwoCheckdate.Caption = "鎵瑰噯鏃ユ湡";
- this.gv_ftwoCheckdate.FieldName = "ftwoCheckdate";
- this.gv_ftwoCheckdate.MinWidth = 50;
- this.gv_ftwoCheckdate.Name = "gv_ftwoCheckdate";
- this.gv_ftwoCheckdate.OptionsColumn.AllowEdit = false;
- this.gv_ftwoCheckdate.Tag = "query_a.FTWO_CHECKDATE";
- this.gv_ftwoCheckdate.Visible = true;
- this.gv_ftwoCheckdate.VisibleIndex = 10;
- this.gv_ftwoCheckdate.Width = 200;
//
// gv_memo
//
@@ -538,7 +479,7 @@
this.gv_memo.OptionsColumn.AllowEdit = false;
this.gv_memo.Tag = "query_a.MEMO";
this.gv_memo.Visible = true;
- this.gv_memo.VisibleIndex = 11;
+ this.gv_memo.VisibleIndex = 3;
this.gv_memo.Width = 94;
//
// pageBar1
@@ -576,6 +517,7 @@
//
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(1746, 570);
this.splitMx1.TabIndex = 0;
//
@@ -585,20 +527,17 @@
this.layoutMx1.Controls.Add(this.txt_sampleSizeNo);
this.layoutMx1.Controls.Add(this.txt_sampleSizeName);
this.layoutMx1.Controls.Add(this.txt_fversion);
- this.layoutMx1.Controls.Add(this.txt_ftwoCheckdate);
this.layoutMx1.Controls.Add(this.txt_memo);
this.layoutMx1.Controls.Add(this.txt_createBy);
this.layoutMx1.Controls.Add(this.txt_foneCheckdate);
- this.layoutMx1.Controls.Add(this.txt_ftwoCheckor);
this.layoutMx1.Controls.Add(this.txt_createDate);
this.layoutMx1.Controls.Add(this.txt_foneCheckor);
this.layoutMx1.Controls.Add(this.txt_foneChecked);
- this.layoutMx1.Controls.Add(this.txt_ftwoChecked);
this.layoutMx1.Controls.Add(this.txt_isenabled);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem14,
- this.layoutControlItem13});
+ this.layoutControlItem6});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(898, 472, 812, 500);
@@ -635,22 +574,12 @@
//
// txt_fversion
//
- this.txt_fversion.Location = new System.Drawing.Point(510, 68);
+ this.txt_fversion.Location = new System.Drawing.Point(510, 64);
this.txt_fversion.Name = "txt_fversion";
this.txt_fversion.Properties.Appearance.Options.UseFont = true;
this.txt_fversion.Size = new System.Drawing.Size(350, 24);
this.txt_fversion.StyleController = this.layoutMx1;
this.txt_fversion.TabIndex = 273;
- //
- // txt_ftwoCheckdate
- //
- this.txt_ftwoCheckdate.Location = new System.Drawing.Point(936, 40);
- this.txt_ftwoCheckdate.Name = "txt_ftwoCheckdate";
- this.txt_ftwoCheckdate.Properties.Appearance.Options.UseFont = true;
- this.txt_ftwoCheckdate.Size = new System.Drawing.Size(350, 24);
- this.txt_ftwoCheckdate.StyleController = this.layoutMx1;
- this.txt_ftwoCheckdate.TabIndex = 262;
- this.txt_ftwoCheckdate.Tag = "readOnly";
//
// txt_memo
//
@@ -673,23 +602,13 @@
//
// txt_foneCheckdate
//
- this.txt_foneCheckdate.Location = new System.Drawing.Point(1362, 40);
+ this.txt_foneCheckdate.Location = new System.Drawing.Point(936, 40);
this.txt_foneCheckdate.Name = "txt_foneCheckdate";
this.txt_foneCheckdate.Properties.Appearance.Options.UseFont = true;
- this.txt_foneCheckdate.Size = new System.Drawing.Size(351, 24);
+ this.txt_foneCheckdate.Size = new System.Drawing.Size(350, 24);
this.txt_foneCheckdate.StyleController = this.layoutMx1;
this.txt_foneCheckdate.TabIndex = 247;
this.txt_foneCheckdate.Tag = "readOnly";
- //
- // txt_ftwoCheckor
- //
- this.txt_ftwoCheckor.Location = new System.Drawing.Point(936, 12);
- this.txt_ftwoCheckor.Name = "txt_ftwoCheckor";
- this.txt_ftwoCheckor.Properties.Appearance.Options.UseFont = true;
- this.txt_ftwoCheckor.Size = new System.Drawing.Size(350, 24);
- this.txt_ftwoCheckor.StyleController = this.layoutMx1;
- this.txt_ftwoCheckor.TabIndex = 258;
- this.txt_ftwoCheckor.Tag = "readOnly";
//
// txt_createDate
//
@@ -703,40 +622,33 @@
//
// txt_foneCheckor
//
- this.txt_foneCheckor.Location = new System.Drawing.Point(1362, 12);
+ this.txt_foneCheckor.Location = new System.Drawing.Point(936, 12);
this.txt_foneCheckor.Name = "txt_foneCheckor";
this.txt_foneCheckor.Properties.Appearance.Options.UseFont = true;
- this.txt_foneCheckor.Size = new System.Drawing.Size(351, 24);
+ this.txt_foneCheckor.Size = new System.Drawing.Size(350, 24);
this.txt_foneCheckor.StyleController = this.layoutMx1;
this.txt_foneCheckor.TabIndex = 243;
this.txt_foneCheckor.Tag = "readOnly";
//
// txt_foneChecked
//
- this.txt_foneChecked.Location = new System.Drawing.Point(1290, 68);
+ this.txt_foneChecked.Location = new System.Drawing.Point(864, 68);
this.txt_foneChecked.Name = "txt_foneChecked";
- this.txt_foneChecked.Properties.Caption = "瀹℃牳鏃堕棿";
- this.txt_foneChecked.Size = new System.Drawing.Size(423, 24);
+ this.txt_foneChecked.Properties.Caption = "瀹℃牳鏍囪瘑";
+ this.txt_foneChecked.Size = new System.Drawing.Size(422, 24);
this.txt_foneChecked.StyleController = this.layoutMx1;
this.txt_foneChecked.TabIndex = 274;
- //
- // txt_ftwoChecked
- //
- this.txt_ftwoChecked.Location = new System.Drawing.Point(864, 68);
- this.txt_ftwoChecked.Name = "txt_ftwoChecked";
- this.txt_ftwoChecked.Properties.Caption = "鎵瑰噯鏍囪";
- this.txt_ftwoChecked.Size = new System.Drawing.Size(422, 24);
- this.txt_ftwoChecked.StyleController = this.layoutMx1;
- this.txt_ftwoChecked.TabIndex = 275;
+ this.txt_foneChecked.Tag = "readOnly";
//
// txt_isenabled
//
- this.txt_isenabled.Location = new System.Drawing.Point(874, 97);
+ this.txt_isenabled.Location = new System.Drawing.Point(438, 68);
this.txt_isenabled.Name = "txt_isenabled";
this.txt_isenabled.Properties.Caption = "鍙敤鏍囪瘑";
- this.txt_isenabled.Size = new System.Drawing.Size(427, 24);
+ this.txt_isenabled.Size = new System.Drawing.Size(422, 24);
this.txt_isenabled.StyleController = this.layoutMx1;
this.txt_isenabled.TabIndex = 276;
+ this.txt_isenabled.Tag = "readOnly";
//
// layoutControlItem14
//
@@ -750,17 +662,16 @@
this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem14.TextVisible = false;
//
- // layoutControlItem13
+ // layoutControlItem6
//
- this.layoutControlItem13.Control = this.txt_isenabled;
- this.layoutControlItem13.Location = new System.Drawing.Point(862, 85);
- this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem13.Size = new System.Drawing.Size(431, 43);
- this.layoutControlItem13.Text = "鍙敤鏍囪瘑";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem13.TextVisible = false;
+ this.layoutControlItem6.Control = this.txt_fversion;
+ this.layoutControlItem6.Location = new System.Drawing.Point(426, 56);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem6.Size = new System.Drawing.Size(426, 28);
+ this.layoutControlItem6.Text = "鐗堟湰鍙�";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
//
// Root
//
@@ -772,13 +683,10 @@
this.layoutControlItem3,
this.layoutControlItem4,
this.layoutControlItem5,
- this.layoutControlItem6,
- this.layoutControlItem7,
- this.layoutControlItem8,
this.layoutControlItem9,
this.layoutControlItem10,
this.layoutControlItem11,
- this.layoutControlItem12});
+ this.layoutControlItem13});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -843,7 +751,7 @@
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem4.Size = new System.Drawing.Size(426, 28);
- this.layoutControlItem4.Text = "鍒朵綔浜�";
+ this.layoutControlItem4.Text = "鍒朵綔浜哄憳";
this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem5
@@ -857,82 +765,50 @@
this.layoutControlItem5.Text = "鍒朵綔鏃堕棿";
this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
//
- // layoutControlItem6
- //
- this.layoutControlItem6.Control = this.txt_fversion;
- this.layoutControlItem6.Location = new System.Drawing.Point(426, 56);
- this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem6.Size = new System.Drawing.Size(426, 28);
- this.layoutControlItem6.Text = "鐗堟湰鍙�";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem7
- //
- this.layoutControlItem7.Control = this.txt_ftwoCheckor;
- this.layoutControlItem7.Location = new System.Drawing.Point(852, 0);
- this.layoutControlItem7.Name = "layoutControlItem7";
- this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(426, 28);
- this.layoutControlItem7.Text = "鎵瑰噯浜�";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem8
- //
- this.layoutControlItem8.Control = this.txt_ftwoCheckdate;
- this.layoutControlItem8.Location = new System.Drawing.Point(852, 28);
- this.layoutControlItem8.Name = "layoutControlItem8";
- this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(426, 28);
- this.layoutControlItem8.Text = "鎵瑰噯鏃堕棿";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
- //
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_foneCheckor;
- this.layoutControlItem9.Location = new System.Drawing.Point(1278, 0);
+ this.layoutControlItem9.Location = new System.Drawing.Point(852, 0);
this.layoutControlItem9.Name = "layoutControlItem9";
- this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem9.Size = new System.Drawing.Size(427, 28);
- this.layoutControlItem9.Text = "瀹℃牳浜�";
+ this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem9.Size = new System.Drawing.Size(426, 28);
+ this.layoutControlItem9.Text = "瀹℃牳浜哄憳";
this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_foneCheckdate;
- this.layoutControlItem10.Location = new System.Drawing.Point(1278, 28);
+ this.layoutControlItem10.Location = new System.Drawing.Point(852, 28);
this.layoutControlItem10.Name = "layoutControlItem10";
- this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(427, 28);
+ this.layoutControlItem10.Size = new System.Drawing.Size(426, 28);
this.layoutControlItem10.Text = "瀹℃牳鏃堕棿";
this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_foneChecked;
- this.layoutControlItem11.Location = new System.Drawing.Point(1278, 56);
+ this.layoutControlItem11.Location = new System.Drawing.Point(852, 56);
this.layoutControlItem11.Name = "layoutControlItem11";
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(427, 28);
+ this.layoutControlItem11.Size = new System.Drawing.Size(426, 28);
this.layoutControlItem11.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem11.TextVisible = false;
//
- // layoutControlItem12
+ // layoutControlItem13
//
- this.layoutControlItem12.Control = this.txt_ftwoChecked;
- this.layoutControlItem12.Location = new System.Drawing.Point(852, 56);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(426, 28);
- this.layoutControlItem12.Text = "鎵瑰噯鏍囪瘑";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem12.TextVisible = false;
+ this.layoutControlItem13.Control = this.txt_isenabled;
+ this.layoutControlItem13.Location = new System.Drawing.Point(426, 56);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem13.Size = new System.Drawing.Size(426, 28);
+ this.layoutControlItem13.Text = "鍙敤鏍囪瘑";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem13.TextVisible = false;
//
// tabMx
//
@@ -1332,7 +1208,7 @@
//
this.tabMxPage2.Controls.Add(this.gcMx2);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1744, 378);
+ this.tabMxPage2.Size = new System.Drawing.Size(1744, 426);
this.tabMxPage2.Text = "鎶芥牱鏂规";
//
// gcMx2
@@ -1344,7 +1220,7 @@
this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemComboBox1,
this.repositoryItemButtonEdit2});
- this.gcMx2.Size = new System.Drawing.Size(1744, 378);
+ this.gcMx2.Size = new System.Drawing.Size(1744, 426);
this.gcMx2.TabIndex = 0;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2,
@@ -2221,31 +2097,25 @@
((System.ComponentModel.ISupportInitialize)(this.txt_sampleSizeNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_sampleSizeName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fversion.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_ftwoCheckdate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_memo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_foneCheckdate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_ftwoCheckor.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_foneCheckor.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_foneChecked.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_ftwoChecked.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isenabled.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -2279,7 +2149,6 @@
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
private DevExpress.XtraGrid.Columns.GridColumn gv_isenabled;
- private DevExpress.XtraGrid.Columns.GridColumn gv_ftwoChecked;
private DevExpress.XtraGrid.Columns.GridColumn gv_foneChecked;
private DevExpress.XtraGrid.Columns.GridColumn gv_fversion;
private DevExpress.XtraGrid.Columns.GridColumn gv_sampleSizeNo;
@@ -2287,15 +2156,11 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_createName;
private DevExpress.XtraGrid.Columns.GridColumn gv_foneCheckor;
private DevExpress.XtraGrid.Columns.GridColumn gv_foneCheckdate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_ftwoCheckor;
- private DevExpress.XtraGrid.Columns.GridColumn gv_ftwoCheckdate;
private DevExpress.XtraGrid.Columns.GridColumn gv_memo;
private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraEditors.TextEdit txt_fversion;
- private DevExpress.XtraEditors.TextEdit txt_ftwoCheckdate;
- private DevExpress.XtraEditors.TextEdit txt_ftwoCheckor;
private DevExpress.XtraEditors.TextEdit txt_foneCheckdate;
private DevExpress.XtraEditors.TextEdit txt_foneCheckor;
private DevExpress.XtraEditors.TextEdit txt_memo;
@@ -2306,19 +2171,13 @@
private DevExpress.XtraLayout.LayoutControl layoutMx1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
private DevExpress.XtraEditors.CheckEdit txt_foneChecked;
- private DevExpress.XtraEditors.CheckEdit txt_ftwoChecked;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraEditors.CheckEdit txt_isenabled;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
private DevExpress.XtraTab.XtraTabControl tabMx;
@@ -2435,8 +2294,10 @@
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn22;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn1;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn2;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
}
}
\ No newline at end of file
--
Gitblit v1.9.3