SVN r934
SVN-Revision: r934
This commit is contained in:
@@ -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
|
||||
Reference in New Issue
Block a user