diff --git a/插件库/Lskj.Business/Impl/SystemInfo.cs b/插件库/Lskj.Business/Impl/SystemInfo.cs
index f506ce9..856e57b 100644
--- a/插件库/Lskj.Business/Impl/SystemInfo.cs
+++ b/插件库/Lskj.Business/Impl/SystemInfo.cs
@@ -342,7 +342,13 @@ namespace Lskj.Business
             Instance.IsSpecialAuditSave = item.Table.Columns.Contains("IsSpecialAuditSave") && !string.IsNullOrEmpty(item["IsSpecialAuditSave"] + "") ? "1".Equals(item["IsSpecialAuditSave"] + "") : false;
             Instance.SuppressImportSuccessTip = item.Table.Columns.Contains("SuppressImportSuccessTip") && !string.IsNullOrEmpty(item["SuppressImportSuccessTip"] + "") ? "1".Equals(item["SuppressImportSuccessTip"] + "") : false;
 
-
+            string newMainValue = item.Table.Columns.Contains("NewMain") ? (item["NewMain"] + "").Trim() : "";
+            Instance.NewMain = "1".Equals(newMainValue) || "true".Equals(newMainValue, StringComparison.OrdinalIgnoreCase);
+            if (Instance.NewMain)
+            {
+                Instance.MainLeftShowMode = "1";
+                Instance.DefaultMainTag = 4;
+            }
         }
         /// <summary>
         /// 高拍仪AccessKey
@@ -1184,5 +1190,9 @@ namespace Lskj.Business
         /// 导入成功不会提示，直接关闭导入框（失败时还是会提示）
         /// </summary>
         public bool SuppressImportSuccessTip;
+        /// <summary>
+        /// 新版界面（读取 P_SystemTab.NewMain；true 时加载 MainPanelControlEx2，默认使用旧界面）
+        /// </summary>
+        public bool NewMain;
     }
 }
diff --git a/插件库/Lskj.Control/MultiModelLookUp/FrmModelLookUp2.cs b/插件库/Lskj.Control/MultiModelLookUp/FrmModelLookUp2.cs
index 1fc8b82..a560725 100644
--- a/插件库/Lskj.Control/MultiModelLookUp/FrmModelLookUp2.cs
+++ b/插件库/Lskj.Control/MultiModelLookUp/FrmModelLookUp2.cs
@@ -192,8 +192,12 @@ namespace Lskj.Control.MultiModelLookUp
             this.gcDetail.GridView.OptionsSelection.EnableAppearanceFocusedCell = false;
             this.Resize += new System.EventHandler(maximization);
             this.splitMain_Right.SplitterMoved += new EventHandler(PositionChange);
-            this.gcDetail.GridView.OptionsView.ColumnAutoWidth = true;
-            this.gcMain.GridView.OptionsView.ColumnAutoWidth = true;
+            //this.gcDetail.GridView.OptionsView.ColumnAutoWidth = true;
+            //this.gcMain.GridView.OptionsView.ColumnAutoWidth = true;
+            this.gcDetail.GridView.OptionsView.ColumnAutoWidth = false;
+            this.gcDetail.GridView.HorzScrollVisibility = DevExpress.XtraGrid.Views.Base.ScrollVisibility.Auto;
+            this.gcMain.GridView.OptionsView.ColumnAutoWidth = false;
+            this.gcMain.GridView.HorzScrollVisibility =DevExpress.XtraGrid.Views.Base.ScrollVisibility.Auto;
         }
 
         //关联模块号;是否为单选模式
@@ -243,8 +247,12 @@ namespace Lskj.Control.MultiModelLookUp
             this.SourceSQL = this.SysModel.MenuSql;
             this.gcDetail.GridView.OptionsSelection.EnableAppearanceFocusedCell = false;
 
-            this.gcDetail.GridView.OptionsView.ColumnAutoWidth = true;
-            this.gcMain.GridView.OptionsView.ColumnAutoWidth = true;
+            //this.gcDetail.GridView.OptionsView.ColumnAutoWidth = true;
+            //this.gcMain.GridView.OptionsView.ColumnAutoWidth = true;
+            this.gcDetail.GridView.OptionsView.ColumnAutoWidth = false;
+            this.gcDetail.GridView.HorzScrollVisibility =DevExpress.XtraGrid.Views.Base.ScrollVisibility.Auto;
+            this.gcMain.GridView.OptionsView.ColumnAutoWidth = false;
+            this.gcMain.GridView.HorzScrollVisibility =DevExpress.XtraGrid.Views.Base.ScrollVisibility.Auto;
         }
 
 
