提交当前本机整理版本

This commit is contained in:
cyf
2026-07-02 10:11:39 +00:00
parent c10a5d64c7
commit aacefa24f8
822 changed files with 196665 additions and 14263 deletions
@@ -401,4 +401,25 @@ namespace Lskj.PubUserTomodule.AuditPermissionControls
private DevExpress.XtraEditors.SimpleButton btnAdd;
private DevExpress.XtraEditors.SimpleButton btnSave;
private DevExpress.XtraEditors.PanelControl panelControl3;
private System.Windows.Forms.Panel panel
private System.Windows.Forms.Panel panel2;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Panel plzsht;
private System.Windows.Forms.Panel plxllzsz;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Panel plxlsz;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Panel pllzbzsz;
private System.Windows.Forms.Panel PlAdd;
private DevExpress.XtraEditors.PanelControl panelControl5;
public DevExpress.XtraEditors.PanelControl panelControl1;
private StepPage4 stepPage41;
private StepPage3 stepPage31;
private StepPage2 stepPage21;
private StepPage1 stepPage11;
private DevExpress.XtraEditors.SimpleButton but_delete;
private DevExpress.XtraEditors.SimpleButton but_increase;
private DevExpress.XtraEditors.SimpleButton btnInsert;
}
}
@@ -631,4 +631,51 @@ namespace Lskj.PubUserTomodule.AuditPermissionControls
if (this.stepPage41.Sp4XtraTabControl.SelectedTabPage.Name == "xtraTabPage1")//进行tabpage位置判断
{
this.but_increase.Enabled = false;
this.but_delete.Enabled = false
this.but_delete.Enabled = false;
}
if (this.stepPage41.Sp4XtraTabControl.SelectedTabPage.Name == "xtraTabPage2")
{
this.but_increase.Enabled = true;
this.but_delete.Enabled = true;
}
}
private void onBut_increase(object sender, EventArgs e)
{
this.stepPage41.onBut_increase();
}
private void onBut_delete(object sender, EventArgs e)
{
this.stepPage41.onBut_delete();
}
#endregion
}
public enum StepEnum
{
/// <summary>
/// 流转步骤界面
/// </summary>
StepPage1,
/// <summary>
/// 小类设置界面
/// </summary>
StepPage2,
/// <summary>
/// 小类流转步骤界面设置
/// </summary>
StepPage3,
/// <summary>
/// 终审回退权限设置
/// </summary>
StepPage4
}
}
@@ -1217,4 +1217,38 @@ namespace Lskj.PubUserTomodule.AuditPermissionControls
.DefaultIfEmpty() // 避免空集合时抛出异常
.Max();
Code = (int)(maxStepCode + (selectedStepCode - max
Code = (int)(maxStepCode + (selectedStepCode - maxStepCode) / 2);
}
BillflowModel model = new BillflowModel
{
stepCode = Convert.ToInt32(Code),
typeCode = mMenuCode,
stepGroup = stepGroup,
stepName = stepName,
stepApplyText = "审核(&Y)",
stepApplyContent = "同意",
stepBackText = "反退(&N)",
stepBackContent = "不同意"
};
try
{
// 保存
if (WorkFlowBillImpl.SaveBillFlow(model))
{
// 重排列表
InitializeStepFlow();
}
}
catch (Exception ex)
{
throw;
//MessageUtil.Show("保存失败!" + ex.Message);
}
}
}
}
}
@@ -487,4 +487,21 @@ namespace Lskj.PubUserTomodule.AuditPermissionControls
private DevExpress.XtraTab.XtraTabControl xtraTabControl2;
private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
public DevExpress.XtraGrid.GridControl gridControl1;
private Dev
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 Control.LabelTextEdit labelTextEdit1;
private Control.LabelComboxEdit labelComboxEdit1;
private DevExpress.XtraEditors.PanelControl panelControl3;
private System.Windows.Forms.Panel PlStep2Container;
private DevExpress.XtraEditors.PanelControl panelControl2;
private Control.LabelCheckEdit labdisable;
}
}
@@ -588,4 +588,36 @@ namespace Lskj.PubUserTomodule.AuditPermissionControls
{
foreach (DataRow item in e.GridViewSelectRows)
{
userNames += "{&" + item["roleName"] +
userNames += "{&" + item["roleName"] + "&},";
}
//userNames = PowerImpl.getAllPersonnel(userNames);
//if (userNames.Equals(",")) userNames = "";
}
//List<System.String> namesList = new List<System.String>((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)
{
string Message = ErrorMessage.PromptErrorMessage(ex);
MessageUtil.Show(Message, ex.Message);
LogHelper.Instance.WriteError(ex);
//MessageUtil.Show(ResourceKeys.OperFault);
}
}
#endregion
}
}
@@ -1366,4 +1366,32 @@ namespace Lskj.PubUserTomodule.AuditPermissionControls
InitializeStepTypeFlow();
}
else
{
MessageUtil.Show("删除失败");
}
}
else
{
BillflowTypeStepModel model = deletePanel.Tag as BillflowTypeStepModel;
if (WorkFlowBillImpl.DeleteSchemeSteps(model))
{
MessageUtil.Show("删除成功!");
InitializeStepTypeFlow();
}
else
{
MessageUtil.Show("删除失败");
}
}
}
}
}
catch (Exception ex)
{
string Message = ErrorMessage.PromptErrorMessage(ex);
MessageUtil.Show(Message, ex.Message);
}
}
}
}
@@ -612,4 +612,40 @@ namespace Lskj.PubUserTomodule.AuditPermissionControls
this.memoEdit2.Text = dataTable.Rows[0]["OverBackOper"] + "";
string key = dataTable.Rows[0]["OverBackKey"] + "";
OverBackKey = key;
this.ConditionsControlEx.gridControl.DataSource = isBasis ? WorkFlowBaseImpl.getFallbackCondition(key) : WorkFlowBillImpl.getFallbackCondition(
this.ConditionsControlEx.gridControl.DataSource = isBasis ? WorkFlowBaseImpl.getFallbackCondition(key) : WorkFlowBillImpl.getFallbackCondition(key);
}
}
/// <summary>
/// 生成终审sql
/// </summary>
public void GenerateFinalSqlStatement()
{
bool result = WorkFlowBaseImpl.CreateSQL();
//DataTable table = isBasis ? WorkFlowBaseImpl.GetBaseFlowData(mMenuCode) : WorkFlowBillImpl.GetBillFlowData(mMenuCode);
if (result)
{
//单据,单表用的同一个存储过程
string sql = "";
//string stepcode = table.Rows[0]["stepcode"] + "";
int resultNew = WorkFlowBaseImpl.GenerateFinalSqlStatement(mMenuCode, "0", out sql);
if (resultNew == 1)
{
this.memoEdit1.Text = sql;
this.UpdateFinalReturnSettings();
}
}
else
{
MessageUtil.Show("p_systemCreateendFlowSQL存储过程错!");
}
}
}
}
+17 -4
View File
@@ -28,10 +28,9 @@
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.MenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components);
this.MenuStrip = new System.Windows.Forms.ContextMenuStrip();
this.btn_delete = new System.Windows.Forms.ToolStripMenuItem();
this.contextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components);
this.contextMenuStrip = new System.Windows.Forms.ContextMenuStrip();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -293,6 +292,7 @@
this.RoleControlEx.Name = "RoleControlEx";
this.RoleControlEx.SiftEnumObj = Lskj.Control.GridControlEx.HeaderSiftEnum.Sum;
this.RoleControlEx.Size = new System.Drawing.Size(334, 261);
this.RoleControlEx.SysModel = null;
this.RoleControlEx.TabIndex = 2;
//
// panelControl1
@@ -346,13 +346,13 @@
// RoleOwnerControl
//
this.RoleOwnerControl.AdapterObj = null;
this.RoleOwnerControl.ContextMenuStrip = this.MenuStrip;
this.RoleOwnerControl.Dock = System.Windows.Forms.DockStyle.Fill;
this.RoleOwnerControl.Location = new System.Drawing.Point(0, 0);
this.RoleOwnerControl.Margin = new System.Windows.Forms.Padding(4);
this.RoleOwnerControl.Name = "RoleOwnerControl";
this.RoleOwnerControl.SiftEnumObj = Lskj.Control.GridControlEx.HeaderSiftEnum.Sum;
this.RoleOwnerControl.Size = new System.Drawing.Size(334, 321);
this.RoleOwnerControl.SysModel = null;
this.RoleOwnerControl.TabIndex = 3;
//
// xtraTabPage2
@@ -371,6 +371,7 @@
this.PeopleControlEx.Name = "PeopleControlEx";
this.PeopleControlEx.SiftEnumObj = Lskj.Control.GridControlEx.HeaderSiftEnum.Sum;
this.PeopleControlEx.Size = new System.Drawing.Size(334, 612);
this.PeopleControlEx.SysModel = null;
this.PeopleControlEx.TabIndex = 1;
//
// xtraTabControl2
@@ -445,6 +446,7 @@
this.gridLeft.Name = "gridLeft";
this.gridLeft.SiftEnumObj = Lskj.Control.GridControlEx.HeaderSiftEnum.Sum;
this.gridLeft.Size = new System.Drawing.Size(268, 589);
this.gridLeft.SysModel = null;
this.gridLeft.TabIndex = 7;
//
// pl_left_top
@@ -506,6 +508,7 @@
this.AllQuickControlEx.Name = "AllQuickControlEx";
this.AllQuickControlEx.SiftEnumObj = Lskj.Control.GridControlEx.HeaderSiftEnum.Sum;
this.AllQuickControlEx.Size = new System.Drawing.Size(656, 191);
this.AllQuickControlEx.SysModel = null;
this.AllQuickControlEx.TabIndex = 5;
//
// panelControl15
@@ -572,6 +575,7 @@
this.QuickReportFormControlEx.Name = "QuickReportFormControlEx";
this.QuickReportFormControlEx.SiftEnumObj = Lskj.Control.GridControlEx.HeaderSiftEnum.Sum;
this.QuickReportFormControlEx.Size = new System.Drawing.Size(333, 315);
this.QuickReportFormControlEx.SysModel = null;
this.QuickReportFormControlEx.TabIndex = 3;
//
// groupBox1
@@ -594,6 +598,7 @@
this.QuickOperationControlEx.Name = "QuickOperationControlEx";
this.QuickOperationControlEx.SiftEnumObj = Lskj.Control.GridControlEx.HeaderSiftEnum.Sum;
this.QuickOperationControlEx.Size = new System.Drawing.Size(311, 315);
this.QuickOperationControlEx.SysModel = null;
this.QuickOperationControlEx.TabIndex = 4;
//
// panelControl17
@@ -674,6 +679,7 @@
this.ModulePermissionsControl.Name = "ModulePermissionsControl";
this.ModulePermissionsControl.SiftEnumObj = Lskj.Control.GridControlEx.HeaderSiftEnum.Sum;
this.ModulePermissionsControl.Size = new System.Drawing.Size(925, 574);
this.ModulePermissionsControl.SysModel = null;
this.ModulePermissionsControl.TabIndex = 4;
//
// panelControl4
@@ -733,6 +739,7 @@
this.gridControlEx1.Name = "gridControlEx1";
this.gridControlEx1.SiftEnumObj = Lskj.Control.GridControlEx.HeaderSiftEnum.Sum;
this.gridControlEx1.Size = new System.Drawing.Size(933, 612);
this.gridControlEx1.SysModel = null;
this.gridControlEx1.TabIndex = 1;
//
// xtraTabPage11
@@ -812,6 +819,7 @@
this.LogControl.Name = "LogControl";
this.LogControl.SiftEnumObj = Lskj.Control.GridControlEx.HeaderSiftEnum.Sum;
this.LogControl.Size = new System.Drawing.Size(921, 526);
this.LogControl.SysModel = null;
this.LogControl.TabIndex = 2;
//
// panelControl9
@@ -840,6 +848,7 @@
// name_lde
//
this.name_lde.BackColor = System.Drawing.Color.Transparent;
this.name_lde.BackgroundColor = System.Drawing.Color.Empty;
this.name_lde.EditText = "";
this.name_lde.FontSize = 0F;
this.name_lde.LabelText = "姓名";
@@ -856,6 +865,7 @@
// end_lde
//
this.end_lde.BackColor = System.Drawing.Color.Transparent;
this.end_lde.BackgroundColor = System.Drawing.Color.Empty;
this.end_lde.EditText = "";
this.end_lde.FontSize = 0F;
this.end_lde.LabelText = "结束时间";
@@ -872,6 +882,7 @@
// start_lde
//
this.start_lde.BackColor = System.Drawing.Color.Transparent;
this.start_lde.BackgroundColor = System.Drawing.Color.Empty;
this.start_lde.EditText = "";
this.start_lde.FontSize = 0F;
this.start_lde.LabelText = "开始时间";
@@ -990,6 +1001,7 @@
this.moduleControl.Name = "moduleControl";
this.moduleControl.SiftEnumObj = Lskj.Control.GridControlEx.HeaderSiftEnum.Sum;
this.moduleControl.Size = new System.Drawing.Size(188, 461);
this.moduleControl.SysModel = null;
this.moduleControl.TabIndex = 3;
//
// panelControl18
@@ -1022,6 +1034,7 @@
//
this.searchModuleLab.AutoSize = true;
this.searchModuleLab.BackColor = System.Drawing.Color.Transparent;
this.searchModuleLab.BackgroundColor = System.Drawing.Color.Empty;
this.searchModuleLab.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.searchModuleLab.Dock = System.Windows.Forms.DockStyle.Fill;
this.searchModuleLab.EditText = "";
+27 -1
View File
@@ -2467,4 +2467,30 @@ namespace Lskj.PubUserTomodule
string sql = string.Empty;
try
{
if (MessageUtil.Show(ResourceKeys.DragSelectR
if (MessageUtil.Show(ResourceKeys.DragSelectRow, MessageBoxButtons.YesNo) == DialogResult.Yes)
{
foreach (DataRow rowItem in e.GridViewSelectRows)
{
string RoleId = rowItem["id"] + "";
//把推拽角色id传入页签中,页签根据选中的人员添加角色权限
personnelInformation.AddRolePermissions(RoleId);
}
personnelInformation.GridView_FocusedRowObjectChanged(null, null);
ModuleAssociationRole_onClickDeleteButton(null, null);
}
}
catch (Exception ex)
{
LogUtil.WriteError("表格拖拽错误", ex);
LogHelper.Instance.WriteError(ex);
//MessageUtil.Show(ResourceKeys.OperFault);
string Message = ErrorMessage.PromptErrorMessage(ex);
MessageUtil.Show(Message, ex.Message);
}
}
}
}
@@ -123,4 +123,13 @@
<metadata name="contextMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>130, 17</value>
</metadata>
<metadata name="panelControl1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="panelControl4.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>25</value>
</metadata>
</root>
@@ -152,6 +152,7 @@ namespace Lskj.PubUserTomodule
this.gridLeft.Name = "gridLeft";
this.gridLeft.SiftEnumObj = Lskj.Control.GridControlEx.HeaderSiftEnum.Sum;
this.gridLeft.Size = new System.Drawing.Size(268, 447);
this.gridLeft.SysModel = null;
this.gridLeft.TabIndex = 31;
//
// treeLeft
@@ -115,6 +115,7 @@ namespace Lskj.PubUserTomodule
this.gridLeft.Name = "gridLeft";
this.gridLeft.SiftEnumObj = Lskj.Control.GridControlEx.HeaderSiftEnum.Sum;
this.gridLeft.Size = new System.Drawing.Size(268, 537);
this.gridLeft.SysModel = null;
this.gridLeft.TabIndex = 7;
//
// pl_left_top
@@ -175,6 +176,7 @@ namespace Lskj.PubUserTomodule
this.AllModules.Name = "AllModules";
this.AllModules.SiftEnumObj = Lskj.Control.GridControlEx.HeaderSiftEnum.Sum;
this.AllModules.Size = new System.Drawing.Size(653, 191);
this.AllModules.SysModel = null;
this.AllModules.TabIndex = 5;
//
// panelControl15
@@ -238,6 +240,7 @@ namespace Lskj.PubUserTomodule
this.RoleControlEx.Name = "RoleControlEx";
this.RoleControlEx.SiftEnumObj = Lskj.Control.GridControlEx.HeaderSiftEnum.Sum;
this.RoleControlEx.Size = new System.Drawing.Size(651, 293);
this.RoleControlEx.SysModel = null;
this.RoleControlEx.TabIndex = 5;
//
// xtraTabPage2
@@ -256,6 +259,7 @@ namespace Lskj.PubUserTomodule
this.PersonnelControlEx.Name = "PersonnelControlEx";
this.PersonnelControlEx.SiftEnumObj = Lskj.Control.GridControlEx.HeaderSiftEnum.Sum;
this.PersonnelControlEx.Size = new System.Drawing.Size(651, 293);
this.PersonnelControlEx.SysModel = null;
this.PersonnelControlEx.TabIndex = 5;
//
// ModuleAssociationRole
@@ -244,4 +244,33 @@ namespace Lskj.PubUserTomodule
MessageUtil.Show("请选择需要删除的角色");
}
}
}
/// <summary>
/// 执行保存角色权限时候的存储过程
/// </summary>
/// <param name="modid"></param>
/// <param name="tagid"></param>
/// <param name="mid"></param>
/// <returns></returns>
public int saveRoledata(int roleid)
{
SqlParameter pMsg = new SqlParameter("@msg", SqlDbType.VarChar, 2000);
pMsg.Direction = ParameterDirection.Output;
SqlParameter returnValue = new SqlParameter("@return", SqlDbType.Int, 4);
returnValue.Direction = ParameterDirection.ReturnValue;
SqlParameter[] param =
{
new SqlParameter("@roleid ",SqlDbType.VarChar,20),
pMsg,
returnValue
};
param[0].Value = roleid;
BaseImpl.ExecProcedure("p_SystemSetRoleUserPurview", param);
return Convert.ToInt32(returnValue.Value.ToString());
}
}
}
@@ -0,0 +1,5 @@
DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v15.2, Version=15.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit, DevExpress.XtraEditors.v15.2, Version=15.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v15.2, Version=15.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v15.2, Version=15.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a