From 0f3565802d82703c4bf374891fe67f2ea89458a7 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 23 五月 2025 16:37:13 +0800
Subject: [PATCH] copy

---
 DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.Designer.cs |  698 ++++++++++++++++++++++++++---------------------------
 DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs              |    2 
 DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.cs          |    2 
 DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs                             |    2 
 DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs     |   20 
 5 files changed, 357 insertions(+), 367 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
index 741dbc8..237b7be 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -86,7 +86,7 @@
                     Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇ラ」鐩湭瀹℃牳锛屾殏涓嶈兘澶嶅埗鍒板叾瀹冪墿鏂欙紒");
                     return;
                 }
-                Frm_WorkTechniqueShow frm = new Frm_WorkTechniqueShow(lbGuid.Text.Trim(), strType);
+                JyxmShow frm = new JyxmShow(lbGuid.Text.Trim(), strType);
                 frm.ShowDialog();
             };
         }
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs
index 1505a50..c614ad5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs
@@ -379,7 +379,7 @@
             this.splitMx1.Panel2.Text = "Panel2";
             this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.splitMx1.Size = new System.Drawing.Size(708, 632);
-            this.splitMx1.SplitterPosition = 189;
+            this.splitMx1.SplitterPosition = 197;
             this.splitMx1.TabIndex = 1;
             // 
             // layoutMx1
@@ -415,7 +415,7 @@
             this.layoutMx1.Name = "layoutMx1";
             this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(-31, 392, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(708, 189);
+            this.layoutMx1.Size = new System.Drawing.Size(708, 197);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
             // 
@@ -744,7 +744,7 @@
             rowDefinition3,
             rowDefinition4,
             rowDefinition5});
-            this.Root.Size = new System.Drawing.Size(710, 175);
+            this.Root.Size = new System.Drawing.Size(710, 176);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -840,7 +840,7 @@
             this.layoutControlItem25.Name = "layoutControlItem25";
             this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 4;
             this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem25.Size = new System.Drawing.Size(138, 31);
+            this.layoutControlItem25.Size = new System.Drawing.Size(138, 32);
             this.layoutControlItem25.Text = "瀹℃牳鐘舵��";
             this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem25.TextVisible = false;
@@ -908,7 +908,7 @@
             this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem9.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem9.Size = new System.Drawing.Size(276, 31);
+            this.layoutControlItem9.Size = new System.Drawing.Size(276, 32);
             this.layoutControlItem9.Text = "澶辨晥鏃ユ湡";
             this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
             // 
@@ -943,7 +943,7 @@
             this.layoutControlItem15.MinSize = new System.Drawing.Size(90, 31);
             this.layoutControlItem15.Name = "layoutControlItem15";
             this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem15.Size = new System.Drawing.Size(138, 31);
+            this.layoutControlItem15.Size = new System.Drawing.Size(138, 32);
             this.layoutControlItem15.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem15.Text = "閫夋嫨宸ュ簭";
             this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0);
@@ -956,7 +956,7 @@
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem10.Size = new System.Drawing.Size(138, 31);
+            this.layoutControlItem10.Size = new System.Drawing.Size(138, 32);
             this.layoutControlItem10.Text = "澶嶅埗";
             this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem10.TextVisible = false;
@@ -967,7 +967,7 @@
             this.tabMx.Location = new System.Drawing.Point(0, 0);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(708, 431);
+            this.tabMx.Size = new System.Drawing.Size(708, 423);
             this.tabMx.TabIndex = 4;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1});
@@ -976,7 +976,7 @@
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(706, 399);
+            this.tabMxPage1.Size = new System.Drawing.Size(706, 391);
             this.tabMxPage1.Text = "宸ュ簭淇℃伅";
             // 
             // gcMx1
@@ -993,7 +993,7 @@
             this.repositoryItemComboBox1,
             this.repositoryItemComboBox2,
             this.rptGx});
-            this.gcMx1.Size = new System.Drawing.Size(706, 399);
+            this.gcMx1.Size = new System.Drawing.Size(706, 391);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
index ee7acdd..7544877 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
@@ -96,7 +96,7 @@
                     Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇ラ」鐩湭瀹℃牳锛屾殏涓嶈兘澶嶅埗鍒板叾瀹冪墿鏂欙紒");
                     return;
                 }
