From ef6c207519d9be8fbbd33f782cea21a20e574328 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 07 二月 2025 17:32:38 +0800
Subject: [PATCH] 细节

---
 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs |   63 +++++++++++++++++++++----------
 1 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index dc4be61..7a32a52 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -190,11 +190,7 @@
                 string.IsNullOrEmpty(LoginInfoModel.CurrentUser.LoginUserGuid)
                     ? Guid.NewGuid().ToString()
                     : LoginInfoModel.CurrentUser.LoginUserGuid;
-            var orgGuid =
-                string.IsNullOrEmpty(LoginInfoModel.CurrentUser.LoginOrgGuid)
-                    ? Guid.NewGuid().ToString()
-                    : LoginInfoModel.CurrentUser.LoginOrgGuid;
-            var token = userGuid + "~" + orgGuid;
+            var token = userGuid;
             return token;
         }
 
@@ -785,7 +781,12 @@
                 {
                     var txt = ctrl as CheckEdit;
                     txt.ReadOnly = isEdt;
-                    txt.Checked = false;
+                    if (txt.Tag != null && txt.Tag.ToString().Length > 0 && txt.Tag.ToString().StartsWith("moren"))
+                    {
+                        txt.Checked = bool.Parse(txt.Tag.ToString().Replace("moren.", ""));
+                    }
+                    else
+                        txt.Checked = false;
                     continue;
                 }
 
@@ -1334,7 +1335,18 @@
             if (string.IsNullOrEmpty(str)) return Guid.Empty;
             return Guid.Parse(str);
         }
+        public static decimal ToDecimal(string str)
+        {
+            try
+            {
+                return decimal.Parse(str);
+            }
+            catch (Exception)
+            {
 
+                return 0;
+            }
+        }
         public static int ToInt(string str)
         {
             try
@@ -1372,12 +1384,7 @@
                 return true;
             return false;
         }
-        public string GetIsNullOrEmpty(string str)
-        {
-            if (string.IsNullOrEmpty(str.Trim()))
-                return "{>";
-            return str.Trim();
-        }
+       
 
         /// <summary>
         /// 璇诲彇grid鐨勫綋鍓嶈
@@ -1569,7 +1576,7 @@
                         var checkStatus = dgv.GetRowCellValue(selectedRow, fileName).ToString(); // 鑾峰彇鎸囧畾鍒楃殑鍊�
                         btnChkIco.Text = checkStatus;
                         btnChkIco.Visible = true;
-                        if (checkStatus == "1" || checkStatus.ToUpper() == true.ToString().ToUpper())
+                        if (checkStatus == "1" || checkStatus.ToUpper() == true.ToString().ToUpper()|| checkStatus == "宸插鏍�")
                         {
                             btnChkIco.Image = global::Gs.DevApp.Properties.Resources.ico_check;
                             btnChkIco.Tag = "宸插鏍�";
@@ -1597,23 +1604,29 @@
         /// <param name="fm">褰撳墠绐椾綋</param>
         /// <param name="fileName">1涓哄鏍革紝0涓哄弽瀹℃牳</param>
         /// <param name="icoName"></param>
-        public static void SetCheckIco(GridView gridView1,string zdChk,string zdChkUser,string zdCkDate,  PictureBox btnChkIco, Form fm, string fileName, string icoName = "")
+        public static void SetCheckIco(GridView gridView1, string zdChk, string zdChkUser, string zdCkDate, PictureBox btnChkIco, Form fm, string fileName, string icoName = "")
         {
             if (fileName == "1" || fileName.ToUpper() == true.ToString().ToUpper())
             {
                 btnChkIco.Image = global::Gs.DevApp.Properties.Resources.ico_check;
                 btnChkIco.Tag = "宸插鏍�";
-                gridView1.SetFocusedRowCellValue(zdChkUser, "宸插鏍�");
-                gridView1.SetFocusedRowCellValue(zdCkDate, DateTime.Now.ToString());
-                gridView1.SetFocusedRowCellValue(zdChk, true);
+                if (!string.IsNullOrEmpty(zdChkUser))
+                    gridView1.SetFocusedRowCellValue(zdChkUser, "宸插鏍�");
+                if (!string.IsNullOrEmpty(zdCkDate))
+                    gridView1.SetFocusedRowCellValue(zdCkDate, DateTime.Now.ToString());
+                if (!string.IsNullOrEmpty(zdChk))
+                    gridView1.SetFocusedRowCellValue(zdChk, true);
             }
             else
             {
                 btnChkIco.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
                 btnChkIco.Tag = "鏈鏍�";
-                gridView1.SetFocusedRowCellValue(zdChkUser, "");
-                gridView1.SetFocusedRowCellValue(zdCkDate, "");
-                gridView1.SetFocusedRowCellValue(zdChk, false);
+                if (!string.IsNullOrEmpty(zdChkUser))
+                    gridView1.SetFocusedRowCellValue(zdChkUser, "");
+                if (!string.IsNullOrEmpty(zdCkDate))
+                    gridView1.SetFocusedRowCellValue(zdCkDate, "");
+                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鍍忕礌
@@ -1689,9 +1702,11 @@
         /// <param name="action"></param>
         public static void SetGridViewParameter(GridView gridView1, PictureBox picCheckBox = null, Form fm = null, string fileName = "checkStatus", string icoName = "", DelegateGetModel action = null)
         {
+            gridView1.Appearance.HeaderPanel.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.ControlText;
             gridView1.OptionsView.ColumnAutoWidth = false;//鑷姩璋冩暣鍒楀
             foreach (GridColumn column in gridView1.Columns)
             {
+                column.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near;
                 column.OptionsColumn.AllowEdit = true;
                 column.OptionsFilter.AutoFilterCondition = AutoFilterCondition.Contains;
                 column.OptionsFilter.AutoFilterCondition = DevExpress.XtraGrid.Columns.AutoFilterCondition.Contains;
@@ -1774,7 +1789,7 @@
                         string _isRed = row["isRed"].ToString();
                         if (_isRed == "1")
                         {
-                            e.Appearance.BackColor = Color.LightPink;
+                            e.Appearance.ForeColor = Color.Tomato;
                         }
                     }
                     // 璁剧疆鐒︾偣琛岀殑鑳屾櫙鑹�
@@ -1848,6 +1863,12 @@
         /// <param name="icoName"></param>
         public static void SetGridViewParameterMx(GridView gridView1)
         {
+           // gridView1.OptionsView.Alignment = DataGridViewContentAlignment.MiddleLeft;
+            foreach (GridColumn column in gridView1.Columns)
+            {
+                // column.DefaultCellStyle.Alignment = true;
+                column.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near;
+            }
             gridView1.OptionsView.ColumnAutoWidth = false;//鑷姩璋冩暣鍒楀
             gridView1.OptionsFilter.AllowFilterEditor = false;
             gridView1.OptionsFilter.ShowCustomFunctions = DevExpress.Utils.DefaultBoolean.False;

--
Gitblit v1.9.3