From bb59b3c2baa039889b74aef492a90883d69c4855 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期三, 10 九月 2025 14:38:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs | 44 +++++++++++++++++++++-----------------------
1 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
index b886fce..c8e79ce 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
@@ -76,6 +76,7 @@
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layDianJian = new DevExpress.XtraLayout.LayoutControlItem();
this.simpleButton7 = new DevExpress.XtraEditors.SimpleButton();
this.simpleButton6 = new DevExpress.XtraEditors.SimpleButton();
this.simpleButton5 = new DevExpress.XtraEditors.SimpleButton();
@@ -131,7 +132,6 @@
this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
this.alertControl1 = new DevExpress.XtraBars.Alerter.AlertControl(this.components);
- this.layDianJian = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
this.splitMx1.Panel1.SuspendLayout();
@@ -178,6 +178,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layDianJian)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.prog1.Properties)).BeginInit();
this.panel3.SuspendLayout();
this.panel2.SuspendLayout();
@@ -191,7 +192,6 @@
this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layDianJian)).BeginInit();
this.SuspendLayout();
//
// splitMx1
@@ -677,6 +677,17 @@
this.layoutControlItem11.Text = "浜у搧瑙勬牸";
this.layoutControlItem11.TextSize = new System.Drawing.Size(87, 18);
//
+ // layDianJian
+ //
+ this.layDianJian.Control = this.txt_dianJianPath;
+ this.layDianJian.Location = new System.Drawing.Point(202, 174);
+ this.layDianJian.Name = "layDianJian";
+ this.layDianJian.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layDianJian.OptionsTableLayoutItem.RowIndex = 5;
+ this.layDianJian.Size = new System.Drawing.Size(202, 35);
+ this.layDianJian.Text = "鐢垫璺緞";
+ this.layDianJian.TextSize = new System.Drawing.Size(87, 18);
+ //
// simpleButton7
//
this.simpleButton7.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
@@ -967,8 +978,6 @@
this.gridColumn6.FieldName = "itemModel";
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.OptionsColumn.ReadOnly = true;
- this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 4;
this.gridColumn6.Width = 94;
//
// gridColumn3
@@ -979,7 +988,7 @@
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.ReadOnly = true;
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 6;
+ this.gridColumn3.VisibleIndex = 5;
this.gridColumn3.Width = 94;
//
// gvMx2tlQty
@@ -991,7 +1000,7 @@
this.gvMx2tlQty.OptionsColumn.ReadOnly = true;
this.gvMx2tlQty.Tag = "query_a.tl_qty";
this.gvMx2tlQty.Visible = true;
- this.gvMx2tlQty.VisibleIndex = 5;
+ this.gvMx2tlQty.VisibleIndex = 4;
this.gvMx2tlQty.Width = 94;
//
// gridColumn2
@@ -1002,7 +1011,7 @@
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.OptionsColumn.ReadOnly = true;
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 7;
+ this.gridColumn2.VisibleIndex = 6;
this.gridColumn2.Width = 94;
//
// gridColumn1
@@ -1022,7 +1031,7 @@
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.OptionsColumn.ReadOnly = true;
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 8;
+ this.gridColumn4.VisibleIndex = 7;
this.gridColumn4.Width = 94;
//
// gridColumn14
@@ -1033,7 +1042,7 @@
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.OptionsColumn.ReadOnly = true;
this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 9;
+ this.gridColumn14.VisibleIndex = 8;
this.gridColumn14.Width = 94;
//
// gridColumn15
@@ -1044,7 +1053,7 @@
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.OptionsColumn.ReadOnly = true;
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 10;
+ this.gridColumn15.VisibleIndex = 9;
this.gridColumn15.Width = 94;
//
// gridColumn24
@@ -1055,7 +1064,7 @@
this.gridColumn24.Name = "gridColumn24";
this.gridColumn24.OptionsColumn.ReadOnly = true;
this.gridColumn24.Visible = true;
- this.gridColumn24.VisibleIndex = 11;
+ this.gridColumn24.VisibleIndex = 10;
this.gridColumn24.Width = 94;
//
// tabMxPage2
@@ -1265,17 +1274,6 @@
this.gridColumn25.VisibleIndex = 12;
this.gridColumn25.Width = 94;
//
- // layDianJian
- //
- this.layDianJian.Control = this.txt_dianJianPath;
- this.layDianJian.Location = new System.Drawing.Point(202, 174);
- this.layDianJian.Name = "layDianJian";
- this.layDianJian.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layDianJian.OptionsTableLayoutItem.RowIndex = 5;
- this.layDianJian.Size = new System.Drawing.Size(202, 35);
- this.layDianJian.Text = "鐢垫璺緞";
- this.layDianJian.TextSize = new System.Drawing.Size(87, 18);
- //
// Frm_Work01
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1334,6 +1332,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layDianJian)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.prog1.Properties)).EndInit();
this.panel3.ResumeLayout(false);
this.panel3.PerformLayout();
@@ -1351,7 +1350,6 @@
this.tabMxPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layDianJian)).EndInit();
this.ResumeLayout(false);
}
--
Gitblit v1.9.3