-                Frm_WorkTechniqueShow frm = new Frm_WorkTechniqueShow(lbGuid.Text.Trim(), "");
+                Frm_WorkTechniqueShow frm = new Frm_WorkTechniqueShow(lbGuid.Text.Trim());
                 frm.ShowDialog();
             };
         }
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.Designer.cs
index a3c4555..0a3094e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.Designer.cs
@@ -33,37 +33,18 @@
             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.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.ColumnDefinition columnDefinition5 = 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();
             this.wizardControl1 = new DevExpress.XtraWizard.WizardControl();
             this.welcomeWizardPage1 = new DevExpress.XtraWizard.WelcomeWizardPage();
-            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
-            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1pid = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1fcheckItem = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.rptJYXM = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
-            this.gvMx1forder = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
-            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1memo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1fcheckTool = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.rptJYGJ = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
-            this.gvMx1sampleSizeNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.rptJYBZ = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
-            this.sampleSizeName = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1fcheckLevel = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.rptJYSP = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
-            this.gvMx1facLevel = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.rptJSSP = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
-            this.gvMx1fupAllow = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1fstand = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1fdownAllow = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.wizardPage1 = new DevExpress.XtraWizard.WizardPage();
             this.splitLeft = new DevExpress.XtraEditors.SplitContainerControl();
             this.gcMain = new DevExpress.XtraGrid.GridControl();
@@ -90,18 +71,28 @@
             this.rptBtnDel = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.completionWizardPage1 = new DevExpress.XtraWizard.CompletionWizardPage();
+            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
+            this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txt_remark = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txt_fType = new DevExpress.XtraEditors.TextEdit();
+            this.txt_fJingDu = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txt_fSumPeople = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txt_fBegDate = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txt_fEndDate = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
             ((System.ComponentModel.ISupportInitialize)(this.wizardControl1)).BeginInit();
             this.wizardControl1.SuspendLayout();
             this.welcomeWizardPage1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptJYXM)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptJYGJ)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptJYSP)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptJSSP)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
             this.wizardPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.splitLeft)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.splitLeft.Panel1)).BeginInit();
@@ -122,6 +113,30 @@
             ((System.ComponentModel.ISupportInitialize)(this.gcMainCopy)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMainCopy)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.rptBtnDel)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
+            this.splitMx1.Panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit();
+            this.splitMx1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
+            this.layoutMx1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fJingDu.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fSumPeople.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fBegDate.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fEndDate.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
             this.SuspendLayout();
             // 
             // wizardControl1
@@ -147,287 +162,13 @@
             // 
             // welcomeWizardPage1
             // 
-            this.welcomeWizardPage1.Controls.Add(this.gcMx1);
-            this.welcomeWizardPage1.IntroductionText = "璇ュ悜瀵硷紝灏嗘妸褰撳墠鐗╂枡鐨勬楠岄」鐩紝澶嶅埗涓�涓垨澶氫釜鐗╂枡锛屽鍒惰繃绋嬩腑锛岃嫢閲嶅閫夋嫨浜嗙墿鏂欙紝灏嗚嚜鍔ㄨ繃婊わ紝鍙細澶嶅埗涓�娆★紒";
+            this.welcomeWizardPage1.Controls.Add(this.splitMx1);
+            this.welcomeWizardPage1.IntroductionText = "璇ュ悜瀵硷紝灏嗘妸褰撳墠鐗╂枡鐨勫伐鑹轰俊鎭紝澶嶅埗鍒颁竴涓垨澶氫釜鐗╂枡锛屽鍒惰繃绋嬩腑锛岃嫢閲嶅閫夋嫨浜嗙墿鏂欙紝灏嗚嚜鍔ㄨ繃婊わ紝鍙細澶嶅埗涓�娆★紒";
             this.welcomeWizardPage1.Margin = new System.Windows.Forms.Padding(4);
             this.welcomeWizardPage1.Name = "welcomeWizardPage1";
             this.welcomeWizardPage1.ProceedText = "鐐瑰嚮 Next 缁х画杩涜";
             this.welcomeWizardPage1.Size = new System.Drawing.Size(898, 553);
