From 1f99c554ffc67f599fbce5981a3da584945b3b16 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期一, 18 八月 2025 14:24:07 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/UserControl/UcDictionarySelect.cs | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.cs b/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.cs
index 9e3a574..621b517 100644
--- a/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.cs
@@ -16,9 +16,10 @@
private List<dynamic> lstCheckedKeyID = new List<dynamic>();//閫夋嫨闆嗗悎
string strTitle = "";
string strWhere = "";
- public UcDictionarySelect(string _strTitle, string _strWhere)
+ public UcDictionarySelect(string _strTitle, string _strWhere,string _strMsg="")
{
InitializeComponent();
+ lbMsg.Text = _strMsg;
this.strTitle = _strTitle;
this.strWhere = _strWhere;
this.Text = _strTitle;
@@ -83,8 +84,8 @@
/// </summary>
private void getTree()
{
- string _where = " and 1=1 and "+this.strWhere;
- var pgq = new PageQueryModel(1, 999999, "a.defect_name","asc","", _where);
+ string _where = " and 1=1 and a.type1=1 and " + this.strWhere;
+ var pgq = new PageQueryModel(1, 999999, "a.defect_name", "asc", "", _where);
var json = JsonConvert.SerializeObject(pgq);
try
{
@@ -101,6 +102,7 @@
// tlMenu.OptionsBehavior.Editable = true;
tlMenu.OptionsBehavior.AllowRecursiveNodeChecking = false;
tlMenu.BestFitColumns();
+ tlMenu.ExpandAll();
}
catch (Exception ex)
{
--
Gitblit v1.9.3