SVN r821

SVN-Revision: r821
2025-07-01 09:35:37 +00:00
parent 404c423daf
commit 6e3e683317
3 changed files with 74 additions and 28 deletions
@@ -340,7 +340,7 @@ namespace Lskj.Main.Control

                ERPInfo.Instance.PageControl = this.tabMain;
                ERPInfo.Instance.ModuleForms = Manager.ModuleForms;
-                if ((!this._allMenus.Columns.Contains("menuposition") || (!SystemInfo.Instance.IsOpenWork && !SystemInfo.Instance.ShowGallerysFromMenu)) && !SystemInfo.Instance.HideGallerys)
+                if ((!this._allMenus.Columns.Contains("menuposition") || (!SystemInfo.Instance.IsOpenWork && !SystemInfo.Instance.ShowGallerysFromMenu)) && (!SystemInfo.Instance.HideGallerys || SystemInfo.Instance.DesktopFormatShowGallerys))
                {
                    this.lblShortcutset.DoubleClick += OnShortCutDoubleClick;
                    this.lblReportcutset.DoubleClick += OnShortCutDoubleClick;
@@ -509,6 +509,13 @@ namespace Lskj.Main.Control
            }
            else
            {
+                if (SystemInfo.Instance.AccountSwitchingRestrictions>0&& SystemInfo.Instance.AccountSwitchingRestrictions<int.Parse(ERPInfo.Instance.UserId)) 
+                {
+                    this.button4.Visible = false;
+                    this.label1.Visible = false;
+                    HiddenAccountSet = true;
+                }
+
                //添加子系统快捷窗口
                _accountsItemForm = new SubItemForm();
                //this.Controls.Add(this._accountsItemForm);
@@ -4239,4 +4246,41 @@ namespace Lskj.Main.Control
                        {
                            bottomLayoutPanel.RowStyles[i].Height = 25;
                        }
-      
+                    }
+                }
+                catch (Exception)
+                {
+                }
+            }
+        }
+        /// <summary>
+        /// 判断是不是数值
+        /// </summary>
+        /// <param name="oText"></param>
+        /// <returns></returns>
+        private bool IsNumberic(string oText)
+        {
+            try
+            {
+                int var1 = Convert.ToInt32(oText);
+                return true;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+        #region 加密狗验证
+        /// <summary>
+        /// 加密狗验证
+        /// </summary>
+        /// <returns></returns>
+        private void DogVerify()
+        {
+            int[] keyHandles = ERPInfo.Instance.keyHandles = new int[8];
+            int[] keyNumber = ERPInfo.Instance.keyNumber = new int[8];
+            int rtn = SmartX1Api.SmartX1Find("Ls_ERP", keyHandles, keyNumber);
+        }
+        #endregion
+    }
+}