diff --git a/插件库/Lskj.Main/Control/MainPanelControlEx2.Designer.cs b/插件库/Lskj.Main/Control/MainPanelControlEx2.Designer.cs
new file mode 100644
index 0000000..c451c01
--- /dev/null
+++ b/插件库/Lskj.Main/Control/MainPanelControlEx2.Designer.cs
@@ -0,0 +1,584 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+using DevExpress.XtraTab;
+using DevExpress.XtraTreeList;
+using Lskj.Business;
+using Lskj.Model;
+using WinFormsControl = System.Windows.Forms.Control;
+
+namespace Lskj.Main.Control
+{
+    partial class MainPanelControlEx2
+    {
+        private static readonly Color HeaderColor = Color.FromArgb(31, 75, 153);
+        private static readonly Color SidebarColor = Color.FromArgb(39, 45, 81);
+        private static readonly Color SidebarSelectedColor = Color.FromArgb(52, 142, 216);
+        private static readonly Color WorkspaceColor = Color.FromArgb(247, 249, 252);
+        private static readonly Color ShortcutBorderColor = Color.FromArgb(221, 227, 234);
+        private System.ComponentModel.IContainer components = null;
+        private MainPanelControlEx _legacyPanel;
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null)) components.Dispose();
+            base.Dispose(disposing);
+        }
+
+        #region 组件设计器生成的代码
+        private void InitializeComponent()
+        {
+            this._legacyPanel = new Lskj.Main.Control.MainPanelControlEx();
+            this.SuspendLayout();
+            // 
+            // _legacyPanel
+            // 
+            this._legacyPanel.Dock = System.Windows.Forms.DockStyle.Fill;
+            this._legacyPanel.Location = new System.Drawing.Point(0, 0);
+            this._legacyPanel.Name = "_legacyPanel";
+            this._legacyPanel.Size = new System.Drawing.Size(1275, 696);
+            this._legacyPanel.TabIndex = 0;
+            // 
+            // MainPanelControlEx2
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this._legacyPanel);
+            this.Name = "MainPanelControlEx2";
+            this.Size = new System.Drawing.Size(1275, 696);
+            this.ResumeLayout(false);
+
+        }
+        #endregion
+
+        #region 新版主界面外观
+        private void ApplyWpfShellStyle()
+        {
+            Panel header = FindControl<Panel>("plTop");
+            Panel headerLeft = FindControl<Panel>("pl_top_left");
+            Panel headerCenter = FindControl<Panel>("pl_top_center");
+            Panel headerRight = FindControl<Panel>("pl_top_right");
+            Panel headerSeparator = FindControl<Panel>("panel3");
+            MenuStrip topMenu = FindControl<MenuStrip>("menuMain");
+            if (header != null) { header.Height = 50; header.BackColor = HeaderColor; }
+            if (headerLeft != null)
+            {
+                headerLeft.Width = 176;
+                headerLeft.BackColor = HeaderColor;
+                headerLeft.BackgroundImage = null;
+                AddBrandVisual(headerLeft);
+            }
+            if (headerCenter != null) { headerCenter.BackColor = HeaderColor; headerCenter.Padding = new Padding(0, 9, 0, 0); }
+            // 右上角继续使用旧版控件、按钮和位置，仅统一顶部背景色。
+            if (headerRight != null) { headerRight.BackColor = HeaderColor; headerRight.BackgroundImage = null; }
+            // 旧版 Logo 与菜单之间有 19px 的装饰分隔面板；WPF 顶部栏是连续布局，
+            // 保留该控件会在两块蓝色之间形成突兀的深色竖条。
+            if (headerSeparator != null)
+            {
+                headerSeparator.Width = 0;
+                headerSeparator.BackColor = HeaderColor;
+                headerSeparator.BackgroundImage = null;
+            }
+            StyleSearchControls();
+            if (topMenu != null) StyleTopNavigation(topMenu);
+            StyleMainTabs();
+            StyleSidebar();
+            StyleWorkspaceAndShortcuts();
+            RememberStyledNavigation();
+        }
+
+        private void AddBrandVisual(WinFormsControl host)
+        {
+            if (host.Controls.Find("wpfBrandVisual", false).Length > 0) return;
+            PictureBox logo = new PictureBox
+            {
+                Name = "wpfBrandVisual", BackColor = Color.Transparent,
+                Size = new Size(150, 32), Location = new Point(12, 9),
+                SizeMode = PictureBoxSizeMode.Zoom
+            };
+            Image image = LoadWpfHeaderLogo();
+            if (image != null)
+            {
+                logo.Image = image;
+                host.Controls.Add(logo);
+                logo.BringToFront();
+            }
+            WinFormsControl oldTitle = host.Controls.Find("lblSubTitle", true).FirstOrDefault();
+            if (oldTitle != null) oldTitle.Visible = false;
+        }
+
+        private static Image LoadWpfHeaderLogo()
+        {
+            // 客户部署时只从程序目录下的 Images\Main 查找 Logo；
+            // 文件不存在则不显示图片，不再回退到开发机或 SVG 资源。
+            string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Images", "Main", "logoNew.png");
+            try
+            {
+                if (!File.Exists(path)) return null;
+                // 克隆后释放文件句柄，避免程序运行期间锁定更新包中的图片。
+                using (Image source = Image.FromFile(path)) return new Bitmap(source);
+            }
+            catch (Exception)
+            {
+                return null;
+            }
+        }
+
+        private void StyleMainTabs()
+        {
+            XtraTabControl tabs = FindControl<XtraTabControl>("tabMain");
+            if (tabs == null) return;
+
+            // 旧版 DevExpress 皮肤会把相邻页签绘成深浅不一的灰块，
+            // 在新版蓝色顶部栏下显得突兀；统一为 WPF 主界面的浅灰页签带，
+            // 当前页签保持白色，边界与左侧导航自然衔接。
+            Color tabStrip = Color.FromArgb(245, 247, 251);
+            Color tabHover = Color.FromArgb(232, 239, 249);
+            Color tabBorder = Color.FromArgb(214, 222, 233);
+            tabs.PaintStyleName = "Flat";
+            tabs.HeaderLocation = DevExpress.XtraTab.TabHeaderLocation.Top;
+            tabs.HeaderAutoFill = DevExpress.Utils.DefaultBoolean.False;
+            tabs.TabPageWidth = 0;
+            tabs.BackColor = tabStrip;
+            tabs.Appearance.BackColor = tabStrip;
+            tabs.Appearance.Options.UseBackColor = true;
+            ConfigureTabAppearance(tabs.AppearancePage.Header, Color.White, Color.FromArgb(74, 86, 105), tabBorder);
+            ConfigureTabAppearance(tabs.AppearancePage.HeaderActive, Color.White, Color.FromArgb(31, 119, 201), tabBorder);
+            ConfigureTabAppearance(tabs.AppearancePage.HeaderHotTracked, tabHover, Color.FromArgb(31, 119, 201), tabBorder);
+            ConfigureTabAppearance(tabs.AppearancePage.HeaderDisabled, tabStrip, Color.FromArgb(160, 169, 182), tabBorder);
+            tabs.AppearancePage.Header.Font = new Font("微软雅黑", 9F);
+            tabs.AppearancePage.HeaderActive.Font = tabs.AppearancePage.Header.Font;
+            tabs.AppearancePage.HeaderHotTracked.Font = tabs.AppearancePage.Header.Font;
+            tabs.AppearancePage.HeaderDisabled.Font = tabs.AppearancePage.Header.Font;
+
+            // 功能导航页签要与左侧 176px 目录栏严格对齐。DevExpress 旧版
+            // 页签宽度按文本自适应，因此用不可见的全角空格补足首个页签宽度，
+            // 其它页签仍保持按内容自适应，并通过边框清晰分隔。
+            XtraTabPage first = tabs.TabPages.Cast<XtraTabPage>().FirstOrDefault(p => p.Name == "xtpFirst");
+            if (first != null) first.Text = "功能导航" + new string('\u3000', 10);
+        }
+
+        private static void ConfigureTabAppearance(DevExpress.Utils.AppearanceObject appearance, Color backColor, Color foreColor, Color borderColor)
+        {
+            appearance.BackColor = backColor;
+            appearance.ForeColor = foreColor;
+            appearance.BorderColor = borderColor;
+            appearance.Options.UseBackColor = true;
+            appearance.Options.UseForeColor = true;
+            appearance.Options.UseBorderColor = true;
+        }
+
+        private void StyleSearchControls()
+        {
+            // 旧版搜索框和按钮原本位于 y=27、高度 25/26，顶部栏改为 50px 后
+            // 底部会被裁掉约 2~3px。仅上移 2px 并缩短 1~2px，保留足够的
+            // 输入高度和按钮点击区域，避免控件显得过小。
+            WinFormsControl searchBox = FindControl<WinFormsControl>("lueUserName");
+            if (searchBox != null)
+            {
+                searchBox.Top = 25;
+                searchBox.Height = 24;
+            }
+            PictureBox searchButton = FindControl<PictureBox>("pic_search");
+            if (searchButton != null)
+            {
+                searchButton.Top = 25;
+                searchButton.Height = 24;
+            }
+        }
+
+        private void StyleTopNavigation(MenuStrip menu)
+        {
+            menu.Renderer = new WpfMenuRenderer(HeaderColor, () =>
+            {
+                // 每次绘制都重新读取当前导航，支持旧版双击或其它入口切换目录。
+                return FindCurrentTopMenu(menu) ?? _selectedTopMenu;
+            });
+            menu.BackColor = HeaderColor;
+            menu.ForeColor = Color.FromArgb(242, 246, 255);
+            menu.Font = new Font("微软雅黑", 10F);
+            menu.Dock = DockStyle.Fill;
+            menu.Location = Point.Empty;
+            menu.Padding = new Padding(4, 0, 4, 0);
+            menu.AutoSize = false;
+            menu.Height = 32;
+            foreach (ToolStripMenuItem item in menu.Items.OfType<ToolStripMenuItem>())
+            {
+                item.BackColor = Color.Transparent;
+                item.ForeColor = Color.FromArgb(242, 246, 255);
+                item.Font = menu.Font;
+                item.Padding = new Padding(8, 0, 8, 0);
+                item.Margin = Padding.Empty;
+                item.AutoSize = true;
+                item.Click -= TopMenuItem_Click;
+                item.Click += TopMenuItem_Click;
+                item.DropDownOpened -= TopMenuDropDownOpened;
+                item.DropDownOpened += TopMenuDropDownOpened;
+                item.DropDownClosed -= TopMenuDropDownClosed;
+                item.DropDownClosed += TopMenuDropDownClosed;
+                HookDropDownClicks(item);
+            }
+            // 当前功能导航是唯一权威状态。旧版在双击切换目录时会更新
+            // ERPInfo.Instance.SubSysName；这里每次重新套用样式都优先按该值查找，
+            // 避免上一次点击留下的菜单项一直保持高亮。
+            ToolStripMenuItem current = FindCurrentTopMenu(menu);
+            if (current == null)
+                current = _selectedTopMenu;
+            if (current == null || !menu.Items.Contains(current))
+                current = null;
+            if (current == null)
+                current = menu.Items.OfType<ToolStripMenuItem>().FirstOrDefault();
+            SelectTopMenu(current);
+        }
+
+        private void HookDropDownClicks(ToolStripMenuItem root)
+        {
+            foreach (ToolStripMenuItem child in root.DropDownItems.OfType<ToolStripMenuItem>())
+            {
+                child.Click -= LegacyDropDownItem_Click;
+                child.Click += LegacyDropDownItem_Click;
+                HookDropDownClicks(child);
+            }
+        }
+
+        private void LegacyDropDownItem_Click(object sender, EventArgs e)
+        {
+            ToolStripMenuItem item = sender as ToolStripMenuItem;
+            if (item == null) return;
+            // 普通二级模块点击不会改变当前功能导航，不要因此重做右侧布局。
+            if (!IsNavigationChangedSinceLastStyle()) return;
+            _selectedTopMenu = null;
+            RequestApplyWpfShellStyle();
+        }
+
+        private void TopMenuDropDownOpened(object sender, EventArgs e)
+        {
+            // 下拉菜单展开及二级目录移动期间，旧版会触发父容器重绘；
+            // 暂停右侧快捷通道的 WM_PAINT，避免看到中间清空状态。
+            SetShortcutRedraw(false);
+        }
+
+        private void TopMenuDropDownClosed(object sender, EventArgs e)
+        {
+            // 若目录切换已经排队，保持暂停到统一样式刷新完成，避免先显示中间状态。
+            if (_styleUpdatePending) return;
+            SetShortcutRedraw(true);
+        }
+
+        private void SetShortcutRedraw(bool enabled)
+        {
+            _shortcutRedrawSuppressed = !enabled;
+            Panel right = FindControl<Panel>("pl_center_main_right");
+            Panel container = FindControl<Panel>("pl_center_main_right_container");
+            SendRedrawMessage(right, enabled);
+            if (container != right) SendRedrawMessage(container, enabled);
+            if (enabled && !_styleUpdatePending)
+            {
+                if (right != null) right.Invalidate(true);
+                if (container != null) container.Invalidate(true);
+            }
+        }
+
+        private static void SendRedrawMessage(WinFormsControl control, bool enabled)
+        {
+            if (control == null || !control.IsHandleCreated) return;
+            SendMessage(control.Handle, 0x000B, new IntPtr(enabled ? 1 : 0), IntPtr.Zero);
+        }
+
+        [DllImport("user32.dll")]
+        private static extern IntPtr SendMessage(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam);
+
+        private static ToolStripMenuItem FindCurrentTopMenu(MenuStrip menu)
+        {
+            // 设计器中旧控件尚未加载业务数据，不能触发 ERPInfo 的运行时初始化。
+            if (LicenseManager.UsageMode == LicenseUsageMode.Designtime) return null;
+            string currentName = (ERPInfo.Instance.SubSysName ?? string.Empty).Trim();
+            string currentId = (ERPInfo.Instance.SubSysId ?? string.Empty).Trim();
+            if (string.IsNullOrWhiteSpace(currentName) && string.IsNullOrWhiteSpace(currentId)) return null;
+            foreach (ToolStripMenuItem item in menu.Items.OfType<ToolStripMenuItem>())
+            {
+                if (MenuItemMatchesCurrent(item, currentName, currentId)) return item;
+                // “更多”中的目录仍属于顶部一级导航，命中子项时返回其顶层父项，
+                // 这样当前目录无论是否被收进下拉框都能保持顶部高亮。
+                foreach (ToolStripMenuItem child in item.DropDownItems.OfType<ToolStripMenuItem>())
+                {
+                    if (MenuItemTreeMatchesCurrent(child, currentName, currentId)) return item;
+                }
+            }
+            return null;
+        }
+
+        private static bool MenuItemTreeMatchesCurrent(ToolStripMenuItem item, string currentName, string currentId)
+        {
+            if (MenuItemMatchesCurrent(item, currentName, currentId)) return true;
+            foreach (ToolStripMenuItem child in item.DropDownItems.OfType<ToolStripMenuItem>())
+                if (MenuItemTreeMatchesCurrent(child, currentName, currentId)) return true;
+            return false;
+        }
+
+        private static bool MenuItemMatchesCurrent(ToolStripMenuItem item, string currentName, string currentId)
+        {
+            if (!string.IsNullOrWhiteSpace(currentName)
+                && string.Equals((item.Text ?? string.Empty).Trim(), currentName, StringComparison.OrdinalIgnoreCase))
+                return true;
+            DataRow row = item.Tag as DataRow;
+            string itemId = row != null && row.Table.Columns.Contains("subsysid")
+                ? row["subsysid"] + ""
+                : item.Tag + "";
+            return !string.IsNullOrWhiteSpace(currentId)
+                && string.Equals(itemId, currentId, StringComparison.OrdinalIgnoreCase);
+        }
+
+        private void SelectTopMenu(ToolStripMenuItem item)
+        {
+            if (item == null) return;
+            _selectedTopMenu = item;
+            MenuStrip menu = FindControl<MenuStrip>("menuMain");
+            if (menu == null) return;
+            foreach (ToolStripMenuItem top in menu.Items.OfType<ToolStripMenuItem>())
+            {
+                top.ForeColor = top == item ? Color.FromArgb(255, 214, 102) : Color.FromArgb(242, 246, 255);
+                top.Invalidate();
+            }
+        }
+
+        private void ResetBrandArea()
+        {
+            Panel brandArea = FindControl<Panel>("pl_top_left");
+            if (brandArea != null) brandArea.Width = 176;
+            WinFormsControl oldTitle = FindControl<WinFormsControl>("lblSubTitle");
+            if (oldTitle != null) oldTitle.Visible = false;
+        }
+
+        private void StyleSidebar()
+        {
+            Panel sidebar = FindControl<Panel>("pl_center_left");
+            if (sidebar == null) return;
+            // 新版侧栏对应旧程序的 MainLeftShowMode=1（分组树菜单）配置。
+            bool useGroupedSidebar = IsGroupedSidebarMode();
+            sidebar.Width = 176; sidebar.Padding = Padding.Empty; sidebar.BackColor = SidebarColor; sidebar.AutoScroll = true;
+            if (!useGroupedSidebar) return;
+            foreach (TreeList tree in FindControls<TreeList>(sidebar))
+            {
+                tree.Dock = DockStyle.Fill; tree.RowHeight = 44; tree.BackColor = SidebarColor;
+                tree.Appearance.Empty.BackColor = SidebarColor; tree.Appearance.Empty.Options.UseBackColor = true;
+                tree.Appearance.Row.BackColor = SidebarColor; tree.Appearance.Row.ForeColor = Color.FromArgb(235, 255, 255, 255);
+                tree.Appearance.Row.Font = new Font("微软雅黑", 10F); tree.Appearance.Row.Options.UseBackColor = true;
+                tree.Appearance.Row.Options.UseForeColor = true; tree.Appearance.Row.Options.UseFont = true;
+                tree.Appearance.FocusedRow.BackColor = SidebarSelectedColor; tree.Appearance.FocusedRow.ForeColor = Color.White;
+                tree.Appearance.FocusedRow.Options.UseBackColor = true; tree.Appearance.FocusedRow.Options.UseForeColor = true;
+                tree.Appearance.HideSelectionRow.BackColor = SidebarSelectedColor; tree.Appearance.HideSelectionRow.ForeColor = Color.White;
+                tree.Appearance.HideSelectionRow.Options.UseBackColor = true; tree.Appearance.HideSelectionRow.Options.UseForeColor = true;
+                tree.OptionsView.ShowColumns = false; tree.OptionsView.ShowIndicator = false; tree.OptionsView.ShowHorzLines = false; tree.OptionsView.ShowVertLines = false;
+            }
+            foreach (MenuBar menuBar in FindControls<MenuBar>(sidebar))
+            {
+                Button button = menuBar.GetButton(); menuBar.BackColor = SidebarColor; menuBar.Height = 44;
+                button.Dock = DockStyle.Fill; button.BackColor = SidebarColor; button.BackgroundImage = null;
+                button.FlatStyle = FlatStyle.Flat; button.FlatAppearance.BorderSize = 0;
+                button.FlatAppearance.MouseOverBackColor = Color.FromArgb(74, 80, 108); button.FlatAppearance.MouseDownBackColor = SidebarSelectedColor;
+                button.ForeColor = Color.FromArgb(235, 255, 255, 255); button.Font = new Font("微软雅黑", 10F);
+                button.TextAlign = ContentAlignment.MiddleLeft; button.Padding = new Padding(20, 0, 12, 0);
+                button.Click -= SidebarButton_Click;
+                button.Click += SidebarButton_Click;
+            }
+        }
+
+        private void SidebarButton_Click(object sender, EventArgs e)
+        {
+            Button selected = sender as Button;
+            if (selected == null) return;
+            Panel sidebar = FindControl<Panel>("pl_center_left");
+            foreach (Button button in FindControls<Button>(sidebar))
+            {
+                button.BackgroundImage = null;
+                button.BackColor = button == selected ? SidebarSelectedColor : SidebarColor;
+            }
+        }
+
+        private void StyleWorkspaceAndShortcuts()
+        {
+            Panel center = FindControl<Panel>("pl_center_main"); if (center != null) center.BackColor = WorkspaceColor;
+            Panel middle = FindControl<Panel>("pl_center_main_middle");
+            if (middle != null) { middle.BackColor = Color.White; middle.Padding = new Padding(20, 18, 20, 22); }
+            Panel right = FindControl<Panel>("pl_center_main_right");
+            Panel rightContainer = FindControl<Panel>("pl_center_main_right_container");
+            EnableDoubleBuffer(right);
+            EnableDoubleBuffer(rightContainer);
+            if (rightContainer != null) { rightContainer.BackColor = Color.White; rightContainer.Padding = Padding.Empty; }
+            if (right != null) { right.BackColor = Color.White; right.Padding = new Padding(12); }
+            SplitContainer split = FindControl<SplitContainer>("splitMainControl");
+            if (split != null)
+            {
+                split.BackColor = WorkspaceColor;
+                split.SplitterWidth = 1;
+                if (split.Width > 177) split.SplitterDistance = Math.Max(176, split.Width - 240);
+            }
+            StyleShortcutSection("panel6", "lblShortcutset", "其它功能");
+            StyleShortcutSection("pl_center_main_bottom_right", "lblReportcutset", "最近使用");
+            foreach (SimpleControl shortcut in FindControls<SimpleControl>(this)) StyleShortcut(shortcut);
+            foreach (TableLayoutPanel table in FindControls<TableLayoutPanel>(rightContainer)) EnableDoubleBuffer(table);
+            ResizeShortcutSections();
+        }
+
+        private static void EnableDoubleBuffer(WinFormsControl control)
+        {
+            if (control == null) return;
+            try
+            {
+                PropertyInfo property = typeof(WinFormsControl).GetProperty(
+                    "DoubleBuffered", BindingFlags.Instance | BindingFlags.NonPublic);
+                if (property != null && property.CanWrite) property.SetValue(control, true, null);
+            }
+            catch (Exception)
+            {
+                // 某些旧版控件不允许修改 DoubleBuffered，不影响正常显示。
+            }
+        }
+
+        private void ResizeShortcutSections()
+        {
+            Panel first = FindControl<Panel>("pl_center_main_bottom_left");
+            Panel firstContent = FindControl<Panel>("pl_center_main_bottom_right_main");
+            Panel second = FindControl<Panel>("pl_center_main_bottom_right");
+            Panel secondContent = FindControl<Panel>("pl_center_main_bottom_left_main");
+            if (firstContent != null)
+            {
+                EnableDoubleBuffer(firstContent);
+                firstContent.BackColor = Color.White;
+                firstContent.Padding = new Padding(0, 4, 0, 0);
+                TableLayoutPanel table = firstContent.Controls.OfType<TableLayoutPanel>().FirstOrDefault();
+                if (table != null && first != null) first.Height = Math.Max(84, table.Height + 46);
+            }
+            if (secondContent != null)
+            {
+                EnableDoubleBuffer(secondContent);
+                secondContent.BackColor = Color.White;
+                secondContent.Padding = new Padding(0, 4, 0, 0);
+                TableLayoutPanel table = secondContent.Controls.OfType<TableLayoutPanel>().FirstOrDefault();
+                if (table != null && second != null) second.Height = Math.Max(84, table.Height + 46);
+            }
+        }
+
+        private void StyleShortcutSection(string panelName, string titleName, string title)
+        {
+            Panel panel = FindControl<Panel>(panelName); Label label = FindControl<Label>(titleName);
+            if (panel != null) { panel.BackColor = Color.White; panel.Height = 42; panel.Padding = new Padding(4, 0, 0, 0); }
+            if (label != null) { label.Text = title; label.Tag = title; label.BackColor = Color.White; label.ForeColor = Color.FromArgb(36, 136, 223); label.Font = new Font("微软雅黑", 10F, FontStyle.Bold); label.TextAlign = ContentAlignment.MiddleLeft; label.Padding = new Padding(4, 0, 0, 0); }
+        }
+
+        private void StyleShortcut(SimpleControl shortcut)
+        {
+            shortcut.Height = 56; shortcut.Margin = Padding.Empty; shortcut.BackColor = Color.White; shortcut.Padding = new Padding(4, 1, 0, 1); shortcut.Cursor = Cursors.Hand;
+            shortcut.PicBox.Width = 34; shortcut.PicBox.BackColor = Color.White; shortcut.PicBox.BackgroundImageLayout = ImageLayout.Center;
+            shortcut.Label.Font = new Font("微软雅黑", 9F); shortcut.Label.ForeColor = Color.FromArgb(55, 68, 84); shortcut.Label.BackColor = Color.White;
+            shortcut.Label.TextAlign = ContentAlignment.MiddleLeft; shortcut.Label.Padding = new Padding(7, 0, 18, 0); shortcut.Label.AutoEllipsis = true;
+            DataRow row = shortcut.Label.Tag as DataRow;
+            if (row != null)
+            {
+                string caption = row.Table.Columns.Contains("menucaption") ? row["menucaption"] + "" : shortcut.Label.Text;
+                string group = row.Table.Columns.Contains("groupcaption") ? row["groupcaption"] + "" : string.Empty;
+                if (string.IsNullOrWhiteSpace(group)) group = "常用功能";
+                shortcut.Label.Text = caption + Environment.NewLine + group;
+            }
+            TableLayoutPanel table = shortcut.Parent as TableLayoutPanel;
+            if (table != null)
+            {
+                table.AutoSize = true;
+                table.AutoSizeMode = AutoSizeMode.GrowAndShrink;
+                table.Dock = DockStyle.Top;
+                int rowIndex = table.GetRow(shortcut);
+                if (rowIndex >= 0 && rowIndex < table.RowStyles.Count)
+                {
+                    table.RowStyles[rowIndex].SizeType = SizeType.Absolute;
+                    table.RowStyles[rowIndex].Height = shortcut.Height;
+                }
+                table.BackColor = Color.White;
+            }
+            shortcut.Paint -= Shortcut_Paint; shortcut.Paint += Shortcut_Paint;
+        }
+
+        private void Shortcut_Paint(object sender, PaintEventArgs e)
+        {
+            SimpleControl shortcut = sender as SimpleControl; if (shortcut == null) return;
+            using (Pen pen = new Pen(ShortcutBorderColor)) e.Graphics.DrawLine(pen, 0, shortcut.Height - 1, shortcut.Width, shortcut.Height - 1);
+            using (Pen pen = new Pen(Color.FromArgb(150, 137, 164, 197), 1.5F))
+            {
+                int x = Math.Max(0, shortcut.Width - 9), y = shortcut.Height / 2;
+                e.Graphics.DrawLine(pen, x - 3, y - 4, x + 1, y); e.Graphics.DrawLine(pen, x + 1, y, x - 3, y + 4);
+            }
+        }
+
+        private T FindControl<T>(string name) where T : WinFormsControl { return Controls.Find(name, true).OfType<T>().FirstOrDefault(); }
+
+        private static IEnumerable<T> FindControls<T>(WinFormsControl root) where T : WinFormsControl
+        {
+            if (root == null) yield break;
+            foreach (WinFormsControl child in root.Controls)
+            {
+                T typed = child as T; if (typed != null) yield return typed;
+                foreach (T nested in FindControls<T>(child)) yield return nested;
+            }
+        }
+
+        private sealed class WpfMenuRenderer : ToolStripProfessionalRenderer
+        {
+            private readonly Color _header;
+            private readonly Func<ToolStripMenuItem> _activeMenuProvider;
+            public WpfMenuRenderer(Color header, Func<ToolStripMenuItem> activeMenuProvider)
+            {
+                _header = header;
+                _activeMenuProvider = activeMenuProvider;
+            }
+            protected override void OnRenderToolStripBackground(ToolStripRenderEventArgs e)
+            {
+                // 只改变顶层 MenuStrip 的背景；下拉菜单交回 WinForms 默认渲染。
+                if (e.ToolStrip is MenuStrip) e.Graphics.Clear(_header);
+                else base.OnRenderToolStripBackground(e);
+            }
+            protected override void OnRenderMenuItemBackground(ToolStripItemRenderEventArgs e)
+            {
+                ToolStripMenuItem item = e.Item as ToolStripMenuItem; if (item == null) return;
+                // 下拉框恢复旧版默认效果，不使用 WPF 顶部导航的高亮绘制。
+                if (!(e.ToolStrip is MenuStrip))
+                {
+                    base.OnRenderMenuItemBackground(e);
+                    return;
+                }
+                // Selected/Pressed 只表示鼠标状态，鼠标移开后会被 WinForms 清除。
+                // 高亮必须跟随当前功能导航（ERPInfo.SubSysName）持续显示。
+                string currentName = LicenseManager.UsageMode == LicenseUsageMode.Designtime
+                    ? string.Empty
+                    : (ERPInfo.Instance.SubSysName ?? string.Empty).Trim();
+                bool current = _activeMenuProvider != null && item == _activeMenuProvider();
+                if (!current)
+                    current = !string.IsNullOrWhiteSpace(currentName)
+                        && string.Equals((item.Text ?? string.Empty).Trim(), currentName, StringComparison.OrdinalIgnoreCase);
+                bool hover = item.Selected || item.Pressed;
+                bool drawBackground = current || hover;
+                // 当前目录使用黄色文字；鼠标悬浮只显示背景，不改变文字颜色和下划线。
+                item.ForeColor = current
+                    ? Color.FromArgb(255, 214, 102)
+                    : Color.FromArgb(242, 246, 255);
+                if (!drawBackground) return;
+                Rectangle r = new Rectangle(Point.Empty, item.Size);
+                using (Brush brush = new SolidBrush(current
+                    ? Color.FromArgb(49, 90, 166)
+                    : Color.FromArgb(42, 88, 164))) e.Graphics.FillRectangle(brush, r);
+                if (current)
+                {
+                    using (Brush brush = new SolidBrush(Color.FromArgb(255, 214, 102)))
+                        e.Graphics.FillRectangle(brush, 2, r.Bottom - 3, Math.Max(1, r.Width - 4), 2);
+                }
+            }
+        }
+        #endregion
+    }
+}
diff --git a/插件库/Lskj.Main/Control/MainPanelControlEx2.cs b/插件库/Lskj.Main/Control/MainPanelControlEx2.cs
new file mode 100644
index 0000000..c953f06
--- /dev/null
+++ b/插件库/Lskj.Main/Control/MainPanelControlEx2.cs
@@ -0,0 +1,105 @@
+using System;
+using System.ComponentModel;
+using System.Windows.Forms;
+using DevExpress.XtraTab;
+using Lskj.Business;
+using Lskj.Model;
+
+namespace Lskj.Main.Control
+{
+    /// <summary>新版 WPF 主界面的 WinForms 过渡版。</summary>
+    public partial class MainPanelControlEx2 : UserControl
+    {
+        private ToolStripMenuItem _selectedTopMenu;
+        private bool _styleUpdatePending;
+        private bool _shortcutRedrawSuppressed;
+        private string _styledSubSysId;
+        private string _styledSubSysName;
+
+        public MainPanelControlEx2()
+        {
+            InitializeComponent();
+            // 运行时必须等旧控件 OnLoad 完成后再改菜单布局；否则旧逻辑会按
+            // 构造阶段的默认宽度计算“更多”，导致一级目录全部被收进去。
+            // 设计器不会触发业务 OnLoad，因此仅在设计时直接套用预览样式。
+            if (LicenseManager.UsageMode == LicenseUsageMode.Designtime)
+                ApplyWpfShellStyle();
+        }
+
+        public float DpiX { get { return _legacyPanel.DpiX; } set { _legacyPanel.DpiX = value; } }
+        public float DpiY { get { return _legacyPanel.DpiY; } set { _legacyPanel.DpiY = value; } }
+        public int plTopHeight { get { return _legacyPanel.plTopHeight; } }
+        public FormWindowState State { get { return _legacyPanel.State; } set { _legacyPanel.State = value; } }
+        public XtraTabControl TabMain { get { return _legacyPanel.TabMain; } }
+        public Panel MainPanel { get { return _legacyPanel.MainPanel; } }
+        public AwaitScreenControl AwaitControl { get { return _legacyPanel.AwaitControl; } }
+        public PictureBox pic_search { get { return _legacyPanel.pic_search; } }
+        public event EventHandler OnMaxButtonCallBack { add { _legacyPanel.OnMaxButtonCallBack += value; } remove { _legacyPanel.OnMaxButtonCallBack -= value; } }
+        public event EventHandler OnMinButtonCallBack { add { _legacyPanel.OnMinButtonCallBack += value; } remove { _legacyPanel.OnMinButtonCallBack -= value; } }
+        public event EventHandler OnCloseButtonCallBack { add { _legacyPanel.OnCloseButtonCallBack += value; } remove { _legacyPanel.OnCloseButtonCallBack -= value; } }
+        public event EventHandler OnTopPanelMouseDoubleClickCallBack { add { _legacyPanel.OnTopPanelMouseDoubleClickCallBack += value; } remove { _legacyPanel.OnTopPanelMouseDoubleClickCallBack -= value; } }
+        public event MouseEventHandler OnTopMouseDownCallback { add { _legacyPanel.OnTopMouseDownCallback += value; } remove { _legacyPanel.OnTopMouseDownCallback -= value; } }
+        public event MouseEventHandler OnTopMouseUpCallBack { add { _legacyPanel.OnTopMouseUpCallBack += value; } remove { _legacyPanel.OnTopMouseUpCallBack -= value; } }
+        public event MouseEventHandler OnTopMouseMoveCallBack { add { _legacyPanel.OnTopMouseMoveCallBack += value; } remove { _legacyPanel.OnTopMouseMoveCallBack -= value; } }
+
+        /// <summary>保持旧 FrmMain 的 OnLoad 调用契约，在菜单绑定完成后应用新版样式。</summary>
+        public void OnLoad()
+        {
+            _legacyPanel.OnLoad();
+            ApplyWpfShellStyle();
+        }
+
+        private void TopMenuItem_Click(object sender, EventArgs e)
+        {
+            SelectTopMenu(sender as ToolStripMenuItem);
+            ResetBrandArea();
+            // 切换一级目录时旧逻辑会重建左侧菜单，下一帧重新套用新版布局。
+            if (IsNavigationChangedSinceLastStyle())
+                RequestApplyWpfShellStyle();
+        }
+
+        private static bool IsGroupedSidebarMode()
+        {
+            // 设计器预览不能访问数据库；预览时直接采用新版分组侧栏样式。
+            if (LicenseManager.UsageMode == LicenseUsageMode.Designtime)
+                return true;
+            // 与旧主界面使用同一份系统参数，避免新版界面出现目录不一致。
+            return "1".Equals((SystemInfo.Instance.MainLeftShowMode ?? string.Empty).Trim());
+        }
+
+        private bool IsNavigationChangedSinceLastStyle()
+        {
+            if (LicenseManager.UsageMode == LicenseUsageMode.Designtime) return false;
+            string id = (ERPInfo.Instance.SubSysId ?? string.Empty).Trim();
+            string name = (ERPInfo.Instance.SubSysName ?? string.Empty).Trim();
+            return !string.Equals(id, _styledSubSysId, StringComparison.OrdinalIgnoreCase)
+                || !string.Equals(name, _styledSubSysName, StringComparison.OrdinalIgnoreCase);
+        }
+
+        private void RememberStyledNavigation()
+        {
+            if (LicenseManager.UsageMode == LicenseUsageMode.Designtime) return;
+            _styledSubSysId = (ERPInfo.Instance.SubSysId ?? string.Empty).Trim();
+            _styledSubSysName = (ERPInfo.Instance.SubSysName ?? string.Empty).Trim();
+        }
+
+        /// <summary>
+        /// 合并同一消息循环内由顶部菜单点击、下拉框关闭等事件发起的重复重绘。
+        /// 旧版切换目录本身已经重建快捷通道，重复套用样式会造成右侧闪烁。
+        /// </summary>
+        private void RequestApplyWpfShellStyle()
+        {
+            if (!IsHandleCreated || _styleUpdatePending) return;
+            _styleUpdatePending = true;
+            BeginInvoke((MethodInvoker)(() =>
+            {
+                _styleUpdatePending = false;
+                if (!IsDisposed)
+                {
+                    ApplyWpfShellStyle();
+                    if (_shortcutRedrawSuppressed) SetShortcutRedraw(true);
+                }
+            }));
+        }
+    }
+}
diff --git a/插件库/Lskj.Main/Control/MainPanelControlEx2.resx b/插件库/Lskj.Main/Control/MainPanelControlEx2.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/插件库/Lskj.Main/Control/MainPanelControlEx2.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/插件库/Lskj.Main/FrmMain.cs b/插件库/Lskj.Main/FrmMain.cs
index 1a2d911..50ea5e8 100644
--- a/插件库/Lskj.Main/FrmMain.cs
+++ b/插件库/Lskj.Main/FrmMain.cs
@@ -42,6 +42,9 @@ namespace Lskj.Main
     /// </summary>
     public partial class FrmMain : Form
     {
+        // 设计器仍保留旧控件字段；运行时通过配置决定实际使用的主界面。
+        private dynamic _activeMainPanel;
+        private dynamic ActiveMainPanel { get { return _activeMainPanel ?? (dynamic)this.mainPanelControlEx; } }
         /// <summary>
         /// 屏幕dpix、dpiy
         /// </summary>
@@ -71,9 +74,48 @@ namespace Lskj.Main
             _dpiX = graphics.DpiX;
             _dpiY = graphics.DpiY;
             InitializeComponent();
+            InitializeMainPanelVariant();
             this.MaximumSize = new Size(Screen.PrimaryScreen.WorkingArea.Width, Screen.PrimaryScreen.WorkingArea.Height);
 
         }
