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

SVN r922

Browse Source 
SVN-Revision: r922
This commit is contained in:
cyf
2025-08-07 09:19:31 +00:00
parent d96ddc4bd9
commit 25e9863964
6 changed files with 670 additions and 610 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.BaseWorkflow/Control/StepPage1.cs
+55 -1
View File
@@ -420,4 +420,58 @@ namespace Lskj.BaseWorkflow.Control
}
catch (Exception ex)
{
MessageUtil.Show("删除失败：\r\
MessageUtil.Show("删除失败：\r\n" + ex.Message);
}
}
}
}
/// <summary>
/// <para>说明：点击流转步骤加载数据</para>
/// <para>创建人：龚宇超</para>
/// <para>创建日期：2019-06-21 </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)
{
BaseflowModel model = after.Tag as BaseflowModel;
this.SeletStepItem1Obj = after;
this.SetFlowItem(model);
this.SetMainFieldCheckState(model);
}
#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 (SelectBaseflowModel == null)
{
MessageUtil.Show("插入的流转类别不能为空");
return;
}
else
{
//BillflowModelList
//选中的步骤号
int selectedStepCode = SelectBaseflowModel.stepCode;
//获取比选中步骤小一步的步骤号
int? maxStepCode = BaseflowModelList
.Where(m => m.stepCode < selectedStepCode)
.Select(m => m.stepCode)
.DefaultIfEmpty
插件库/Lskj.BaseWorkflow/Control/StepPage3.cs
+67 -26
View File
@@ -46,9 +46,14 @@ namespace Lskj.BaseWorkflow.Control
/// 缓存model
/// </summary>
public List<BaseflowTypeModel> modellist = new List<BaseflowTypeModel>();
/// <summary>
/// 主页转过来的操作权限
/// </summary>
public bool SerpPage3Power;
public StepPage3()
{
InitializeComponent();
setCombox();
this.labelTextEdit1.TextEdit.EditValueChanged += new EventHandler(OnUserEditValueChanged);
@@ -57,14 +62,15 @@ namespace Lskj.BaseWorkflow.Control
this.LeftFontColor.TextEdit.Click += new EventHandler(color_Click);
this.fontColor.TextEdit.Click += new EventHandler(color_Click);
this.LeftFlowCharfillcolor.TextEdit.Click += new EventHandler(color_Click);
if (SystemInfo.Instance.HideFlowchartTab) this.xtraTabControl1.TabPages[1].PageVisible = false;
}
#region 公共方法
/// <summary>
/// 设置下拉框值
/// </summary>
public void setCombox() {
public void setCombox()
{
DataTable flowcharTagIdTable = new DataTable();
flowcharTagIdTable.Columns.Add("dm");
flowcharTagIdTable.Columns.Add("mc");
@@ -100,8 +106,8 @@ namespace Lskj.BaseWorkflow.Control
this.fontWeight.ValueField = "dm";
this.fontWeight.TextField = "mc";
this.fontWeight.SetDataSource(fontWeightTable);
}
/// <summary>
/// <para>说明：初始化界面控件</para>
@@ -135,7 +141,8 @@ namespace Lskj.BaseWorkflow.Control
this.comboBoxEdit1.Properties.Items.Clear();
modellist.Clear();
DataTable table = WorkFlowBaseImpl.GetBaseFlowType(mMenuCode);
if (table.Rows.Count==0) {
if (table.Rows.Count == 0)
{
this.comboBoxEdit1.Visible = false;
return;
}
@@ -219,12 +226,13 @@ namespace Lskj.BaseWorkflow.Control
}
this.xtraTabControl1.Visible = true;
}
else {
else
{
this.xtraTabControl1.Visible = false;
return;
}
}
/// <summary>
/// 执行存储过程
/// </summary>
@@ -498,7 +506,7 @@ namespace Lskj.BaseWorkflow.Control
this.FlowCharfillcolor.TextEdit.BackColor = ColorTranslator.FromHtml(this.FlowCharfillcolor.EditText);
this.LeftFlowCharfillcolor.EditText = string.IsNullOrWhiteSpace(model.LeftFlowCharfillcolor) ? "#FFFFFF" : model.LeftFlowCharfillcolor;
this.LeftFlowCharfillcolor.TextEdit.BackColor = ColorTranslator.FromHtml(this.LeftFlowCharfillcolor.EditText);
this.fontSize.EditText =string.IsNullOrWhiteSpace(model.fontSize) ? "18":model.fontSize;
this.fontSize.EditText = string.IsNullOrWhiteSpace(model.fontSize) ? "18" : model.fontSize;
this.fontWeight.EditText = string.IsNullOrWhiteSpace(model.fontWeight) ? "normal" : model.fontWeight;
this.LeftFlowCharWidth.EditText = string.IsNullOrWhiteSpace(model.LeftFlowCharWidth) ? "160" : model.LeftFlowCharWidth;
this.fontFamily.EditText = string.IsNullOrWhiteSpace(model.fontFamily) ? "Microsoft YaHei" : model.fontFamily;
@@ -542,9 +550,14 @@ namespace Lskj.BaseWorkflow.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)
{
@@ -756,7 +769,7 @@ namespace Lskj.BaseWorkflow.Control
userNames += "{&" + item["roleName"] + "&},";
}
}
this.memoEdit2.EditValue += userNames;
}
catch (Exception ex)
@@ -787,19 +800,42 @@ namespace Lskj.BaseWorkflow.Control
{
if (xtraTabControl1.SelectedTabPage == xtraTabPage2)//进行tabpage位置判断
{
if (moduleWebView1 != null)
{
moduleWebView1.FDispose();
moduleWebView1 = null;
}
this.xtraTabPage2.Controls.Clear();
//if (moduleWebView1 != null)
//{
// moduleWebView1.FDispose();
// moduleWebView1 = null;
//}
//this.xtraTabPage2.Controls.Clear();
// 获取基本数据
moduleWebView1 = new ModuleWebView();
this.xtraTabPage2.Controls.Add(moduleWebView1);
//moduleWebView1 = new ModuleWebView();
//this.xtraTabPage2.Controls.Add(moduleWebView1);
//BaseflowTypeStepModel model = this.SelectBaseflowTypeStepModel;
//string url = SystemInfo.Instance.OAUrl+"/pages/flowchart/FlowChart.html?ModuleId=" + model.typeCode + "&ModuleType=" + "0" + "&billType=" + model.billType + "&T=" + DateTime.Now.ToString("yyyyMMddHHmmss");
//moduleWebView1.Navigate(url);
this.xtraTabPage2.Controls.Clear();
BaseflowTypeStepModel model = this.SelectBaseflowTypeStepModel;
string url = SystemInfo.Instance.OAUrl+"/pages/flowchart/FlowChart.html?ModuleId=" + model.typeCode + "&ModuleType=" + "0" + "&billType=" + model.billType + "&T=" + DateTime.Now.ToString("yyyyMMddHHmmss");
moduleWebView1.Navigate(url);
string url = SystemInfo.Instance.OAUrl + "/pages/flowchart/FlowChart.html?ModuleId=" + model.typeCode + "&ModuleType=" + "0" + "&billType=" + model.billType + "&T=" + DateTime.Now.ToString("yyyyMMddHHmmss");
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));
}
}
}
/// <summary>
@@ -819,9 +855,14 @@ namespace Lskj.BaseWorkflow.Control
string colorHtml = ColorTranslator.ToHtml(System.Drawing.Color.FromArgb(colorChoosed.R, colorChoosed.G, colorChoosed.B));
txt.EditValue = colorHtml;
}
else {
else
{
return;
}
}
}
}
private void OnDeletePabelObjClick(object sender, EventArgs e)
{
try
{
Panel
插件库/Lskj.BaseWorkflow/Control/StepPage4.cs
+1 -8
View File
@@ -281,11 +281,4 @@ namespace Lskj.BaseWorkflow.Control
DataTable dataTable = WorkFlowBaseImpl.getFinalBack(mMenuCode);
if (dataTable.Rows.Count > 0) {
this.memoEdit1.Text = dataTable.Rows[0]["OverBackSql"]+"";
this.memoEdit2.Text = dataTable.Rows[0]["OverBackOper"] + "";
}
}
}
}
this.memo
插件库/Lskj.BaseWorkflow/FrmMain.cs
+2 -37
View File
@@ -33,6 +33,7 @@ namespace Lskj.BaseWorkflow
public FrmMain()
{
InitializeComponent();
if (SystemInfo.Instance.HidePDFGeneration) this.btn_pdf.Visible = false;
Lskj.Control.Model.AutoSizeChange.ControllInitializeSize(this);
}
DataTable masterdt = new DataTable();
@@ -509,40 +510,4 @@ namespace Lskj.BaseWorkflow
WordDocViewer(filePath);
}
public static void WordDocViewer(string fileName)
{
try
{
System.Diagnostics.Process.Start(fileName);
}
catch
{
}
}
/// <summary>
/// 点击开始生成
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void btn_start_Click(object sender, EventArgs e)
{
this.Initialization(); // 初始化同步平台
// 创建后台线程
try
{
Thread backThread = new Thread(Mulu);
backThread.IsBackground = true;
backThread.Start();
}
catch (Exception ex)
{
string Message = ErrorMessage.PromptErrorMessage(ex);
MessageUtil.Show(Message,ex.Message);
}
}
private void btn_getout_Click(object sender, EventArgs e)
{
this.Close();
}
}
}
插件库/Lskj.BaseWorkflow/FrmWork.Designer.cs
Generated
+18 -23
View File
@@ -53,6 +53,7 @@
this.stepPage31 = new Lskj.BaseWorkflow.Control.StepPage3();
this.stepPage11 = new Lskj.BaseWorkflow.Control.StepPage1();
this.stepPage21 = new Lskj.BaseWorkflow.Control.StepPage2();
this.btnInsert = new DevExpress.XtraEditors.SimpleButton();
((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
this.panelControl1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit();
@@ -208,6 +209,7 @@
this.panelControl2.Appearance.BackColor = System.Drawing.SystemColors.Control;
this.panelControl2.Appearance.Options.UseBackColor = true;
this.panelControl2.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
this.panelControl2.Controls.Add(this.btnInsert);
this.panelControl2.Controls.Add(this.simpleButton1);
this.panelControl2.Controls.Add(this.btnInit);
this.panelControl2.Controls.Add(this.btnReset);
@@ -225,7 +227,7 @@
//
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(177, 6);
this.simpleButton1.Location = new System.Drawing.Point(263, 6);
this.simpleButton1.Name = "simpleButton1";
this.simpleButton1.Size = new System.Drawing.Size(80, 28);
this.simpleButton1.TabIndex = 21;
@@ -237,7 +239,7 @@
//
this.btnInit.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btnInit.Appearance.Options.UseFont = true;
this.btnInit.Location = new System.Drawing.Point(267, 6);
this.btnInit.Location = new System.Drawing.Point(353, 6);
this.btnInit.Name = "btnInit";
this.btnInit.Size = new System.Drawing.Size(80, 28);
this.btnInit.TabIndex = 21;
@@ -249,7 +251,7 @@
//
this.btnReset.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btnReset.Appearance.Options.UseFont = true;
this.btnReset.Location = new System.Drawing.Point(91, 6);
this.btnReset.Location = new System.Drawing.Point(177, 6);
this.btnReset.Name = "btnReset";
this.btnReset.Size = new System.Drawing.Size(80, 28);
this.btnReset.TabIndex = 20;
@@ -355,6 +357,18 @@
this.stepPage21.Size = new System.Drawing.Size(1077, 560);
this.stepPage21.TabIndex = 1;
//
// btnInsert
//
this.btnInsert.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btnInsert.Appearance.Options.UseFont = true;
this.btnInsert.Location = new System.Drawing.Point(91, 6);
this.btnInsert.Name = "btnInsert";
this.btnInsert.Size = new System.Drawing.Size(80, 28);
this.btnInsert.TabIndex = 24;
this.btnInsert.TabStop = false;
this.btnInsert.Text = "插入";
this.btnInsert.Click += new System.EventHandler(this.btnInsert_Click);
//
// FrmWork
//
this.Appearance.BackColor = System.Drawing.SystemColors.Control;
@@ -390,23 +404,4 @@
private System.Windows.Forms.Panel pllzbzsz;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Panel plxllzsz;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Panel plxlsz;
private System.Windows.Forms.Panel panel1;
private DevExpress.XtraEditors.SimpleButton btnSave;
private DevExpress.XtraEditors.SimpleButton btnAdd;
private DevExpress.XtraEditors.SimpleButton btnReset;
private DevExpress.XtraEditors.SimpleButton btnInit;
private DevExpress.XtraEditors.SimpleButton btnSaveAllflow;
private DevExpress.XtraEditors.SimpleButton btnToWord;
private DevExpress.XtraEditors.SimpleButton simpleButton1;
private System.Windows.Forms.Panel panel2;
private System.Windows.Forms.Panel plzsht;
private System.Windows.Forms.Label label4;
private Control.StepPage3 stepPage31;
private Control.StepPage1 stepPage11;
private Control.StepPage2 stepPage21;
private Control.StepPage4 stepPage41;
}
}
private System.Windows.Forms.Panel plxllzsz
插件库/Lskj.BaseWorkflow/FrmWork.cs
+527 -515
View File
File diff suppressed because it is too large Load Diff