cyf/lserp_cs_6.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 更新业务、控件及单据功能

Browse Source
This commit is contained in:
cyf
2026-08-10 09:59:46 +08:00
parent c07220bbf0
commit 000a69ce15
29 changed files with 919 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.Main/Control/MainPanelControlEx.cs
+8
View File
@@ -4836,6 +4836,14 @@ namespace Lskj.Main.Control
tabPage.Controls.Add(this.FirstMain);
this.webBrowser.Show();
this.webBrowser.BringToFront();
// 等待页签和FirstMain完成布局后，再同步CEF原生子窗口的位置和尺寸。
this.webBrowser.BeginInvoke(new MethodInvoker(delegate
{
if (!this.webBrowser.IsDisposed && !this.webBrowser.Disposing)
{
this.webBrowser.SyncBrowserBounds();
}
}));
//if (this.webBrowser.cefBrowserSettings != null) this.webBrowser.cefBrowserSettings.Reload();
int MemuEventType = 1;
//左侧二级目录菜单设置为单击切换模式
插件库/Lskj.Main/FrmLogin.cs
+3
View File
@@ -681,6 +681,9 @@ namespace Lskj.Main
ERPInfo.Instance.LoginAccount = LoginAccount;
ERPInfo.Instance.InPassWord = password;
ERPInfo.Instance.PrimitiveBrowser = SystemInfo.Instance.PrimitiveBrowser;
if (BaseImpl.HasExistsColumn("p_formmenuconfigtab", "SingleOpenMode")) ERPInfo.Instance.SingleOpenMode = true;
DBConfig.Instance.LoginName = isLoginByAd ? lueUserName.Text.Trim() : lueUserName.Text;
DBConfig.Instance.NoticeUserID = userId;
DBConfig.Instance.NoticeUserName = userName;
插件库/Lskj.Main/Model/Manager.cs
+17 -16
View File
@@ -571,22 +571,23 @@ namespace Lskj.Main.Model
form.Show();
if (args != null && !string.IsNullOrEmpty(args[4] + ""))
{
ModuleModel moduleModel = new ModuleModel(MainImpl.GetSystemdllTab(args[4] + ""));
if (!string.IsNullOrEmpty(moduleModel.SearchCondFormModuleCode))
{
ModuleConditionsPanelEx mcpex = new ModuleConditionsPanelEx();
mcpex.InitializeControl(new ModuleModel(MainImpl.GetSystemdllTab(moduleModel.SearchCondFormModuleCode)), null, null, true);
if (StaticControl.ConditionsPanelDic.ContainsKey(args[4] + ""))
{
StaticControl.ConditionsPanelDic[args[4] + ""].Dispose();
StaticControl.ConditionsPanelDic[args[4] + ""] = mcpex;
}
else
{
StaticControl.ConditionsPanelDic.Add(args[4] + "", mcpex);
}
DialogResult dialogResult = mcpex.ShowDialog();
}
//2026-08-08 pz说把SearchCondFormModuleCode判断去掉，不要这个功能
//ModuleModel moduleModel = new ModuleModel(MainImpl.GetSystemdllTab(args[4] + ""));
//if (!string.IsNullOrEmpty(moduleModel.SearchCondFormModuleCode))
//{
// ModuleConditionsPanelEx mcpex = new ModuleConditionsPanelEx();
// mcpex.InitializeControl(new ModuleModel(MainImpl.GetSystemdllTab(moduleModel.SearchCondFormModuleCode)), null, null, true);
// if (StaticControl.ConditionsPanelDic.ContainsKey(args[4] + ""))
// {
// StaticControl.ConditionsPanelDic[args[4] + ""].Dispose();
// StaticControl.ConditionsPanelDic[args[4] + ""] = mcpex;
// }
// else
// {
// StaticControl.ConditionsPanelDic.Add(args[4] + "", mcpex);
// }
// DialogResult dialogResult = mcpex.ShowDialog();
//}
}
TabMain.TabPages.Add(tp);