From 1430ce0bec47863b136f2d96a64f8b55e1b3b0e1 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 10 八月 2025 07:08:32 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs | 137 ++++++++++++++++++++++-----------------------
1 files changed, 68 insertions(+), 69 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs
index 2238904..4a731b8 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs
@@ -29,25 +29,26 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
- 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.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.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();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
this.gcMain1 = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumnIndex = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -117,7 +118,6 @@
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.gridColumnIndex = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -280,6 +280,13 @@
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
//
+ // gridColumnIndex
+ //
+ this.gridColumnIndex.Caption = "搴忓彿";
+ this.gridColumnIndex.FieldName = "rowNo";
+ this.gridColumnIndex.Name = "gridColumnIndex";
+ this.gridColumnIndex.UnboundType = DevExpress.Data.UnboundColumnType.Integer;
+ //
// gv_createBy
//
this.gv_createBy.AppearanceCell.Options.UseFont = true;
@@ -290,7 +297,7 @@
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 2;
+ this.gv_createBy.VisibleIndex = 1;
this.gv_createBy.Width = 100;
//
// gv_createDate
@@ -303,7 +310,7 @@
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.Tag = "query_a.create_date";
this.gv_createDate.Visible = true;
- this.gv_createDate.VisibleIndex = 3;
+ this.gv_createDate.VisibleIndex = 2;
this.gv_createDate.Width = 286;
//
// gridColumn6
@@ -314,7 +321,7 @@
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.OptionsColumn.ReadOnly = true;
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 1;
+ this.gridColumn6.VisibleIndex = 0;
this.gridColumn6.Width = 117;
//
// gridColumn1
@@ -325,7 +332,7 @@
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Tag = "errorNo";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 4;
+ this.gridColumn1.VisibleIndex = 3;
this.gridColumn1.Width = 112;
//
// gridColumn2
@@ -336,7 +343,7 @@
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Tag = "errorTime";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 5;
+ this.gridColumn2.VisibleIndex = 4;
this.gridColumn2.Width = 112;
//
// gridColumn3
@@ -347,7 +354,7 @@
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Tag = "errorType";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 6;
+ this.gridColumn3.VisibleIndex = 5;
this.gridColumn3.Width = 112;
//
// gridColumn4
@@ -358,7 +365,7 @@
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Tag = "hourlyType";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 7;
+ this.gridColumn4.VisibleIndex = 6;
this.gridColumn4.Width = 112;
//
// gridColumn5
@@ -369,7 +376,7 @@
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Tag = "remark";
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 8;
+ this.gridColumn5.VisibleIndex = 7;
this.gridColumn5.Width = 112;
//
// gridColumn7
@@ -380,7 +387,7 @@
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Tag = "dAA001";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 9;
+ this.gridColumn7.VisibleIndex = 8;
this.gridColumn7.Width = 112;
//
// gridColumn17
@@ -391,7 +398,7 @@
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Tag = "dAAType";
this.gridColumn17.Visible = true;
- this.gridColumn17.VisibleIndex = 10;
+ this.gridColumn17.VisibleIndex = 9;
this.gridColumn17.Width = 112;
//
// pageBar1
@@ -716,32 +723,32 @@
this.layoutControlItem4});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition5.Width = 100D;
- columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition6.Width = 100D;
- columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition7.Width = 100D;
- columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition8.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[] {
- columnDefinition5,
- columnDefinition6,
- columnDefinition7,
- columnDefinition8});
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition7.Height = 100D;
- rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition8.Height = 100D;
- rowDefinition8.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;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition5,
- rowDefinition6,
- rowDefinition7,
- rowDefinition8});
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4});
this.Root.Size = new System.Drawing.Size(1408, 299);
this.Root.TextVisible = false;
//
@@ -957,6 +964,7 @@
// gridView2
//
this.gridView2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumnIndex,
this.gridColumn16,
this.gridColumn9,
this.gridColumn10,
@@ -980,7 +988,7 @@
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.OptionsColumn.ReadOnly = true;
this.gridColumn16.Visible = true;
- this.gridColumn16.VisibleIndex = 0;
+ this.gridColumn16.VisibleIndex = 1;
this.gridColumn16.Width = 112;
//
// gridColumn9
@@ -991,7 +999,7 @@
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.OptionsColumn.ReadOnly = true;
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 1;
+ this.gridColumn9.VisibleIndex = 2;
this.gridColumn9.Width = 112;
//
// gridColumn10
@@ -1002,7 +1010,7 @@
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.OptionsColumn.ReadOnly = true;
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 2;
+ this.gridColumn10.VisibleIndex = 3;
this.gridColumn10.Width = 112;
//
// gridColumn11
@@ -1013,7 +1021,7 @@
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Tag = "edit";
this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 3;
+ this.gridColumn11.VisibleIndex = 4;
this.gridColumn11.Width = 112;
//
// gridColumn12
@@ -1025,7 +1033,7 @@
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Tag = "edit";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 4;
+ this.gridColumn12.VisibleIndex = 5;
this.gridColumn12.Width = 112;
//
// repositoryItemSearchLookUpEdit1
@@ -1052,7 +1060,7 @@
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.OptionsColumn.ReadOnly = true;
this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 5;
+ this.gridColumn13.VisibleIndex = 6;
this.gridColumn13.Width = 112;
//
// gridColumn14
@@ -1064,7 +1072,7 @@
this.gridColumn14.OptionsColumn.ReadOnly = true;
this.gridColumn14.Tag = "";
this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 6;
+ this.gridColumn14.VisibleIndex = 7;
this.gridColumn14.Width = 112;
//
// gridColumn15
@@ -1075,7 +1083,7 @@
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Tag = "edit";
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 7;
+ this.gridColumn15.VisibleIndex = 8;
this.gridColumn15.Width = 112;
//
// gridColumn18
@@ -1101,16 +1109,16 @@
this.gvMxDel.MinWidth = 30;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 8;
+ this.gvMxDel.VisibleIndex = 9;
this.gvMxDel.Width = 112;
//
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.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.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, 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);
@@ -1126,15 +1134,6 @@
this.picCheckBox.TabIndex = 9;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
- //
- // gridColumnIndex
- //
- this.gridColumnIndex.Caption = "搴忓彿";
- this.gridColumnIndex.FieldName = "rowNo";
- this.gridColumnIndex.UnboundType = DevExpress.Data.UnboundColumnType.Integer;
- this.gridColumnIndex.Visible = true;
- this.gridColumnIndex.VisibleIndex = 0; // 鏀惧湪绗竴鍒�
- this.gridView2.Columns.Insert(0, this.gridColumnIndex);
//
// Frm_MESJJERRORJS
//
--
Gitblit v1.9.3