From c3af491dcd019d4b5f1cf1565c5591b42285b2e0 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 07 四月 2025 10:06:51 +0800
Subject: [PATCH] 查询过滤

---
 DevApp/Gs.DevApp/UserControl/ShowFilter.Designer.cs |  284 ++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 172 insertions(+), 112 deletions(-)

diff --git a/DevApp/Gs.DevApp/UserControl/ShowFilter.Designer.cs b/DevApp/Gs.DevApp/UserControl/ShowFilter.Designer.cs
index 91242ea..b84be5b 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowFilter.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowFilter.Designer.cs
@@ -44,7 +44,6 @@
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
-            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.panel1 = new System.Windows.Forms.Panel();
             this.btnEsc = new DevExpress.XtraEditors.SimpleButton();
             this.btnQuery = new DevExpress.XtraEditors.SimpleButton();
@@ -57,7 +56,9 @@
             this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemComboBox2 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
             this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
             this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
             this.gcTable = new DevExpress.XtraGrid.GridControl();
@@ -72,20 +73,20 @@
             this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.panQueryTable = new System.Windows.Forms.Panel();
             this.btnSqlTable = new DevExpress.XtraEditors.SimpleButton();
             this.gcQuery = new DevExpress.XtraGrid.GridControl();
             this.gvQuery = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemComboBoxSql = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
-            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemSearchLookUpEdit2Sql = new DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit();
+            this.repositoryItemSearchLookUpEdit2View = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemComboBox3Sql = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
             this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.panQueryBom = new System.Windows.Forms.Panel();
-            this.btnQueryEsc = new DevExpress.XtraEditors.SimpleButton();
-            this.btnQuerySave = new DevExpress.XtraEditors.SimpleButton();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
@@ -94,6 +95,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
             this.xtraTabPage3.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
@@ -109,43 +111,42 @@
             this.panQueryTable.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcQuery)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvQuery)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBoxSql)).BeginInit();
-            this.panQueryBom.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit2Sql)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit2View)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox3Sql)).BeginInit();
             this.SuspendLayout();
-            // 
-            // 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;
             // 
             // panel1
             // 
             this.panel1.Controls.Add(this.btnEsc);
             this.panel1.Controls.Add(this.btnQuery);
             this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.panel1.Location = new System.Drawing.Point(0, 405);
+            this.panel1.Location = new System.Drawing.Point(0, 529);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(734, 56);
+            this.panel1.Size = new System.Drawing.Size(734, 44);
             this.panel1.TabIndex = 1;
             // 
             // btnEsc
             // 
-            this.btnEsc.Location = new System.Drawing.Point(391, 15);
+            this.btnEsc.Appearance.Options.UseFont = true;
+            this.btnEsc.Dock = System.Windows.Forms.DockStyle.Right;
+            this.btnEsc.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            this.btnEsc.Location = new System.Drawing.Point(546, 0);
             this.btnEsc.Name = "btnEsc";
-            this.btnEsc.Size = new System.Drawing.Size(94, 29);
+            this.btnEsc.Size = new System.Drawing.Size(94, 44);
             this.btnEsc.TabIndex = 1;
-            this.btnEsc.Text = "鍙栨秷";
+            this.btnEsc.Text = "鍙栨秷鏌ヨ";
             // 
             // btnQuery
             // 
-            this.btnQuery.Location = new System.Drawing.Point(270, 15);
+            this.btnQuery.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
+            this.btnQuery.Appearance.Options.UseBackColor = true;
+            this.btnQuery.Appearance.Options.UseFont = true;
+            this.btnQuery.Dock = System.Windows.Forms.DockStyle.Right;
+            this.btnQuery.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.zoom100_16x16;
+            this.btnQuery.Location = new System.Drawing.Point(640, 0);
             this.btnQuery.Name = "btnQuery";
-            this.btnQuery.Size = new System.Drawing.Size(94, 29);
+            this.btnQuery.Size = new System.Drawing.Size(94, 44);
             this.btnQuery.TabIndex = 0;
             this.btnQuery.Text = "纭畾鏌ヨ";
             // 
@@ -155,7 +156,7 @@
             this.xtraTabControl1.Location = new System.Drawing.Point(0, 0);
             this.xtraTabControl1.Name = "xtraTabControl1";
             this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
-            this.xtraTabControl1.Size = new System.Drawing.Size(736, 493);
+            this.xtraTabControl1.Size = new System.Drawing.Size(736, 605);
             this.xtraTabControl1.TabIndex = 2;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPage1,