+
+        private void InitializeMainPanelVariant()
+        {
+            _activeMainPanel = this.mainPanelControlEx;
+            if (LicenseManager.UsageMode == LicenseUsageMode.Designtime) return;
+            if (!SystemInfo.Instance.NewMain) return;
+
+            System.Windows.Forms.Control oldPanel = this.mainPanelControlEx;
+            System.Windows.Forms.Control parent = oldPanel.Parent;
+            if (parent == null) return;
+            int childIndex = parent.Controls.GetChildIndex(oldPanel);
+            MainPanelControlEx2 newPanel = null;
+            try
+            {
+                // 先创建新版控件，只有创建成功后才移除旧控件，避免异常时主界面为空。
+                newPanel = new MainPanelControlEx2
+                {
+                    Dock = DockStyle.Fill,
+                    Location = Point.Empty,
+                    Name = "mainPanelControlEx2"
+                };
+                parent.Controls.Add(newPanel);
+                parent.Controls.SetChildIndex(newPanel, childIndex);
+                parent.Controls.Remove(oldPanel);
+                oldPanel.Dispose();
+                _activeMainPanel = newPanel;
+            }
+            catch (Exception ex)
+            {
+                if (newPanel != null)
+                {
+                    parent.Controls.Remove(newPanel);
+                    newPanel.Dispose();
+                }
+                _activeMainPanel = oldPanel;
+                LogHelper.Instance.WriteError(ex);
+            }
+        }
         #region 内存回收
         [DllImport("kernel32.dll", EntryPoint = "SetProcessWorkingSetSize")]
         public static extern int SetProcessWorkingSetSize(IntPtr process, int minSize, int maxSize);
