From 72394a31b491cb19fc67b479dde1eaed68bc0288 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 08 五月 2025 07:42:54 +0800
Subject: [PATCH] 打印

---
 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs |   64 ++++++++++++++++++++------------
 1 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index e67a08b..4102f34 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)
                         {
@@ -631,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;
@@ -912,6 +919,14 @@
                     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;
@@ -1012,7 +1027,6 @@
                     ctrl.Enabled = !isEdt;
                     continue;
                 }
-                //
                 if (ctrl is CheckEdit)
                 {
                     var txt = ctrl as CheckEdit;
@@ -1096,7 +1110,6 @@
                     txt.IsReadly = isEdt;
                     continue;
                 }
-
                 //鑷畾閮ㄩ棬
                 if (ctrl is UcLookDepartment)
                 {
@@ -1136,6 +1149,13 @@
                 if (ctrl is UcDictionary)
                 {
                     var txt = ctrl as UcDictionary;
+                    txt.IsReadly = isEdt;
+                    continue;
+                }
+                //鑷畾鍗曟嵁绫诲瀷涓嬫媺
+                if (ctrl is UcDictionaryComBox)
+                {
+                    var txt = ctrl as UcDictionaryComBox;
                     txt.IsReadly = isEdt;
                     continue;
                 }
@@ -1792,7 +1812,7 @@
                 }
             }
 
-            gridView1.IndicatorWidth = 50;
+            gridView1.IndicatorWidth = 60;
             gridView1.CustomDrawRowIndicator += (s, e) =>
             {
                 if (e.Info.IsRowIndicator && e.RowHandle >= 0)
@@ -2022,7 +2042,7 @@
             gridView1.OptionsFind.ShowSearchNavButtons = false;
             gridView1.OptionsView.ShowAutoFilterRow = false;
             gridView1.OptionsView.ShowGroupPanel = false;
-            gridView1.IndicatorWidth = 40;
+            gridView1.IndicatorWidth = 60;
             gridView1.CustomDrawRowIndicator += (s, e) =>
             {
                 if (e.Info.IsRowIndicator && e.RowHandle >= 0)
@@ -2057,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;
@@ -2084,7 +2113,7 @@
                 return true;
             return false;
         }
-        public static void PrintJiSuan(DevExpress.XtraEditors.TextEdit box1, DevExpress.XtraEditors.TextEdit box2, string sum, DevExpress.XtraEditors.RadioGroup rd)
+        public static void PrintJiSuan(DevExpress.XtraEditors.TextEdit box1, DevExpress.XtraEditors.TextEdit box2, string sum, DevExpress.XtraEditors.RadioGroup rd, DevExpress.XtraEditors.TextEdit txt_yuliang = null)
         {
             if (rd.SelectedIndex == 2)
                 return;
@@ -2106,38 +2135,25 @@
                 box2.Text = quotient.ToString();
 
                 if (rd.SelectedIndex == 0)
-                    rd.Properties.Items[0].Description = "鍏ㄨ嚜鍔ㄣ��" + remainder.ToString() + "銆�";
+                    txt_yuliang.Text = remainder.ToString();
             }
             catch (Exception ex)
             {
-
                 Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message);
             }
 
         }
-        public static void PrintAuto(DevExpress.XtraEditors.TextEdit txt_psnQty_1, DevExpress.XtraEditors.TextEdit txt_iCount_1, DevExpress.XtraEditors.RadioGroup radOut)
+        public static void PrintAuto(DevExpress.XtraEditors.TextEdit txt_psnQty_1, DevExpress.XtraEditors.TextEdit txt_iCount_1, DevExpress.XtraEditors.RadioGroup radOut, DevExpress.XtraEditors.TextEdit txt_yuliang = null)
         {
             txt_psnQty_1.Text = "";
             txt_iCount_1.Text = "";
-            radOut.Properties.Items[0].Description = "鍏ㄨ嚜鍔�";
+            txt_yuliang.Text = "";
             if (radOut.SelectedIndex == 2)
                 txt_iCount_1.ReadOnly = false;
             else
                 txt_iCount_1.ReadOnly = true;
         }
-        public static decimal PrintYuLiang(DevExpress.XtraEditors.RadioGroup rd)
-        {
-            decimal dc = 0;
-            if (rd.SelectedIndex != 0)
-                return 0;
-            string txt = rd.Properties.Items[0].Description;// = "鍏ㄨ嚜鍔ㄣ��" + remainder.ToString() + "銆�";
-            txt = txt.Trim().Replace("鍏ㄨ嚜鍔ㄣ��", "");
-            txt = txt.Replace("銆�", "");
-            if (string.IsNullOrEmpty(txt))
-                return 0;
-            return decimal.Parse(txt);
-        }
-
+   
         #region 缁樺埗琛ㄥご鍏ㄩ�夊嬀閫夋
         /// <summary>
         /// 缁樺埗琛ㄥご鍏ㄩ�夊嬀閫夋

--
Gitblit v1.9.3