From c4f46e49677576ac7f1a74feee547b3238c0eeaf Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期三, 19 十一月 2025 16:07:53 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

---
 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs |  337 ++++++++++++++++++++++++++++++-------------------------
 1 files changed, 185 insertions(+), 152 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
index 5b3e7ef..53870bb 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
@@ -31,36 +31,36 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesItemQtrk));
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
-            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.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
-            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.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition17 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition17 = new DevExpress.XtraLayout.ColumnDefinition();
-            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.RowDefinition rowDefinition18 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition19 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition20 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.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.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.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -91,13 +91,14 @@
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
             this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+            this.ucBtnPrintAll1 = new Gs.DevApp.UserControl.UcBtnPrintAll();
             this.btnCopyXls = new DevExpress.XtraEditors.SimpleButton();
             this.txt_qt003 = new Gs.DevApp.UserControl.UcDictionaryComBox();
             this.lbGuid = new System.Windows.Forms.Label();
             this.txt_qt010 = new DevExpress.XtraEditors.TextEdit();
             this.ucLookHuoZhu1 = new Gs.DevApp.UserControl.UcLookHuoZhu();
             this.txt_qt008 = new Gs.DevApp.UserControl.UcLookCk();
-            this.txt_qt016 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_qt016Name = new DevExpress.XtraEditors.TextEdit();
             this.txt_qt018 = new Gs.DevApp.UserControl.UcLookSupplier();
             this.txt_qt022 = new Gs.DevApp.UserControl.UcLookOrg();
             this.txt_qt009 = new Gs.DevApp.UserControl.UcLookDepartment();
@@ -107,10 +108,10 @@
             this.txt_qt015 = new DevExpress.XtraEditors.CheckEdit();
             this.txt_qt005 = new DevExpress.XtraEditors.TextEdit();
             this.txt_qt001 = new DevExpress.XtraEditors.TextEdit();
-            this.txt_qt030 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_qt030Name = new DevExpress.XtraEditors.TextEdit();
             this.txt_qt029 = new DevExpress.XtraEditors.TextEdit();
             this.txt_qt028 = new DevExpress.XtraEditors.CheckEdit();
-            this.txt_qt034 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_qt034Name = new DevExpress.XtraEditors.TextEdit();
             this.txt_qt033 = new DevExpress.XtraEditors.TextEdit();
             this.txt_qt032 = new DevExpress.XtraEditors.CheckEdit();
             this.txt_qt035 = new DevExpress.XtraEditors.ButtonEdit();
@@ -142,6 +143,7 @@
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem38 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem39 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.split99 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -239,17 +241,17 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
             this.layoutMx1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt010.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_qt016.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_qt016Name.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qtck.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt002.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt019.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt015.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt005.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt001.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_qt030.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_qt030Name.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt029.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt028.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_qt034.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_qt034Name.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt033.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt032.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt035.Properties)).BeginInit();
@@ -281,6 +283,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.tabMxPage1.SuspendLayout();
@@ -341,6 +344,7 @@
             this.toolBarMenu1.guidKey = null;
             this.toolBarMenu1.isSetBtn = false;
             this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+            this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(4);
             this.toolBarMenu1.Name = "toolBarMenu1";
             this.toolBarMenu1.rptParameter = "rpt_Qtrk{}";
             this.toolBarMenu1.Size = new System.Drawing.Size(1334, 80);
@@ -501,7 +505,7 @@
             // 
             this.gv_qt005.AppearanceCell.Options.UseFont = true;
             this.gv_qt005.Caption = "鐢宠浜�";
-            this.gv_qt005.FieldName = "qt005";
+            this.gv_qt005.FieldName = "cjPeople";
             this.gv_qt005.MinWidth = 25;
             this.gv_qt005.Name = "gv_qt005";
             this.gv_qt005.OptionsColumn.AllowEdit = false;
@@ -527,7 +531,7 @@
             // 
             this.gv_qt016.AppearanceCell.Options.UseFont = true;
             this.gv_qt016.Caption = "瀹℃牳浜� ";
-            this.gv_qt016.FieldName = "qt016";
+            this.gv_qt016.FieldName = "shPeople";
             this.gv_qt016.MinWidth = 25;
             this.gv_qt016.Name = "gv_qt016";
             this.gv_qt016.OptionsColumn.AllowEdit = false;
@@ -704,13 +708,14 @@
             // 
             // layoutMx1
             // 