-            this.welcomeWizardPage1.Text = "褰撳墠妫�楠岄」鐩俊鎭�";
-            // 
-            // gcMx1
-            // 
-            this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMx1.Location = new System.Drawing.Point(0, 0);
-            this.gcMx1.MainView = this.gvMx1;
-            this.gcMx1.Name = "gcMx1";
-            this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
-            this.rptJYXM,
-            this.rptJYGJ,
-            this.rptJYBZ,
-            this.rptJSSP,
-            this.rptJYSP,
-            this.repositoryItemButtonEdit1,
-            this.repositoryItemComboBox1});
-            this.gcMx1.Size = new System.Drawing.Size(898, 553);
-            this.gcMx1.TabIndex = 1;
-            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gvMx1});
-            // 
-            // gvMx1
-            // 
-            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gvMx1guid,
-            this.gvMx1pid,
-            this.gvMx1fcheckItem,
-            this.gvMx1forder,
-            this.gridColumn5,
-            this.gvMx1memo,
-            this.gvMx1fcheckTool,
-            this.gvMx1sampleSizeNo,
-            this.sampleSizeName,
-            this.gvMx1fcheckLevel,
-            this.gvMx1facLevel,
-            this.gvMx1fupAllow,
-            this.gvMx1fstand,
-            this.gvMx1fdownAllow,
-            this.gridColumn19});
-            this.gvMx1.GridControl = this.gcMx1;
-            this.gvMx1.Name = "gvMx1";
-            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
-            this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
-            this.gvMx1.OptionsView.ShowGroupPanel = false;
-            // 
-            // gvMx1guid
-            // 
-            this.gvMx1guid.AppearanceCell.Options.UseFont = true;
-            this.gvMx1guid.Caption = "guid";
-            this.gvMx1guid.FieldName = "guid";
-            this.gvMx1guid.Name = "gvMx1guid";
-            this.gvMx1guid.Tag = "query_a.guid";
-            this.gvMx1guid.Width = 94;
-            // 
-            // gvMx1pid
-            // 
-            this.gvMx1pid.AppearanceCell.Options.UseFont = true;
-            this.gvMx1pid.Caption = "pid";
-            this.gvMx1pid.FieldName = "pid";
-            this.gvMx1pid.Name = "gvMx1pid";
-            this.gvMx1pid.Tag = "query_a.pid";
-            this.gvMx1pid.Width = 94;
-            // 
-            // gvMx1fcheckItem
-            // 
-            this.gvMx1fcheckItem.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fcheckItem.Caption = "妫�楠岄」鐩�";
-            this.gvMx1fcheckItem.ColumnEdit = this.rptJYXM;
-            this.gvMx1fcheckItem.FieldName = "fcheckItem";
-            this.gvMx1fcheckItem.Name = "gvMx1fcheckItem";
-            this.gvMx1fcheckItem.Tag = "edit";
-            this.gvMx1fcheckItem.Visible = true;
-            this.gvMx1fcheckItem.VisibleIndex = 0;
-            this.gvMx1fcheckItem.Width = 150;
-            // 
-            // rptJYXM
-            // 
-            this.rptJYXM.AutoHeight = false;
-            this.rptJYXM.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.rptJYXM.Name = "rptJYXM";
-            // 
-            // gvMx1forder
-            // 
-            this.gvMx1forder.AppearanceCell.Options.UseFont = true;
-            this.gvMx1forder.Caption = "椤哄簭";
-            this.gvMx1forder.ColumnEdit = this.repositoryItemComboBox1;
-            this.gvMx1forder.FieldName = "forder";
-            this.gvMx1forder.Name = "gvMx1forder";
-            this.gvMx1forder.Tag = "yz_quantity_0_edit";
-            this.gvMx1forder.Visible = true;
-            this.gvMx1forder.VisibleIndex = 1;
-            this.gvMx1forder.Width = 50;
-            // 
-            // repositoryItemComboBox1
-            // 
-            this.repositoryItemComboBox1.AutoHeight = false;
-            this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.repositoryItemComboBox1.Items.AddRange(new object[] {
-            "1",
-            "2",
-            "3",
-            "4",
-            "5",
-            "6",
-            "7",
-            "8",
-            "9",
-            "10",
-            "11",
-            "12",
-            "13",
-            "14",
-            "15"});
-            this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
-            // 
-            // gridColumn5
-            // 
-            this.gridColumn5.Caption = "瑙勬牸瑕佹眰";
-            this.gridColumn5.FieldName = "fspecRequ";
-            this.gridColumn5.Name = "gridColumn5";
-            this.gridColumn5.Tag = "edit";
-            this.gridColumn5.Width = 150;
-            // 
-            // gvMx1memo
-            // 
-            this.gvMx1memo.AppearanceCell.Options.UseFont = true;
-            this.gvMx1memo.Caption = "妫�楠岄」鐩弿杩�";
-            this.gvMx1memo.FieldName = "memo";
-            this.gvMx1memo.Name = "gvMx1memo";
-            this.gvMx1memo.Tag = "edit";
-            this.gvMx1memo.Width = 150;
-            // 
-            // gvMx1fcheckTool
-            // 
-            this.gvMx1fcheckTool.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fcheckTool.Caption = "妫�楠屽伐鍏�";
-            this.gvMx1fcheckTool.ColumnEdit = this.rptJYGJ;
-            this.gvMx1fcheckTool.FieldName = "fcheckTool";
-            this.gvMx1fcheckTool.Name = "gvMx1fcheckTool";
-            this.gvMx1fcheckTool.Tag = "edit";
-            this.gvMx1fcheckTool.Visible = true;
-            this.gvMx1fcheckTool.VisibleIndex = 2;
-            this.gvMx1fcheckTool.Width = 150;
-            // 
-            // rptJYGJ
-            // 
-            this.rptJYGJ.AutoHeight = false;
-            this.rptJYGJ.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.rptJYGJ.Name = "rptJYGJ";
-            this.rptJYGJ.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            // 
-            // gvMx1sampleSizeNo
-            // 
-            this.gvMx1sampleSizeNo.AppearanceCell.Options.UseFont = true;
-            this.gvMx1sampleSizeNo.Caption = "妫�楠屾爣鍑嗗悕绉�";
-            this.gvMx1sampleSizeNo.ColumnEdit = this.rptJYBZ;
-            this.gvMx1sampleSizeNo.FieldName = "sampleSizeName";
-            this.gvMx1sampleSizeNo.Name = "gvMx1sampleSizeNo";
-            this.gvMx1sampleSizeNo.Tag = "edit";
-            this.gvMx1sampleSizeNo.Visible = true;
-            this.gvMx1sampleSizeNo.VisibleIndex = 3;
-            this.gvMx1sampleSizeNo.Width = 150;
-            // 
-            // rptJYBZ
-            // 
-            this.rptJYBZ.AutoHeight = false;
-            this.rptJYBZ.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.rptJYBZ.Name = "rptJYBZ";
-            this.rptJYBZ.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            // 
-            // sampleSizeName
-            // 
-            this.sampleSizeName.Caption = "妫�楠屾爣鍑嗙紪鐮�";
-            this.sampleSizeName.FieldName = "sampleSizeNo";
-            this.sampleSizeName.Name = "sampleSizeName";
-            this.sampleSizeName.OptionsColumn.ReadOnly = true;
-            this.sampleSizeName.Tag = "edit";
-            this.sampleSizeName.Width = 150;
-            // 
-            // gvMx1fcheckLevel
-            // 
-            this.gvMx1fcheckLevel.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fcheckLevel.Caption = "妫�楠屾按骞�";
-            this.gvMx1fcheckLevel.ColumnEdit = this.rptJYSP;
-            this.gvMx1fcheckLevel.FieldName = "fcheckLevel";
-            this.gvMx1fcheckLevel.Name = "gvMx1fcheckLevel";
-            this.gvMx1fcheckLevel.Tag = "edit";
-            this.gvMx1fcheckLevel.Visible = true;
-            this.gvMx1fcheckLevel.VisibleIndex = 4;
-            this.gvMx1fcheckLevel.Width = 200;
-            // 
-            // rptJYSP
-            // 
-            this.rptJYSP.AutoHeight = false;
-            this.rptJYSP.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.rptJYSP.Name = "rptJYSP";
-            this.rptJYSP.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            // 
-            // gvMx1facLevel
-            // 
-            this.gvMx1facLevel.AppearanceCell.Options.UseFont = true;
-            this.gvMx1facLevel.Caption = "鎺ユ敹姘村钩";
-            this.gvMx1facLevel.ColumnEdit = this.rptJSSP;
-            this.gvMx1facLevel.FieldName = "facLevel";
-            this.gvMx1facLevel.Name = "gvMx1facLevel";
-            this.gvMx1facLevel.Tag = "edit";
-            this.gvMx1facLevel.Visible = true;
-            this.gvMx1facLevel.VisibleIndex = 5;
-            this.gvMx1facLevel.Width = 150;
-            // 
-            // rptJSSP
-            // 
-            this.rptJSSP.AutoHeight = false;
-            this.rptJSSP.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.rptJSSP.Name = "rptJSSP";
-            this.rptJSSP.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            // 
-            // gvMx1fupAllow
-            // 
-            this.gvMx1fupAllow.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fupAllow.Caption = "涓婇檺";
-            this.gvMx1fupAllow.FieldName = "fupAllow";
-            this.gvMx1fupAllow.Name = "gvMx1fupAllow";
-            this.gvMx1fupAllow.Tag = "yz_quantity_0_edit";
-            this.gvMx1fupAllow.Visible = true;
-            this.gvMx1fupAllow.VisibleIndex = 6;
-            this.gvMx1fupAllow.Width = 60;
-            // 
-            // gvMx1fstand
-            // 
-            this.gvMx1fstand.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fstand.Caption = "鏍囧噯鍊�";
-            this.gvMx1fstand.FieldName = "fstand";
-            this.gvMx1fstand.Name = "gvMx1fstand";
-            this.gvMx1fstand.Tag = "yz_quantity_0_edit";
-            this.gvMx1fstand.Visible = true;
-            this.gvMx1fstand.VisibleIndex = 7;
-            this.gvMx1fstand.Width = 60;
-            // 
-            // gvMx1fdownAllow
-            // 
-            this.gvMx1fdownAllow.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fdownAllow.Caption = "涓嬮檺";
-            this.gvMx1fdownAllow.FieldName = "fdownAllow";
-            this.gvMx1fdownAllow.Name = "gvMx1fdownAllow";
-            this.gvMx1fdownAllow.Tag = "yz_quantity_0_edit";
-            this.gvMx1fdownAllow.Visible = true;
-            this.gvMx1fdownAllow.VisibleIndex = 8;
-            this.gvMx1fdownAllow.Width = 60;
-            // 
-            // gridColumn19
-            // 
-            this.gridColumn19.Caption = "鏍峰搧鍩烘暟";
-            this.gridColumn19.FieldName = "ypsl";
-            this.gridColumn19.Name = "gridColumn19";
-            this.gridColumn19.Tag = "edit";
-            this.gridColumn19.Visible = true;
-            this.gridColumn19.VisibleIndex = 9;
-            this.gridColumn19.Width = 94;
-            // 
-            // repositoryItemButtonEdit1
-            // 
-            this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions1.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, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
-            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+            this.welcomeWizardPage1.Text = "褰撳墠鐗╂枡宸ヨ壓淇℃伅";
             // 
             // wizardPage1
             // 
