From 437425784b7612e10d4a54bd64905c508347514d Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 06 五月 2025 15:12:50 +0800
Subject: [PATCH] fqc

---
 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs |   65 ++++++++++++++++++++++++++------
 1 files changed, 52 insertions(+), 13 deletions(-)

diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index c1391b6..451a40b 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -489,7 +489,6 @@
                                 txt.Text = strVal;
                             }
                         }
-
                         //鑷畾涔変粨搴�
                         if (colType is UcLookCk)
                         {
@@ -613,7 +612,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;
                         }
                         //鑷畾宸ュ簭
@@ -628,6 +630,14 @@
                         if (colType is UcDictionary)
                         {
                             var txt = colType as UcDictionary;
+                            txt.TextTxt = (strVal);
+                            txt.IsReadly = isEdt;
+                            continue;
+                        }
+                        //鑷畾鍗曟嵁绫诲瀷涓嬫媺
+                        if (colType is UcDictionaryComBox)
+                        {
+                            var txt = colType as UcDictionaryComBox;
                             txt.TextTxt = (strVal);
                             txt.IsReadly = isEdt;
                             continue;
@@ -909,10 +919,21 @@
                     txt.IsReadly = isEdt;
                     continue;
                 }
+                //鑷畾涔夊崟鎹被鍨嬩笅鎷�
+                if (ctrl is UcDictionaryComBox)
+                {
+                    var txt = ctrl as UcDictionaryComBox;
+                    //txt.SetIdOrCode("-1");
+                    txt.IsReadly = isEdt;
+                    continue;
+                }
                 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;
                 }
             }
@@ -1006,7 +1027,6 @@
                     ctrl.Enabled = !isEdt;
                     continue;
                 }
-                //
                 if (ctrl is CheckEdit)
                 {
                     var txt = ctrl as CheckEdit;
@@ -1090,7 +1110,6 @@
                     txt.IsReadly = isEdt;
                     continue;
                 }
-
                 //鑷畾閮ㄩ棬
                 if (ctrl is UcLookDepartment)
                 {
@@ -1133,10 +1152,20 @@
                     txt.IsReadly = isEdt;
                     continue;
                 }
+                //鑷畾鍗曟嵁绫诲瀷涓嬫媺
+                if (ctrl is UcDictionaryComBox)
+                {
+                    var txt = ctrl as UcDictionaryComBox;
+                    txt.IsReadly = isEdt;
+                    continue;
+                }
                 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;
                 }
             }
@@ -1629,14 +1658,14 @@
             switch (type)
             {
                 case "Bit绫诲瀷":
-                    string _val = (val.ToUpper()== "true".ToUpper() ? "1": "0");
+                    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)
         {
@@ -1652,14 +1681,15 @@
                 ColumnFilterInfo filter = col.FilterInfo;
                 if (string.IsNullOrEmpty(filter.FilterString))
                     continue;
-                string _filterString= filter.FilterString.Replace("Contains", "").Replace("(", "").Replace(")", "").Replace("'", "").Replace("'", "");
-                string[] ddd= _filterString.Split(',');
+                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 {
+                else
+                {
                     ddd = _filterString.Split('=');
                     _val = ddd[1].Trim();
                 }
@@ -1698,7 +1728,7 @@
                             _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;
                     }
                 }
@@ -2047,12 +2077,21 @@
         }
 
         #endregion
-
+        /// <summary>
+        /// 鍒ゆ柇鏄笉鏄竴涓湁鏁堢殑鏁板��
+        /// </summary>
+        /// <param name="str"></param>
+        /// <returns></returns>
         public static bool IsNumeric(string str)
         {
             Regex regex = new Regex("^[0-9]+$");
             return regex.IsMatch(str);
         }
+        /// <summary>
+        /// 鍒ゆ柇鏄笉鏄竴涓湁鏁堟灉鐨刣ecimal鏁板��
+        /// </summary>
+        /// <param name="str"></param>
+        /// <returns></returns>
         public static bool IsNumeric2(string str)
         {
             string input = str;

--
Gitblit v1.9.3