SVN r1024
SVN-Revision: r1024
This commit is contained in:
@@ -1853,7 +1853,36 @@ namespace Lskj.BaseAccraditation
|
||||
PushHelper push = new PushHelper(this.SysModel.PrimaryValue, this.SysModel.StepCode, this.SysModel.ModuleCode, this._beforeUsers, this._beforeMenuName, this._beforeId);
|
||||
push.Push_Base_Oper_Message();
|
||||
this.DialogResult = DialogResult.OK;
|
||||
if (refreshThePage != null) refreshThePage("审核成功", ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "");
|
||||
|
||||
if (refreshThePage != null)
|
||||
{
|
||||
refreshThePage("审核成功", ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "");
|
||||
}
|
||||
else
|
||||
{
|
||||
//上一次点开page 当前打开page删除后要选中的page
|
||||
if (ERPInfo.Instance.PageControl != null)
|
||||
{
|
||||
|
||||
string id = ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "";
|
||||
XtraTabPage beforePage = ERPInfo.Instance.ModuleForms[id].BeforePage;
|
||||
if (beforePage != null)
|
||||
{
|
||||
//MessageUtil.Show("审核成功");
|
||||
//要删除的page
|
||||
XtraTabPage removePage = new XtraTabPage();
|
||||
ERPInfo.Instance.ModuleForms.Remove(id);
|
||||
foreach (XtraTabPage tablepage in ERPInfo.Instance.PageControl.TabPages)
|
||||
{
|
||||
if (tablepage.Tag == null) continue;
|
||||
if (tablepage.Tag.ToString().Equals(id)) removePage = tablepage;
|
||||
if (tablepage == beforePage) ERPInfo.Instance.PageControl.SelectedTabPage = beforePage;
|
||||
}
|
||||
ERPInfo.Instance.PageControl.TabPages.Remove(removePage);
|
||||
removePage.Dispose();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1981,7 +2010,10 @@ namespace Lskj.BaseAccraditation
|
||||
}
|
||||
#endregion
|
||||
this.DialogResult = DialogResult.OK;
|
||||
if (refreshThePage != null) refreshThePage("审核成功", ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "");
|
||||
if (refreshThePage != null)
|
||||
{
|
||||
refreshThePage("审核成功", ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "");
|
||||
}
|
||||
else
|
||||
{
|
||||
//上一次点开page 当前打开page删除后要选中的page
|
||||
@@ -2053,19 +2085,34 @@ namespace Lskj.BaseAccraditation
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 返退操作
|
||||
/// <summary>
|
||||
/// <para>说明:提醒返退</para>
|
||||
/// <para>创建人:王一帆</para>
|
||||
/// <para>创建日期:2020-08-20 </para>
|
||||
/// <para>修改人:</para>
|
||||
/// <para>修改日期:</para>
|
||||
/// <para>修改备注:</para>
|
||||
/// <para>版本:1.0</para>
|
||||
/// </summary>
|
||||
/// <param name="sender">The source of the event.</param>
|
||||
/// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
|
||||
private void btnRemindReturn_Click(object sender, EventArgs e)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#region 返退操作
|
||||
/// <summary>
|
||||
/// <para>说明:提醒返退</para>
|
||||
/// <para>创建人:王一帆</para>
|
||||
/// <para>创建日期:2020-08-20 </para>
|
||||
/// <para>修改人:</para>
|
||||
/// <para>修改日期:</para>
|
||||
/// <para>修改备注:</para>
|
||||
/// <para>版本:1.0</para>
|
||||
/// </summary>
|
||||
/// <param name="sender">The source of the event.</param>
|
||||
/// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
|
||||
private void btnRemindReturn_Click(object sender, EventArgs e)
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -2091,7 +2138,36 @@ namespace Lskj.BaseAccraditation
|
||||
PushHelper push = new PushHelper(this.SysModel.PrimaryValue, this.SysModel.StepCode, this.SysModel.ModuleCode, this._beforeUsers, this._beforeMenuName, this._beforeId);
|
||||
push.Push_Base_Oper_Message();
|
||||
this.DialogResult = DialogResult.OK;
|
||||
if (refreshThePage != null) refreshThePage("", ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "");
|
||||
|
||||
if (refreshThePage != null)
|
||||
{
|
||||
refreshThePage("", ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "");
|
||||
}
|
||||
else
|
||||
{
|
||||
//上一次点开page 当前打开page删除后要选中的page
|
||||
if (ERPInfo.Instance.PageControl != null)
|
||||
{
|
||||
|
||||
string id = ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "";
|
||||
XtraTabPage beforePage = ERPInfo.Instance.ModuleForms[id].BeforePage;
|
||||
if (beforePage != null)
|
||||
{
|
||||
//MessageUtil.Show("审核成功");
|
||||
//要删除的page
|
||||
XtraTabPage removePage = new XtraTabPage();
|
||||
ERPInfo.Instance.ModuleForms.Remove(id);
|
||||
foreach (XtraTabPage tablepage in ERPInfo.Instance.PageControl.TabPages)
|
||||
{
|
||||
if (tablepage.Tag == null) continue;
|
||||
if (tablepage.Tag.ToString().Equals(id)) removePage = tablepage;
|
||||
if (tablepage == beforePage) ERPInfo.Instance.PageControl.SelectedTabPage = beforePage;
|
||||
}
|
||||
ERPInfo.Instance.PageControl.TabPages.Remove(removePage);
|
||||
removePage.Dispose();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -2122,7 +2198,36 @@ namespace Lskj.BaseAccraditation
|
||||
PushHelper push = new PushHelper(this.SysModel.PrimaryValue, this.SysModel.StepCode, this.SysModel.ModuleCode, this._beforeUsers, this._beforeMenuName, this._beforeId);
|
||||
push.Push_Base_Oper_Message();
|
||||
this.DialogResult = DialogResult.OK;
|
||||
if (refreshThePage != null) refreshThePage("", ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "");
|
||||
|
||||
if (refreshThePage != null)
|
||||
{
|
||||
refreshThePage("", ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "");
|
||||
}
|
||||
else
|
||||
{
|
||||
//上一次点开page 当前打开page删除后要选中的page
|
||||
if (ERPInfo.Instance.PageControl != null)
|
||||
{
|
||||
|
||||
string id = ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "";
|
||||
XtraTabPage beforePage = ERPInfo.Instance.ModuleForms[id].BeforePage;
|
||||
if (beforePage != null)
|
||||
{
|
||||
//MessageUtil.Show("审核成功");
|
||||
//要删除的page
|
||||
XtraTabPage removePage = new XtraTabPage();
|
||||
ERPInfo.Instance.ModuleForms.Remove(id);
|
||||
foreach (XtraTabPage tablepage in ERPInfo.Instance.PageControl.TabPages)
|
||||
{
|
||||
if (tablepage.Tag == null) continue;
|
||||
if (tablepage.Tag.ToString().Equals(id)) removePage = tablepage;
|
||||
if (tablepage == beforePage) ERPInfo.Instance.PageControl.SelectedTabPage = beforePage;
|
||||
}
|
||||
ERPInfo.Instance.PageControl.TabPages.Remove(removePage);
|
||||
removePage.Dispose();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -2169,7 +2274,36 @@ namespace Lskj.BaseAccraditation
|
||||
if (result == DialogResult.OK)
|
||||
{
|
||||
this.DialogResult = DialogResult.OK;
|
||||
if (refreshThePage != null) refreshThePage("", ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "");
|
||||
|
||||
if (refreshThePage != null)
|
||||
{
|
||||
refreshThePage("", ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "");
|
||||
}
|
||||
else
|
||||
{
|
||||
//上一次点开page 当前打开page删除后要选中的page
|
||||
if (ERPInfo.Instance.PageControl != null)
|
||||
{
|
||||
|
||||
string id = ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "";
|
||||
XtraTabPage beforePage = ERPInfo.Instance.ModuleForms[id].BeforePage;
|
||||
if (beforePage != null)
|
||||
{
|
||||
//MessageUtil.Show("审核成功");
|
||||
//要删除的page
|
||||
XtraTabPage removePage = new XtraTabPage();
|
||||
ERPInfo.Instance.ModuleForms.Remove(id);
|
||||
foreach (XtraTabPage tablepage in ERPInfo.Instance.PageControl.TabPages)
|
||||
{
|
||||
if (tablepage.Tag == null) continue;
|
||||
if (tablepage.Tag.ToString().Equals(id)) removePage = tablepage;
|
||||
if (tablepage == beforePage) ERPInfo.Instance.PageControl.SelectedTabPage = beforePage;
|
||||
}
|
||||
ERPInfo.Instance.PageControl.TabPages.Remove(removePage);
|
||||
removePage.Dispose();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
@@ -2221,7 +2355,35 @@ namespace Lskj.BaseAccraditation
|
||||
}
|
||||
}
|
||||
this.DialogResult = DialogResult.OK;
|
||||
if (refreshThePage != null) refreshThePage("", ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "");
|
||||
if (refreshThePage != null)
|
||||
{
|
||||
refreshThePage("", ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "");
|
||||
}
|
||||
else
|
||||
{
|
||||
//上一次点开page 当前打开page删除后要选中的page
|
||||
if (ERPInfo.Instance.PageControl != null)
|
||||
{
|
||||
|
||||
string id = ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "";
|
||||
XtraTabPage beforePage = ERPInfo.Instance.ModuleForms[id].BeforePage;
|
||||
if (beforePage != null)
|
||||
{
|
||||
//MessageUtil.Show("审核成功");
|
||||
//要删除的page
|
||||
XtraTabPage removePage = new XtraTabPage();
|
||||
ERPInfo.Instance.ModuleForms.Remove(id);
|
||||
foreach (XtraTabPage tablepage in ERPInfo.Instance.PageControl.TabPages)
|
||||
{
|
||||
if (tablepage.Tag == null) continue;
|
||||
if (tablepage.Tag.ToString().Equals(id)) removePage = tablepage;
|
||||
if (tablepage == beforePage) ERPInfo.Instance.PageControl.SelectedTabPage = beforePage;
|
||||
}
|
||||
ERPInfo.Instance.PageControl.TabPages.Remove(removePage);
|
||||
removePage.Dispose();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -2253,7 +2415,35 @@ namespace Lskj.BaseAccraditation
|
||||
PushHelper push = new PushHelper(this.SysModel.PrimaryValue, this.SysModel.StepCode, this.SysModel.ModuleCode, this._beforeUsers, this._beforeMenuName, this._beforeId);
|
||||
push.Push_Base_Oper_Message();
|
||||
this.DialogResult = DialogResult.OK;
|
||||
if (refreshThePage != null) refreshThePage("", ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "");
|
||||
if (refreshThePage != null)
|
||||
{
|
||||
refreshThePage("", ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "");
|
||||
}
|
||||
else
|
||||
{
|
||||
//上一次点开page 当前打开page删除后要选中的page
|
||||
if (ERPInfo.Instance.PageControl != null)
|
||||
{
|
||||
|
||||
string id = ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "";
|
||||
XtraTabPage beforePage = ERPInfo.Instance.ModuleForms[id].BeforePage;
|
||||
if (beforePage != null)
|
||||
{
|
||||
//MessageUtil.Show("审核成功");
|
||||
//要删除的page
|
||||
XtraTabPage removePage = new XtraTabPage();
|
||||
ERPInfo.Instance.ModuleForms.Remove(id);
|
||||
foreach (XtraTabPage tablepage in ERPInfo.Instance.PageControl.TabPages)
|
||||
{
|
||||
if (tablepage.Tag == null) continue;
|
||||
if (tablepage.Tag.ToString().Equals(id)) removePage = tablepage;
|
||||
if (tablepage == beforePage) ERPInfo.Instance.PageControl.SelectedTabPage = beforePage;
|
||||
}
|
||||
ERPInfo.Instance.PageControl.TabPages.Remove(removePage);
|
||||
removePage.Dispose();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -2416,4 +2606,60 @@ namespace Lskj.BaseAccraditation
|
||||
string sqlValue = model.IsReadOnly || model.IsChart ? model.DetailSql : model.SystemModel.MenuSql;
|
||||
if (ReplaceHelper.IsSelect(sqlValue) && !string.IsNullOrEmpty(model.UnionValue))
|
||||
{
|
||||
|
||||
sqlValue = ReplaceHelper.ReplaceWhereCond(sqlValue) + string.Format(" and {0}='{1}'", model.UnionValue, unionPatentValue);
|
||||
}
|
||||
return sqlValue;
|
||||
}
|
||||
#endregion
|
||||
private void simpleButton1_Click(object sender, EventArgs e)
|
||||
{
|
||||
try
|
||||
{
|
||||
WebBrowserUtil.StartWebBrowser(this.SysModel.ModuleCode, mRowItem["ToolsName"] + "");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
string Message = ErrorMessage.PromptErrorMessage(ex);
|
||||
MessageUtil.Show(Message, ex.Message);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private bool VerificationRequired()
|
||||
{
|
||||
bool results = false;
|
||||
if (SystemInfo.Instance.ReviewCommentsRequired && string.IsNullOrWhiteSpace(this.txt_remark.Text))
|
||||
{
|
||||
MessageUtil.Show("请输入审核意见");
|
||||
results = true;
|
||||
}
|
||||
return results;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 审核或反审
|
||||
/// </summary>
|
||||
|
||||
public string AuditMethod(out string nextSelectStepCode,
|
||||
out string nextSelectStepOper,
|
||||
out string msgText,
|
||||
DynamicModel sysModel,
|
||||
string stepCode,
|
||||
string billDocumentId,
|
||||
string message,
|
||||
string storedName,
|
||||
string accractFlag,
|
||||
string remindSelect,
|
||||
string remarkText = "",
|
||||
string remindOpers = "",
|
||||
string confirmOpers = "",
|
||||
bool ret = false,
|
||||
int returnd = 0,
|
||||
int selectConfirmFlag = 0,
|
||||
bool IsStepOver = false,
|
||||
int comfirm = 0
|
||||
)
|
||||
{
|
||||
string re
|
||||
Reference in New Issue
Block a user