@@ -722,10 +463,10 @@
             // rptBtnDel
             // 
             this.rptBtnDel.AutoHeight = false;
-            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
             this.rptBtnDel.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.rptBtnDel.Name = "rptBtnDel";
             this.rptBtnDel.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.rptBtnDel.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptBtnDel_ButtonClick);
@@ -747,7 +488,246 @@
             this.completionWizardPage1.Size = new System.Drawing.Size(898, 553);
             this.completionWizardPage1.Text = "淇濆瓨淇℃伅";
             // 
-            // JyxmShow
+            // splitMx1
+            // 
+            this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitMx1.Horizontal = false;
+            this.splitMx1.Location = new System.Drawing.Point(0, 0);
+            this.splitMx1.Name = "splitMx1";
+            // 
+            // splitMx1.splitMx1_Panel1
+            // 
+            this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
+            this.splitMx1.Panel1.Text = "Panel1";
+            // 
+            // splitMx1.splitMx1_Panel2
+            // 
+            this.splitMx1.Panel2.Text = "Panel2";
+            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+            this.splitMx1.Size = new System.Drawing.Size(898, 553);
+            this.splitMx1.SplitterPosition = 245;
+            this.splitMx1.TabIndex = 0;
+            // 
+            // layoutMx1
+            // 
+            this.layoutMx1.Controls.Add(this.txt_itemNo);
+            this.layoutMx1.Controls.Add(this.txt_itemName);
+            this.layoutMx1.Controls.Add(this.txt_remark);
+            this.layoutMx1.Controls.Add(this.txt_fType);
+            this.layoutMx1.Controls.Add(this.txt_fJingDu);
+            this.layoutMx1.Controls.Add(this.txt_fSumPeople);
+            this.layoutMx1.Controls.Add(this.txt_fBegDate);
+            this.layoutMx1.Controls.Add(this.txt_fEndDate);
+            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+            this.layoutMx1.Name = "layoutMx1";
+            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(897, 171, 812, 500);
+            this.layoutMx1.Root = this.Root;
+            this.layoutMx1.Size = new System.Drawing.Size(898, 245);
+            this.layoutMx1.TabIndex = 0;
+            this.layoutMx1.Text = "layoutControl1";
+            // 
+            // Root
+            // 
+            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            this.Root.GroupBordersVisible = false;
+            this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem1,
+            this.layoutControlItem2,
+            this.layoutControlItem3,
+            this.layoutControlItem4,
+            this.layoutControlItem5,
+            this.layoutControlItem6,
+            this.layoutControlItem7,
+            this.layoutControlItem8});
+            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;
+            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+            columnDefinition1,
+            columnDefinition2,
+            columnDefinition3,
+            columnDefinition4,
+            columnDefinition5});
+            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;
+            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+            rowDefinition1,
+            rowDefinition2,
+            rowDefinition3,
+            rowDefinition4,
+            rowDefinition5});
+            this.Root.Size = new System.Drawing.Size(898, 245);
+            this.Root.TextVisible = false;
+            // 
+            // txt_itemNo
+            // 
+            this.txt_itemNo.Location = new System.Drawing.Point(84, 12);
+            this.txt_itemNo.Name = "txt_itemNo";
+            this.txt_itemNo.Size = new System.Drawing.Size(274, 24);
+            this.txt_itemNo.StyleController = this.layoutMx1;
+            this.txt_itemNo.TabIndex = 4;
+            // 
+            // layoutControlItem1
+            // 
+            this.layoutControlItem1.Control = this.txt_itemNo;
+            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem1.Name = "layoutControlItem1";
+            this.layoutControlItem1.OptionsTableLayoutItem.ColumnSpan = 2;
+            this.layoutControlItem1.Size = new System.Drawing.Size(350, 45);
+            this.layoutControlItem1.Text = "鐗╂枡缂栫爜";
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // txt_itemName
+            // 
+            this.txt_itemName.Location = new System.Drawing.Point(84, 57);
+            this.txt_itemName.Name = "txt_itemName";
+            this.txt_itemName.Size = new System.Drawing.Size(274, 24);
+            this.txt_itemName.StyleController = this.layoutMx1;
+            this.txt_itemName.TabIndex = 5;
+            // 
+            // layoutControlItem2
+            // 
+            this.layoutControlItem2.Control = this.txt_itemName;
+            this.layoutControlItem2.Location = new System.Drawing.Point(0, 45);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.OptionsTableLayoutItem.ColumnSpan = 2;
+            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem2.Size = new System.Drawing.Size(350, 45);
+            this.layoutControlItem2.Text = "鐗╂枡鍚嶇О";
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // txt_remark
+            // 
+            this.txt_remark.Location = new System.Drawing.Point(84, 102);
+            this.txt_remark.Name = "txt_remark";
+            this.txt_remark.Size = new System.Drawing.Size(274, 24);
+            this.txt_remark.StyleController = this.layoutMx1;
+            this.txt_remark.TabIndex = 6;
+            // 
+            // layoutControlItem3
+            // 
+            this.layoutControlItem3.Control = this.txt_remark;
+            this.layoutControlItem3.Location = new System.Drawing.Point(0, 90);
+            this.layoutControlItem3.Name = "layoutControlItem3";
+            this.layoutControlItem3.OptionsTableLayoutItem.ColumnSpan = 2;
+            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem3.Size = new System.Drawing.Size(350, 45);
+            this.layoutControlItem3.Text = "娴佺▼鎻忚堪";
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // txt_fType
+            // 
+            this.txt_fType.Location = new System.Drawing.Point(434, 12);
+            this.txt_fType.Name = "txt_fType";
+            this.txt_fType.Size = new System.Drawing.Size(100, 24);
+            this.txt_fType.StyleController = this.layoutMx1;
+            this.txt_fType.TabIndex = 7;
+            // 
+            // txt_fJingDu
+            // 
+            this.txt_fJingDu.Location = new System.Drawing.Point(434, 57);
+            this.txt_fJingDu.Name = "txt_fJingDu";
+            this.txt_fJingDu.Size = new System.Drawing.Size(100, 24);
+            this.txt_fJingDu.StyleController = this.layoutMx1;
+            this.txt_fJingDu.TabIndex = 8;
+            // 
+            // layoutControlItem4
+            // 
+            this.layoutControlItem4.Control = this.txt_fType;
+            this.layoutControlItem4.Location = new System.Drawing.Point(350, 0);
+            this.layoutControlItem4.Name = "layoutControlItem4";
+            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem4.Size = new System.Drawing.Size(176, 45);
+            this.layoutControlItem4.Text = "鐢熶骇绫诲瀷";
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem5
+            // 
+            this.layoutControlItem5.Control = this.txt_fJingDu;
+            this.layoutControlItem5.Location = new System.Drawing.Point(350, 45);
+            this.layoutControlItem5.Name = "layoutControlItem5";
+            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem5.Size = new System.Drawing.Size(176, 45);
+            this.layoutControlItem5.Text = "绠$悊绮惧害";
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // txt_fSumPeople
+            // 
+            this.txt_fSumPeople.Location = new System.Drawing.Point(434, 102);
+            this.txt_fSumPeople.Name = "txt_fSumPeople";
+            this.txt_fSumPeople.Size = new System.Drawing.Size(100, 24);
+            this.txt_fSumPeople.StyleController = this.layoutMx1;
+            this.txt_fSumPeople.TabIndex = 9;
+            // 
+            // layoutControlItem6
+            // 
+            this.layoutControlItem6.Control = this.txt_fSumPeople;
+            this.layoutControlItem6.Location = new System.Drawing.Point(350, 90);
+            this.layoutControlItem6.Name = "layoutControlItem6";
+            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem6.Size = new System.Drawing.Size(176, 45);
+            this.layoutControlItem6.Text = "鎬诲畾鍛�";
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // txt_fBegDate
+            // 
+            this.txt_fBegDate.Location = new System.Drawing.Point(434, 147);
+            this.txt_fBegDate.Name = "txt_fBegDate";
+            this.txt_fBegDate.Size = new System.Drawing.Size(100, 24);
+            this.txt_fBegDate.StyleController = this.layoutMx1;
+            this.txt_fBegDate.TabIndex = 10;
+            // 
+            // layoutControlItem7
+            // 
+            this.layoutControlItem7.Control = this.txt_fBegDate;
+            this.layoutControlItem7.Location = new System.Drawing.Point(350, 135);
+            this.layoutControlItem7.Name = "layoutControlItem7";
+            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem7.Size = new System.Drawing.Size(176, 45);
+            this.layoutControlItem7.Text = "鐢熸晥鏃ユ湡";
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // txt_fEndDate
+            // 
+            this.txt_fEndDate.Location = new System.Drawing.Point(434, 192);
+            this.txt_fEndDate.Name = "txt_fEndDate";
+            this.txt_fEndDate.Size = new System.Drawing.Size(100, 24);
+            this.txt_fEndDate.StyleController = this.layoutMx1;
+            this.txt_fEndDate.TabIndex = 11;
+            // 
+            // layoutControlItem8
+            // 
+            this.layoutControlItem8.Control = this.txt_fEndDate;
+            this.layoutControlItem8.Location = new System.Drawing.Point(350, 180);
+            this.layoutControlItem8.Name = "layoutControlItem8";
+            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem8.Size = new System.Drawing.Size(176, 45);
+            this.layoutControlItem8.Text = "澶辨晥鏃ユ湡";
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // Frm_WorkTechniqueShow
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
@@ -757,21 +737,12 @@
             this.Margin = new System.Windows.Forms.Padding(4);
             this.MaximizeBox = false;
             this.MinimizeBox = false;
