From aa61ade84d2657a9fb37993378c6fba4680b5ddf Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 27 十二月 2024 09:39:11 +0800
Subject: [PATCH] 调拨

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

diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 2657a09..e2a9375 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -344,25 +344,22 @@
                             var txt = colType as ComboBoxEdit;
                             if (txt.Properties.TextEditStyle ==
                                 TextEditStyles.DisableTextEditor)
-                                txt.SelectedIndex = int.Parse(strVal);
-                            else
-                                txt.Text = strVal;
-                            txt.ReadOnly = isEdt;
-                            continue;
-                        }
+                                try
+                                {
+                                    txt.SelectedIndex = int.Parse(strVal);
+                                }
+                                catch (Exception)
+                                {
 
-                        //涓嬫媺
-                        if (colType is ComboBoxEdit)
-                        {
-                            var txt = colType as ComboBoxEdit;
-                            if (txt.Properties.TextEditStyle ==
-                                TextEditStyles.DisableTextEditor)
-                                txt.SelectedIndex = int.Parse(strVal);
+                                    txt.Text = strVal;
+                                }
+                              
                             else
                                 txt.Text = strVal;
                             txt.ReadOnly = isEdt;
                             continue;
                         }
+                    
 
                         //鑷畾涔変笅鎷�
                         if (colType is UcComBox)
@@ -623,6 +620,17 @@
                                 txt.Enabled = false;
                             continue;
                         }
+                        //鑷畾濮斿
+                        if (colType is UcLookWwgd)
+                        {
+                            var txt = colType as UcLookWwgd;
+                            txt.SetIdOrCode(strVal);
+                            if (txt.IsReadly == false)
+                                txt.Enabled = !isEdt;
+                            else
+                                txt.Enabled = false;
+                            continue;
+                        }
                         if (colType is SimpleButton)
                         {
                             var txt = colType as SimpleButton;
@@ -739,7 +747,6 @@
                 if (ctrl is CheckBox)
                 {
                     var txt = ctrl as CheckBox;
-                    //txt.Checked = false;
                     txt.Enabled = !isEdt;
                 }
                 if (ctrl is CheckEdit)
@@ -861,6 +868,14 @@
                     txt.Enabled = !isEdt;
                     continue;
                 }
+                //鑷畾濮斿
+                if (ctrl is UcLookWwgd)
+                {
+                    var txt = ctrl as UcLookWwgd;
+                    txt.SetIdOrCode("-1");
+                    txt.Enabled = !isEdt;
+                    continue;
+                }
                 if (ctrl is SimpleButton)
                 {
                     var txt = ctrl as SimpleButton;
@@ -897,7 +912,7 @@
                             if (colmn.Tag!=null && colmn.Tag.ToString().EndsWith("edit"))
                                 colmn.OptionsColumn.ReadOnly = isEdt;
                             else
-                                colmn.OptionsColumn.ReadOnly = !isEdt;
+                                colmn.OptionsColumn.ReadOnly = isEdt;
                         }
                     }
                 }
@@ -1093,7 +1108,16 @@
                         txt.Enabled = false;
                     continue;
                 }
-
+                //鑷畾濮斿
+                if (ctrl is UcLookWwgd)
+                {
+                    var txt = ctrl as UcLookWwgd;
+                    if (txt.IsReadly == false)
+                        txt.Enabled = !isEdt;
+                    else
+                        txt.Enabled = false;
+                    continue;
+                }
                 if (ctrl is SimpleButton)
                 {
                     var txt = ctrl as SimpleButton;
@@ -1286,7 +1310,12 @@
                 return 1;
             return 0;
         }
-
+        public static bool ToBoole(string str)
+        {
+            if (str.ToUpper() == "true".ToUpper())
+                return true;
+            return false;
+        }
         public string GetIsNullOrEmpty(string str)
         {
             if (string.IsNullOrEmpty(str.Trim()))
@@ -1567,7 +1596,10 @@
                 column.OptionsFilter.AutoFilterCondition = AutoFilterCondition.Contains;
                 column.OptionsFilter.ImmediateUpdateAutoFilter = false;
                 column.OptionsColumn.AllowEdit = true;
-                column.OptionsColumn.ReadOnly = true;
+                if (column.Tag == null || column.Tag.ToString().EndsWith("edit"))
+                    column.OptionsColumn.ReadOnly = false;
+                else
+                    column.OptionsColumn.ReadOnly = true;
                 if (column.Tag == null || column.Tag.ToString().Length <= 0)
                     column.OptionsFilter.AllowAutoFilter = false;
             }

--
Gitblit v1.9.3