From 1fd408a9ba01142cd824894f01ee0d3affff547e Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 12 五月 2025 13:52:12 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs | 20 ++++++++++++++++----
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs | 2 --
DevApp/Gs.DevApp/UserControl/UcDictionarySelect.Designer.cs | 17 +++++++++--------
DevApp/Gs.DevApp/UserControl/UcDictionarySelect.cs | 1 +
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs | 2 +-
5 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index 1523e56..afd01ba 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -71,6 +71,11 @@
Task.Delay(100);
getPageList(1);
}
+ /// <summary>
+ /// 5琛ㄧ劍鐐规椂锛岄噸鏂拌鍙�12琛�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
{
if (e.FocusedRowHandle >= 0)
@@ -251,7 +256,7 @@
return;
if (txt_fcheckResu.Text.Trim() == _strTag)
{
- if (string.IsNullOrEmpty(txt_fngDesc.Text.Trim()))
+ if (string.IsNullOrEmpty(txt_fngDesc.TextTxt.Trim()))
{
MsgHelper.Warning("鍗曟嵁涓轰笉鍚堟牸鏃讹紝璇峰～鍐欏紓甯稿娉ㄨ鏄庯紒");
return;
@@ -399,7 +404,6 @@
private void getPageList(int curPage)
{
gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
- // _sbSqlWhere += " and isnull(fsubmit,0)=0";
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
@@ -435,6 +439,11 @@
}
}
+ /// <summary>
+ /// 璇诲彇瀹炰綋
+ /// </summary>
+ /// <param name="strGuid"></param>
+ /// <param name="guid5"></param>
private void getModel(string strGuid, string guid5)
{
bool isEdit = false;
@@ -556,7 +565,10 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
+ /// <summary>
+ /// 绂佺敤妫�楠屾+閲嶆柊鍔犺浇鎸夐挳
+ /// </summary>
+ /// <param name="bl"></param>
private void setEable(bool bl)
{
txtJianYan.ReadOnly = !bl;
@@ -564,7 +576,7 @@
btnIpt.Text = (bl == true ? "褰曞叆鏍锋湰" : "鏌ョ湅鏍锋湰");
}
- #region 鎵撳紑鐖朵翰绐楀彛濮旀墭
+ #region 鎵撳紑鐖朵翰绐楀彛濮旀墭锛屾煡鐪嬪紓甯告姤鍛�
public event EventHandler<UpdateParentEventArgs> ToUpdateParent;
private void BtnYcReport_Click(object sender, EventArgs e)
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
index 9ab7a97..9829dfe 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -1142,7 +1142,7 @@
// gvMx1ebeln
//
this.gvMx1ebeln.AppearanceCell.Options.UseFont = true;
- this.gvMx1ebeln.Caption = "ERP鍗曞彿";
+ this.gvMx1ebeln.Caption = "閲囪喘鍗曞彿";
this.gvMx1ebeln.FieldName = "ebeln";
this.gvMx1ebeln.MinWidth = 120;
this.gvMx1ebeln.Name = "gvMx1ebeln";
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
index d3f0353..d4ae8aa 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
@@ -112,7 +112,6 @@
};
frm.ShowDialog();
};
-
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -641,6 +640,5 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.Designer.cs
index bc26169..a538c36 100644
--- a/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.Designer.cs
@@ -52,7 +52,7 @@
this.tlMenu.OptionsView.CheckBoxStyle = DevExpress.XtraTreeList.DefaultNodeCheckBoxStyle.Check;
this.tlMenu.OptionsView.RootCheckBoxStyle = DevExpress.XtraTreeList.NodeCheckBoxStyle.Check;
this.tlMenu.OptionsView.TreeLineStyle = DevExpress.XtraTreeList.LineStyle.Solid;
- this.tlMenu.Size = new System.Drawing.Size(445, 464);
+ this.tlMenu.Size = new System.Drawing.Size(776, 475);
this.tlMenu.TabIndex = 5;
this.tlMenu.TreeLevelWidth = 21;
//
@@ -64,25 +64,26 @@
this.tlcMenuName.Name = "tlcMenuName";
this.tlcMenuName.Visible = true;
this.tlcMenuName.VisibleIndex = 0;
- this.tlcMenuName.Width = 50;
+ this.tlcMenuName.Width = 666;
//
// tlcActions
//
- this.tlcActions.Caption = "鑿滃崟绫诲瀷";
+ this.tlcActions.Caption = "绫诲瀷";
this.tlcActions.FieldName = "sType";
+ this.tlcActions.MaxWidth = 100;
this.tlcActions.MinWidth = 23;
this.tlcActions.Name = "tlcActions";
this.tlcActions.Visible = true;
this.tlcActions.VisibleIndex = 1;
- this.tlcActions.Width = 60;
+ this.tlcActions.Width = 100;
//
// panel1
//
this.panel1.Controls.Add(this.btnIn);
this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panel1.Location = new System.Drawing.Point(0, 464);
+ this.panel1.Location = new System.Drawing.Point(0, 475);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(445, 56);
+ this.panel1.Size = new System.Drawing.Size(776, 56);
this.panel1.TabIndex = 6;
//
// btnIn
@@ -91,7 +92,7 @@
this.btnIn.Appearance.Options.UseBackColor = true;
this.btnIn.Dock = System.Windows.Forms.DockStyle.Right;
this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.zoom100_16x16;
- this.btnIn.Location = new System.Drawing.Point(351, 0);
+ this.btnIn.Location = new System.Drawing.Point(682, 0);
this.btnIn.Name = "btnIn";
this.btnIn.Size = new System.Drawing.Size(94, 56);
this.btnIn.TabIndex = 5;
@@ -101,7 +102,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(445, 520);
+ this.ClientSize = new System.Drawing.Size(776, 531);
this.Controls.Add(this.tlMenu);
this.Controls.Add(this.panel1);
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
diff --git a/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.cs b/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.cs
index 7b4f02a..6c53912 100644
--- a/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.cs
@@ -101,6 +101,7 @@
// tlMenu.OptionsBehavior.Editable = true;
tlMenu.OptionsBehavior.AllowRecursiveNodeChecking = false;
tlMenu.BestFitColumns();
+ tlMenu.ExpandAll();
}
catch (Exception ex)
{
--
Gitblit v1.9.3