+            this.layoutMx1.Controls.Add(this.ucBtnPrintAll1);
             this.layoutMx1.Controls.Add(this.btnCopyXls);
             this.layoutMx1.Controls.Add(this.txt_qt003);
             this.layoutMx1.Controls.Add(this.lbGuid);
             this.layoutMx1.Controls.Add(this.txt_qt010);
             this.layoutMx1.Controls.Add(this.ucLookHuoZhu1);
             this.layoutMx1.Controls.Add(this.txt_qt008);
-            this.layoutMx1.Controls.Add(this.txt_qt016);
+            this.layoutMx1.Controls.Add(this.txt_qt016Name);
             this.layoutMx1.Controls.Add(this.txt_qt018);
             this.layoutMx1.Controls.Add(this.txt_qt022);
             this.layoutMx1.Controls.Add(this.txt_qt009);
@@ -720,10 +725,10 @@
             this.layoutMx1.Controls.Add(this.txt_qt015);
             this.layoutMx1.Controls.Add(this.txt_qt005);
             this.layoutMx1.Controls.Add(this.txt_qt001);
-            this.layoutMx1.Controls.Add(this.txt_qt030);
+            this.layoutMx1.Controls.Add(this.txt_qt030Name);
             this.layoutMx1.Controls.Add(this.txt_qt029);
             this.layoutMx1.Controls.Add(this.txt_qt028);
-            this.layoutMx1.Controls.Add(this.txt_qt034);
+            this.layoutMx1.Controls.Add(this.txt_qt034Name);
             this.layoutMx1.Controls.Add(this.txt_qt033);
             this.layoutMx1.Controls.Add(this.txt_qt032);
             this.layoutMx1.Controls.Add(this.txt_qt035);
@@ -743,6 +748,15 @@
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
             // 
+            // ucBtnPrintAll1
+            // 
+            this.ucBtnPrintAll1.Location = new System.Drawing.Point(668, 167);
+            this.ucBtnPrintAll1.mxList = null;
+            this.ucBtnPrintAll1.Name = "ucBtnPrintAll1";
+            this.ucBtnPrintAll1.rptType = null;
+            this.ucBtnPrintAll1.Size = new System.Drawing.Size(324, 27);
+            this.ucBtnPrintAll1.TabIndex = 446;
+            // 
             // btnCopyXls
             // 
             this.btnCopyXls.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnCopyXls.ImageOptions.Image")));
@@ -756,6 +770,7 @@
             // txt_qt003
             // 
             this.txt_qt003.Location = new System.Drawing.Point(770, 43);
+            this.txt_qt003.Margin = new System.Windows.Forms.Padding(4);
             this.txt_qt003.Name = "txt_qt003";
             this.txt_qt003.Size = new System.Drawing.Size(222, 24);
             this.txt_qt003.TabIndex = 333;
@@ -800,15 +815,15 @@
             this.txt_qt008.Size = new System.Drawing.Size(222, 24);
             this.txt_qt008.TabIndex = 301;
             // 
-            // txt_qt016
+            // txt_qt016Name
             // 
-            this.txt_qt016.Location = new System.Drawing.Point(770, 74);
-            this.txt_qt016.Name = "txt_qt016";
-            this.txt_qt016.Properties.Appearance.Options.UseFont = true;
-            this.txt_qt016.Size = new System.Drawing.Size(222, 24);
-            this.txt_qt016.StyleController = this.layoutMx1;
-            this.txt_qt016.TabIndex = 267;
-            this.txt_qt016.Tag = "readonly";
+            this.txt_qt016Name.Location = new System.Drawing.Point(770, 74);
+            this.txt_qt016Name.Name = "txt_qt016Name";
+            this.txt_qt016Name.Properties.Appearance.Options.UseFont = true;
+            this.txt_qt016Name.Size = new System.Drawing.Size(222, 24);
+            this.txt_qt016Name.StyleController = this.layoutMx1;
+            this.txt_qt016Name.TabIndex = 267;
+            this.txt_qt016Name.Tag = "readonly";
             // 
             // txt_qt018
             // 
@@ -823,6 +838,7 @@
             // 
             this.txt_qt022.IsReadly = false;
             this.txt_qt022.Location = new System.Drawing.Point(114, 43);
+            this.txt_qt022.Margin = new System.Windows.Forms.Padding(4);
             this.txt_qt022.Name = "txt_qt022";
             this.txt_qt022.Size = new System.Drawing.Size(222, 24);
             this.txt_qt022.TabIndex = 326;
