From 86e875b896d74dce8757ad693eb5dd336a7645cf Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期二, 16 九月 2025 13:14:03 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~kyy/LW_MesClient
---
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 45 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index c042718..ecf808f 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -43,6 +43,20 @@
ConfigurationManager.AppSettings["WebApiUrl"];
/// <summary>
+ /// 鏁版嵁杩囨护
+ /// </summary>
+ /// <returns></returns>
+ public static string GetOrgWhere()
+ {
+ System.Text.StringBuilder sb = new System.Text.StringBuilder();
+ //sb.Append(" (select aboutGuid as fid from SYS_USER_BIND where userGuid='" + LoginInfoModel.CurrentUser.LoginUserGuid + "' and ftype='缁勭粐')");
+ //榫欏穽鍗曠粍缁囩洿鎺ヨ繃婊わ紝骞朵笖鍗曠粍缁囦紶鍏ョ殑鈥�1鈥欎笌guid绫诲瀷涓嶇杩欓噷寰呬慨鏀�
+ sb.Append(" (select 1 as fid from SYS_USER_BIND where userGuid='" + LoginInfoModel.CurrentUser.LoginUserGuid + "' and ftype='缁勭粐')");
+ return sb.ToString();
+ }
+
+
+ /// <summary>
/// 璇诲彇鍔犺浇淇℃伅
/// </summary>
/// <returns></returns>
@@ -274,7 +288,7 @@
{
colmn.Visible = !isEdt;
if (colmn.Visible == true)
- colmn.VisibleIndex = 99999;
+ colmn.VisibleIndex = 1;
}
else
{
@@ -1713,8 +1727,8 @@
/// <param name="isPostSearch"></param>
/// <param name="action2">濮旀墭2锛堝垪琛ㄦ樉绀烘槑缁嗭級</param>
public static void SetGridViewParameter(GridView gridView1, PictureBox picCheckBox = null, Form fm = null, string fileName = "checkStatus", string icoName = "", DelegateGetModel action = null, DevExpress.Utils.ToolTipController tips = null, bool isPostSearch = true, DelegateGetModel action2 = null)
- {
- gridView1.PopupMenuShowing += (s, e) =>
+ { //2025-09-04 kyy 寮曞叆涓枃鎻掍欢娉�
+ /*gridView1.PopupMenuShowing += (s, e) =>
{
if (e.MenuType == DevExpress.XtraGrid.Views.Grid.GridMenuType.Column)
{
@@ -1732,7 +1746,7 @@
}
}
}
- };
+ };*/
gridView1.OptionsView.ColumnAutoWidth = false;//鑷姩璋冩暣鍒楀
if (isPostSearch == true)
{
@@ -1997,7 +2011,8 @@
/// <param name="icoName"></param>
public static void SetGridViewParameterMx(GridView gridView1, DevExpress.Utils.ToolTipController tips = null)
{
- gridView1.PopupMenuShowing += (s, e) =>
+ //2025-09-04 kyy 娉�
+ /* gridView1.PopupMenuShowing += (s, e) =>
{
if (e.MenuType == DevExpress.XtraGrid.Views.Grid.GridMenuType.Column)
{
@@ -2014,10 +2029,11 @@
}
}
}
+
}
};
gridView1.OptionsView.ShowGroupPanel = false;
- gridView1.OptionsCustomization.AllowGroup = false;
+ gridView1.OptionsCustomization.AllowGroup = false;*/
// gridView1.OptionsView.Alignment = DataGridViewContentAlignment.MiddleLeft;
foreach (GridColumn column in gridView1.Columns)
@@ -3364,11 +3380,24 @@
ipqc棣栨,
fqc,
鐢熶骇閫�鏂欏叆搴撴,
- 鍏跺畠鍏ュ簱妫�
+ 鍏跺畠鍏ュ簱妫�,
+ 閿�鍞��璐у叆搴撴,
+ 瓒呮湡妫�,
+ 濮斿閫�鏂欏叆搴撴,
+ cqcjyes,//閲嶆鏂规
+ cqcjno,//閲嶆鏂规
+ 浜х嚎绉伴噸,
+ iqc绉伴噸,
+ 鍙楁墭鍏ュ簱
}
-
+ public enum OrderType
+ {
+ 鍏跺畠鍏ュ簱,
+ 鐗╂枡璋冩嫧,
+ 鍏跺畠鍑哄簱
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3