@@ -116,25 +158,26 @@ namespace Lskj.Main
             {
                 ERPInfo.Instance.MainControl = this;
                 this.Text = SystemInfo.Instance.ClientName + "ERP系统:" + ERPInfo.Instance.UserName;
-                this.mainPanelControlEx.Hide();
+
+                this.ActiveMainPanel.Hide();
                 //FrmAutoSqlLoad frm = new FrmAutoSqlLoad();
                 //frm.ShowDialog();
                 this.KeyPreview = true;//主窗体允许使用事件
-                this.mainPanelControlEx.DpiX = _dpiX;
-                this.mainPanelControlEx.DpiY = _dpiY;
-                this.mainPanelControlEx.OnLoad();
-                this.mainPanelControlEx.OnCloseButtonCallBack += new EventHandler(OnCloseButtonCallBack);
-                this.mainPanelControlEx.OnMaxButtonCallBack += new EventHandler(OnTopPanelMouseDoubleClickCallBack);
-                this.mainPanelControlEx.OnMinButtonCallBack += new EventHandler(OnMinButtonCallBack);
-                this.mainPanelControlEx.OnTopMouseDownCallback += new MouseEventHandler(OnTopMouseDownCallback);
-                this.mainPanelControlEx.OnTopMouseMoveCallBack += new MouseEventHandler(OnTopMouseMoveCallBack);
-                this.mainPanelControlEx.OnTopMouseUpCallBack += new MouseEventHandler(OnTopMouseUpCallBack);
-                this.mainPanelControlEx.OnTopPanelMouseDoubleClickCallBack += new EventHandler(OnTopPanelMouseDoubleClickCallBack);
+                this.ActiveMainPanel.DpiX = _dpiX;
+                this.ActiveMainPanel.DpiY = _dpiY;
+                this.ActiveMainPanel.OnLoad();
+                this.ActiveMainPanel.OnCloseButtonCallBack += new EventHandler(OnCloseButtonCallBack);
+                this.ActiveMainPanel.OnMaxButtonCallBack += new EventHandler(OnTopPanelMouseDoubleClickCallBack);
+                this.ActiveMainPanel.OnMinButtonCallBack += new EventHandler(OnMinButtonCallBack);
+                this.ActiveMainPanel.OnTopMouseDownCallback += new MouseEventHandler(OnTopMouseDownCallback);
+                this.ActiveMainPanel.OnTopMouseMoveCallBack += new MouseEventHandler(OnTopMouseMoveCallBack);
+                this.ActiveMainPanel.OnTopMouseUpCallBack += new MouseEventHandler(OnTopMouseUpCallBack);
+                this.ActiveMainPanel.OnTopPanelMouseDoubleClickCallBack += new EventHandler(OnTopPanelMouseDoubleClickCallBack);
                 if (SystemInfo.Instance.DetectionMemory)
                 {
                     this.TheMemoryTest.Start();
                 }
-                this.mainPanelControlEx.State = this.WindowState;
+                this.ActiveMainPanel.State = this.WindowState;
                 this.MouseMove += OnFrmMainMouseMove;
                 this.MouseLeave += OnFrmMainMouseLeave;
 
@@ -162,7 +205,7 @@ namespace Lskj.Main
             }
             finally
             {
-                this.mainPanelControlEx.Show();
+                this.ActiveMainPanel.Show();
             }
         }
 
