SVN r1050
SVN-Revision: r1050
This commit is contained in:
@@ -2275,7 +2275,8 @@ namespace Lskj.PubAccraditation
|
||||
string nextSelectStepOper = string.Empty;
|
||||
this._auditAdvice = txtRemark.Text;
|
||||
//string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", "p_BillAudit", "Q", "0", this.txtRemark.Text, "", "", true, -1);
|
||||
string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, out string msgText, this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", "p_BillAudit", "Q", "0", this.txtRemark.Text, "", "", true, -1);
|
||||
//string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, out string msgText, this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", "p_BillAudit", "Q", "0", this.txtRemark.Text, "", "", true, -1);
|
||||
string result = this.AuditMethod(out nextSelectStepCode, out nextSelectStepOper, out string msgText, this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", "p_BillAudit", "Q", "0", this.txtRemark.Text, "", "", true, -1);
|
||||
if ("1".Equals(result))
|
||||
{
|
||||
MessageUtil.Show(ResourceKeys.CloseSuccess);
|
||||
@@ -2283,7 +2284,7 @@ namespace Lskj.PubAccraditation
|
||||
}
|
||||
else
|
||||
{
|
||||
MessageUtil.Show(ResourceKeys.CloseFail + "\r\n" + msgText);
|
||||
if (!"9".Equals(result)) MessageUtil.Show(ResourceKeys.CloseFail + "\r\n" + msgText);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2365,8 +2366,36 @@ namespace Lskj.PubAccraditation
|
||||
if (BillAuditImpl.ConfirmAudit(this.SysModel.UserId, this.txtRemark.Text, this.SysModel.ModuleCode, this.SysModel.BillDocumentId) > 0)
|
||||
{
|
||||
MessageUtil.Show(ResourceKeys.ConfirmSuccess);
|
||||
if (refreshThePage != null) refreshThePage("", ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "");
|
||||
this.Close();
|
||||
//this.Close();
|
||||
this.DialogResult = DialogResult.OK;
|
||||
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)
|
||||
{
|
||||
//要删除的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
|
||||
{
|
||||
@@ -2399,18 +2428,45 @@ namespace Lskj.PubAccraditation
|
||||
}
|
||||
if (!SaveBillData(0, false)) return;
|
||||
//string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", this.BillAuditComObj.ProcedureName, "F", this._flowTypeStepModel.RemindSelect, this.txtRemark.Text, remindOpers, confirmOpers);
|
||||
string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, out string msgText, this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", this.BillAuditComObj.ProcedureName, "F", this._flowTypeStepModel.RemindSelect, this.txtRemark.Text, remindOpers, confirmOpers);
|
||||
|
||||
//string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, out string msgText, this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", this.BillAuditComObj.ProcedureName, "F", this._flowTypeStepModel.RemindSelect, this.txtRemark.Text, remindOpers, confirmOpers);
|
||||
string result = this.AuditMethod(out nextSelectStepCode, out nextSelectStepOper, out string msgText, this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", this.BillAuditComObj.ProcedureName, "F", this._flowTypeStepModel.RemindSelect, this.txtRemark.Text, remindOpers, confirmOpers);
|
||||
if ("1".Equals(result))
|
||||
{
|
||||
PushHelper push = new PushHelper(this.SysModel.BillDocumentId, this.SysModel.StepCode, this.SysModel.ModuleCode, this._beforeUsers, this._beforeMenuName, this._beforeId);
|
||||
push.Push_Bill_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
|
||||
{
|
||||
MessageUtil.Show(ResourceKeys.AuditFail + "\r\n" + msgText);
|
||||
if (!"9".Equals(result)) MessageUtil.Show(ResourceKeys.AuditFail + "\r\n" + msgText);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2443,6 +2499,11 @@ namespace Lskj.PubAccraditation
|
||||
{
|
||||
try
|
||||
{
|
||||
//下方页签保存
|
||||
if (this.BillModelObj.ReviewSaveAdditional)
|
||||
{
|
||||
this.SaveAdditionalModules();
|
||||
}
|
||||
if (VerificationRequired()) return;
|
||||
WaitForm.ShowForm(ResourceKeys.Handing);
|
||||
if (this.SysModel.ConfirmId == "1")
|
||||
@@ -2450,8 +2511,36 @@ namespace Lskj.PubAccraditation
|
||||
if (BillAuditImpl.ConfirmAudit(this.SysModel.UserId, this.txtRemark.Text, this.SysModel.ModuleCode, this.SysModel.BillDocumentId) > 0)
|
||||
{
|
||||
MessageUtil.Show(ResourceKeys.ConfirmSuccess);
|
||||
if (refreshThePage != null) refreshThePage("", ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "");
|
||||
this.Close();
|
||||
this.DialogResult = DialogResult.OK;
|
||||
//this.Close();
|
||||
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)
|
||||
{
|
||||
//要删除的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
|
||||
{
|
||||
@@ -2507,7 +2596,8 @@ namespace Lskj.PubAccraditation
|
||||
}
|
||||
//string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper,
|
||||
//this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", this.BillAuditComObj.ProcedureName, "F", this._flowTypeStepModel.RemindSelect, opinion, remindOpers, confirmOpers);
|
||||
string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, out string msgText,this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "",this.BillAuditComObj.ProcedureName, "F", this._flowTypeStepModel.RemindSelect,opinion, remindOpers, confirmOpers);
|
||||
//string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, out string msgText, this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", this.BillAuditComObj.ProcedureName, "F", this._flowTypeStepModel.RemindSelect, opinion, remindOpers, confirmOpers);
|
||||
string result = this.AuditMethod(out nextSelectStepCode, out nextSelectStepOper, out string msgText, this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", this.BillAuditComObj.ProcedureName, "F", this._flowTypeStepModel.RemindSelect, opinion, remindOpers, confirmOpers);
|
||||
WaitForm.HideForm();
|
||||
if ("1".Equals(result))
|
||||
{
|
||||
@@ -2525,6 +2615,7 @@ namespace Lskj.PubAccraditation
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
this.DialogResult = DialogResult.OK;
|
||||
if (refreshThePage != null)
|
||||
{
|
||||
refreshThePage("审核成功", ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "");
|
||||
@@ -2538,7 +2629,7 @@ namespace Lskj.PubAccraditation
|
||||
XtraTabPage beforePage = ERPInfo.Instance.ModuleForms[id].BeforePage;
|
||||
if (beforePage != null)
|
||||
{
|
||||
MessageUtil.Show("审核成功");
|
||||
//MessageUtil.Show("审核成功");
|
||||
//要删除的page
|
||||
XtraTabPage removePage = new XtraTabPage();
|
||||
ERPInfo.Instance.ModuleForms.Remove(id);
|
||||
@@ -2553,11 +2644,11 @@ namespace Lskj.PubAccraditation
|
||||
}
|
||||
}
|
||||
}
|
||||
this.DialogResult = DialogResult.OK;
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
MessageUtil.Show(ResourceKeys.AuditFail + "\r\n" + msgText);
|
||||
if (!"9".Equals(result)) MessageUtil.Show(ResourceKeys.AuditFail + "\r\n" + msgText);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -2853,21 +2944,48 @@ namespace Lskj.PubAccraditation
|
||||
{
|
||||
// string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper,
|
||||
//this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", this.BillAuditComObj.ProcedureName, "R", this._flowTypeStepModel.RemindSelect, this._auditAdvice, "", "", true, ret, 0, true);
|
||||
string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, out string msgText,
|
||||
// string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, out string msgText,
|
||||
//this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", this.BillAuditComObj.ProcedureName, "R", this._flowTypeStepModel.RemindSelect, this._auditAdvice, "", "", true, ret, 0, true);
|
||||
string result = this.AuditMethod(out nextSelectStepCode, out nextSelectStepOper, out string msgText,
|
||||
this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", this.BillAuditComObj.ProcedureName, "R", this._flowTypeStepModel.RemindSelect, this._auditAdvice, "", "", true, ret, 0, true);
|
||||
|
||||
|
||||
if (result == "1")
|
||||
{
|
||||
MessageUtil.Show(ResourceKeys.ForcedSuccess);
|
||||
PushHelper push = new PushHelper(this.SysModel.BillDocumentId, this.SysModel.StepCode, this.SysModel.ModuleCode, this._beforeUsers, this._beforeMenuName, this._beforeId);
|
||||
push.Push_Bill_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)
|
||||
{
|
||||
//要删除的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
|
||||
{
|
||||
MessageUtil.Show(string.Format(ResourceKeys.ForcedFail, msgText));
|
||||
if (!"9".Equals(result)) MessageUtil.Show(string.Format(ResourceKeys.ForcedFail, msgText));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2885,7 +3003,10 @@ namespace Lskj.PubAccraditation
|
||||
{
|
||||
// string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper,
|
||||
//this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", this.BillAuditComObj.ProcedureName, "R", this._flowTypeStepModel.RemindSelect, this._auditAdvice, remindOpers, confirmOpers, true, ret);
|
||||
string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, out string msgText,
|
||||
// string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, out string msgText,
|
||||
//this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", this.BillAuditComObj.ProcedureName, "R", this._flowTypeStepModel.RemindSelect, this._auditAdvice, remindOpers, confirmOpers, true, ret);
|
||||
|
||||
string result = this.AuditMethod(out nextSelectStepCode, out nextSelectStepOper, out string msgText,
|
||||
this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", this.BillAuditComObj.ProcedureName, "R", this._flowTypeStepModel.RemindSelect, this._auditAdvice, remindOpers, confirmOpers, true, ret);
|
||||
|
||||
if (result == "1")
|
||||
@@ -2894,11 +3015,37 @@ namespace Lskj.PubAccraditation
|
||||
PushHelper push = new PushHelper(this.SysModel.BillDocumentId, this.SysModel.StepCode, this.SysModel.ModuleCode, this._beforeUsers, this._beforeMenuName, this._beforeId);
|
||||
push.Push_Bill_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)
|
||||
{
|
||||
//要删除的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
|
||||
{
|
||||
MessageUtil.Show(string.Format(ResourceKeys.ForcedFail, msgText));
|
||||
if (!"9".Equals(result)) MessageUtil.Show(string.Format(ResourceKeys.ForcedFail, msgText));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2942,7 +3089,33 @@ namespace Lskj.PubAccraditation
|
||||
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)
|
||||
{
|
||||
//要删除的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;
|
||||
@@ -2974,9 +3147,11 @@ namespace Lskj.PubAccraditation
|
||||
}
|
||||
//string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper,
|
||||
//this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", this.BillAuditComObj.ProcedureName, "R", this._flowTypeStepModel.RemindSelect, this._auditAdvice, "", "", true, ret, 0, true);
|
||||
string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, out string msgText,
|
||||
this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", this.BillAuditComObj.ProcedureName, "R", this._flowTypeStepModel.RemindSelect, this._auditAdvice, "", "", true, ret, 0, true);
|
||||
//string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, out string msgText,
|
||||
//this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", this.BillAuditComObj.ProcedureName, "R", this._flowTypeStepModel.RemindSelect, this._auditAdvice, "", "", true, ret, 0, true);
|
||||
|
||||
string result = this.AuditMethod(out nextSelectStepCode, out nextSelectStepOper, out string msgText,
|
||||
this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", this.BillAuditComObj.ProcedureName, "R", this._flowTypeStepModel.RemindSelect, this._auditAdvice, "", "", true, ret, 0, true);
|
||||
|
||||
if (result == "1")
|
||||
{
|
||||
@@ -2994,12 +3169,37 @@ namespace Lskj.PubAccraditation
|
||||
}
|
||||
}
|
||||
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)
|
||||
{
|
||||
//要删除的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
|
||||
{
|
||||
MessageUtil.Show(string.Format(ResourceKeys.ForcedFail, msgText));
|
||||
if (!"9".Equals(result)) MessageUtil.Show(string.Format(ResourceKeys.ForcedFail, msgText));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3018,7 +3218,10 @@ namespace Lskj.PubAccraditation
|
||||
{
|
||||
// string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper,
|
||||
//this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", this.BillAuditComObj.ProcedureName, "R", this._flowTypeStepModel.RemindSelect, this._auditAdvice, remindOpers, confirmOpers, true, ret);
|
||||
string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, out string msgText,
|
||||
// string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, out string msgText,
|
||||
//this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", this.BillAuditComObj.ProcedureName, "R", this._flowTypeStepModel.RemindSelect, this._auditAdvice, remindOpers, confirmOpers, true, ret);
|
||||
|
||||
string result = this.AuditMethod(out nextSelectStepCode, out nextSelectStepOper, out string msgText,
|
||||
this.SysModel, this.SysModel.StepCode, this.SysModel.BillDocumentId, "", this.BillAuditComObj.ProcedureName, "R", this._flowTypeStepModel.RemindSelect, this._auditAdvice, remindOpers, confirmOpers, true, ret);
|
||||
|
||||
if (result == "1")
|
||||
@@ -3027,11 +3230,37 @@ namespace Lskj.PubAccraditation
|
||||
PushHelper push = new PushHelper(this.SysModel.BillDocumentId, this.SysModel.StepCode, this.SysModel.ModuleCode, this._beforeUsers, this._beforeMenuName, this._beforeId);
|
||||
push.Push_Bill_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)
|
||||
{
|
||||
//要删除的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
|
||||
{
|
||||
MessageUtil.Show(string.Format(ResourceKeys.ForcedFail, msgText));
|
||||
if (!"9".Equals(result)) MessageUtil.Show(string.Format(ResourceKeys.ForcedFail, msgText));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -4001,4 +4230,73 @@ namespace Lskj.PubAccraditation
|
||||
{
|
||||
this.SetUnionValue(UnionModel, rowItem[gridModel.FieldName] + "", rowItem);
|
||||
}
|
||||
//this.gridView.SetRowCellValue(this.gri
|
||||
//this.gridView.SetRowCellValue(this.gridView.FocusedRowHandle, this.gridView.Columns[gridModel.FieldName], result);
|
||||
}
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
LogHelper.Instance.WriteError(ex);
|
||||
LogUtil.WriteError("计算列计算公式--错误-->" + rowItem[gridModel.FieldName], ex);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
LogHelper.Instance.WriteError(ex);
|
||||
string Message = ErrorMessage.PromptErrorMessage(ex);
|
||||
// MessageUtil.Show(Message,ex.Message);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// <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 result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, out msgText, sysModel, stepCode, billDocumentId, message, storedName, accractFlag, remindSelect, remarkText, remindOpers, confirmOpers, ret, returnd, selectConfirmFlag, IsStepOver, comfirm);
|
||||
|
||||
if ("9".Equals(result))
|
||||
{
|
||||
// 继续执行保存
|
||||
//if (string.IsNullOrWhiteSpace(msgText)) msgText = "失败";
|
||||
if (MessageUtil.Show(msgText, MessageBoxButtons.YesNo) == DialogResult.Yes)
|
||||
result = AuditMethod(out nextSelectStepCode, out nextSelectStepOper, out msgText, sysModel, stepCode, billDocumentId, message, storedName, accractFlag, remindSelect, remarkText, remindOpers, confirmOpers, ret, returnd, selectConfirmFlag, IsStepOver, 1);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 保存所有附加模块
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public void SaveAdditionalModules()
|
||||
{
|
||||
Reference in New Issue
Block a user