From 49e7d052cc72a98b10ba9c06268c8a1d79e94a5b Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 15 四月 2025 11:14:10 +0800
Subject: [PATCH] fqc

---
 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs |   58 +++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 65c3af7..f665fdc 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -1,4 +1,18 @@
-锘縰sing System;
+锘縰sing DevExpress.Utils;
+using DevExpress.XtraEditors;
+using DevExpress.XtraEditors.Controls;
+using DevExpress.XtraGrid;
+using DevExpress.XtraGrid.Columns;
+using DevExpress.XtraGrid.Menu;
+using DevExpress.XtraGrid.Views.Grid;
+using DevExpress.XtraGrid.Views.Grid.ViewInfo;
+using DevExpress.XtraTab;
+using DevExpress.XtraTreeList;
+using Gs.DevApp.Entity;
+using Gs.DevApp.UserControl;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
 using System.Collections.Generic;
 using System.Configuration;
 using System.Data;
@@ -14,20 +28,6 @@
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using DevExpress.Utils;
-using DevExpress.XtraEditors;
-using DevExpress.XtraEditors.Controls;
-using DevExpress.XtraGrid;
-using DevExpress.XtraGrid.Columns;
-using DevExpress.XtraGrid.Menu;
-using DevExpress.XtraGrid.Views.Grid;
-using DevExpress.XtraGrid.Views.Grid.ViewInfo;
-using DevExpress.XtraTab;
-using DevExpress.XtraTreeList;
-using Gs.DevApp.Entity;
-using Gs.DevApp.UserControl;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using UserControls.Data;
 using static System.Windows.Forms.Control;
 
@@ -726,6 +726,7 @@
                     var txt = ctrl as ButtonEdit;
                     txt.Text = "";
                     txt.Enabled = !isEdt;
+                    txt.ReadOnly = isEdt;
                     continue;
                 }
                 //鏂囨湰
@@ -1691,7 +1692,7 @@
         /// <param name="fileName">瀛楁</param>
         /// <param name="icoName">鍥炬爣璺緞</param>
         /// <param name="action"></param>
-        public static void SetGridViewParameter(GridView gridView1, PictureBox picCheckBox = null, Form fm = null, string fileName = "checkStatus", string icoName = "", DelegateGetModel action = null, DevExpress.Utils.ToolTipController tips = null, bool isSearch = true)
+        public static void SetGridViewParameter(GridView gridView1, PictureBox picCheckBox = null, Form fm = null, string fileName = "checkStatus", string icoName = "", DelegateGetModel action = null, DevExpress.Utils.ToolTipController tips = null, bool isPostSearch = true)
         {
             gridView1.PopupMenuShowing += (s, e) =>
             {
@@ -1714,7 +1715,7 @@
             };
             gridView1.OptionsView.ColumnAutoWidth = false;//鑷姩璋冩暣鍒楀
 
-            if (isSearch == true)
+            if (isPostSearch == true)
             {
                 gridView1.OptionsView.ShowGroupPanel = false;
                 gridView1.OptionsCustomization.AllowGroup = false;
@@ -1746,8 +1747,11 @@
                     column.OptionsColumn.ReadOnly = false;
                 else
                     column.OptionsColumn.ReadOnly = true;
+                
+                if(isPostSearch==false)
+                    column.OptionsColumn.ReadOnly = true;
 
-                if (isSearch == true)
+                if (isPostSearch == true)
                 {
                     if (column.Tag == null || column.Tag.ToString().Length <= 0)
                         column.OptionsFilter.AllowAutoFilter = false;
@@ -2033,17 +2037,12 @@
             return isNumeric;
         }
 
-        public static void PrintJiSuan(Form fm, 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)
         {
             if (rd.SelectedIndex == 2)
                 return;
             try
             {
-                if (fm.ActiveControl is DevExpress.XtraEditors.TextEdit textBox)
-                {
-                    if (textBox.Name != box1.Name)
-                        return;
-                }
                 string t1 = box1.Text.Trim();
                 string t2 = box2.Text.Trim();
                 if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric2(t1))
@@ -2069,7 +2068,16 @@
             }
 
         }
-
+        public static void PrintAuto(DevExpress.XtraEditors.TextEdit txt_psnQty_1, DevExpress.XtraEditors.TextEdit txt_iCount_1, DevExpress.XtraEditors.RadioGroup radOut)
+        {
+            txt_psnQty_1.Text = "";
+            txt_iCount_1.Text = "";
+            radOut.Properties.Items[0].Description = "鍏ㄨ嚜鍔�";
+            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;

--
Gitblit v1.9.3