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

SVN r934

Browse Source 
SVN-Revision: r934
This commit is contained in:
cyf
2025-08-07 09:36:37 +00:00
parent 0293871027
commit 87056b7953
6 changed files with 178 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.Workflow/Control/StepPage1.cs
+55 -1
View File
@@ -536,4 +536,58 @@ namespace Lskj.Workflow.Control
/// <para>说明：点击流转步骤加载数据</para>
/// <para>创建人：龚宇超</para>
/// <para>创建日期：2019-06-21 </para>
/// <para
/// <para>修改人：</para>
/// <para>修改日期：</para>
/// <para>修改备注：</para>
/// <para>版本：1.0</para>
/// </summary>
/// <param name="sender">The sender.</param>
/// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
/// <exception cref="System.NotImplementedException"></exception>
void OnTitleLabelObjClick(StepItem1 before, StepItem1 after)
{
try
{
BillflowModel model = after.Tag as BillflowModel;
this.SeletStepItem1Obj = after;
this.SetFlowItem(model);
this.SetMainFieldCheckState(model);
this.SetDetailFieldCheckState(model);
}
catch (Exception ex)
{
string Message = ErrorMessage.PromptErrorMessage(ex);
MessageUtil.Show(Message,ex.Message);
}
}
#endregion
/// <summary>
/// <para>说明：插入流转类别</para>
/// <para>创建人：龚宇超</para>
/// <para>创建日期：2019-06-24 </para>
/// <para>修改人：</para>
/// <para>修改日期：</para>
/// <para>修改备注：</para>
/// <para>版本：1.0</para>
/// </summary>
public void InsertFlowItem(string stepGroup, string stepName)
{
int Code =0;
if (SelectBillflowModel == null)
{
MessageUtil.Show("插入的流转类别不能为空");
return;
}
else
{
//BillflowModelList
//选中的步骤号
int selectedStepCode = SelectBillflowModel.stepCode;
//获取比选中步骤小一步的步骤号
int? maxStepCode = BillflowModelList
.Where(m => m.stepCode < selectedStepCode)
.Select(m => m.stepCode)
.DefaultIfEmpty() // 避免空集合时抛出��
插件库/Lskj.Workflow/Control/StepPage3.cs
+60 -22
View File
@@ -45,6 +45,10 @@ namespace Lskj.Workflow.Control
/// 缓存model
/// </summary>
public List<BillflowTypeModel> modellist = new List<BillflowTypeModel>();
/// <summary>
/// 主页转过来的操作权限
/// </summary>
public bool SerpPage3Power;
public StepPage3()
{
InitializeComponent();
@@ -55,6 +59,7 @@ namespace Lskj.Workflow.Control
this.LeftFlowCharfillcolor.TextEdit.Click += new EventHandler(color_Click);
this.fontColor.TextEdit.Click += new EventHandler(color_Click);
this.LeftFontColor.TextEdit.Click += new EventHandler(color_Click);
if (SystemInfo.Instance.HideFlowchartTab) this.xtraTabControl1.TabPages[1].PageVisible = false;
}
#region 公共方法
@@ -121,7 +126,7 @@ namespace Lskj.Workflow.Control
catch (Exception ex)
{
string Message = ErrorMessage.PromptErrorMessage(ex);
MessageUtil.Show(Message,ex.Message);
MessageUtil.Show(Message, ex.Message);
}
}
/// <summary>
@@ -374,7 +379,7 @@ namespace Lskj.Workflow.Control
catch (Exception ex)
{
string Message = ErrorMessage.PromptErrorMessage(ex);
MessageUtil.Show(Message,ex.Message);
MessageUtil.Show(Message, ex.Message);
LogUtil.WriteError("重置失败！", ex);
}
}
@@ -403,7 +408,7 @@ namespace Lskj.Workflow.Control
catch (Exception ex)
{
string Message = ErrorMessage.PromptErrorMessage(ex);
MessageUtil.Show(Message,ex.Message);
MessageUtil.Show(Message, ex.Message);
LogUtil.WriteError("初始化权限出错！", ex);
}
}
@@ -435,7 +440,7 @@ namespace Lskj.Workflow.Control
catch (Exception ex)
{
string Message = ErrorMessage.PromptErrorMessage(ex);
MessageUtil.Show(Message,ex.Message);
MessageUtil.Show(Message, ex.Message);
}
}
#endregion
@@ -569,9 +574,15 @@ namespace Lskj.Workflow.Control
{
StepItem3 item = new StepItem3();
item.TitleLabelObj.Text = pos + "、" + model.stepName + " " + model.stepCode;
item.DeletePabelObj.Visible = false;
//item.DeletePabelObj.Visible = false;
if (SerpPage3Power)
{
item.DeletePabelObj.Enabled = false;
}
item.DeletePabelObj.Click += new EventHandler(OnDeletePabelObjClick);
item.Dock = DockStyle.Top;
item.Tag = item.TitleLabelObj.Tag = model;
item.Tag = item.TitleLabelObj.Tag = item.DeletePabelObj.Tag = model;
item.SetHoverEvent(OnBillFlowLabelObjClick);
if (pos == 1)
{
@@ -653,7 +664,7 @@ namespace Lskj.Workflow.Control
catch (Exception ex)
{
string Message = ErrorMessage.PromptErrorMessage(ex);
MessageUtil.Show(Message,ex.Message);
MessageUtil.Show(Message, ex.Message);
}
}
/// <summary>
@@ -680,7 +691,7 @@ namespace Lskj.Workflow.Control
catch (Exception ex)
{
string Message = ErrorMessage.PromptErrorMessage(ex);
MessageUtil.Show(Message,ex.Message);
MessageUtil.Show(Message, ex.Message);
}
}
/// <summary>
@@ -708,7 +719,7 @@ namespace Lskj.Workflow.Control
catch (Exception ex)
{
string Message = ErrorMessage.PromptErrorMessage(ex);
MessageUtil.Show(Message,ex.Message);
MessageUtil.Show(Message, ex.Message);
}
}
/// <summary>
@@ -737,7 +748,7 @@ namespace Lskj.Workflow.Control
catch (Exception ex)
{
string Message = ErrorMessage.PromptErrorMessage(ex);
MessageUtil.Show(Message,ex.Message);
MessageUtil.Show(Message, ex.Message);
}
}
/// <summary>
@@ -778,7 +789,7 @@ namespace Lskj.Workflow.Control
catch (Exception ex)
{
string Message = ErrorMessage.PromptErrorMessage(ex);
MessageUtil.Show(Message,ex.Message);
MessageUtil.Show(Message, ex.Message);
LogHelper.Instance.WriteError(ex);
//MessageUtil.Show(ResourceKeys.OperFault);
}
@@ -823,7 +834,7 @@ namespace Lskj.Workflow.Control
catch (Exception ex)
{
string Message = ErrorMessage.PromptErrorMessage(ex);
MessageUtil.Show(Message,ex.Message);
MessageUtil.Show(Message, ex.Message);
LogHelper.Instance.WriteError(ex);
//MessageUtil.Show(ResourceKeys.OperFault);
}
@@ -854,7 +865,7 @@ namespace Lskj.Workflow.Control
catch (Exception ex)
{
string Message = ErrorMessage.PromptErrorMessage(ex);
MessageUtil.Show(Message,ex.Message);
MessageUtil.Show(Message, ex.Message);
}
}
/// <summary>
@@ -876,7 +887,7 @@ namespace Lskj.Workflow.Control
catch (Exception ex)
{
string Message = ErrorMessage.PromptErrorMessage(ex);
MessageUtil.Show(Message,ex.Message);
MessageUtil.Show(Message, ex.Message);
}
}
/// <summary>
@@ -890,22 +901,49 @@ namespace Lskj.Workflow.Control
{
if (xtraTabControl1.SelectedTabPage == xtraTabPage2)//进行tabpage位置判断
{
//this.xtraTabPage2.Controls.Clear();
//// 获取基本数据
//ModuleWebView moduleWebView1 = new ModuleWebView();
//this.xtraTabPage2.Controls.Add(moduleWebView1);
//// 获取单据数据
//BillflowTypeStepModel model = this.SelectBillflowTypeStepModel;
//string url = SystemInfo.Instance.OAUrl + "/pages/flowchart/FlowChart.html?ModuleId=" + model.typeCode + "&ModuleType=" + "1" + "&billType=" + model.billType;
//moduleWebView1.Navigate(url);
this.xtraTabPage2.Controls.Clear();
// 获取基本数据
ModuleWebView moduleWebView1 = new ModuleWebView();
this.xtraTabPage2.Controls.Add(moduleWebView1);
// 获取单据数据
BillflowTypeStepModel model = this.SelectBillflowTypeStepModel;
string url = SystemInfo.Instance.OAUrl + "/pages/flowchart/FlowChart.html?ModuleId=" + model.typeCode + "&ModuleType=" + "1" + "&billType=" + model.billType;
moduleWebView1.Navigate(url);
if (SystemInfo.Instance.PrimitiveBrowser)
{
FrmMiniBlink webView = new FrmMiniBlink();
webView.AllowDownload = false;
webView.Dock = DockStyle.Fill;
webView.Tag = model;
this.xtraTabPage2.Controls.Add(webView);
webView.LoadUrl(ReplaceHelper.ReplaceUserInfo(url));
}
else
{
FrmWebBrowser webView = new FrmWebBrowser();
webView.Dock = DockStyle.Fill;
webView.Tag = model;
this.xtraTabPage2.Controls.Add(webView);
webView.FrmLoad(ReplaceHelper.ReplaceUserInfo(url));
}
}
}
catch (Exception ex)
{
string Message = ErrorMessage.PromptErrorMessage(ex);
MessageUtil.Show(Message,ex.Message);
MessageUtil.Show(Message, ex.Message);
}
}
#endregion
}
}
private void OnDeletePabelObjClick(object sender, EventArgs e)
{
try
{
Panel de
插件库/Lskj.Workflow/Control/StepPage4.cs
+1 -8
View File
@@ -242,11 +242,4 @@ namespace Lskj.Workflow.Control
if (dataTable.Rows.Count > 0)
{
this.memoEdit1.Text = dataTable.Rows[0]["OverBackSql"] + "";
this.memoEdit2.Text = dataTable.Rows[0]["OverBackOper"] + "";
}
}
}
}