From 8bcfd6a94e1e43d3acdb435b7e2facb6fc8ce597 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期三, 27 八月 2025 15:25:02 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.cs | 7 +++++--
DevApp/Gs.DevApp/DevFrm/QC/DefectCode.cs | 33 ++++++++++++++++++++++++++++++---
2 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/DefectCode.cs b/DevApp/Gs.DevApp/DevFrm/QC/DefectCode.cs
index e82a529..f629eae 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/DefectCode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/DefectCode.cs
@@ -20,6 +20,8 @@
public DefectCode(string _strType)
{
InitializeComponent();
+ toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+ this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
strType = _strType;
tlMenu.IndicatorWidth = 50;
tlMenu.CustomDrawNodeIndicator += (s, ee) =>
@@ -106,11 +108,36 @@
frm.UpdateParent += (s2, ee2) =>
{
getPageList(1);
+ // 渚嬪锛岄�氳繃ID鏌ユ壘鑺傜偣锛�
+ TreeListNode node = tlMenu.FindNodeByKeyID(strGuid);
+ if (node !=null)
+ {
+ node.Expanded = true; // 灞曞紑鑺傜偣
+ tlMenu.MakeNodeVisible(node); // 纭繚鍙
+ }
};
frm.ShowDialog();
};
}
-
+ /// <summary>
+ /// 鏌ヨ浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇ョ獥浣撲笉鏀寔鏌ヨ锛岃嫢鎯虫洿鏂伴〉闈紝璇风偣鍑� 鍒锋柊");
+ }
+ /// <summary>
+ /// 鍒锋柊浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
+ {
+ _filterList.Clear();
+ getPageList(1);
+ }
/// <summary>
/// 鍙抽敭寮瑰嚭鑿滃崟,濡傛灉鏄锛屽鍔犲瓙椤圭洰锛屽惁鍒欏鍔犱富椤�
/// </summary>
@@ -169,9 +196,9 @@
tlMenu.KeyFieldName = "guid";
tlMenu.ParentFieldName = "pid";
tlMenu.EndUpdate();
- //this.tlMenu.CollapseAll();
+ this.tlMenu.CollapseAll();
// this.tlMenu.ExpandAll();
- this.tlMenu.ExpandToLevel(0);
+ // this.tlMenu.ExpandToLevel(0);
}
catch (Exception ex)
{
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.cs b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.cs
index 569737b..09b643f 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.cs
@@ -154,8 +154,11 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- gcMain.DataSource = null;
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain.DataSource = null;
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ _sbSqlWhere.Append(" and a.FSubsidiary in");
+ _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
//_sbSqlWhere += " and q.guid is null";
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_no", "asc", "", _sbSqlWhere.ToString(), strType);
var json = JsonConvert.SerializeObject(pgq);
--
Gitblit v1.9.3