From 6940ba1b4fe555c94353de9d7ab6a53a6c8884bc Mon Sep 17 00:00:00 2001
From: wbc <2597324127@qq.com>
Date: 星期三, 03 十二月 2025 18:27:35 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~kyy/LB_MesClient
---
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 55 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 9 deletions(-)
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 2a2c3c6..f995d5b 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -501,6 +501,14 @@
txt.IsReadly = isEdt;
continue;
}
+ //鑷畾涔夊簱浣�
+ if (colType is UcLookKw)
+ {
+ var txt = colType as UcLookKw;
+ txt.SetIdOrCode(strVal);
+ txt.IsReadly = isEdt;
+ continue;
+ }
//鑷畾涔変緵搴斿晢
if (colType is UcLookSupplier)
{
@@ -806,6 +814,14 @@
txt.IsReadly = isEdt;
continue;
}
+ //鑷畾涔夊簱浣�
+ if (ctrl is UcLookKw)
+ {
+ var txt = ctrl as UcLookKw;
+ txt.SetIdOrCode("-1");
+ txt.IsReadly = isEdt;
+ continue;
+ }
//鑷畾涔変緵搴斿晢
if (ctrl is UcLookSupplier)
{
@@ -1062,6 +1078,13 @@
if (ctrl is UcLookCk)
{
var txt = ctrl as UcLookCk;
+ txt.IsReadly = isEdt;
+ continue;
+ }
+ //鑷畾涔夊簱浣�
+ if (ctrl is UcLookKw)
+ {
+ var txt = ctrl as UcLookKw;
txt.IsReadly = isEdt;
continue;
}
@@ -1710,6 +1733,7 @@
}
public delegate void DelegateGetModel(string guid);
public delegate void DelegateGetList(int currentPage);
+ public delegate void DelegateGetUserControlList();
/// <summary>
///
@@ -1970,7 +1994,7 @@
column.Width = maxWidth;
}
}
-
+
/// <summary>
/// 璁剧疆閫夐」鍗�
/// </summary>
@@ -1979,10 +2003,24 @@
/// <param name="pageBar1"></param>
/// <param name="action"></param>
/// <param name="page"></param>
- public static void SetTabParameter(GridView gridView1, DevExpress.XtraTab.XtraTabControl xtraTabControl1, UcPageBar pageBar1, DelegateGetModel action = null, DelegateGetList page = null, Label lbGuid = null)
+ public static void SetTabParameter(GridView gridView1, DevExpress.XtraTab.XtraTabControl xtraTabControl1, UcPageBar pageBar1, DelegateGetModel action = null, DelegateGetList page = null, Label lbGuid = null, UcToolBarMenu barMenu = null, DelegateGetUserControlList ucLst = null)
{
xtraTabControl1.SelectedPageChanged += (s, e) =>
{
+ if (pageBar1 != null && xtraTabControl1.SelectedTabPageIndex == 0)
+ {
+ if (barMenu != null)
+ barMenu.SetAllButton(0);
+
+ page(pageBar1.CurrentPage);
+ int rowHandle = 0;
+ rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], lbGuid.Text);
+ if (rowHandle < 0)
+ rowHandle = 0;
+ gridView1.FocusedRowHandle = rowHandle;
+ return;
+ }
+
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
int _handle = gridView1.FocusedRowHandle;
@@ -2010,15 +2048,14 @@
return;
}
action(_guid);
+ return;
}
- if (pageBar1 != null && xtraTabControl1.SelectedTabPageIndex == 0)
+
+ if (barMenu != null && xtraTabControl1.SelectedTabPageIndex == 2)
{
- page(pageBar1.CurrentPage);
- int rowHandle = 0;
- rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], lbGuid.Text);
- if (rowHandle < 0)
- rowHandle = 0;
- gridView1.FocusedRowHandle = rowHandle;
+ barMenu.SetAllButton(2);
+ ucLst();
+ return;
}
};
}
--
Gitblit v1.9.3