@@ -297,13 +340,13 @@ namespace Lskj.Main
                             {
                                 foreach (DevExpress.XtraTab.XtraTabPage page in StaticControl.DogVerifyModuleForms)
                                 {
-                                    this.mainPanelControlEx.TabMain.Invoke(new Action(() =>
+                                    this.ActiveMainPanel.TabMain.Invoke(new Action(() =>
                                     {
                                         try
                                         {
-                                            if (this.mainPanelControlEx.TabMain.TabPages.Contains(page))
+                                            if (this.ActiveMainPanel.TabMain.TabPages.Contains(page))
                                             {
-                                                this.mainPanelControlEx.TabMain.TabPages.Remove(page);
+                                                this.ActiveMainPanel.TabMain.TabPages.Remove(page);
                                                 page.Dispose();
                                             }
                                         }
@@ -487,7 +530,7 @@ namespace Lskj.Main
                 {
                     this.Padding = new Padding(0, 0, 3, 3);
                 }
-                this.mainPanelControlEx.State = this.WindowState;
+                this.ActiveMainPanel.State = this.WindowState;
                 this.StartPosition = FormStartPosition.CenterScreen;
                 this.ResetFormState();
             }
@@ -621,7 +664,7 @@ namespace Lskj.Main
                 {
                     EnsureFormInCurrentScreen();
                 }
-                this.mainPanelControlEx.pic_search.Focus();//点击界面失去焦点
+                this.ActiveMainPanel.pic_search.Focus();//点击界面失去焦点
             }
             catch (Exception ex)
             {
diff --git a/插件库/Lskj.Main/Lskj.Main.csproj b/插件库/Lskj.Main/Lskj.Main.csproj
index ea87bb7..1d086ea 100644
--- a/插件库/Lskj.Main/Lskj.Main.csproj
+++ b/插件库/Lskj.Main/Lskj.Main.csproj
@@ -132,6 +132,12 @@
     <Compile Include="Control\MainPanelControlEx.Designer.cs">
       <DependentUpon>MainPanelControlEx.cs</DependentUpon>
     </Compile>
+    <Compile Include="Control\MainPanelControlEx2.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Control\MainPanelControlEx2.Designer.cs">
+      <DependentUpon>MainPanelControlEx2.cs</DependentUpon>
+    </Compile>
     <Compile Include="Control\MenuBar.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -299,6 +305,9 @@
     <EmbeddedResource Include="Control\MainPanelControlEx.resx">
       <DependentUpon>MainPanelControlEx.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Control\MainPanelControlEx2.resx">
+      <DependentUpon>MainPanelControlEx2.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Control\MenuBar.resx">
       <DependentUpon>MenuBar.cs</DependentUpon>
     </EmbeddedResource>
@@ -587,4 +596,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/插件库/Lskj.PubBill/BillModule.cs b/插件库/Lskj.PubBill/BillModule.cs
index a894667..85ec6b7 100644
--- a/插件库/Lskj.PubBill/BillModule.cs
+++ b/插件库/Lskj.PubBill/BillModule.cs
@@ -1793,7 +1793,8 @@ namespace Lskj.PubBill
                     //e.Cancel = !ValidateCond(gridColumnModel.DisableCond, focusedRow);
                     string UpdateCond = this.ControlObj.ReplaceParentControlValue(gridColumnModel.DisableCond);
                     UpdateCond = ReplaceHelper.ReplaceRowParam(rowItem, UpdateCond);
-                    if (!ReplaceHelper.EvalCond(UpdateCond))
+                    
+                    if (!ValidateCond(UpdateCond, rowItem))
                     {
                         e.Cancel = true;//该行不可编辑
                     }
diff --git a/插件库/Lskj.PubModule/FrmMain.cs b/插件库/Lskj.PubModule/FrmMain.cs
index 4231168..d8a3ad4 100644
--- a/插件库/Lskj.PubModule/FrmMain.cs
+++ b/插件库/Lskj.PubModule/FrmMain.cs
@@ -151,7 +151,11 @@ namespace Lskj.PubModule
         {
             this.mControl.CloseModule();
             string guid = this.Tag + "";
-            if (string.IsNullOrWhiteSpace(guid)) return;
+            if (string.IsNullOrWhiteSpace(guid)) 
+            {
+                this.CloseExecution();
+                return;
+            } 
             DllModule m = Manager.ModuleForms[guid];
             m.IsClose = true;
             if (SystemInfo.Instance.EfficientVerification)
@@ -175,6 +179,15 @@ namespace Lskj.PubModule
             }
 
             if (!e.Cancel)
+            {
+                this.CloseExecution();
+            }
+
+        }
+
+        private void CloseExecution() 
+        {
+            try
             {
                 if (!string.IsNullOrEmpty(this.mControl.SysModel.FrmCloseStored))
                 {
@@ -185,9 +198,14 @@ namespace Lskj.PubModule
                     if (!string.IsNullOrEmpty(result)) MessageUtil.Show(result);
                 }
             }
-
+            catch (Exception ex) 
+            {
+            
+            }
+           
         }
 
+
         #region 设置窗口大小
         /// <summary>
         /// <para>说明：设置弹出窗体大小</para>
diff --git a/插件库/Lskj.PubModuleDetail/FrmMain.cs b/插件库/Lskj.PubModuleDetail/FrmMain.cs
index 2a1e38a..25de4cd 100644
--- a/插件库/Lskj.PubModuleDetail/FrmMain.cs
+++ b/插件库/Lskj.PubModuleDetail/FrmMain.cs
@@ -157,6 +157,7 @@ namespace Lskj.PubModuleDetail
             string guid = this.Tag + "";
             if (string.IsNullOrWhiteSpace(guid))
             {
+                this.CloseExecution();
                 this.mControl.ReleaseResourcesForDispose();
                 return;
             }
@@ -186,20 +187,33 @@ namespace Lskj.PubModuleDetail
             // confirmed; waiting for FrmMain.Dispose leaves GDI handles alive
             // between module cycles.
             if (!e.Cancel)
+            {
+                this.CloseExecution();
+                this.mControl.ReleaseResourcesForDispose();
+            }
+        }
+
+        private void CloseExecution()
+        {
+            try
             {
                 if (!string.IsNullOrEmpty(this.mControl.SysModel.FrmCloseStored))
                 {
                     string sql = this.mControl.SysModel.FrmCloseStored;
-                    if (this.mControl.SearchObj!=null) sql=this.mControl.SearchObj.ReplaceControlValue(sql);
+                    if (this.mControl.SearchObj != null) sql = this.mControl.SearchObj.ReplaceControlValue(sql);
                     sql = ReplaceHelper.ReplaceUserInfo(sql);
                     string result = SqlHelper.ExecuteScalar(sql) + "";
                     if (!string.IsNullOrEmpty(result)) MessageUtil.Show(result);
                 }
-
-                this.mControl.ReleaseResourcesForDispose();
             }
+            catch (Exception ex)
+            {
+
+            }
+
         }
 
+
         /// <summary>
         /// <para>说明：拿到底部表格数据</para>
         /// <para>创建人：龚宇超</para>