From a44e14cc44c5beea13cfa0accd2237c3a8a07202 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 01 四月 2025 16:56:35 +0800
Subject: [PATCH] 现场修理
---
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 62 ++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 14 deletions(-)
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 0225218..e2dae72 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -282,6 +282,8 @@
if (colmn.Name.ToString().Contains("gvMxDel") || colmn.Name.ToString().Contains("gvMxTui"))
{
colmn.Visible = !isEdt;
+ if (colmn.Visible==true)
+ colmn.VisibleIndex = 99999;
}
else
{
@@ -1589,7 +1591,6 @@
return rowGuid;
}
}
-
return "";
}
@@ -1645,6 +1646,23 @@
/// <param name="icoName"></param>
public static void SetCheckIco(GridView gridView1, string zdChk, string zdChkUser, string zdCkDate, PictureBox btnChkIco, Form fm, string fileName, string icoName = "")
{
+ btnChkIco.Anchor = AnchorStyles.Top | AnchorStyles.Right; // 闈犲彸
+ btnChkIco.Location = new Point(fm.ClientSize.Width - btnChkIco.Width - 20, 80); // 璺濈椤堕儴10鍍忕礌
+ if (gridView1 == null)
+ {
+ btnChkIco.Visible = true;
+ if (fileName == "1")
+ {
+ btnChkIco.Image = global::Gs.DevApp.Properties.Resources.ico_check;
+ btnChkIco.Tag = "宸插鏍�";
+ }
+ else
+ {
+ btnChkIco.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+ btnChkIco.Tag = "鏈鏍�";
+ }
+ return;
+ }
if (fileName == "1" || fileName.ToUpper() == true.ToString().ToUpper())
{
btnChkIco.Image = global::Gs.DevApp.Properties.Resources.ico_check;
@@ -1667,14 +1685,14 @@
if (!string.IsNullOrEmpty(zdChk))
gridView1.SetFocusedRowCellValue(zdChk, false);
}
- btnChkIco.Anchor = AnchorStyles.Top | AnchorStyles.Right; // 闈犲彸
- btnChkIco.Location = new Point(fm.ClientSize.Width - btnChkIco.Width - 20, 80); // 璺濈椤堕儴10鍍忕礌
+
}
+
#region 璁剧疆鎼滅储
-
- public static FilterEntity getFilterEntityWord(string id, string idDec, string val)
+
+ public static FilterEntity getFilterEntityWord(string id, string idDec, string val, string type)
{
- return new FilterEntity(id, idDec + ")", " like ", "鍖呭惈)", "%" + val + "%");
+ return new FilterEntity(id, idDec + ")", " like ", "鍖呭惈)", "%" + val + "%", type);
}
public static List<FilterEntity> GetDilter(GridColumnCollection Columns, GridView gridView1 = null)
{
@@ -1693,7 +1711,7 @@
// fiList.Add(new FilterEntity("b.FNumber", "浣跨敤缁勭粐", " like ", "鍖呭惈", "%" + filter.Value + "%"));
string[] ddd = filter.FilterString.Replace("Contains", "").Replace("(", "").Replace(")", "").Replace("'", "").Replace("'", "").Split(',');
//Contains([fSubsidiary], '005')
- fiList.Add(getFilterEntityWord(col.Tag.ToString(), col.Caption.Trim(), ddd[1].Trim()));
+ fiList.Add(getFilterEntityWord(col.Tag.ToString(), col.Caption.Trim(), ddd[1].Trim(), col.UnboundExpression));
}
return fiList;
}
@@ -1718,8 +1736,20 @@
}
}
else
- _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" +
- itm.fileValue + "'");
+ {
+ switch (itm.fileType)
+ {
+ case "鏃堕棿绫诲瀷":
+ _sbSqlWhere.Append(" and CONVERT(nvarchar(30)," + itm.fileId + ",23)" + itm.fileOper + "'" + itm.fileValue + "'");
+ break;
+ //case "鏁板�肩被鍨�":
+ // _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" + itm.fileValue + "'");
+ // break;
+ default:
+ _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" + itm.fileValue + "'");
+ break;
+ }
+ }
}
return _sbSqlWhere.ToString();
}
@@ -1759,8 +1789,7 @@
};
gridView1.OptionsView.ShowGroupPanel = false;
gridView1.OptionsCustomization.AllowGroup = false;
-
- gridView1.Appearance.HeaderPanel.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.ControlText;
+ // gridView1.Appearance.HeaderPanel.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.ControlText;
gridView1.OptionsView.ColumnAutoWidth = false;//鑷姩璋冩暣鍒楀
foreach (GridColumn column in gridView1.Columns)
{
@@ -1775,7 +1804,6 @@
column.OptionsColumn.ReadOnly = true;
if (column.Tag == null || column.Tag.ToString().Length <= 0)
column.OptionsFilter.AllowAutoFilter = false;
-
}
gridView1.OptionsFilter.AllowAutoFilterConditionChange = DevExpress.Utils.DefaultBoolean.False;
gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -2094,10 +2122,11 @@
{
}
- public CboItemEntity(string val, string text)
+ public CboItemEntity(string val, string text, string fType = "")
{
Text = text;
Value = val;
+ FType = fType;
}
/// <summary>
@@ -2109,6 +2138,8 @@
/// 瀵硅薄鍊�
/// </summary>
public object Value { get; set; } = "";
+
+ public object FType { get; set; } = "";
public override string ToString()
{
@@ -2130,13 +2161,14 @@
/// <param name="operDec">鎿嶄綔绗﹀娉�</param>
/// <param name="val"></param>
public FilterEntity(string id, string idDec, string oper,
- string operDec, string val)
+ string operDec, string val, string type)
{
fileId = id;
fileIdDec = idDec;
fileOper = oper;
fileOperDec = operDec;
fileValue = val;
+ fileType = type;
}
public string fileId { get; set; }
@@ -2148,5 +2180,7 @@
public string fileOperDec { get; set; }
public string fileValue { get; set; }
+
+ public string fileType { get; set; }
}
}
\ No newline at end of file
--
Gitblit v1.9.3