From e7e44b5d746cecfcfcd1c480735ae8f2a7ec18c5 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期四, 16 十月 2025 17:49:34 +0800
Subject: [PATCH] 线长姓名和头像
---
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.resx | 19 +++++++++
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs | 19 +++++++++
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs | 81 +++++++++++++++++++++++++++++-----------
3 files changed, 97 insertions(+), 22 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs
index 9d61670..d663ddd 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs
@@ -38,6 +38,12 @@
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();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesWorkshopLine));
+ 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();
@@ -81,6 +87,8 @@
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -116,6 +124,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -181,6 +190,8 @@
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
this.gcMain1.Name = "gcMain1";
+ this.gcMain1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemButtonEdit1});
this.gcMain1.Size = new System.Drawing.Size(1126, 519);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -205,7 +216,8 @@
this.gv_lineType,
this.gv_isZxbg,
this.gridColumn2,
- this.gridColumn3});
+ this.gridColumn3,
+ this.gridColumn4});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -266,7 +278,7 @@
// gv_remark
//
this.gv_remark.AppearanceCell.Options.UseFont = true;
- this.gv_remark.Caption = "澶囨敞";
+ this.gv_remark.Caption = "澶囨敞(绾块暱)";
this.gv_remark.FieldName = "remark";
this.gv_remark.MinWidth = 50;
this.gv_remark.Name = "gv_remark";
@@ -443,55 +455,55 @@
// txt_dptId
//
this.txt_dptId.IsReadly = false;
- this.txt_dptId.Location = new System.Drawing.Point(84, 12);
+ this.txt_dptId.Location = new System.Drawing.Point(126, 12);
this.txt_dptId.Name = "txt_dptId";
- this.txt_dptId.Size = new System.Drawing.Size(200, 24);
+ this.txt_dptId.Size = new System.Drawing.Size(158, 24);
this.txt_dptId.TabIndex = 244;
//
// txt_lineNo
//
- this.txt_lineNo.Location = new System.Drawing.Point(84, 43);
+ this.txt_lineNo.Location = new System.Drawing.Point(126, 43);
this.txt_lineNo.Name = "txt_lineNo";
this.txt_lineNo.Properties.Appearance.Options.UseFont = true;
- this.txt_lineNo.Size = new System.Drawing.Size(200, 24);
+ this.txt_lineNo.Size = new System.Drawing.Size(158, 24);
this.txt_lineNo.StyleController = this.layoutMx1;
this.txt_lineNo.TabIndex = 216;
this.txt_lineNo.Tag = "";
//
// txt_name
//
- this.txt_name.Location = new System.Drawing.Point(84, 75);
+ this.txt_name.Location = new System.Drawing.Point(126, 75);
this.txt_name.Name = "txt_name";
this.txt_name.Properties.Appearance.Options.UseFont = true;
- this.txt_name.Size = new System.Drawing.Size(200, 24);
+ this.txt_name.Size = new System.Drawing.Size(158, 24);
this.txt_name.StyleController = this.layoutMx1;
this.txt_name.TabIndex = 217;
//
// txt_lastupdateDate
//
- this.txt_lastupdateDate.Location = new System.Drawing.Point(360, 43);
+ this.txt_lastupdateDate.Location = new System.Drawing.Point(402, 43);
this.txt_lastupdateDate.Name = "txt_lastupdateDate";
this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true;
- this.txt_lastupdateDate.Size = new System.Drawing.Size(200, 24);
+ this.txt_lastupdateDate.Size = new System.Drawing.Size(158, 24);
this.txt_lastupdateDate.StyleController = this.layoutMx1;
this.txt_lastupdateDate.TabIndex = 231;
this.txt_lastupdateDate.Tag = "readonly";
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(360, 75);
+ this.txt_remark.Location = new System.Drawing.Point(402, 75);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(200, 24);
+ this.txt_remark.Size = new System.Drawing.Size(158, 24);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 219;
//
// txt_lastupdateBy
//
- this.txt_lastupdateBy.Location = new System.Drawing.Point(360, 12);
+ this.txt_lastupdateBy.Location = new System.Drawing.Point(402, 12);
this.txt_lastupdateBy.Name = "txt_lastupdateBy";
this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true;
- this.txt_lastupdateBy.Size = new System.Drawing.Size(200, 24);
+ this.txt_lastupdateBy.Size = new System.Drawing.Size(158, 24);
this.txt_lastupdateBy.StyleController = this.layoutMx1;
this.txt_lastupdateBy.TabIndex = 228;
this.txt_lastupdateBy.Tag = "readonly";
@@ -577,7 +589,7 @@
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem1.Text = "鎵�鍦ㄩ儴闂�";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(102, 18);
//
// layoutControlItem2
//
@@ -587,7 +599,7 @@
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem2.Size = new System.Drawing.Size(276, 32);
this.layoutControlItem2.Text = "浜х嚎缂栧彿";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(102, 18);
//
// layoutControlItem3
//
@@ -597,17 +609,18 @@
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem3.Size = new System.Drawing.Size(276, 32);
this.layoutControlItem3.Text = "浜х嚎鍚嶇О";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(102, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_lastupdateBy;
+ this.layoutControlItem5.CustomizationFormText = "鏇存柊浜哄憳";
this.layoutControlItem5.Location = new System.Drawing.Point(276, 0);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem5.Size = new System.Drawing.Size(276, 31);
- this.layoutControlItem5.Text = "鏇存柊鑰�";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem5.Text = "鏇存柊浜哄憳";
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(102, 18);
//
// layoutControlItem6
//
@@ -618,7 +631,7 @@
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem6.Size = new System.Drawing.Size(276, 32);
this.layoutControlItem6.Text = "鏇存柊鏃堕棿";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(102, 18);
//
// layoutControlItem4
//
@@ -628,8 +641,8 @@
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem4.Size = new System.Drawing.Size(276, 32);
- this.layoutControlItem4.Text = "澶囨敞";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem4.Text = "澶囨敞(绾块暱濮撳悕)";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(102, 18);
//
// layoutControlItem8
//
@@ -652,6 +665,27 @@
this.layoutControlItem10.Size = new System.Drawing.Size(276, 32);
this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem10.TextVisible = false;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "绾块暱澶村儚";
+ this.gridColumn4.ColumnEdit = this.repositoryItemButtonEdit1;
+ this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 11;
+ this.gridColumn4.Width = 94;
+ //
+ // repositoryItemButtonEdit1
+ //
+ this.repositoryItemButtonEdit1.AutoHeight = false;
+ editorButtonImageOptions1.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions1.Image")));
+ 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);
//
// Frm_MesWorkshopLine
//
@@ -697,6 +731,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
this.ResumeLayout(false);
}
@@ -744,5 +779,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraEditors.CheckEdit txt_lineType;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs
index 4e935ae..dc224f6 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs
@@ -344,5 +344,24 @@
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
+
+ private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ var rowhandle = gridView1.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ if (e.Button.Index == 0)
+ {
+ var dr = gridView1.GetDataRow(rowhandle);
+ var mxGuid = dr["guid"].ToString();
+ Gs.DevApp.UserControl.ShowUp frm = new Gs.DevApp.UserControl.ShowUp(mxGuid);
+ frm.UpdateParent += (ss, ee) =>
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation("涓婁紶鎴愬姛锛�");
+ getPageList(this.pageBar1.CurrentPage);
+ };
+ frm.ShowDialog();
+ }
+ }
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.resx b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.resx
index a4826a3..cf99b39 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.resx
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.resx
@@ -117,6 +117,25 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="editorButtonImageOptions1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAADXRFWHRUaXRsZQBVcGxvYWQ7
+ a3x9RAAAAn1JREFUOE9tk+1LU3EUx91WmZHRq4qif6K3rblpNWzpXBbDDCQ1H9BZmXNuWVIKvQjzlSyK
+ ksCHze2qcw8GUoQ4dUrZCyG0lfkwK11Yb+rdvp3zWxNu+oUP93fP+Z5zf/d37k1L6eLt0BaFjhCHFBfs
+ gUsm4t86zdSUpMDm57xcXARAQFIY6noOlbSNbpS0jm7kWroPcyyVN1p3amAPimQikeBbJT3FO/IuhuDb
+ VeRbfRLFVIRoktfgY49cJlsgVaw4Xy+Z217MYDr+B+H137jfNY3c614z5UQTQ/0Q++QyNoptKXSlnUeK
+ W0LxyZVfGF5MMrb0E0XNwbj6Sscx8ijZx+b/xUGV4eag5IssYyC6CdeHHwLP/CakiSXoLZ4B8uwmuIlM
+ olhf01t09+kUXO/X4Yx8RdfsOp4TYj3zDQ5nGNqyrmLychPZLpQnL7cfNTsC8ZG5DTyZWMPjcAx3/J8E
+ zvEYnHQ/OPsdpoah+AnjveNUI85DVJOUZ2u9kt4iga44U+NFJxXZh6Nw+KLoHFtFdrUH2VX90FW5kVXe
+ y6+yi9hqwAsOpBOZOWR+NrmGW9ICMY+ONyvQVrj5AzlI7CP2ELLD5AXD28rQVbrFazx6vSxoJ7KuubjB
+ foIftH0S2sp+vnAiXVPWM8kFGuJUOdMH9dXuKcrtZY+6tJe9chXSP0DiBnzCvM1Mgrec4gDB8R3HyFIU
+ NAXGjbYg8m0B5DX6kWclGoYFhnqf4NyNgTB5uck2KfV1Evrm4nj4agkPRr+g9eUiWkKf0eyPwu77iMbB
+ BeiSh5mRLCGl/jCSKqfaHT5NE8ihcTHZlTQ2giegrXCJg9SUdkfIm5GsQ9pfC0htwf0VafMAAAAASUVO
+ RK5CYII=
+</value>
+ </data>
<metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
--
Gitblit v1.9.3