From 6c0f72cb62ba5c49c6517f62328feb0aa1d8670d Mon Sep 17 00:00:00 2001 From: cyf Date: Thu, 20 Nov 2025 08:55:52 +0000 Subject: [PATCH] SVN r1046 SVN-Revision: r1046 --- .../Control/StepPage2.Designer.cs | 447 +++++++++--------- 插件库/Lskj.BaseWorkflow/Control/StepPage2.cs | 36 +- 2 files changed, 227 insertions(+), 256 deletions(-) diff --git a/插件库/Lskj.BaseWorkflow/Control/StepPage2.Designer.cs b/插件库/Lskj.BaseWorkflow/Control/StepPage2.Designer.cs index 8e45127..80133e6 100644 --- a/插件库/Lskj.BaseWorkflow/Control/StepPage2.Designer.cs +++ b/插件库/Lskj.BaseWorkflow/Control/StepPage2.Designer.cs @@ -33,54 +33,55 @@ this.panelControl3 = new DevExpress.XtraEditors.PanelControl(); this.PlStep2Container = new System.Windows.Forms.Panel(); this.panelControl1 = new DevExpress.XtraEditors.PanelControl(); + this.panelControl5 = new DevExpress.XtraEditors.PanelControl(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.txtEdit = new DevExpress.XtraEditors.MemoEdit(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.ltestepGroup = new Lskj.Control.LabelTextEdit(); this.panelControl4 = new DevExpress.XtraEditors.PanelControl(); this.groupBox3 = new System.Windows.Forms.GroupBox(); - this.panelControl6 = new DevExpress.XtraEditors.PanelControl(); - this.labelComboxEdit1 = new Lskj.Control.LabelComboxEdit(); - this.labelTextEdit1 = new Lskj.Control.LabelTextEdit(); this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl(); - this.xtraTabPage4 = new DevExpress.XtraTab.XtraTabPage(); - this.gridControl = new DevExpress.XtraGrid.GridControl(); - this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); - this.gridView = new DevExpress.XtraGrid.Views.Grid.GridView(); - this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage(); this.gridControl1 = new DevExpress.XtraGrid.GridControl(); this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView(); - this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.panelControl5 = new DevExpress.XtraEditors.PanelControl(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.ltestepGroup = new Lskj.Control.LabelTextEdit(); - this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.txtEdit = new DevExpress.XtraEditors.MemoEdit(); + this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.xtraTabPage4 = new DevExpress.XtraTab.XtraTabPage(); + this.gridControl = new DevExpress.XtraGrid.GridControl(); + this.gridView = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.panelControl6 = new DevExpress.XtraEditors.PanelControl(); + this.labelTextEdit1 = new Lskj.Control.LabelTextEdit(); + this.labelComboxEdit1 = new Lskj.Control.LabelComboxEdit(); this.xtraScrollableControl1 = new DevExpress.XtraEditors.XtraScrollableControl(); + this.labdisable = new Lskj.Control.LabelCheckEdit(); ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.panelControl3)).BeginInit(); this.panelControl3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit(); this.panelControl1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.panelControl5)).BeginInit(); + this.panelControl5.SuspendLayout(); + this.groupBox2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.txtEdit.Properties)).BeginInit(); + this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.panelControl4)).BeginInit(); this.panelControl4.SuspendLayout(); this.groupBox3.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.panelControl6)).BeginInit(); - this.panelControl6.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit(); this.xtraTabControl2.SuspendLayout(); - this.xtraTabPage4.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.gridControl)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.gridView)).BeginInit(); this.xtraTabPage3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gridControl1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.panelControl5)).BeginInit(); - this.panelControl5.SuspendLayout(); - this.groupBox1.SuspendLayout(); - this.groupBox2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.txtEdit.Properties)).BeginInit(); + this.xtraTabPage4.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.gridControl)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gridView)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.panelControl6)).BeginInit(); + this.panelControl6.SuspendLayout(); this.xtraScrollableControl1.SuspendLayout(); this.SuspendLayout(); // @@ -144,6 +145,66 @@ this.panelControl1.Size = new System.Drawing.Size(845, 555); this.panelControl1.TabIndex = 9; // + // panelControl5 + // + this.panelControl5.Appearance.BackColor = System.Drawing.Color.White; + this.panelControl5.Appearance.Options.UseBackColor = true; + this.panelControl5.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder; + this.panelControl5.Controls.Add(this.groupBox2); + this.panelControl5.Controls.Add(this.groupBox1); + this.panelControl5.Dock = System.Windows.Forms.DockStyle.Fill; + this.panelControl5.Location = new System.Drawing.Point(1, 1); + this.panelControl5.Name = "panelControl5"; + this.panelControl5.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); + this.panelControl5.Size = new System.Drawing.Size(659, 553); + this.panelControl5.TabIndex = 9; + // + // groupBox2 + // + this.groupBox2.Controls.Add(this.txtEdit); + this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill; + this.groupBox2.Location = new System.Drawing.Point(5, 59); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(654, 494); + this.groupBox2.TabIndex = 7; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "方案权限设置(双击或拖拽操作员即可)"; + // + // txtEdit + // + this.txtEdit.Dock = System.Windows.Forms.DockStyle.Fill; + this.txtEdit.Location = new System.Drawing.Point(3, 18); + this.txtEdit.Name = "txtEdit"; + this.txtEdit.Size = new System.Drawing.Size(648, 473); + this.txtEdit.TabIndex = 1; + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.labdisable); + this.groupBox1.Controls.Add(this.ltestepGroup); + this.groupBox1.Dock = System.Windows.Forms.DockStyle.Top; + this.groupBox1.Location = new System.Drawing.Point(5, 0); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(654, 59); + this.groupBox1.TabIndex = 6; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "基本设置"; + // + // ltestepGroup + // + this.ltestepGroup.BackColor = System.Drawing.Color.Transparent; + this.ltestepGroup.EditText = ""; + this.ltestepGroup.FontSize = 0F; + this.ltestepGroup.LabelText = "方案名称"; + this.ltestepGroup.Location = new System.Drawing.Point(12, 22); + this.ltestepGroup.Model = null; + this.ltestepGroup.Name = "ltestepGroup"; + this.ltestepGroup.NullText = ""; + this.ltestepGroup.ReadOnly = false; + this.ltestepGroup.Required = true; + this.ltestepGroup.Size = new System.Drawing.Size(180, 21); + this.ltestepGroup.TabIndex = 1; + // // panelControl4 // this.panelControl4.Appearance.BackColor = System.Drawing.Color.White; @@ -169,49 +230,6 @@ this.groupBox3.TabStop = false; this.groupBox3.Text = "待选操作员"; // - // panelControl6 - // - this.panelControl6.Appearance.BackColor = System.Drawing.Color.White; - this.panelControl6.Appearance.Options.UseBackColor = true; - this.panelControl6.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder; - this.panelControl6.Controls.Add(this.labelTextEdit1); - this.panelControl6.Controls.Add(this.labelComboxEdit1); - this.panelControl6.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panelControl6.Location = new System.Drawing.Point(3, 486); - this.panelControl6.Name = "panelControl6"; - this.panelControl6.Size = new System.Drawing.Size(173, 64); - this.panelControl6.TabIndex = 8; - // - // labelComboxEdit1 - // - this.labelComboxEdit1.BackColor = System.Drawing.Color.Transparent; - this.labelComboxEdit1.EditText = ""; - this.labelComboxEdit1.FontSize = 0F; - this.labelComboxEdit1.LabelText = "部门"; - this.labelComboxEdit1.Location = new System.Drawing.Point(3, 35); - this.labelComboxEdit1.Model = null; - this.labelComboxEdit1.Name = "labelComboxEdit1"; - this.labelComboxEdit1.NullText = ""; - this.labelComboxEdit1.ReadOnly = false; - this.labelComboxEdit1.Required = false; - this.labelComboxEdit1.Size = new System.Drawing.Size(164, 21); - this.labelComboxEdit1.TabIndex = 0; - // - // labelTextEdit1 - // - this.labelTextEdit1.BackColor = System.Drawing.Color.Transparent; - this.labelTextEdit1.EditText = ""; - this.labelTextEdit1.FontSize = 0F; - this.labelTextEdit1.LabelText = "模糊"; - this.labelTextEdit1.Location = new System.Drawing.Point(3, 8); - this.labelTextEdit1.Model = null; - this.labelTextEdit1.Name = "labelTextEdit1"; - this.labelTextEdit1.NullText = ""; - this.labelTextEdit1.ReadOnly = false; - this.labelTextEdit1.Required = false; - this.labelTextEdit1.Size = new System.Drawing.Size(164, 21); - this.labelTextEdit1.TabIndex = 1; - // // xtraTabControl2 // this.xtraTabControl2.Dock = System.Windows.Forms.DockStyle.Fill; @@ -224,78 +242,6 @@ this.xtraTabPage3, this.xtraTabPage4}); // - // xtraTabPage4 - // - this.xtraTabPage4.Controls.Add(this.gridControl); - this.xtraTabPage4.Name = "xtraTabPage4"; - this.xtraTabPage4.Size = new System.Drawing.Size(167, 439); - this.xtraTabPage4.Text = "人员名称"; - // - // gridControl - // - this.gridControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.gridControl.Location = new System.Drawing.Point(0, 0); - this.gridControl.MainView = this.gridView; - this.gridControl.Name = "gridControl"; - this.gridControl.Size = new System.Drawing.Size(167, 439); - this.gridControl.TabIndex = 3; - this.gridControl.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { - this.gridView, - this.gridView1}); - // - // gridView1 - // - this.gridView1.GridControl = this.gridControl; - this.gridView1.Name = "gridView1"; - // - // gridView - // - this.gridView.Appearance.HeaderPanel.Font = new System.Drawing.Font("宋体", 9F); - this.gridView.Appearance.HeaderPanel.Options.UseFont = true; - this.gridView.Appearance.HeaderPanel.Options.UseTextOptions = true; - this.gridView.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; - this.gridView.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; - this.gridView.Appearance.Preview.Font = new System.Drawing.Font("宋体", 9F); - this.gridView.Appearance.Preview.Options.UseFont = true; - this.gridView.Appearance.Row.Font = new System.Drawing.Font("宋体", 9F); - this.gridView.Appearance.Row.Options.UseBackColor = true; - this.gridView.Appearance.Row.Options.UseFont = true; - this.gridView.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.Flat; - this.gridView.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { - this.gridColumn2, - this.gridColumn1}); - this.gridView.GridControl = this.gridControl; - this.gridView.IndicatorWidth = 30; - this.gridView.Name = "gridView"; - this.gridView.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True; - this.gridView.OptionsBehavior.Editable = false; - this.gridView.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.False; - this.gridView.OptionsFilter.ShowAllTableValuesInCheckedFilterPopup = false; - this.gridView.OptionsSelection.MultiSelect = true; - this.gridView.OptionsView.AllowHtmlDrawHeaders = true; - this.gridView.OptionsView.ColumnHeaderAutoHeight = DevExpress.Utils.DefaultBoolean.True; - this.gridView.OptionsView.RowAutoHeight = true; - this.gridView.OptionsView.ShowGroupPanel = false; - this.gridView.PaintStyleName = "Skin"; - // - // gridColumn2 - // - this.gridColumn2.Caption = "工号"; - this.gridColumn2.FieldName = "loginaccount"; - this.gridColumn2.Name = "gridColumn2"; - this.gridColumn2.Visible = true; - this.gridColumn2.VisibleIndex = 0; - this.gridColumn2.Width = 60; - // - // gridColumn1 - // - this.gridColumn1.Caption = "姓名"; - this.gridColumn1.FieldName = "employeename"; - this.gridColumn1.Name = "gridColumn1"; - this.gridColumn1.Visible = true; - this.gridColumn1.VisibleIndex = 1; - this.gridColumn1.Width = 70; - // // xtraTabPage3 // this.xtraTabPage3.Controls.Add(this.gridControl1); @@ -344,11 +290,6 @@ this.gridView2.OptionsView.ShowGroupPanel = false; this.gridView2.PaintStyleName = "Skin"; // - // gridView3 - // - this.gridView3.GridControl = this.gridControl1; - this.gridView3.Name = "gridView3"; - // // gridColumn3 // this.gridColumn3.Caption = "角色"; @@ -358,64 +299,125 @@ this.gridColumn3.VisibleIndex = 0; this.gridColumn3.Width = 60; // - // panelControl5 + // gridView3 // - this.panelControl5.Appearance.BackColor = System.Drawing.Color.White; - this.panelControl5.Appearance.Options.UseBackColor = true; - this.panelControl5.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder; - this.panelControl5.Controls.Add(this.groupBox2); - this.panelControl5.Controls.Add(this.groupBox1); - this.panelControl5.Dock = System.Windows.Forms.DockStyle.Fill; - this.panelControl5.Location = new System.Drawing.Point(1, 1); - this.panelControl5.Name = "panelControl5"; - this.panelControl5.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); - this.panelControl5.Size = new System.Drawing.Size(659, 553); - this.panelControl5.TabIndex = 9; + this.gridView3.GridControl = this.gridControl1; + this.gridView3.Name = "gridView3"; // - // groupBox1 + // xtraTabPage4 // - this.groupBox1.Controls.Add(this.ltestepGroup); - this.groupBox1.Dock = System.Windows.Forms.DockStyle.Top; - this.groupBox1.Location = new System.Drawing.Point(5, 0); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(654, 59); - this.groupBox1.TabIndex = 6; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "基本设置"; + this.xtraTabPage4.Controls.Add(this.gridControl); + this.xtraTabPage4.Name = "xtraTabPage4"; + this.xtraTabPage4.Size = new System.Drawing.Size(167, 439); + this.xtraTabPage4.Text = "人员名称"; // - // ltestepGroup + // gridControl // - this.ltestepGroup.BackColor = System.Drawing.Color.Transparent; - this.ltestepGroup.EditText = ""; - this.ltestepGroup.FontSize = 0F; - this.ltestepGroup.LabelText = "方案名称"; - this.ltestepGroup.Location = new System.Drawing.Point(12, 22); - this.ltestepGroup.Model = null; - this.ltestepGroup.Name = "ltestepGroup"; - this.ltestepGroup.NullText = ""; - this.ltestepGroup.ReadOnly = false; - this.ltestepGroup.Required = true; - this.ltestepGroup.Size = new System.Drawing.Size(180, 21); - this.ltestepGroup.TabIndex = 1; + this.gridControl.Dock = System.Windows.Forms.DockStyle.Fill; + this.gridControl.Location = new System.Drawing.Point(0, 0); + this.gridControl.MainView = this.gridView; + this.gridControl.Name = "gridControl"; + this.gridControl.Size = new System.Drawing.Size(167, 439); + this.gridControl.TabIndex = 3; + this.gridControl.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { + this.gridView, + this.gridView1}); // - // groupBox2 + // gridView // - this.groupBox2.Controls.Add(this.txtEdit); - this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupBox2.Location = new System.Drawing.Point(5, 59); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(654, 494); - this.groupBox2.TabIndex = 7; - this.groupBox2.TabStop = false; - this.groupBox2.Text = "方案权限设置(双击或拖拽操作员即可)"; + this.gridView.Appearance.HeaderPanel.Font = new System.Drawing.Font("宋体", 9F); + this.gridView.Appearance.HeaderPanel.Options.UseFont = true; + this.gridView.Appearance.HeaderPanel.Options.UseTextOptions = true; + this.gridView.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; + this.gridView.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; + this.gridView.Appearance.Preview.Font = new System.Drawing.Font("宋体", 9F); + this.gridView.Appearance.Preview.Options.UseFont = true; + this.gridView.Appearance.Row.Font = new System.Drawing.Font("宋体", 9F); + this.gridView.Appearance.Row.Options.UseBackColor = true; + this.gridView.Appearance.Row.Options.UseFont = true; + this.gridView.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.Flat; + this.gridView.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.gridColumn2, + this.gridColumn1}); + this.gridView.GridControl = this.gridControl; + this.gridView.IndicatorWidth = 30; + this.gridView.Name = "gridView"; + this.gridView.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True; + this.gridView.OptionsBehavior.Editable = false; + this.gridView.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.False; + this.gridView.OptionsFilter.ShowAllTableValuesInCheckedFilterPopup = false; + this.gridView.OptionsSelection.MultiSelect = true; + this.gridView.OptionsView.AllowHtmlDrawHeaders = true; + this.gridView.OptionsView.ColumnHeaderAutoHeight = DevExpress.Utils.DefaultBoolean.True; + this.gridView.OptionsView.RowAutoHeight = true; + this.gridView.OptionsView.ShowGroupPanel = false; + this.gridView.PaintStyleName = "Skin"; // - // txtEdit + // gridColumn2 // - this.txtEdit.Dock = System.Windows.Forms.DockStyle.Fill; - this.txtEdit.Location = new System.Drawing.Point(3, 18); - this.txtEdit.Name = "txtEdit"; - this.txtEdit.Size = new System.Drawing.Size(648, 473); - this.txtEdit.TabIndex = 1; + this.gridColumn2.Caption = "工号"; + this.gridColumn2.FieldName = "loginaccount"; + this.gridColumn2.Name = "gridColumn2"; + this.gridColumn2.Visible = true; + this.gridColumn2.VisibleIndex = 0; + this.gridColumn2.Width = 60; + // + // gridColumn1 + // + this.gridColumn1.Caption = "姓名"; + this.gridColumn1.FieldName = "employeename"; + this.gridColumn1.Name = "gridColumn1"; + this.gridColumn1.Visible = true; + this.gridColumn1.VisibleIndex = 1; + this.gridColumn1.Width = 70; + // + // gridView1 + // + this.gridView1.GridControl = this.gridControl; + this.gridView1.Name = "gridView1"; + // + // panelControl6 + // + this.panelControl6.Appearance.BackColor = System.Drawing.Color.White; + this.panelControl6.Appearance.Options.UseBackColor = true; + this.panelControl6.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder; + this.panelControl6.Controls.Add(this.labelTextEdit1); + this.panelControl6.Controls.Add(this.labelComboxEdit1); + this.panelControl6.Dock = System.Windows.Forms.DockStyle.Bottom; + this.panelControl6.Location = new System.Drawing.Point(3, 486); + this.panelControl6.Name = "panelControl6"; + this.panelControl6.Size = new System.Drawing.Size(173, 64); + this.panelControl6.TabIndex = 8; + // + // labelTextEdit1 + // + this.labelTextEdit1.BackColor = System.Drawing.Color.Transparent; + this.labelTextEdit1.EditText = ""; + this.labelTextEdit1.FontSize = 0F; + this.labelTextEdit1.LabelText = "模糊"; + this.labelTextEdit1.Location = new System.Drawing.Point(3, 8); + this.labelTextEdit1.Model = null; + this.labelTextEdit1.Name = "labelTextEdit1"; + this.labelTextEdit1.NullText = ""; + this.labelTextEdit1.ReadOnly = false; + this.labelTextEdit1.Required = false; + this.labelTextEdit1.Size = new System.Drawing.Size(164, 21); + this.labelTextEdit1.TabIndex = 1; + // + // labelComboxEdit1 + // + this.labelComboxEdit1.BackColor = System.Drawing.Color.Transparent; + this.labelComboxEdit1.EditText = ""; + this.labelComboxEdit1.FontSize = 0F; + this.labelComboxEdit1.LabelText = "部门"; + this.labelComboxEdit1.Location = new System.Drawing.Point(3, 35); + this.labelComboxEdit1.Model = null; + this.labelComboxEdit1.Name = "labelComboxEdit1"; + this.labelComboxEdit1.NullText = ""; + this.labelComboxEdit1.ReadOnly = false; + this.labelComboxEdit1.Required = false; + this.labelComboxEdit1.Size = new System.Drawing.Size(164, 21); + this.labelComboxEdit1.TabIndex = 0; // // xtraScrollableControl1 // @@ -431,6 +433,21 @@ this.xtraScrollableControl1.Size = new System.Drawing.Size(988, 570); this.xtraScrollableControl1.TabIndex = 5; // + // labdisable + // + this.labdisable.BackColor = System.Drawing.Color.Transparent; + this.labdisable.EditText = "0"; + this.labdisable.FontSize = 0F; + this.labdisable.LabelText = "禁用"; + this.labdisable.Location = new System.Drawing.Point(198, 22); + this.labdisable.Model = null; + this.labdisable.Name = "labdisable"; + this.labdisable.NullText = null; + this.labdisable.ReadOnly = false; + this.labdisable.Required = false; + this.labdisable.Size = new System.Drawing.Size(53, 21); + this.labdisable.TabIndex = 12; + // // StepPage2 // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -443,26 +460,26 @@ this.panelControl3.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit(); this.panelControl1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.panelControl5)).EndInit(); + this.panelControl5.ResumeLayout(false); + this.groupBox2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.txtEdit.Properties)).EndInit(); + this.groupBox1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.panelControl4)).EndInit(); this.panelControl4.ResumeLayout(false); this.groupBox3.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.panelControl6)).EndInit(); - this.panelControl6.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit(); this.xtraTabControl2.ResumeLayout(false); - this.xtraTabPage4.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.gridControl)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.gridView)).EndInit(); this.xtraTabPage3.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gridControl1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.panelControl5)).EndInit(); - this.panelControl5.ResumeLayout(false); - this.groupBox1.ResumeLayout(false); - this.groupBox2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.txtEdit.Properties)).EndInit(); + this.xtraTabPage4.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.gridControl)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gridView)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.panelControl6)).EndInit(); + this.panelControl6.ResumeLayout(false); this.xtraScrollableControl1.ResumeLayout(false); this.ResumeLayout(false); @@ -483,20 +500,4 @@ private DevExpress.XtraEditors.PanelControl panelControl4; private System.Windows.Forms.GroupBox groupBox3; private DevExpress.XtraTab.XtraTabControl xtraTabControl2; - private DevExpress.XtraTab.XtraTabPage xtraTabPage3; - public DevExpress.XtraGrid.GridControl gridControl1; - private DevExpress.XtraGrid.Views.Grid.GridView gridView2; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; - private DevExpress.XtraGrid.Views.Grid.GridView gridView3; - private DevExpress.XtraTab.XtraTabPage xtraTabPage4; - public DevExpress.XtraGrid.GridControl gridControl; - private DevExpress.XtraGrid.Views.Grid.GridView gridView; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; - private DevExpress.XtraGrid.Views.Grid.GridView gridView1; - private DevExpress.XtraEditors.PanelControl panelControl6; - private Lskj.Control.LabelTextEdit labelTextEdit1; - private Lskj.Control.LabelComboxEdit labelComboxEdit1; - private DevExpress.XtraEditors.XtraScrollableControl xtraScrollableControl1; - } -} + private DevExpress.XtraTab.XtraTabPage \ No newline at end of file diff --git a/插件库/Lskj.BaseWorkflow/Control/StepPage2.cs b/插件库/Lskj.BaseWorkflow/Control/StepPage2.cs index c178f72..01a87c5 100644 --- a/插件库/Lskj.BaseWorkflow/Control/StepPage2.cs +++ b/插件库/Lskj.BaseWorkflow/Control/StepPage2.cs @@ -116,7 +116,7 @@ namespace Lskj.BaseWorkflow.Control BaseflowTypeModel model = this.SelectBaseflowTypeModel; model.billTypeName = this.ltestepGroup.EditText; model.operUser = this.txtEdit.EditValue + ""; - + model.billflowban = int.Parse(this.labdisable.EditText); //string personnel = this.txtEdit.EditValue + ""; //personnel = PowerImpl.getAllPersonnel(personnel); //model.operUser = personnel; @@ -223,6 +223,7 @@ namespace Lskj.BaseWorkflow.Control this.ltestepGroup.EditText = model.billTypeName; this.txtEdit.EditValue = model.operUser; this.SelectBaseflowTypeModel = model; + this.labdisable.EditText = model.billflowban + ""; } } /// @@ -409,35 +410,4 @@ namespace Lskj.BaseWorkflow.Control } else if (e.SourceGridViewObj.Name == "gridView2") { - foreach (DataRow item in e.GridViewSelectRows) - { - userNames += "{&" + item["roleName"] + "&},"; - } - - //userNames = PowerImpl.getAllPersonnel(userNames); - //if (userNames.Equals(",")) userNames = ""; - } - - - //List namesList = new List((this.txtEdit.EditValue + "").Split(',')); - //foreach (string item in userNames.Split(',')) - //{ - // if (!namesList.Exists(t => t.Equals(item))) - // { - // this.txtEdit.EditValue += item + ","; - // } - - //} - - - this.txtEdit.EditValue += userNames; - } - catch (Exception ex) - { - LogHelper.Instance.WriteError(ex); - MessageUtil.Show(ResourceKeys.OperFault); - } - } - #endregion - } -} \ No newline at end of file + f \ No newline at end of file