@@ -166,19 +167,20 @@
             this.xtraTabPage1.Controls.Add(this.gcMain);
             this.xtraTabPage1.Controls.Add(this.panel1);
             this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(734, 461);
+            this.xtraTabPage1.Size = new System.Drawing.Size(734, 573);
             this.xtraTabPage1.Text = "鏌ヨ鏉′欢";
             // 
             // gcMain
             // 
-            this.gcMain.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
             this.gcMain.Location = new System.Drawing.Point(0, 0);
             this.gcMain.MainView = this.gridView1;
             this.gcMain.Name = "gcMain";
             this.gcMain.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemComboBox1,
-            this.repositoryItemComboBox2});
-            this.gcMain.Size = new System.Drawing.Size(734, 405);
+            this.repositoryItemComboBox2,
+            this.repositoryItemButtonEdit1});
+            this.gcMain.Size = new System.Drawing.Size(734, 529);
             this.gcMain.TabIndex = 0;
             this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -189,6 +191,7 @@
             this.gridColumn1,
             this.gridColumn2,
             this.gridColumn3,
+            this.gridColumn8,
             this.gridColumn4});
             this.gridView1.GridControl = this.gcMain;
             this.gridView1.Name = "gridView1";
@@ -211,6 +214,8 @@
             this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
+            this.repositoryItemComboBox1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+            this.repositoryItemComboBox1.SelectedValueChanged += new System.EventHandler(this.repositoryItemComboBox1_SelectedValueChanged);
             // 
             // gridColumn2
             // 
@@ -229,6 +234,7 @@
             this.repositoryItemComboBox2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.repositoryItemComboBox2.Name = "repositoryItemComboBox2";
+            this.repositoryItemComboBox2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
             // 
             // gridColumn3
             // 
@@ -239,6 +245,14 @@
             this.gridColumn3.Visible = true;
             this.gridColumn3.VisibleIndex = 2;
             this.gridColumn3.Width = 100;
+            // 
+            // gridColumn8
+            // 
+            this.gridColumn8.Caption = "瀛楁绫诲瀷";
+            this.gridColumn8.FieldName = "fieldType";
+            this.gridColumn8.MinWidth = 25;
+            this.gridColumn8.Name = "gridColumn8";
+            this.gridColumn8.Width = 94;
             // 
             // gridColumn4
             // 
@@ -251,11 +265,22 @@
             this.gridColumn4.VisibleIndex = 3;
             this.gridColumn4.Width = 60;
             // 
+            // 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.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
+            // 
             // xtraTabPage3
             // 
             this.xtraTabPage3.Controls.Add(this.splitContainerControl1);
             this.xtraTabPage3.Name = "xtraTabPage3";
-            this.xtraTabPage3.Size = new System.Drawing.Size(734, 461);
+            this.xtraTabPage3.Size = new System.Drawing.Size(734, 573);
             this.xtraTabPage3.Text = "鏌ヨ閰嶇疆";
             // 
             // splitContainerControl1
@@ -274,9 +299,8 @@
             // splitContainerControl1.Panel2
             // 
             this.splitContainerControl1.Panel2.Controls.Add(this.gcQuery);
-            this.splitContainerControl1.Panel2.Controls.Add(this.panQueryBom);
             this.splitContainerControl1.Panel2.Text = "Panel2";
-            this.splitContainerControl1.Size = new System.Drawing.Size(734, 461);
+            this.splitContainerControl1.Size = new System.Drawing.Size(734, 573);
             this.splitContainerControl1.SplitterPosition = 230;
             this.splitContainerControl1.TabIndex = 0;
             // 
@@ -301,7 +325,8 @@
             this.gridColumn13,
             this.gridColumn11,
             this.gridColumn12,
-            this.gridColumn14});
+            this.gridColumn14,
+            this.gridColumn19});
             this.gvTable.GridControl = this.gcTable;
             this.gvTable.Name = "gvTable";
             this.gvTable.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
@@ -317,7 +342,7 @@
             this.gridColumn10.MinWidth = 25;
             this.gridColumn10.Name = "gridColumn10";
             this.gridColumn10.Visible = true;
-            this.gridColumn10.VisibleIndex = 0;
+            this.gridColumn10.VisibleIndex = 1;
             this.gridColumn10.Width = 94;
             // 
             // repositoryItemSearchLookUpEdit1