@@ -831,6 +847,7 @@
             // 
             this.txt_qt009.IsReadly = false;
             this.txt_qt009.Location = new System.Drawing.Point(442, 43);
+            this.txt_qt009.Margin = new System.Windows.Forms.Padding(4);
             this.txt_qt009.Name = "txt_qt009";
             this.txt_qt009.Size = new System.Drawing.Size(222, 24);
             this.txt_qt009.TabIndex = 304;
@@ -900,14 +917,14 @@
             this.txt_qt001.TabIndex = 332;
             this.txt_qt001.Tag = "readonly";
             // 
-            // txt_qt030
+            // txt_qt030Name
             // 
-            this.txt_qt030.Location = new System.Drawing.Point(1098, 105);
-            this.txt_qt030.Name = "txt_qt030";
-            this.txt_qt030.Size = new System.Drawing.Size(222, 24);
-            this.txt_qt030.StyleController = this.layoutMx1;
-            this.txt_qt030.TabIndex = 334;
-            this.txt_qt030.Tag = "readonly";
+            this.txt_qt030Name.Location = new System.Drawing.Point(1098, 105);
+            this.txt_qt030Name.Name = "txt_qt030Name";
+            this.txt_qt030Name.Size = new System.Drawing.Size(222, 24);
+            this.txt_qt030Name.StyleController = this.layoutMx1;
+            this.txt_qt030Name.TabIndex = 334;
+            this.txt_qt030Name.Tag = "readonly";
             // 
             // txt_qt029
             // 
@@ -928,14 +945,14 @@
             this.txt_qt028.TabIndex = 336;
             this.txt_qt028.Tag = "readonly";
             // 
-            // txt_qt034
+            // txt_qt034Name
             // 
-            this.txt_qt034.Location = new System.Drawing.Point(1098, 12);
-            this.txt_qt034.Name = "txt_qt034";
-            this.txt_qt034.Size = new System.Drawing.Size(222, 24);
-            this.txt_qt034.StyleController = this.layoutMx1;
-            this.txt_qt034.TabIndex = 337;
-            this.txt_qt034.Tag = "readonly";
+            this.txt_qt034Name.Location = new System.Drawing.Point(1098, 12);
+            this.txt_qt034Name.Name = "txt_qt034Name";
+            this.txt_qt034Name.Size = new System.Drawing.Size(222, 24);
+            this.txt_qt034Name.StyleController = this.layoutMx1;
+            this.txt_qt034Name.TabIndex = 337;
+            this.txt_qt034Name.Tag = "readonly";
             // 
             // txt_qt033
             // 
@@ -989,7 +1006,8 @@
             "2:鎷嗗嵏鍏ュ簱",
             "3:渚涘簲鍟嗚禒閫�",
             "4:鏃犳簮鍗曞澶栭��鏉愭枡",
-            "5:鐩樼泩"});
+            "5:鐩樼泩",
+            "6:宸ュ崟瀹屾垚鍚庨��鎹㈡枡"});
             this.txt_qtlx.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
             this.txt_qtlx.Size = new System.Drawing.Size(222, 24);
             this.txt_qtlx.StyleController = this.layoutMx1;
@@ -1067,41 +1085,42 @@
             this.layoutControlItem11,
             this.layoutControlItem2,
             this.layoutControlItem38,
-            this.layoutControlItem3});
+            this.layoutControlItem3,
+            this.layoutControlItem39});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
-            columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition11.Width = 100D;
-            columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition12.Width = 100D;
-            columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition13.Width = 100D;
-            columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition14.Width = 100D;
+            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition1.Width = 100D;
+            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition2.Width = 100D;
+            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition3.Width = 100D;
+            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition4.Width = 100D;
             this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition11,
-            columnDefinition12,
-            columnDefinition13,
-            columnDefinition14});
-            rowDefinition11.Height = 100D;
-            rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
-            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;
+            columnDefinition1,
+            columnDefinition2,
+            columnDefinition3,
+            columnDefinition4});
+            rowDefinition1.Height = 100D;
+            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition2.Height = 100D;
+            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition3.Height = 100D;
+            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition4.Height = 100D;
+            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition5.Height = 100D;
+            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition6.Height = 100D;
+            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition11,
-            rowDefinition12,
-            rowDefinition13,
-            rowDefinition14,
-            rowDefinition15,
-            rowDefinition16});
+            rowDefinition1,
+            rowDefinition2,
+            rowDefinition3,
+            rowDefinition4,
+            rowDefinition5,
+            rowDefinition6});
             this.Root.Size = new System.Drawing.Size(1332, 207);
             this.Root.TextVisible = false;
             // 
