From da1667144a6160a2ea78e9c4b112272dea20cbec Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期六, 09 八月 2025 17:55:54 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.Designer.cs | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.Designer.cs
index 1d1bd31..b291d56 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.Designer.cs
@@ -36,6 +36,8 @@
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
this.btnIn = new DevExpress.XtraEditors.SimpleButton();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
@@ -50,7 +52,7 @@
this.gcMain.MainView = this.gridView1;
this.gcMain.Margin = new System.Windows.Forms.Padding(4);
this.gcMain.Name = "gcMain";
- this.gcMain.Size = new System.Drawing.Size(1292, 662);
+ this.gcMain.Size = new System.Drawing.Size(1025, 662);
this.gcMain.TabIndex = 6;
this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -65,7 +67,9 @@
this.colChkInt,
this.gridColumn1,
this.gridColumn2,
- this.gridColumn3});
+ this.gridColumn3,
+ this.gridColumn4,
+ this.gridColumn5});
this.gridView1.DetailHeight = 428;
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 62;
@@ -121,7 +125,7 @@
this.panelControl1.Location = new System.Drawing.Point(0, 662);
this.panelControl1.Margin = new System.Windows.Forms.Padding(4);
this.panelControl1.Name = "panelControl1";
- this.panelControl1.Size = new System.Drawing.Size(1292, 53);
+ this.panelControl1.Size = new System.Drawing.Size(1025, 53);
this.panelControl1.TabIndex = 9;
//
// btnIn
@@ -130,25 +134,45 @@
this.btnIn.Appearance.Options.UseBackColor = true;
this.btnIn.Dock = System.Windows.Forms.DockStyle.Right;
this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_16x161;
- this.btnIn.Location = new System.Drawing.Point(1172, 2);
+ this.btnIn.Location = new System.Drawing.Point(905, 2);
this.btnIn.Margin = new System.Windows.Forms.Padding(4);
this.btnIn.Name = "btnIn";
this.btnIn.Size = new System.Drawing.Size(118, 49);
this.btnIn.TabIndex = 4;
this.btnIn.Text = "纭畾瀵煎叆";
//
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "浜х嚎鍙�";
+ this.gridColumn4.FieldName = "lineNo";
+ this.gridColumn4.MinWidth = 30;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 4;
+ this.gridColumn4.Width = 112;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "浜х嚎缂栫爜";
+ this.gridColumn5.FieldName = "lineName";
+ this.gridColumn5.MinWidth = 30;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 5;
+ this.gridColumn5.Width = 112;
+ //
// SelectSTAFF
//
this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1292, 715);
+ this.ClientSize = new System.Drawing.Size(1025, 715);
this.Controls.Add(this.gcMain);
this.Controls.Add(this.panelControl1);
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "SelectSTAFF";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
- this.Text = "鐢熶骇閫�鏂欑敵璇凤紝鍙樉绀哄彲閫�鏁伴噺澶т簬0鐨�";
+ this.Text = "閫夋嫨鍛樺伐";
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
@@ -166,5 +190,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
}
}
\ No newline at end of file
--
Gitblit v1.9.3