@@ -364,7 +389,7 @@
             this.gridColumn13.Name = "gridColumn13";
             this.gridColumn13.OptionsColumn.ReadOnly = true;
             this.gridColumn13.Visible = true;
-            this.gridColumn13.VisibleIndex = 1;
+            this.gridColumn13.VisibleIndex = 2;
             this.gridColumn13.Width = 94;
             // 
             // gridColumn11
@@ -375,11 +400,13 @@
             this.gridColumn11.Name = "gridColumn11";
             this.gridColumn11.OptionsColumn.ReadOnly = true;
             this.gridColumn11.Visible = true;
-            this.gridColumn11.VisibleIndex = 2;
+            this.gridColumn11.VisibleIndex = 3;
             this.gridColumn11.Width = 94;
             // 
             // gridColumn12
             // 
+            this.gridColumn12.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn12.AppearanceCell.Options.UseForeColor = true;
             this.gridColumn12.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
             this.gridColumn12.AppearanceHeader.Options.UseForeColor = true;
             this.gridColumn12.Caption = "鍒悕";
@@ -387,7 +414,7 @@
             this.gridColumn12.MinWidth = 25;
             this.gridColumn12.Name = "gridColumn12";
             this.gridColumn12.Visible = true;
-            this.gridColumn12.VisibleIndex = 3;
+            this.gridColumn12.VisibleIndex = 4;
             this.gridColumn12.Width = 94;
             // 
             // gridColumn14
@@ -397,7 +424,7 @@
             this.gridColumn14.MinWidth = 25;
             this.gridColumn14.Name = "gridColumn14";
             this.gridColumn14.Visible = true;
-            this.gridColumn14.VisibleIndex = 4;
+            this.gridColumn14.VisibleIndex = 5;
             this.gridColumn14.Width = 94;
             // 
             // repositoryItemButtonEdit2
@@ -410,6 +437,16 @@
             this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
             this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
+            // 
+            // gridColumn19
+            // 
+            this.gridColumn19.Caption = "涓婚敭Guid";
+            this.gridColumn19.FieldName = "guid";
+            this.gridColumn19.MinWidth = 25;
+            this.gridColumn19.Name = "gridColumn19";
+            this.gridColumn19.Visible = true;
+            this.gridColumn19.VisibleIndex = 0;
+            this.gridColumn19.Width = 94;
             // 
             // panQueryTable
             // 
@@ -435,8 +472,9 @@
             this.gcQuery.MainView = this.gvQuery;
             this.gcQuery.Name = "gcQuery";
             this.gcQuery.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
-            this.repositoryItemComboBoxSql});
-            this.gcQuery.Size = new System.Drawing.Size(734, 175);
+            this.repositoryItemComboBox3Sql,
+            this.repositoryItemSearchLookUpEdit2Sql});
+            this.gcQuery.Size = new System.Drawing.Size(734, 331);
             this.gcQuery.TabIndex = 3;
             this.gcQuery.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvQuery});
@@ -445,61 +483,104 @@
             // 
             this.gvQuery.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gridColumn5,
-            this.gridColumn6,
             this.gridColumn7,
-            this.gridColumn8,
+            this.gridColumn6,
             this.gridColumn9});
             this.gvQuery.GridControl = this.gcQuery;
             this.gvQuery.Name = "gvQuery";
             // 
             // gridColumn5
             // 
-            this.gridColumn5.Caption = "鍒楀悕";
-            this.gridColumn5.FieldName = "gvColName";
+            this.gridColumn5.Caption = "鍒楄〃ID(鏍囬)";
+            this.gridColumn5.FieldName = "gvNameCap";
             this.gridColumn5.MinWidth = 25;
             this.gridColumn5.Name = "gridColumn5";
+            this.gridColumn5.OptionsColumn.ReadOnly = true;
             this.gridColumn5.Visible = true;
             this.gridColumn5.VisibleIndex = 0;
             this.gridColumn5.Width = 94;
             // 
-            // gridColumn6
-            // 
-            this.gridColumn6.Caption = "鍒楁爣棰�";
-            this.gridColumn6.FieldName = "gvColCaption";
-            this.gridColumn6.MinWidth = 25;
-            this.gridColumn6.Name = "gridColumn6";
-            this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 1;
-            this.gridColumn6.Width = 94;
-            // 
             // gridColumn7
             // 