@@ -1182,7 +1201,7 @@
             // 
             // layoutControlItem16
             // 
-            this.layoutControlItem16.Control = this.txt_qt030;
+            this.layoutControlItem16.Control = this.txt_qt030Name;
             this.layoutControlItem16.Location = new System.Drawing.Point(984, 93);
             this.layoutControlItem16.Name = "layoutControlItem16";
             this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
@@ -1216,7 +1235,7 @@
             // 
             // layoutControlItem19
             // 
-            this.layoutControlItem19.Control = this.txt_qt034;
+            this.layoutControlItem19.Control = this.txt_qt034Name;
             this.layoutControlItem19.Location = new System.Drawing.Point(984, 0);
             this.layoutControlItem19.Name = "layoutControlItem19";
             this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
@@ -1285,7 +1304,7 @@
             // 
             // layoutControlItem9
             // 
-            this.layoutControlItem9.Control = this.txt_qt016;
+            this.layoutControlItem9.Control = this.txt_qt016Name;
             this.layoutControlItem9.Location = new System.Drawing.Point(656, 62);
             this.layoutControlItem9.Name = "layoutControlItem9";
             this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
@@ -1336,6 +1355,17 @@
             this.layoutControlItem3.Size = new System.Drawing.Size(328, 31);
             this.layoutControlItem3.Text = "搴撳瓨鏂瑰悜";
             this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem39
+            // 
+            this.layoutControlItem39.Control = this.ucBtnPrintAll1;
+            this.layoutControlItem39.Location = new System.Drawing.Point(656, 155);
+            this.layoutControlItem39.Name = "layoutControlItem39";
+            this.layoutControlItem39.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem39.OptionsTableLayoutItem.RowIndex = 5;
+            this.layoutControlItem39.Size = new System.Drawing.Size(328, 32);
+            this.layoutControlItem39.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem39.TextVisible = false;
             // 
             // tabMx
             // 
@@ -1475,17 +1505,17 @@
             this.layoutControlItem34});
             this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.layoutControlGroup2.Name = "layoutControlGroup2";
-            columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition15.Width = 100D;
-            columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition16.Width = 100D;
+            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition5.Width = 100D;
+            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition6.Width = 100D;
             this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition15,
-            columnDefinition16});
-            rowDefinition17.Height = 100D;
-            rowDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition5,
+            columnDefinition6});
+            rowDefinition7.Height = 100D;
+            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition17});
+            rowDefinition7});
             this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
             this.layoutControlGroup2.Size = new System.Drawing.Size(336, 33);
             this.layoutControlGroup2.TextVisible = false;
@@ -1609,29 +1639,29 @@
             this.layoutControlItem31});
             this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.layoutControlGroup1.Name = "Root";
-            columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition17.Width = 100D;
-            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;
+            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;
             this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition17,
-            columnDefinition18,
-            columnDefinition19,
-            columnDefinition20});
-            rowDefinition18.Height = 100D;
-            rowDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition19.Height = 100D;
-            rowDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition20.Height = 100D;
-            rowDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition7,
+            columnDefinition8,
+            columnDefinition9,
+            columnDefinition10});
+            rowDefinition8.Height = 100D;
+            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition9.Height = 100D;
+            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition10.Height = 100D;
+            rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition18,
-            rowDefinition19,
-            rowDefinition20});
+            rowDefinition8,
+            rowDefinition9,
+            rowDefinition10});
             this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 131);
             this.layoutControlGroup1.TextVisible = false;
             // 
@@ -1873,41 +1903,41 @@
             // 
             this.gridColumn9.Caption = "鐗╂枡缂栫爜";
             this.gridColumn9.FieldName = "itemNo";
-            this.gridColumn9.MinWidth = 100;
+            this.gridColumn9.MinWidth = 50;
             this.gridColumn9.Name = "gridColumn9";
             this.gridColumn9.Visible = true;
