From 7470cb9ad57c31fa65d818698f9c804289f876a6 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 21 十一月 2024 18:57:33 +0800
Subject: [PATCH] 增加了审核图标
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs | 16 +++++
DevApp/Gs.DevApp/DevFrm/User/Role.cs | 2
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs | 46 ++++++++-------
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs | 2
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs | 4 +
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs | 32 ++++++++--
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs | 10 ++-
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs | 4
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs | 1
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 17 ++++-
10 files changed, 91 insertions(+), 43 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs
index d567b2b..f1f3fb0 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs
@@ -161,7 +161,7 @@
{
string rowGuid, rowName;
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_name, gridView1);
+ lbGuid, txt_name, gridView1, "name");
if (string.IsNullOrEmpty(rowGuid))
{
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs
index c709156..2322b19 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs
@@ -29,11 +29,11 @@
/// </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();
this.gvMx1createBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1createDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1remark = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -85,6 +85,7 @@
this.txt_isStatus = new System.Windows.Forms.CheckBox();
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
+ this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -107,6 +108,7 @@
this.tabMx.SuspendLayout();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
//
// gvMx1createBy
@@ -257,10 +259,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions2.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)});
+ 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)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -716,11 +718,23 @@
this.lbGuid.TabIndex = 1;
this.lbGuid.Visible = false;
//
+ // picCheckBox
+ //
+ this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+ this.picCheckBox.Location = new System.Drawing.Point(1034, 55);
+ this.picCheckBox.Name = "picCheckBox";
+ this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+ this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.picCheckBox.TabIndex = 5;
+ this.picCheckBox.TabStop = false;
+ this.picCheckBox.Visible = false;
+ //
// Frm_MesWorkshop
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1283, 682);
+ this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_MesWorkshop";
@@ -747,6 +761,7 @@
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.ResumeLayout(false);
}
@@ -810,5 +825,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx1isStatus;
private DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit repositoryItemCheckEdit1;
private DevExpress.XtraEditors.CheckEdit txt_checkStatus;
+ private System.Windows.Forms.PictureBox picCheckBox;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs
index 47f82c5..e4a1b2f 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs
@@ -33,6 +33,10 @@
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
+ gridView1.FocusedRowChanged += (s, e) =>
+ {
+ UtilityHelper.SetCheckIco(s, picCheckBox, this, "checkStatus", "");
+ };
getPageList(1, UtilityHelper.GetPageSize());
pageBar1.PagerEvent += PageBar1_PagerEvent;
gridView1.CustomDrawRowIndicator += (s, e) =>
@@ -107,7 +111,7 @@
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_name, gridView1);
+ lbGuid, txt_name, gridView1, "workshopNo");
toolBarMenu1.guidKey = rowGuid;
}
@@ -121,7 +125,7 @@
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_name, gridView1);
+ lbGuid, txt_name, gridView1, "workshopNo");
toolBarMenu1.guidKey = rowGuid;
}
@@ -144,7 +148,7 @@
{
string rowGuid = "", rowName = "";
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_name, gridView1);
+ lbGuid, txt_name, gridView1, "workshopNo");
if (string.IsNullOrEmpty(rowGuid))
{
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Role.cs b/DevApp/Gs.DevApp/DevFrm/User/Role.cs
index 023ad57..d7b7b2b 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Role.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/Role.cs
@@ -113,7 +113,7 @@
{
string rowGuid, rowName;
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_roleName, gridView1, 2);
+ lbGuid, txt_roleName, gridView1,"", 2);
if (string.IsNullOrEmpty(rowGuid))
{
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs
index b3decce..7418591 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs
@@ -114,6 +114,7 @@
this.panel1 = new System.Windows.Forms.Panel();
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
+ this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -147,6 +148,7 @@
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
//
// gvMx1depotSectionNamet
@@ -1106,11 +1108,23 @@
this.lbGuid.TabIndex = 1;
this.lbGuid.Visible = false;
//
+ // picCheckBox
+ //
+ this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+ this.picCheckBox.Location = new System.Drawing.Point(983, 55);
+ this.picCheckBox.Name = "picCheckBox";
+ this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+ this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.picCheckBox.TabIndex = 5;
+ this.picCheckBox.TabStop = false;
+ this.picCheckBox.Visible = false;
+ //
// Frm_MesDepot
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1128, 682);
+ this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_MesDepot";
@@ -1148,6 +1162,7 @@
this.tabMx.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.ResumeLayout(false);
}
@@ -1252,5 +1267,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private System.Windows.Forms.PictureBox picCheckBox;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs
index e6335f6..b2f145c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs
@@ -32,6 +32,10 @@
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
+ gridView1.FocusedRowChanged += (s, e) =>
+ {
+ UtilityHelper.SetCheckIco(s, picCheckBox, this, "checkStatus", "");
+ };
getPageList(1, UtilityHelper.GetPageSize());
pageBar1.PagerEvent += PageBar1_PagerEvent;
gridView1.CustomDrawRowIndicator += (s, e) =>
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
index 53d17e0..ed1204f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
@@ -215,7 +215,7 @@
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_billNo, gridView1);
+ lbGuid, txt_billNo, gridView1, "billNo");
toolBarMenu1.guidKey = rowGuid;
if (string.IsNullOrEmpty(rowGuid))
{
@@ -261,7 +261,7 @@
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_billNo, gridView1);
+ lbGuid, txt_billNo, gridView1, "billNo");
toolBarMenu1.guidKey = rowGuid;
if (string.IsNullOrEmpty(rowGuid))
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
index 2d8694a..58ab9b5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
@@ -74,7 +74,7 @@
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridView();
- this.gv_factory = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gv_fSubsidiary = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_paymentParty = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_transportMethod = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_lastupdateDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
@@ -82,6 +82,7 @@
this.gv_checkDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_checkBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_checkFalg = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gv_factory = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_billNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_documentStatus = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_documentType = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
@@ -113,7 +114,6 @@
this.panel1 = new System.Windows.Forms.Panel();
this.lbGuid = new DevExpress.XtraEditors.LabelControl();
this.txt_supplier = new Gs.DevApp.UserControl.UcLookSupplier();
- this.gv_fSubsidiary = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gridBand29 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gridBand2 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
@@ -796,15 +796,15 @@
this.gridView1.OptionsView.ShowColumnHeaders = false;
this.gridView1.OptionsView.ShowGroupPanel = false;
//
- // gv_factory
+ // gv_fSubsidiary
//
- this.gv_factory.Caption = "ERPID鍙�";
- this.gv_factory.FieldName = "ebelnK3id";
- this.gv_factory.MinWidth = 25;
- this.gv_factory.Name = "gv_factory";
- this.gv_factory.OptionsColumn.AllowEdit = false;
- this.gv_factory.Visible = true;
- this.gv_factory.Width = 80;
+ this.gv_fSubsidiary.Caption = "鏀舵枡缁勭粐";
+ this.gv_fSubsidiary.FieldName = "fSubsidiary";
+ this.gv_fSubsidiary.MinWidth = 25;
+ this.gv_fSubsidiary.Name = "gv_fSubsidiary";
+ this.gv_fSubsidiary.OptionsColumn.AllowEdit = false;
+ this.gv_fSubsidiary.Visible = true;
+ this.gv_fSubsidiary.Width = 250;
//
// gv_paymentParty
//
@@ -890,6 +890,16 @@
this.gv_checkFalg.Tag = "query_a.CHECK_FALG";
this.gv_checkFalg.Width = 100;
//
+ // gv_factory
+ //
+ this.gv_factory.Caption = "ERPID鍙�";
+ this.gv_factory.FieldName = "ebelnK3id";
+ this.gv_factory.MinWidth = 25;
+ this.gv_factory.Name = "gv_factory";
+ this.gv_factory.OptionsColumn.AllowEdit = false;
+ this.gv_factory.Visible = true;
+ this.gv_factory.Width = 80;
+ //
// gv_billNo
//
this.gv_billNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -914,7 +924,7 @@
this.gv_documentStatus.OptionsColumn.AllowEdit = false;
this.gv_documentStatus.Tag = "query_a.DOCUMENT_STATUS";
this.gv_documentStatus.Visible = true;
- this.gv_documentStatus.Width = 100;
+ this.gv_documentStatus.Width = 130;
//
// gv_documentType
//
@@ -1272,15 +1282,6 @@
this.txt_supplier.Size = new System.Drawing.Size(305, 30);
this.txt_supplier.TabIndex = 227;
//
- // gv_fSubsidiary
- //
- this.gv_fSubsidiary.Caption = "鏀舵枡缁勭粐";
- this.gv_fSubsidiary.FieldName = "fSubsidiary";
- this.gv_fSubsidiary.MinWidth = 25;
- this.gv_fSubsidiary.Name = "gv_fSubsidiary";
- this.gv_fSubsidiary.Visible = true;
- this.gv_fSubsidiary.Width = 25;
- //
// gridBand29
//
this.gridBand29.Caption = "鏀舵枡缁勭粐";
@@ -1321,10 +1322,11 @@
this.gridBand3.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gridBand3.Caption = "鍗曟嵁鐘舵��:A鍒涘缓,B瀹℃牳涓�,C宸插鏍�,D閲嶆柊瀹℃牳,Z鏆傚瓨";
this.gridBand3.Columns.Add(this.gv_documentStatus);
- this.gridBand3.MinWidth = 100;
+ this.gridBand3.MinWidth = 130;
this.gridBand3.Name = "gridBand3";
+ this.gridBand3.RowCount = 2;
this.gridBand3.VisibleIndex = 3;
- this.gridBand3.Width = 100;
+ this.gridBand3.Width = 130;
//
// gridBand4
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
index 36c4a5a..2643d27 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
@@ -19,7 +19,6 @@
{
private List<FilterEntity> _filterList = new List<FilterEntity>();
private readonly string _webServiceName = "MesRohInManager/";
-
public Frm_MesRohIn()
{
InitializeComponent();
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index cc511a4..da48bf5 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -865,6 +865,7 @@
, Label lbGuid
, TextEdit txtName
, GridView gridView1
+ , string fileName = ""
, int SelectedTabPageIndex = 1)
{
var _strGuid = "";
@@ -884,7 +885,10 @@
else
{
_strGuid = dr["guid"].ToString();
- _strName = dr[1].ToString();
+ if (string.IsNullOrEmpty(fileName))
+ _strName = dr[1].ToString();
+ else
+ _strName = dr[fileName].ToString();
}
}
@@ -1025,13 +1029,16 @@
/// <param name="fm"></param>
/// <param name="fileName">瀵瑰簲鐨勫鏍稿瓧娈靛悕绉�</param>
/// <param name="icoName"></param>
- public static void SetCheckIco(object s, PictureBox btnChkIco, Form fm,string fileName= "checkStatus", string icoName="")
+ public static void SetCheckIco(object s, PictureBox btnChkIco, Form fm, string fileName = "checkStatus", string icoName = "")
{
GridView dgv = s as GridView;
- if (dgv != null) {
- if (dgv.GetSelectedRows() != null) {
+ if (dgv != null)
+ {
+ if (dgv.GetSelectedRows() != null)
+ {
var selectedRow = dgv.GetSelectedRows()[0]; // 鑾峰彇绗竴涓�変腑琛岀殑绱㈠紩
- if (selectedRow >= 0) {
+ if (selectedRow >= 0)
+ {
var checkStatus = dgv.GetRowCellValue(selectedRow, fileName).ToString(); // 鑾峰彇鎸囧畾鍒楃殑鍊�
btnChkIco.Text = checkStatus;
btnChkIco.Visible = true;
--
Gitblit v1.9.3