-            this.gridColumn7.Caption = "瀵瑰簲瀛楁";
-            this.gridColumn7.ColumnEdit = this.repositoryItemComboBoxSql;
-            this.gridColumn7.FieldName = "gvTag";
+            this.gridColumn7.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn7.AppearanceCell.Options.UseForeColor = true;
+            this.gridColumn7.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn7.AppearanceHeader.Options.UseForeColor = true;
+            this.gridColumn7.Caption = "瀵瑰簲鏁版嵁搴撳瓧娈�";
+            this.gridColumn7.ColumnEdit = this.repositoryItemSearchLookUpEdit2Sql;
+            this.gridColumn7.FieldName = "sqlField";
             this.gridColumn7.MinWidth = 25;
             this.gridColumn7.Name = "gridColumn7";
             this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 2;
+            this.gridColumn7.VisibleIndex = 1;
             this.gridColumn7.Width = 94;
             // 
-            // repositoryItemComboBoxSql
+            // repositoryItemSearchLookUpEdit2Sql
             // 
-            this.repositoryItemComboBoxSql.AutoHeight = false;
-            this.repositoryItemComboBoxSql.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            this.repositoryItemSearchLookUpEdit2Sql.AutoHeight = false;
+            this.repositoryItemSearchLookUpEdit2Sql.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.repositoryItemComboBoxSql.Name = "repositoryItemComboBoxSql";
-            this.repositoryItemComboBoxSql.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+            this.repositoryItemSearchLookUpEdit2Sql.DisplayMember = "tableOtherName";
+            this.repositoryItemSearchLookUpEdit2Sql.Name = "repositoryItemSearchLookUpEdit2Sql";
+            this.repositoryItemSearchLookUpEdit2Sql.NullText = "璇烽�夋嫨";
+            this.repositoryItemSearchLookUpEdit2Sql.PopupView = this.repositoryItemSearchLookUpEdit2View;
+            this.repositoryItemSearchLookUpEdit2Sql.ValueMember = "tableOtherName";
+            this.repositoryItemSearchLookUpEdit2Sql.EditValueChanged += new System.EventHandler(this.repositoryItemSearchLookUpEdit2Sql_EditValueChanged);
             // 
-            // gridColumn8
+            // repositoryItemSearchLookUpEdit2View
             // 
-            this.gridColumn8.Caption = "鏈�鍚庝慨鏀逛汉";
-            this.gridColumn8.FieldName = "lastUpdateBy";
-            this.gridColumn8.MinWidth = 25;
-            this.gridColumn8.Name = "gridColumn8";
-            this.gridColumn8.Visible = true;
-            this.gridColumn8.VisibleIndex = 3;
-            this.gridColumn8.Width = 94;
+            this.repositoryItemSearchLookUpEdit2View.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn17,
+            this.gridColumn18});
+            this.repositoryItemSearchLookUpEdit2View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
+            this.repositoryItemSearchLookUpEdit2View.Name = "repositoryItemSearchLookUpEdit2View";
+            this.repositoryItemSearchLookUpEdit2View.OptionsSelection.EnableAppearanceFocusedCell = false;
+            this.repositoryItemSearchLookUpEdit2View.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridColumn17
+            // 
+            this.gridColumn17.Caption = "瀛楁鍚嶇О";
+            this.gridColumn17.FieldName = "tableOtherName";
+            this.gridColumn17.Name = "gridColumn17";
+            this.gridColumn17.Visible = true;
+            this.gridColumn17.VisibleIndex = 0;
+            // 
+            // gridColumn18
+            // 
+            this.gridColumn18.Caption = "瀛楁澶囨敞";
+            this.gridColumn18.FieldName = "remark";
+            this.gridColumn18.Name = "gridColumn18";
+            this.gridColumn18.Visible = true;
+            this.gridColumn18.VisibleIndex = 1;
+            // 
+            // gridColumn6
+            // 
+            this.gridColumn6.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn6.AppearanceCell.Options.UseForeColor = true;
+            this.gridColumn6.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn6.AppearanceHeader.Options.UseForeColor = true;
+            this.gridColumn6.Caption = "鏁版嵁搴撳瓧娈电被鍨�";
+            this.gridColumn6.ColumnEdit = this.repositoryItemComboBox3Sql;
+            this.gridColumn6.FieldName = "sqlFieldType";
+            this.gridColumn6.MinWidth = 25;
+            this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.Visible = true;
+            this.gridColumn6.VisibleIndex = 2;
+            this.gridColumn6.Width = 94;
+            // 
+            // repositoryItemComboBox3Sql
+            // 
+            this.repositoryItemComboBox3Sql.AutoHeight = false;
+            this.repositoryItemComboBox3Sql.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemComboBox3Sql.Items.AddRange(new object[] {
+            "瀛楃涓茬被鍨�",
+            "鏁板�肩被鍨�",
+            "鏃堕棿绫诲瀷",
+            "Bit绫诲瀷"});
+            this.repositoryItemComboBox3Sql.Name = "repositoryItemComboBox3Sql";
+            this.repositoryItemComboBox3Sql.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+            this.repositoryItemComboBox3Sql.EditValueChanged += new System.EventHandler(this.repositoryItemComboBox3Sql_EditValueChanged);
             // 
             // gridColumn9
             // 