-            this.gridColumn9.VisibleIndex = 1;
-            this.gridColumn9.Width = 100;
+            this.gridColumn9.VisibleIndex = 0;
+            this.gridColumn9.Width = 68;
             // 
             // gridColumn10
             // 
             this.gridColumn10.Caption = "鐗╂枡鍚嶇О";
             this.gridColumn10.FieldName = "itemName";
-            this.gridColumn10.MinWidth = 120;
+            this.gridColumn10.MinWidth = 50;
             this.gridColumn10.Name = "gridColumn10";
             this.gridColumn10.Visible = true;
-            this.gridColumn10.VisibleIndex = 2;
-            this.gridColumn10.Width = 120;
+            this.gridColumn10.VisibleIndex = 1;
+            this.gridColumn10.Width = 82;
             // 
             // gridColumn11
             // 
             this.gridColumn11.Caption = "鐗╂枡鍨嬪彿";
             this.gridColumn11.FieldName = "itemModel";
-            this.gridColumn11.MinWidth = 120;
+            this.gridColumn11.MinWidth = 50;
             this.gridColumn11.Name = "gridColumn11";
             this.gridColumn11.Visible = true;
-            this.gridColumn11.VisibleIndex = 3;
-            this.gridColumn11.Width = 120;
+            this.gridColumn11.VisibleIndex = 2;
+            this.gridColumn11.Width = 82;
             // 
             // gridColumn7
             // 
             this.gridColumn7.Caption = "浣跨敤缁勭粐";
             this.gridColumn7.FieldName = "fSubsidiary";
-            this.gridColumn7.MinWidth = 200;
+            this.gridColumn7.MinWidth = 50;
             this.gridColumn7.Name = "gridColumn7";
             this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 0;
-            this.gridColumn7.Width = 200;
+            this.gridColumn7.VisibleIndex = 3;
+            this.gridColumn7.Width = 100;
             // 
             // gvMx1qd002
             // 
@@ -2044,10 +2074,10 @@
             // repositoryItemButtonEdit1
             // 
             this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            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, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, 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.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -2071,9 +2101,9 @@
             // rptBl
             // 
             this.rptBl.AutoHeight = false;
-            editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
             this.rptBl.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            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.rptBl.Name = "rptBl";
             this.rptBl.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptBl_ButtonClick);
             // 
@@ -2241,7 +2271,7 @@
             // gridColumn18
             // 
             this.gridColumn18.Caption = "鍏ュ簱浜�";
-            this.gridColumn18.FieldName = "rkUser";
+            this.gridColumn18.FieldName = "rkUserName";
             this.gridColumn18.MinWidth = 25;
             this.gridColumn18.Name = "gridColumn18";
             this.gridColumn18.Visible = true;
@@ -2309,17 +2339,17 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
             this.layoutMx1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt010.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_qt016.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_qt016Name.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qtck.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt002.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt019.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt015.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt005.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt001.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_qt030.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_qt030Name.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt029.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt028.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_qt034.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_qt034Name.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt033.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt032.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt035.Properties)).EndInit();
@@ -2351,6 +2381,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
             this.tabMxPage1.ResumeLayout(false);
@@ -2433,7 +2464,7 @@
         private UserControl.UcLookCk txt_qt008;
         private DevExpress.XtraEditors.ComboBoxEdit txt_qt019;
         private System.Windows.Forms.Label lbGuid;
-        private DevExpress.XtraEditors.TextEdit txt_qt016;
+        private DevExpress.XtraEditors.TextEdit txt_qt016Name;
         private DevExpress.XtraEditors.TextEdit txt_qt010;
         private DevExpress.XtraEditors.TextEdit txt_qt002;
         private DevExpress.XtraEditors.TextEdit txt_qtck;
@@ -2500,10 +2531,10 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
-        private DevExpress.XtraEditors.TextEdit txt_qt030;
+        private DevExpress.XtraEditors.TextEdit txt_qt030Name;
         private DevExpress.XtraEditors.TextEdit txt_qt029;
         private DevExpress.XtraEditors.CheckEdit txt_qt028;
-        private DevExpress.XtraEditors.TextEdit txt_qt034;
+        private DevExpress.XtraEditors.TextEdit txt_qt034Name;
         private DevExpress.XtraEditors.TextEdit txt_qt033;
         private DevExpress.XtraEditors.CheckEdit txt_qt032;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
@@ -2562,5 +2593,7 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem38;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
+        private UserControl.UcBtnPrintAll ucBtnPrintAll1;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem39;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3