From b24e075998745eec077f32eb73cfb1045f7d6a11 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 07 十二月 2024 16:34:03 +0800
Subject: [PATCH] 1
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs | 20 +---------
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs | 3 -
DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs | 20 +---------
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs | 32 ++++++++--------
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs | 1
DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs | 1
6 files changed, 23 insertions(+), 54 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs
index c749a11..b12c257 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs
@@ -35,7 +35,6 @@
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
this.gvMx1lookupName = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1lookupValue = new DevExpress.XtraGrid.Columns.GridColumn();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -91,21 +90,8 @@
this.gvMx1lookupName.Name = "gvMx1lookupName";
this.gvMx1lookupName.Tag = "query_a.LOOKUP_NAME";
this.gvMx1lookupName.Visible = true;
- this.gvMx1lookupName.VisibleIndex = 1;
+ this.gvMx1lookupName.VisibleIndex = 0;
this.gvMx1lookupName.Width = 509;
- //
- // gvMx1lookupValue
- //
- this.gvMx1lookupValue.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1lookupValue.AppearanceCell.Options.UseFont = true;
- this.gvMx1lookupValue.Caption = "绯荤粺蹇爜鍊�";
- this.gvMx1lookupValue.FieldName = "lookupValue";
- this.gvMx1lookupValue.MinWidth = 50;
- this.gvMx1lookupValue.Name = "gvMx1lookupValue";
- this.gvMx1lookupValue.Tag = "query_a.LOOKUP_VALUE";
- this.gvMx1lookupValue.Visible = true;
- this.gvMx1lookupValue.VisibleIndex = 0;
- this.gvMx1lookupValue.Width = 505;
//
// tabMxPage1
//
@@ -130,7 +116,6 @@
// gvMx1
//
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gvMx1lookupValue,
this.gvMx1lookupName,
this.gvMxDel,
this.gridColumn2});
@@ -148,7 +133,7 @@
this.gvMxDel.MinWidth = 25;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 2;
+ this.gvMxDel.VisibleIndex = 1;
this.gvMxDel.Width = 80;
//
// repositoryItemButtonEdit1
@@ -452,7 +437,6 @@
private DevExpress.XtraEditors.LabelControl labelControl11;
private DevExpress.XtraTab.XtraTabControl tabMx;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1lookupName;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1lookupValue;
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
private DevExpress.XtraGrid.GridControl gcMx1;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
index cc6f316..245fe3c 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
@@ -33,6 +33,7 @@
Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1, picCheckBox, this, "checkStatus", "");
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSearMx(gvMx1);
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
index ddaa274..8f7cbf9 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
@@ -29,16 +29,16 @@
/// </summary>
private void InitializeComponent()
{
- 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();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions7 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject25 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject26 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject27 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject28 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions8 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject29 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject30 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject31 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject32 = new DevExpress.Utils.SerializableAppearanceObject();
this.gvMx2aql1Id = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2aql00065 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2aql00040 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -531,10 +531,10 @@
// repositoryItemButtonEdit2
//
this.repositoryItemButtonEdit2.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions7.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions7.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉婚櫎", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉婚櫎", -1, true, true, false, editorButtonImageOptions7, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject25, serializableAppearanceObject26, serializableAppearanceObject27, serializableAppearanceObject28, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
@@ -747,10 +747,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions8.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions8.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, 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, editorButtonImageOptions8, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject29, serializableAppearanceObject30, serializableAppearanceObject31, serializableAppearanceObject32, "", 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);
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
index 2aae436..68d0d01 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
@@ -35,6 +35,7 @@
Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1, picCheckBox, this, "foneChecked", "");
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSearMx(gvMx2);
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -445,12 +446,10 @@
{
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
}
-
foreach (var a in _job["rtnData"]["mesQmAql3s"])
{
mesQmAql3s.Add(a);
}
-
DataTable dt1 = JsonConvert.DeserializeObject<DataTable>(mesQmAql3s.ToString());
if (dt1.Rows.Count > 0)
{
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs
index 540d87e..4fa0376 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs
@@ -35,7 +35,6 @@
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
this.gvMx1lookupName = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1lookupValue = new DevExpress.XtraGrid.Columns.GridColumn();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -91,21 +90,8 @@
this.gvMx1lookupName.Name = "gvMx1lookupName";
this.gvMx1lookupName.Tag = "query_a.LOOKUP_NAME";
this.gvMx1lookupName.Visible = true;
- this.gvMx1lookupName.VisibleIndex = 1;
+ this.gvMx1lookupName.VisibleIndex = 0;
this.gvMx1lookupName.Width = 509;
- //
- // gvMx1lookupValue
- //
- this.gvMx1lookupValue.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1lookupValue.AppearanceCell.Options.UseFont = true;
- this.gvMx1lookupValue.Caption = "绯荤粺蹇爜鍊�";
- this.gvMx1lookupValue.FieldName = "lookupValue";
- this.gvMx1lookupValue.MinWidth = 50;
- this.gvMx1lookupValue.Name = "gvMx1lookupValue";
- this.gvMx1lookupValue.Tag = "query_a.LOOKUP_VALUE";
- this.gvMx1lookupValue.Visible = true;
- this.gvMx1lookupValue.VisibleIndex = 0;
- this.gvMx1lookupValue.Width = 505;
//
// tabMxPage1
//
@@ -131,7 +117,6 @@
//
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gridColumn2,
- this.gvMx1lookupValue,
this.gvMx1lookupName,
this.gvMxDel});
this.gvMx1.GridControl = this.gcMx1;
@@ -156,7 +141,7 @@
this.gvMxDel.MinWidth = 25;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 2;
+ this.gvMxDel.VisibleIndex = 1;
this.gvMxDel.Width = 80;
//
// repositoryItemButtonEdit1
@@ -452,7 +437,6 @@
private DevExpress.XtraEditors.LabelControl labelControl11;
private DevExpress.XtraTab.XtraTabControl tabMx;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1lookupName;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1lookupValue;
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
private DevExpress.XtraGrid.GridControl gcMx1;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
index 48b848a..50b1ae8 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
@@ -36,6 +36,7 @@
Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1, picCheckBox, this, "checkStatus", "");
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSearMx(gvMx1);
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
--
Gitblit v1.9.3