From 40cd5e015bf24a4ce76b190920413f4cf4ba9f48 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 25 二月 2025 16:54:31 +0800
Subject: [PATCH] 销售

---
 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs |   36 ++++++++++++++++++++++++++++--------
 1 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index d6b0c51..758f5ad 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -6,6 +6,7 @@
 using System.Net;
 using System.Windows.Forms;
 using DevExpress.XtraBars;
+using DevExpress.XtraBars.Commands;
 using DevExpress.XtraEditors;
 using Gs.DevApp.DevFrm.Rpt;
 using Gs.DevApp.DevFrm.Sys;
@@ -49,6 +50,7 @@
             btnZhongTai.ItemClick += BtnbZhongTai_ItemClick;
             btnWg.ItemClick += BtnWg_ItemClick;
             btnHelp.ItemClick += BtnHelp_ItemClick;
+            btnLayout.ItemClick += BtnLayout_ItemClick;
             var lst = new List<string>();
             foreach (BarItem item in barManager1.Items)
                 if (item is BarLargeButtonItem largeButtonItem)
@@ -67,13 +69,18 @@
             if (Parent != null) getNamespace();
         }
 
-        private bool _isCk(int _type) {
+        private bool _isCk(int _type)
+        {
             Form parentForm = this.FindForm();
             if (parentForm != null)
             {
+                PictureBox specificControl = (PictureBox)parentForm.Controls.Find("picCheckBox", true).FirstOrDefault();
+                if (specificControl == null)
+                    return false;
+                if (specificControl.Tag == null)
+                    return false;
                 if (_type == 1)
                 {
-                    PictureBox specificControl = (PictureBox)parentForm.Controls.Find("picCheckBox", true).FirstOrDefault();
                     if (specificControl != null)
                     {
                         if (specificControl.Tag.ToString() == "宸插鏍�")
@@ -85,7 +92,6 @@
                 }
                 if (_type == 0)
                 {
-                    PictureBox specificControl = (PictureBox)parentForm.Controls.Find("picCheckBox", true).FirstOrDefault();
                     if (specificControl != null)
                     {
                         if (specificControl.Tag.ToString() == "鏈鏍�")
@@ -262,6 +268,8 @@
 
         private void BtnFjianYan_ItemClick(object sender, ItemClickEventArgs e)
         {
+            bool bl = _isCk(0);
+            if (bl) return;
             if (btnFjianYanClick != null)
                 btnFjianYanClick(this, e);
             else
@@ -476,7 +484,12 @@
                 lst.Add(btnLog.Name);
                 lst.Add(btnPiZhun.Name);
                 lst.Add(btnHelp.Name);
+                lst.Add(btnLayout.Name);
                 lst.Add(btnBoHui.Name);
+                lst.Add(btnTzbl.Name);
+                lst.Add(btnKg.Name);
+                lst.Add(btnWg.Name);
+                lst.Add(btnZhongTai.Name);
                 _enabledBtn(lst);
                 this.currentAction = "esc";
                 if (btnEscClick != null) btnEscClick(this, e);
@@ -513,7 +526,9 @@
                     lst.Add(btnWg.Name);
                     lst.Add(btnZhongTai.Name);
                     lst.Add(btnHelp.Name);
+                    lst.Add(btnLayout.Name);
                     lst.Add(btnLoad.Name);
+                    lst.Add(btnTzbl.Name);
                     _enabledBtn(lst);
                 }
             }
@@ -536,10 +551,10 @@
             lst.Add(btnSave.Name);
             lst.Add(btnEsc.Name);
             lst.Add(btnHelp.Name);
+            lst.Add(btnLayout.Name);
             _enabledBtn(lst);
             this.currentAction = "edit";
             if (btnEdtClick != null) btnEdtClick(this, e);
-           
         }
 
         private void BtnDel_ItemClick(object sender, ItemClickEventArgs e)
@@ -548,7 +563,7 @@
             if (bl) return;
             if (btnDelClick != null) btnDelClick(this, e);
 
-           // btnEsc.Enabled = false;
+            // btnEsc.Enabled = false;
             this.currentAction = "";
         }
 
@@ -562,13 +577,14 @@
             lst.Add(btnSave.Name);
             lst.Add(btnEsc.Name);
             lst.Add(btnHelp.Name);
+            lst.Add(btnLayout.Name);
             _enabledBtn(lst);
             this.currentAction = "add";
             if (btnAddClick != null) btnAddClick(this, e);
             Form parentForm = this.FindForm();
             if (parentForm != null)
             {
-                PictureBox specificControl =(PictureBox) parentForm.Controls.Find("picCheckBox", true).FirstOrDefault();
+                PictureBox specificControl = (PictureBox)parentForm.Controls.Find("picCheckBox", true).FirstOrDefault();
                 if (specificControl != null)
                 {
                     specificControl.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
@@ -634,10 +650,12 @@
                 return;
             }
             Gs.DevApp.ToolBox.MsgHelper.ShowInformation(_rtnJson.rtnMsg);
-
         }
 
-
+        private void BtnLayout_ItemClick(object sender, ItemClickEventArgs e)
+        {
+            if (btnLayoutClick != null) btnLayoutClick(this, e);
+        }
         private void _enabledBtn(List<string> lstBtn)
         {
             foreach (BarItem item in barManager1.Items)
@@ -956,6 +974,8 @@
         public event EventHandler btnWgClick;
 
 
+        public event EventHandler btnLayoutClick;
+
         #endregion
 
         #region 鍏叡灞炴��

--
Gitblit v1.9.3