-            this.Name = "JyxmShow";
+            this.Name = "Frm_WorkTechniqueShow";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "妫�楠岄」鐩鍒�";
+            this.Text = "浜у搧淇℃伅澶嶅埗";
             ((System.ComponentModel.ISupportInitialize)(this.wizardControl1)).EndInit();
             this.wizardControl1.ResumeLayout(false);
             this.welcomeWizardPage1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptJYXM)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptJYGJ)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptJYSP)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptJSSP)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
             this.wizardPage1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.splitLeft.Panel1)).EndInit();
             this.splitLeft.Panel1.ResumeLayout(false);
@@ -792,6 +763,30 @@
             ((System.ComponentModel.ISupportInitialize)(this.gcMainCopy)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMainCopy)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.rptBtnDel)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
+            this.splitMx1.Panel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();
+            this.splitMx1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
+            this.layoutMx1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fJingDu.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fSumPeople.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fBegDate.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fEndDate.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -826,29 +821,24 @@
         private DevExpress.XtraGrid.Columns.GridColumn gv_itemId;
         private UserControls.Data.UcPageBar pageBar1;
         private DevExpress.XtraGrid.Columns.GridColumn colChkInt;
-        private DevExpress.XtraGrid.GridControl gcMx1;
-        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1pid;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckItem;
-        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYXM;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1forder;
-        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1memo;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckTool;
-        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYGJ;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1sampleSizeNo;
-        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYBZ;
-        private DevExpress.XtraGrid.Columns.GridColumn sampleSizeName;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckLevel;
-        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYSP;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1facLevel;
-        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJSSP;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fupAllow;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fstand;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fdownAllow;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
-        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+        private DevExpress.XtraEditors.SplitContainerControl splitMx1;
+        private DevExpress.XtraLayout.LayoutControl layoutMx1;
+        private DevExpress.XtraLayout.LayoutControlGroup Root;
+        private DevExpress.XtraEditors.TextEdit txt_itemNo;
+        private DevExpress.XtraEditors.TextEdit txt_itemName;
+        private DevExpress.XtraEditors.TextEdit txt_remark;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+        private DevExpress.XtraEditors.TextEdit txt_fType;
+        private DevExpress.XtraEditors.TextEdit txt_fJingDu;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+        private DevExpress.XtraEditors.TextEdit txt_fSumPeople;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+        private DevExpress.XtraEditors.TextEdit txt_fBegDate;
+        private DevExpress.XtraEditors.TextEdit txt_fEndDate;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.cs
index 18a21eb..edefcd9 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.cs
@@ -21,7 +21,7 @@
         /// </summary>
         /// <param name="_sourceGuid"></param>
         /// <param name="_strType"></param>
-        public Frm_WorkTechniqueShow(string _sourceGuid, string _strType)
+        public Frm_WorkTechniqueShow(string _sourceGuid)
         {
             InitializeComponent();
             sourceGuid = _sourceGuid;

--
Gitblit v1.9.3