From c3ebc2116abc274eb2220e7a24c4ca03acad3a1d Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 21 四月 2025 17:49:19 +0800
Subject: [PATCH] iqc

---
 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs |   74 ++++++++++++++++++++++++++++---------
 1 files changed, 56 insertions(+), 18 deletions(-)

diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 4c7f538..e67a08b 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -613,7 +613,10 @@
                         if (colType is SimpleButton)
                         {
                             var txt = colType as SimpleButton;
-                            txt.Enabled = !isEdt;
+                            if (txt.Tag != null && txt.Tag.ToString() == "gvBtnAlawys")
+                                txt.Enabled = true;
+                            else
+                                txt.Enabled = !isEdt;
                             continue;
                         }
                         //鑷畾宸ュ簭
@@ -912,7 +915,10 @@
                 if (ctrl is SimpleButton)
                 {
                     var txt = ctrl as SimpleButton;
-                    txt.Enabled = !isEdt;
+                    if (txt.Tag != null && txt.Tag.ToString() == "gvBtnAlawys")
+                        txt.Enabled = true;
+                    else
+                        txt.Enabled = !isEdt;
                     continue;
                 }
             }
@@ -1136,7 +1142,10 @@
                 if (ctrl is SimpleButton)
                 {
                     var txt = ctrl as SimpleButton;
-                    txt.Enabled = !isEdt;
+                    if (txt.Tag != null && txt.Tag.ToString() == "gvBtnAlawys")
+                        txt.Enabled = true;
+                    else
+                        txt.Enabled = !isEdt;
                     continue;
                 }
             }
@@ -1626,7 +1635,17 @@
 
         public static FilterEntity getFilterEntityWord(string id, string idDec, string val, string type)
         {
-            return new FilterEntity(id, idDec + ")", " like ", "鍖呭惈)", "%" + val + "%", type);
+            switch (type)
+            {
+                case "Bit绫诲瀷":
+                    string _val = (val.ToUpper() == "true".ToUpper() ? "1" : "0");
+                    return new FilterEntity(id, idDec + ")", "=", "绛変簬)", "" + _val + "", type);
+                    break;
+                default:
+                    return new FilterEntity(id, idDec + ")", "like", "鍖呭惈)", "%" + val + "%", type);
+                    break;
+            }
+
         }
         public static List<FilterEntity> GetDilter(GridColumnCollection Columns, GridView gridView1 = null)
         {
@@ -1642,10 +1661,19 @@
                 ColumnFilterInfo filter = col.FilterInfo;
                 if (string.IsNullOrEmpty(filter.FilterString))
                     continue;
-                //  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(), col.UnboundExpression));
+                string _filterString = filter.FilterString.Replace("Contains", "").Replace("(", "").Replace(")", "").Replace("'", "").Replace("'", "");
+                string[] ddd = _filterString.Split(',');
+                string _val = "";
+                if (ddd.Length > 1)
+                {
+                    _val = ddd[1].Trim();
+                }
+                else
+                {
+                    ddd = _filterString.Split('=');
+                    _val = ddd[1].Trim();
+                }
+                fiList.Add(getFilterEntityWord(col.Tag.ToString(), col.Caption.Trim(), _val, col.UnboundExpression));
             }
             return fiList;
         }
@@ -1676,19 +1704,17 @@
                         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;
+                        case "Bit绫诲瀷":
+                            _sbSqlWhere.Append(" and isnull(" + itm.fileId + ",0) =" + itm.fileValue + "");
+                            break;
                         default:
-                            _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" + itm.fileValue + "'");
+                            _sbSqlWhere.Append(" and " + itm.fileId + " " + itm.fileOper + " '" + itm.fileValue + "'");
                             break;
                     }
                 }
             }
             return _sbSqlWhere.ToString();
         }
-
-
         public delegate void DelegateGetModel(string guid);
         public delegate void DelegateGetList(int currentPage);
         /// <summary>
@@ -1722,7 +1748,7 @@
                 }
             };
             gridView1.OptionsView.ColumnAutoWidth = false;//鑷姩璋冩暣鍒楀
-          
+
             if (isPostSearch == true)
             {
                 gridView1.OptionsView.ShowGroupPanel = false;
@@ -2044,7 +2070,20 @@
             bool isNumeric = decimal.TryParse(input, out number);
             return isNumeric;
         }
-
+        /// <summary>
+        /// 鍒ゆ柇鏄笉鏄竴涓湁鏁堢殑姝f暣鏁�
+        /// </summary>
+        /// <param name="str"></param>
+        /// <returns></returns>
+        public static bool IsNumeric3(string str)
+        {
+            string input = str;
+            decimal number;
+            bool isNumeric = decimal.TryParse(input, out number);
+            if (isNumeric && number > 0)
+                return true;
+            return false;
+        }
         public static void PrintJiSuan(DevExpress.XtraEditors.TextEdit box1, DevExpress.XtraEditors.TextEdit box2, string sum, DevExpress.XtraEditors.RadioGroup rd)
         {
             if (rd.SelectedIndex == 2)
@@ -2099,7 +2138,6 @@
             return decimal.Parse(txt);
         }
 
-
         #region 缁樺埗琛ㄥご鍏ㄩ�夊嬀閫夋
         /// <summary>
         /// 缁樺埗琛ㄥご鍏ㄩ�夊嬀閫夋
@@ -2108,7 +2146,7 @@
         // private GridColumn checkBoxColumn = null;
         public static void CustomDrawColumnHeader(object sender, ColumnHeaderCustomDrawEventArgs e)
         {
-           
+
             Rectangle checkBoxColumnHeaderRect = new Rectangle(51, 1, 37, 57);
             if (e.Column != null && e.Column.AbsoluteIndex == 0)
             {

--
Gitblit v1.9.3