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

Merge branch 'main' of http://192.168.0.7:4133/cyf/lserp_cs_6.0

Browse Source
This commit is contained in:
SugarChes
2026-08-15 16:35:25 +08:00
parent fc5faab65d b091eca540
commit ef13d46fa2
6 changed files with 311 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.Control/AuditPanelEx.Designer.cs
Generated
+273 -273
View File
@@ -32,22 +32,6 @@
/// </summary>
private void InitializeComponent()
{
this.tabMain = new DevExpress.XtraTab.XtraTabControl();
this.tabpage_finish = new DevExpress.XtraTab.XtraTabPage();
this.gridFinish = new Lskj.Control.GridControlEx();
this.splitBelow = new DevExpress.XtraEditors.SplitContainerControl();
this.gridFlow = new Lskj.Control.GridControlEx();
this.gridDetail = new Lskj.Control.GridControlEx();
this.pl_top = new DevExpress.XtraEditors.PanelControl();
this.pl_top_searchCond = new DevExpress.XtraEditors.PanelControl();
this.labeldate_start = new Lskj.Control.LabelCheckDateEdit();
this.labelcheck_finalAuditor = new Lskj.Control.LabelCheckAutoTextEdit();
this.labeltxt_dataFlag = new Lskj.Control.LabelTextEdit();
this.btnSearch = new DevExpress.XtraEditors.SimpleButton();
this.labeldate_end = new Lskj.Control.LabelCheckDateEdit();
this.pl_top_right = new DevExpress.XtraEditors.PanelControl();
this.simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
this.btnBack = new DevExpress.XtraEditors.SimpleButton();
this.label_tips = new DevExpress.XtraEditors.LabelControl();
this.label_date = new DevExpress.XtraEditors.LabelControl();
this.pl_bottom = new DevExpress.XtraEditors.PanelControl();
@@ -63,238 +47,39 @@
this.btnOkAudit = new DevExpress.XtraEditors.SimpleButton();
this.btnBackAudit = new DevExpress.XtraEditors.SimpleButton();
this.btnRefresh = new DevExpress.XtraEditors.SimpleButton();
((System.ComponentModel.ISupportInitialize)(this.tabMain)).BeginInit();
this.tabMain.SuspendLayout();
this.tabpage_finish.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitBelow)).BeginInit();
this.splitBelow.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pl_top)).BeginInit();
this.pl_top.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pl_top_searchCond)).BeginInit();
this.pl_top_searchCond.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pl_top_right)).BeginInit();
this.pl_top_right.SuspendLayout();
this.tabpage_finish = new DevExpress.XtraTab.XtraTabPage();
this.pl_top = new DevExpress.XtraEditors.PanelControl();
this.pl_top_right = new DevExpress.XtraEditors.PanelControl();
this.btnBack = new DevExpress.XtraEditors.SimpleButton();
this.simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
this.pl_top_searchCond = new DevExpress.XtraEditors.PanelControl();
this.labeldate_end = new Lskj.Control.LabelCheckDateEdit();
this.btnSearch = new DevExpress.XtraEditors.SimpleButton();
this.labeltxt_dataFlag = new Lskj.Control.LabelTextEdit();
this.labelcheck_finalAuditor = new Lskj.Control.LabelCheckAutoTextEdit();
this.labeldate_start = new Lskj.Control.LabelCheckDateEdit();
this.splitBelow = new DevExpress.XtraEditors.SplitContainerControl();
this.gridDetail = new Lskj.Control.GridControlEx();
this.gridFlow = new Lskj.Control.GridControlEx();
this.gridFinish = new Lskj.Control.GridControlEx();
this.tabMain = new DevExpress.XtraTab.XtraTabControl();
((System.ComponentModel.ISupportInitialize)(this.pl_bottom)).BeginInit();
this.pl_bottom.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.p_menu)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.barManager1)).BeginInit();
this.tabpage_finish.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pl_top)).BeginInit();
this.pl_top.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pl_top_right)).BeginInit();
this.pl_top_right.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pl_top_searchCond)).BeginInit();
this.pl_top_searchCond.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitBelow)).BeginInit();
this.splitBelow.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.tabMain)).BeginInit();
this.tabMain.SuspendLayout();
this.SuspendLayout();
//
// tabMain
//
this.tabMain.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
this.tabMain.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabMain.HeaderLocation = DevExpress.XtraTab.TabHeaderLocation.Bottom;
this.tabMain.Location = new System.Drawing.Point(0, 0);
this.tabMain.Name = "tabMain";
this.tabMain.SelectedTabPage = this.tabpage_finish;
this.tabMain.Size = new System.Drawing.Size(1051, 701);
this.tabMain.TabIndex = 20;
this.tabMain.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabpage_finish});
//
// tabpage_finish
//
this.tabpage_finish.Controls.Add(this.gridFinish);
this.tabpage_finish.Controls.Add(this.splitBelow);
this.tabpage_finish.Controls.Add(this.pl_top);
this.tabpage_finish.Name = "tabpage_finish";
this.tabpage_finish.Size = new System.Drawing.Size(1045, 672);
this.tabpage_finish.Text = "已完成单据";
//
// gridFinish
//
this.gridFinish.AdapterObj = null;
this.gridFinish.AutoSize = true;
this.gridFinish.Dock = System.Windows.Forms.DockStyle.Fill;
this.gridFinish.Location = new System.Drawing.Point(0, 39);
this.gridFinish.Margin = new System.Windows.Forms.Padding(4);
this.gridFinish.Name = "gridFinish";
this.gridFinish.SiftEnumObj = Lskj.Control.GridControlEx.HeaderSiftEnum.Sum;
this.gridFinish.Size = new System.Drawing.Size(1045, 340);
this.gridFinish.SysModel = null;
this.gridFinish.TabIndex = 29;
//
// splitBelow
//
this.splitBelow.Dock = System.Windows.Forms.DockStyle.Bottom;
this.splitBelow.Location = new System.Drawing.Point(0, 379);
this.splitBelow.Name = "splitBelow";
this.splitBelow.Panel1.Controls.Add(this.gridFlow);
this.splitBelow.Panel1.Text = "Panel1";
this.splitBelow.Panel2.Controls.Add(this.gridDetail);
this.splitBelow.Panel2.Text = "Panel2";
this.splitBelow.Size = new System.Drawing.Size(1045, 293);
this.splitBelow.SplitterPosition = 453;
this.splitBelow.TabIndex = 28;
this.splitBelow.Text = "splitContainerControl1";
//
// gridFlow
//
this.gridFlow.AdapterObj = null;
this.gridFlow.Dock = System.Windows.Forms.DockStyle.Fill;
this.gridFlow.Location = new System.Drawing.Point(0, 0);
this.gridFlow.Margin = new System.Windows.Forms.Padding(4);
this.gridFlow.Name = "gridFlow";
this.gridFlow.SiftEnumObj = Lskj.Control.GridControlEx.HeaderSiftEnum.Sum;
this.gridFlow.Size = new System.Drawing.Size(453, 293);
this.gridFlow.SysModel = null;
this.gridFlow.TabIndex = 19;
//
// gridDetail
//
this.gridDetail.AdapterObj = null;
this.gridDetail.Dock = System.Windows.Forms.DockStyle.Fill;
this.gridDetail.Location = new System.Drawing.Point(0, 0);
this.gridDetail.Margin = new System.Windows.Forms.Padding(4);
this.gridDetail.Name = "gridDetail";
this.gridDetail.SiftEnumObj = Lskj.Control.GridControlEx.HeaderSiftEnum.Sum;
this.gridDetail.Size = new System.Drawing.Size(587, 293);
this.gridDetail.SysModel = null;
this.gridDetail.TabIndex = 20;
//
// pl_top
//
this.pl_top.Controls.Add(this.pl_top_searchCond);
this.pl_top.Controls.Add(this.pl_top_right);
this.pl_top.Dock = System.Windows.Forms.DockStyle.Top;
this.pl_top.Location = new System.Drawing.Point(0, 0);
this.pl_top.Name = "pl_top";
this.pl_top.Size = new System.Drawing.Size(1045, 39);
this.pl_top.TabIndex = 25;
//
// pl_top_searchCond
//
this.pl_top_searchCond.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
this.pl_top_searchCond.Controls.Add(this.labeldate_start);
this.pl_top_searchCond.Controls.Add(this.labelcheck_finalAuditor);
this.pl_top_searchCond.Controls.Add(this.labeltxt_dataFlag);
this.pl_top_searchCond.Controls.Add(this.btnSearch);
this.pl_top_searchCond.Controls.Add(this.labeldate_end);
this.pl_top_searchCond.Dock = System.Windows.Forms.DockStyle.Fill;
this.pl_top_searchCond.Location = new System.Drawing.Point(2, 2);
this.pl_top_searchCond.Name = "pl_top_searchCond";
this.pl_top_searchCond.Size = new System.Drawing.Size(778, 35);
this.pl_top_searchCond.TabIndex = 23;
//
// labeldate_start
//
this.labeldate_start.BackColor = System.Drawing.Color.Transparent;
this.labeldate_start.BackgroundColor = System.Drawing.Color.Empty;
this.labeldate_start.ContentBold = false;
this.labeldate_start.EditText = null;
this.labeldate_start.FontSize = 0F;
this.labeldate_start.LabelText = "终审时间起";
this.labeldate_start.Location = new System.Drawing.Point(10, 8);
this.labeldate_start.Margin = new System.Windows.Forms.Padding(4);
this.labeldate_start.Model = null;
this.labeldate_start.Name = "labeldate_start";
this.labeldate_start.NullText = null;
this.labeldate_start.ReadOnly = false;
this.labeldate_start.Required = false;
this.labeldate_start.Size = new System.Drawing.Size(196, 21);
this.labeldate_start.TabIndex = 11;
//
// labelcheck_finalAuditor
//
this.labelcheck_finalAuditor.BackColor = System.Drawing.Color.Transparent;
this.labelcheck_finalAuditor.BackgroundColor = System.Drawing.Color.Empty;
this.labelcheck_finalAuditor.ContentBold = false;
this.labelcheck_finalAuditor.EditText = null;
this.labelcheck_finalAuditor.FontSize = 0F;
this.labelcheck_finalAuditor.LabelText = "终审人";
this.labelcheck_finalAuditor.Location = new System.Drawing.Point(419, 8);
this.labelcheck_finalAuditor.Margin = new System.Windows.Forms.Padding(4);
this.labelcheck_finalAuditor.Model = null;
this.labelcheck_finalAuditor.Name = "labelcheck_finalAuditor";
this.labelcheck_finalAuditor.NullText = null;
this.labelcheck_finalAuditor.ReadOnly = false;
this.labelcheck_finalAuditor.Required = false;
this.labelcheck_finalAuditor.Size = new System.Drawing.Size(180, 21);
this.labelcheck_finalAuditor.TabIndex = 13;
//
// labeltxt_dataFlag
//
this.labeltxt_dataFlag.BackColor = System.Drawing.Color.Transparent;
this.labeltxt_dataFlag.BackgroundColor = System.Drawing.Color.Empty;
this.labeltxt_dataFlag.ContentBold = false;
this.labeltxt_dataFlag.EditText = "";
this.labeltxt_dataFlag.FontSize = 0F;
this.labeltxt_dataFlag.LabelText = "数据标识号";
this.labeltxt_dataFlag.Location = new System.Drawing.Point(605, 8);
this.labeltxt_dataFlag.Margin = new System.Windows.Forms.Padding(4);
this.labeltxt_dataFlag.Model = null;
this.labeltxt_dataFlag.Name = "labeltxt_dataFlag";
this.labeltxt_dataFlag.NullText = "";
this.labeltxt_dataFlag.ReadOnly = false;
this.labeltxt_dataFlag.Required = false;
this.labeltxt_dataFlag.Size = new System.Drawing.Size(164, 21);
this.labeltxt_dataFlag.TabIndex = 10;
//
// btnSearch
//
this.btnSearch.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btnSearch.Appearance.Options.UseFont = true;
this.btnSearch.Location = new System.Drawing.Point(774, 5);
this.btnSearch.Name = "btnSearch";
this.btnSearch.Size = new System.Drawing.Size(72, 26);
this.btnSearch.TabIndex = 6;
this.btnSearch.Text = "搜索(&Q)";
this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
//
// labeldate_end
//
this.labeldate_end.BackColor = System.Drawing.Color.Transparent;
this.labeldate_end.BackgroundColor = System.Drawing.Color.Empty;
this.labeldate_end.ContentBold = false;
this.labeldate_end.EditText = null;
this.labeldate_end.FontSize = 0F;
this.labeldate_end.LabelText = "终审时间止";
this.labeldate_end.Location = new System.Drawing.Point(216, 8);
this.labeldate_end.Margin = new System.Windows.Forms.Padding(4);
this.labeldate_end.Model = null;
this.labeldate_end.Name = "labeldate_end";
this.labeldate_end.NullText = null;
this.labeldate_end.ReadOnly = false;
this.labeldate_end.Required = false;
this.labeldate_end.Size = new System.Drawing.Size(196, 21);
this.labeldate_end.TabIndex = 12;
//
// pl_top_right
//
this.pl_top_right.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
this.pl_top_right.Controls.Add(this.simpleButton1);
this.pl_top_right.Controls.Add(this.btnBack);
this.pl_top_right.Dock = System.Windows.Forms.DockStyle.Right;
this.pl_top_right.Location = new System.Drawing.Point(780, 2);
this.pl_top_right.Name = "pl_top_right";
this.pl_top_right.Size = new System.Drawing.Size(263, 35);
this.pl_top_right.TabIndex = 24;
//
// simpleButton1
//
this.simpleButton1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.simpleButton1.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.simpleButton1.Appearance.Options.UseFont = true;
this.simpleButton1.Location = new System.Drawing.Point(188, 5);
this.simpleButton1.Name = "simpleButton1";
this.simpleButton1.Size = new System.Drawing.Size(72, 26);
this.simpleButton1.TabIndex = 9;
this.simpleButton1.Text = "帮助文档";
this.simpleButton1.Click += new System.EventHandler(this.simpleButton1_Click);
//
// btnBack
//
this.btnBack.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnBack.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btnBack.Appearance.Options.UseFont = true;
this.btnBack.Location = new System.Drawing.Point(100, 5);
this.btnBack.Name = "btnBack";
this.btnBack.Size = new System.Drawing.Size(82, 26);
this.btnBack.TabIndex = 8;
this.btnBack.Text = "返审(&W)";
this.btnBack.Click += new System.EventHandler(this.btnBack_Click);
//
// label_tips
//
this.label_tips.Appearance.Font = new System.Drawing.Font("宋体", 9F);
@@ -327,9 +112,9 @@
this.pl_bottom.Controls.Add(this.label_tips);
this.pl_bottom.Controls.Add(this.label_date);
this.pl_bottom.Dock = System.Windows.Forms.DockStyle.Bottom;
this.pl_bottom.Location = new System.Drawing.Point(0, 693);
this.pl_bottom.Location = new System.Drawing.Point(0, 1036);
this.pl_bottom.Name = "pl_bottom";
this.pl_bottom.Size = new System.Drawing.Size(1051, 21);
this.pl_bottom.Size = new System.Drawing.Size(1576, 36);
this.pl_bottom.TabIndex = 21;
//
// btnReverseSelection
@@ -337,7 +122,7 @@
this.btnReverseSelection.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnReverseSelection.Appearance.Font = new System.Drawing.Font("宋体", 9F);
this.btnReverseSelection.Appearance.Options.UseFont = true;
this.btnReverseSelection.Location = new System.Drawing.Point(586, -8);
this.btnReverseSelection.Location = new System.Drawing.Point(1111, 7);
this.btnReverseSelection.Name = "btnReverseSelection";
this.btnReverseSelection.Size = new System.Drawing.Size(55, 26);
this.btnReverseSelection.TabIndex = 13;
@@ -350,7 +135,7 @@
this.btnSelectAll.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnSelectAll.Appearance.Font = new System.Drawing.Font("宋体", 9F);
this.btnSelectAll.Appearance.Options.UseFont = true;
this.btnSelectAll.Location = new System.Drawing.Point(647, -8);
this.btnSelectAll.Location = new System.Drawing.Point(1172, 7);
this.btnSelectAll.Name = "btnSelectAll";
this.btnSelectAll.Size = new System.Drawing.Size(55, 26);
this.btnSelectAll.TabIndex = 12;
@@ -365,7 +150,7 @@
this.dpb_Tools.Appearance.Options.UseFont = true;
this.dpb_Tools.DropDownArrowStyle = DevExpress.XtraEditors.DropDownArrowStyle.Show;
this.dpb_Tools.DropDownControl = this.p_menu;
this.dpb_Tools.Location = new System.Drawing.Point(888, -8);
this.dpb_Tools.Location = new System.Drawing.Point(1413, 7);
this.dpb_Tools.Name = "dpb_Tools";
this.dpb_Tools.Size = new System.Drawing.Size(80, 26);
this.dpb_Tools.TabIndex = 11;
@@ -391,35 +176,35 @@
this.barDockControlTop.CausesValidation = false;
this.barDockControlTop.Dock = System.Windows.Forms.DockStyle.Top;
this.barDockControlTop.Location = new System.Drawing.Point(0, 0);
this.barDockControlTop.Size = new System.Drawing.Size(1051, 0);
this.barDockControlTop.Size = new System.Drawing.Size(1576, 0);
//
// barDockControlBottom
//
this.barDockControlBottom.CausesValidation = false;
this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
this.barDockControlBottom.Location = new System.Drawing.Point(0, 715);
this.barDockControlBottom.Size = new System.Drawing.Size(1051, 0);
this.barDockControlBottom.Location = new System.Drawing.Point(0, 1072);
this.barDockControlBottom.Size = new System.Drawing.Size(1576, 0);
//
// barDockControlLeft
//
this.barDockControlLeft.CausesValidation = false;
this.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left;
this.barDockControlLeft.Location = new System.Drawing.Point(0, 0);
this.barDockControlLeft.Size = new System.Drawing.Size(0, 715);
this.barDockControlLeft.Size = new System.Drawing.Size(0, 1072);
//
// barDockControlRight
//
this.barDockControlRight.CausesValidation = false;
this.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right;
this.barDockControlRight.Location = new System.Drawing.Point(1051, 0);
this.barDockControlRight.Size = new System.Drawing.Size(0, 715);
this.barDockControlRight.Location = new System.Drawing.Point(1576, 0);
this.barDockControlRight.Size = new System.Drawing.Size(0, 1072);
//
// btnOkAudit
//
this.btnOkAudit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnOkAudit.Appearance.Font = new System.Drawing.Font("宋体", 9F);
this.btnOkAudit.Appearance.Options.UseFont = true;
this.btnOkAudit.Location = new System.Drawing.Point(708, -8);
this.btnOkAudit.Location = new System.Drawing.Point(1233, 7);
this.btnOkAudit.Name = "btnOkAudit";
this.btnOkAudit.Size = new System.Drawing.Size(82, 26);
this.btnOkAudit.TabIndex = 7;
@@ -432,7 +217,7 @@
this.btnBackAudit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnBackAudit.Appearance.Font = new System.Drawing.Font("宋体", 9F);
this.btnBackAudit.Appearance.Options.UseFont = true;
this.btnBackAudit.Location = new System.Drawing.Point(796, -8);
this.btnBackAudit.Location = new System.Drawing.Point(1321, 7);
this.btnBackAudit.Name = "btnBackAudit";
this.btnBackAudit.Size = new System.Drawing.Size(86, 26);
this.btnBackAudit.TabIndex = 6;
@@ -445,13 +230,228 @@
this.btnRefresh.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnRefresh.Appearance.Font = new System.Drawing.Font("宋体", 9F);
this.btnRefresh.Appearance.Options.UseFont = true;
this.btnRefresh.Location = new System.Drawing.Point(974, -8);
this.btnRefresh.Location = new System.Drawing.Point(1499, 7);
this.btnRefresh.Name = "btnRefresh";
this.btnRefresh.Size = new System.Drawing.Size(72, 26);
this.btnRefresh.TabIndex = 5;
this.btnRefresh.Text = "刷新(&R)";
this.btnRefresh.Click += new System.EventHandler(this.BtnReflash_Click);
//
// tabpage_finish
//
this.tabpage_finish.Controls.Add(this.gridFinish);
this.tabpage_finish.Controls.Add(this.splitBelow);
this.tabpage_finish.Controls.Add(this.pl_top);
this.tabpage_finish.Name = "tabpage_finish";
this.tabpage_finish.Size = new System.Drawing.Size(1570, 1007);
this.tabpage_finish.Text = "已完成单据";
//
// pl_top
//
this.pl_top.Controls.Add(this.pl_top_searchCond);
this.pl_top.Controls.Add(this.pl_top_right);
this.pl_top.Dock = System.Windows.Forms.DockStyle.Top;
this.pl_top.Location = new System.Drawing.Point(0, 0);
this.pl_top.Name = "pl_top";
this.pl_top.Size = new System.Drawing.Size(1570, 39);
this.pl_top.TabIndex = 25;
//
// pl_top_right
//
this.pl_top_right.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
this.pl_top_right.Controls.Add(this.simpleButton1);
this.pl_top_right.Controls.Add(this.btnBack);
this.pl_top_right.Dock = System.Windows.Forms.DockStyle.Right;
this.pl_top_right.Location = new System.Drawing.Point(1305, 2);
this.pl_top_right.Name = "pl_top_right";
this.pl_top_right.Size = new System.Drawing.Size(263, 35);
this.pl_top_right.TabIndex = 24;
//
// btnBack
//
this.btnBack.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnBack.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btnBack.Appearance.Options.UseFont = true;
this.btnBack.Location = new System.Drawing.Point(100, 5);
this.btnBack.Name = "btnBack";
this.btnBack.Size = new System.Drawing.Size(82, 26);
this.btnBack.TabIndex = 8;
this.btnBack.Text = "返审(&W)";
this.btnBack.Click += new System.EventHandler(this.btnBack_Click);
//
// simpleButton1
//
this.simpleButton1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.simpleButton1.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.simpleButton1.Appearance.Options.UseFont = true;
this.simpleButton1.Location = new System.Drawing.Point(188, 5);
this.simpleButton1.Name = "simpleButton1";
this.simpleButton1.Size = new System.Drawing.Size(72, 26);
this.simpleButton1.TabIndex = 9;
this.simpleButton1.Text = "帮助文档";
this.simpleButton1.Click += new System.EventHandler(this.simpleButton1_Click);
//
// pl_top_searchCond
//
this.pl_top_searchCond.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
this.pl_top_searchCond.Controls.Add(this.labeldate_start);
this.pl_top_searchCond.Controls.Add(this.labelcheck_finalAuditor);
this.pl_top_searchCond.Controls.Add(this.labeltxt_dataFlag);
this.pl_top_searchCond.Controls.Add(this.btnSearch);
this.pl_top_searchCond.Controls.Add(this.labeldate_end);
this.pl_top_searchCond.Dock = System.Windows.Forms.DockStyle.Fill;
this.pl_top_searchCond.Location = new System.Drawing.Point(2, 2);
this.pl_top_searchCond.Name = "pl_top_searchCond";
this.pl_top_searchCond.Size = new System.Drawing.Size(1303, 35);
this.pl_top_searchCond.TabIndex = 23;
//
// labeldate_end
//
this.labeldate_end.BackColor = System.Drawing.Color.Transparent;
this.labeldate_end.BackgroundColor = System.Drawing.Color.Empty;
this.labeldate_end.ContentBold = false;
this.labeldate_end.EditText = null;
this.labeldate_end.FontSize = 0F;
this.labeldate_end.LabelText = "终审时间止";
this.labeldate_end.Location = new System.Drawing.Point(216, 8);
this.labeldate_end.Margin = new System.Windows.Forms.Padding(4);
this.labeldate_end.Model = null;
this.labeldate_end.Name = "labeldate_end";
this.labeldate_end.NullText = null;
this.labeldate_end.ReadOnly = false;
this.labeldate_end.Required = false;
this.labeldate_end.Size = new System.Drawing.Size(196, 21);
this.labeldate_end.TabIndex = 12;
//
// btnSearch
//
this.btnSearch.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btnSearch.Appearance.Options.UseFont = true;
this.btnSearch.Location = new System.Drawing.Point(774, 5);
this.btnSearch.Name = "btnSearch";
this.btnSearch.Size = new System.Drawing.Size(72, 26);
this.btnSearch.TabIndex = 6;
this.btnSearch.Text = "搜索(&Q)";
this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
//
// labeltxt_dataFlag
//
this.labeltxt_dataFlag.BackColor = System.Drawing.Color.Transparent;
this.labeltxt_dataFlag.BackgroundColor = System.Drawing.Color.Empty;
this.labeltxt_dataFlag.ContentBold = false;
this.labeltxt_dataFlag.EditText = "";
this.labeltxt_dataFlag.FontSize = 0F;
this.labeltxt_dataFlag.LabelText = "数据标识号";
this.labeltxt_dataFlag.Location = new System.Drawing.Point(605, 8);
this.labeltxt_dataFlag.Margin = new System.Windows.Forms.Padding(4);
this.labeltxt_dataFlag.Model = null;
this.labeltxt_dataFlag.Name = "labeltxt_dataFlag";
this.labeltxt_dataFlag.NullText = "";
this.labeltxt_dataFlag.ReadOnly = false;
this.labeltxt_dataFlag.Required = false;
this.labeltxt_dataFlag.Size = new System.Drawing.Size(164, 21);
this.labeltxt_dataFlag.TabIndex = 10;
//
// labelcheck_finalAuditor
//
this.labelcheck_finalAuditor.BackColor = System.Drawing.Color.Transparent;
this.labelcheck_finalAuditor.BackgroundColor = System.Drawing.Color.Empty;
this.labelcheck_finalAuditor.ContentBold = false;
this.labelcheck_finalAuditor.EditText = null;
this.labelcheck_finalAuditor.FontSize = 0F;
this.labelcheck_finalAuditor.LabelText = "终审人";
this.labelcheck_finalAuditor.Location = new System.Drawing.Point(419, 8);
this.labelcheck_finalAuditor.Margin = new System.Windows.Forms.Padding(4);
this.labelcheck_finalAuditor.Model = null;
this.labelcheck_finalAuditor.Name = "labelcheck_finalAuditor";
this.labelcheck_finalAuditor.NullText = null;
this.labelcheck_finalAuditor.ReadOnly = false;
this.labelcheck_finalAuditor.Required = false;
this.labelcheck_finalAuditor.Size = new System.Drawing.Size(180, 21);
this.labelcheck_finalAuditor.TabIndex = 13;
//
// labeldate_start
//
this.labeldate_start.BackColor = System.Drawing.Color.Transparent;
this.labeldate_start.BackgroundColor = System.Drawing.Color.Empty;
this.labeldate_start.ContentBold = false;
this.labeldate_start.EditText = null;
this.labeldate_start.FontSize = 0F;
this.labeldate_start.LabelText = "终审时间起";
this.labeldate_start.Location = new System.Drawing.Point(10, 8);
this.labeldate_start.Margin = new System.Windows.Forms.Padding(4);
this.labeldate_start.Model = null;
this.labeldate_start.Name = "labeldate_start";
this.labeldate_start.NullText = null;
this.labeldate_start.ReadOnly = false;
this.labeldate_start.Required = false;
this.labeldate_start.Size = new System.Drawing.Size(196, 21);
this.labeldate_start.TabIndex = 11;
//
// splitBelow
//
this.splitBelow.Dock = System.Windows.Forms.DockStyle.Bottom;
this.splitBelow.Location = new System.Drawing.Point(0, 714);
this.splitBelow.Name = "splitBelow";
this.splitBelow.Panel1.Controls.Add(this.gridFlow);
this.splitBelow.Panel1.Text = "Panel1";
this.splitBelow.Panel2.Controls.Add(this.gridDetail);
this.splitBelow.Panel2.Text = "Panel2";
this.splitBelow.Size = new System.Drawing.Size(1570, 293);
this.splitBelow.SplitterPosition = 453;
this.splitBelow.TabIndex = 28;
this.splitBelow.Text = "splitContainerControl1";
//
// gridDetail
//
this.gridDetail.AdapterObj = null;
this.gridDetail.Dock = System.Windows.Forms.DockStyle.Fill;
this.gridDetail.Location = new System.Drawing.Point(0, 0);
this.gridDetail.Margin = new System.Windows.Forms.Padding(4);
this.gridDetail.Name = "gridDetail";
this.gridDetail.SiftEnumObj = Lskj.Control.GridControlEx.HeaderSiftEnum.Sum;
this.gridDetail.Size = new System.Drawing.Size(1112, 293);
this.gridDetail.SysModel = null;
this.gridDetail.TabIndex = 20;
//
// gridFlow
//
this.gridFlow.AdapterObj = null;
this.gridFlow.Dock = System.Windows.Forms.DockStyle.Fill;
this.gridFlow.Location = new System.Drawing.Point(0, 0);
this.gridFlow.Margin = new System.Windows.Forms.Padding(4);
this.gridFlow.Name = "gridFlow";
this.gridFlow.SiftEnumObj = Lskj.Control.GridControlEx.HeaderSiftEnum.Sum;
this.gridFlow.Size = new System.Drawing.Size(453, 293);
this.gridFlow.SysModel = null;
this.gridFlow.TabIndex = 19;
//
// gridFinish
//
this.gridFinish.AdapterObj = null;
this.gridFinish.AutoSize = true;
this.gridFinish.Dock = System.Windows.Forms.DockStyle.Fill;
this.gridFinish.Location = new System.Drawing.Point(0, 39);
this.gridFinish.Margin = new System.Windows.Forms.Padding(4);
this.gridFinish.Name = "gridFinish";
this.gridFinish.SiftEnumObj = Lskj.Control.GridControlEx.HeaderSiftEnum.Sum;
this.gridFinish.Size = new System.Drawing.Size(1570, 675);
this.gridFinish.SysModel = null;
this.gridFinish.TabIndex = 29;
//
// tabMain
//
this.tabMain.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
this.tabMain.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabMain.HeaderLocation = DevExpress.XtraTab.TabHeaderLocation.Bottom;
this.tabMain.Location = new System.Drawing.Point(0, 0);
this.tabMain.Name = "tabMain";
this.tabMain.SelectedTabPage = this.tabpage_finish;
this.tabMain.Size = new System.Drawing.Size(1576, 1036);
this.tabMain.TabIndex = 20;
this.tabMain.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabpage_finish});
//
// AuditPanelEx
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -463,30 +463,29 @@
this.Controls.Add(this.barDockControlTop);
this.Name = "AuditPanelEx";
this.Size = new System.Drawing.Size(1576, 1072);
((System.ComponentModel.ISupportInitialize)(this.tabMain)).EndInit();
this.tabMain.ResumeLayout(false);
this.tabpage_finish.ResumeLayout(false);
this.tabpage_finish.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.splitBelow)).EndInit();
this.splitBelow.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pl_top)).EndInit();
this.pl_top.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pl_top_searchCond)).EndInit();
this.pl_top_searchCond.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pl_top_right)).EndInit();
this.pl_top_right.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pl_bottom)).EndInit();
this.pl_bottom.ResumeLayout(false);
this.pl_bottom.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.p_menu)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
this.tabpage_finish.ResumeLayout(false);
this.tabpage_finish.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.pl_top)).EndInit();
this.pl_top.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pl_top_right)).EndInit();
this.pl_top_right.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pl_top_searchCond)).EndInit();
this.pl_top_searchCond.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitBelow)).EndInit();
this.splitBelow.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.tabMain)).EndInit();
this.tabMain.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private DevExpress.XtraTab.XtraTabControl tabMain;
private DevExpress.XtraEditors.LabelControl label_date;
private DevExpress.XtraEditors.LabelControl label_tips;
private DevExpress.XtraEditors.PanelControl pl_bottom;
@@ -502,7 +501,12 @@
private DevExpress.XtraBars.BarDockControl barDockControlRight;
private DevExpress.XtraEditors.SimpleButton btnSelectAll;
private DevExpress.XtraEditors.SimpleButton btnReverseSelection;
private DevExpress.XtraTab.XtraTabControl tabMain;
private DevExpress.XtraTab.XtraTabPage tabpage_finish;
private GridControlEx gridFinish;
private DevExpress.XtraEditors.SplitContainerControl splitBelow;
private GridControlEx gridFlow;
private GridControlEx gridDetail;
private DevExpress.XtraEditors.PanelControl pl_top;
private DevExpress.XtraEditors.PanelControl pl_top_searchCond;
private LabelCheckDateEdit labeldate_start;
@@ -513,9 +517,5 @@
private DevExpress.XtraEditors.PanelControl pl_top_right;
private DevExpress.XtraEditors.SimpleButton simpleButton1;
private DevExpress.XtraEditors.SimpleButton btnBack;
private DevExpress.XtraEditors.SplitContainerControl splitBelow;
private GridControlEx gridFlow;
private GridControlEx gridFinish;
private GridControlEx gridDetail;
}
}
插件库/Lskj.Control/CefBrowserLifetimeCoordinator.cs
+11
View File
@@ -15,6 +15,8 @@ namespace Lskj.Control
/// </summary>
internal sealed class CefBrowserLifetimeCoordinator
{
// CEF 生命周期诊断默认关闭，避免正常创建和销毁浏览器时持续写入日志。
internal static readonly bool LifecycleTracingEnabled = false;
private static readonly CefBrowserSettings _sharedBrowserSettings =
new CefBrowserSettings();
private readonly object _hostWindowSyncRoot = new object();
@@ -623,6 +625,9 @@ namespace Lskj.Control
private void TraceOwnerAction(string action)
{
if (!LifecycleTracingEnabled)
return;
string stack = Environment.StackTrace
.Replace("\r", string.Empty)
.Replace("\n", " | ");
@@ -637,6 +642,9 @@ namespace Lskj.Control
CefBrowser browser,
CefBrowser currentBrowser)
{
if (!LifecycleTracingEnabled)
return;
try
{
LogHelper.Instance.WriteLog(
@@ -1079,6 +1087,9 @@ namespace Lskj.Control
bool closed,
int timeoutMilliseconds)
{
if (!CefBrowserLifetimeCoordinator.LifecycleTracingEnabled)
return;
try
{
int remaining;
插件库/Lskj.Control/GridControlEx.cs
+2
View File
@@ -4285,6 +4285,8 @@ namespace Lskj.Control
memoEdit.ShowIcon = false;
if (!gridColumn.OptionsColumn.AllowEdit)
{
// AllowEdit 需要保持为 true 才能打开备注弹窗，ReadOnly 保存真实的禁编状态。
gridColumn.OptionsColumn.ReadOnly = true;
gridColumn.OptionsColumn.AllowEdit = true;
//设置只读
memoEdit.ReadOnly = true;
插件库/Lskj.Control/Model/ControlType.cs
+1 -1
View File
@@ -161,7 +161,7 @@ namespace Lskj.Control.Model
/// </summary>
public const int LabComboxCheckListText = 19;
/// <summary>
/// Memo控件
/// Memo控件 （备注框A）
/// </summary>
public const int LabMemoEdit = 20;
/// <summary>
插件库/Lskj.Control/ModuleGridDetailEx.cs
+8 -1
View File
@@ -314,11 +314,18 @@ namespace Lskj.Control
return;
}
mDetailPageCachesPrepared = true;
Task<DynamicModel> dynamicModelTask =
cachesDic.GetTask<DynamicModel>(this, "DynamicModel");
Task<List<GridDetailModel>> detailsTask =
cachesDic.GetTask<List<GridDetailModel>>(this, "Details");
// 未启用预加载缓存时，InitializePages 会按原有同步方式创建明细页签。
if (dynamicModelTask == null || detailsTask == null)
{
return;
}
mDetailPageCachesPrepared = true;
cachesDic.AddTask(tcButtom, "DynamicModel", dynamicModelTask);
cachesDic.AddTask(tcButtom, "Details", detailsTask);
this.tcButtom.GetDataCaches(cachesDic);
插件库/Lskj.Control/ModuleGridEx.cs
+16 -22
View File
@@ -5291,28 +5291,6 @@ namespace Lskj.Control
if (!gridView.FocusedColumn.FieldName.Equals("RightMenuBtnEdit"))//操作列可点击
{
e.Cancel = !btnSave.Enabled;
//如果是备注框，显示编辑框，但不能修改(编辑框弹出和取消编辑冲突，只能改变只读状态后，开始编辑)
if (gridColumnModel != null && gridColumnModel.FieldType == ControlType.LabMemoEdit)
{
RepositoryItemMemoExEdit memoEdit = gridColumn.ColumnEdit as RepositoryItemMemoExEdit;
if (e.Cancel)
{
//设置只读
memoEdit.ReadOnly = true;
//只读状态允许下拉列表
memoEdit.AllowDropDownWhenReadOnly = DevExpress.Utils.DefaultBoolean.True;
//允许编辑（编辑框弹出）
e.Cancel = false;
}
else
{
if (gridColumn.OptionsColumn.AllowEdit && memoEdit.ReadOnly)
{
memoEdit.ReadOnly = false;
}
}
}
}
if (!string.IsNullOrEmpty(this.SysModel.RowAllowEditCond) && focusedRow != null)
{
@@ -5324,6 +5302,22 @@ namespace Lskj.Control
//e.Cancel = !ReplaceHelper.EvalCond(ReplaceHelper.ReplaceRowParam(focusedRow, gridColumnModel.DisableCond));
e.Cancel = !ValidateCond(gridColumnModel.DisableCond, focusedRow);
}
// 备注框在禁编状态下仍允许打开弹窗查看内容，但不能修改。
if (gridColumnModel != null && gridColumnModel.FieldType == ControlType.LabMemoEdit)
{
RepositoryItemMemoExEdit memoEdit = gridColumn.ColumnEdit as RepositoryItemMemoExEdit;
if (memoEdit != null)
{
bool readOnly = !btnSave.Enabled || e.Cancel || gridColumn.OptionsColumn.ReadOnly;
memoEdit.ReadOnly = readOnly;
if (readOnly)
{
memoEdit.AllowDropDownWhenReadOnly = DevExpress.Utils.DefaultBoolean.True;
e.Cancel = false;
}
}
}
}
catch (Exception ex)
{