@@ -507,41 +588,16 @@
             this.gridColumn9.FieldName = "lastUpdateDate";
             this.gridColumn9.MinWidth = 25;
             this.gridColumn9.Name = "gridColumn9";
+            this.gridColumn9.OptionsColumn.ReadOnly = true;
             this.gridColumn9.Visible = true;
-            this.gridColumn9.VisibleIndex = 4;
+            this.gridColumn9.VisibleIndex = 3;
             this.gridColumn9.Width = 94;
-            // 
-            // panQueryBom
-            // 
-            this.panQueryBom.Controls.Add(this.btnQueryEsc);
-            this.panQueryBom.Controls.Add(this.btnQuerySave);
-            this.panQueryBom.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.panQueryBom.Location = new System.Drawing.Point(0, 175);
-            this.panQueryBom.Name = "panQueryBom";
-            this.panQueryBom.Size = new System.Drawing.Size(734, 44);
-            this.panQueryBom.TabIndex = 4;
-            // 
-            // btnQueryEsc
-            // 
-            this.btnQueryEsc.Location = new System.Drawing.Point(639, 6);
-            this.btnQueryEsc.Name = "btnQueryEsc";
-            this.btnQueryEsc.Size = new System.Drawing.Size(94, 29);
-            this.btnQueryEsc.TabIndex = 1;
-            this.btnQueryEsc.Text = "鍙栨秷";
-            // 
-            // btnQuerySave
-            // 
-            this.btnQuerySave.Location = new System.Drawing.Point(518, 6);
-            this.btnQuerySave.Name = "btnQuerySave";
-            this.btnQuerySave.Size = new System.Drawing.Size(94, 29);
-            this.btnQuerySave.TabIndex = 0;
-            this.btnQuerySave.Text = "纭畾淇濆瓨";
             // 
             // ShowFilter
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(736, 493);
+            this.ClientSize = new System.Drawing.Size(736, 605);
             this.Controls.Add(this.xtraTabControl1);
             this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
             this.MaximizeBox = false;
@@ -550,7 +606,6 @@
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
             this.Text = "璇峰鍔犳煡璇㈡潯浠�";
             this.TopMost = true;
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
             this.panel1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
             this.xtraTabControl1.ResumeLayout(false);
@@ -559,6 +614,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
             this.xtraTabPage3.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).EndInit();
             this.splitContainerControl1.Panel1.ResumeLayout(false);
@@ -574,8 +630,9 @@
             this.panQueryTable.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcQuery)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvQuery)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBoxSql)).EndInit();
-            this.panQueryBom.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit2Sql)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit2View)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox3Sql)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -594,7 +651,7 @@
         private DevExpress.XtraGrid.GridControl gcMain;
         private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
         private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox2;
-        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+
         private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
         private DevExpress.XtraEditors.SplitContainerControl splitContainerControl1;
         private DevExpress.XtraGrid.GridControl gcTable;
@@ -606,14 +663,8 @@
         private DevExpress.XtraGrid.GridControl gcQuery;
         private DevExpress.XtraGrid.Views.Grid.GridView gvQuery;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
-        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBoxSql;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
-        private System.Windows.Forms.Panel panQueryBom;
-        private DevExpress.XtraEditors.SimpleButton btnQueryEsc;
-        private DevExpress.XtraEditors.SimpleButton btnQuerySave;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
@@ -622,5 +673,14 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
         private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
+        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox3Sql;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+        private DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit repositoryItemSearchLookUpEdit2Sql;
+        private DevExpress.XtraGrid.Views.Grid.GridView repositoryItemSearchLookUpEdit2View;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3