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

SVN r981

Browse Source 
SVN-Revision: r981
This commit is contained in:
wyf
2025-09-10 06:43:07 +00:00
parent 58d4289f6f
commit e87064be3a
1 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.BaseAccraditation/FrmBaseAccraditation.cs
+37 -4
View File
@@ -1961,7 +1961,8 @@ namespace Lskj.BaseAccraditation
} }
} }
#endregion #endregion
string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, this.SysModel, this.SysModel.StepCode, this.SysModel.PrimaryValue, "", this.BaseAuditModelObj.ProcedureName, "F", this._flowTypeStepModel.RemindSelect, opinion, remindOpers, confirmOpers); //string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, this.SysModel, this.SysModel.StepCode, this.SysModel.PrimaryValue, "", this.BaseAuditModelObj.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.PrimaryValue, "", this.BaseAuditModelObj.ProcedureName, "F", this._flowTypeStepModel.RemindSelect, opinion, remindOpers, confirmOpers);
WaitForm.HideForm(); WaitForm.HideForm();
if ("1".Equals(result)) if ("1".Equals(result))
{ {
@@ -2026,13 +2027,13 @@ namespace Lskj.BaseAccraditation
} }
else else
{ {
MessageUtil.Show("配置新版审批失败！" + "\r\n" + result); MessageUtil.Show("配置新版审批失败！" + "\r\n" + msgText);
} }
} }
else else
{ {
MessageUtil.Show(ResourceKeys.AuditFail + "\r\n" + result); MessageUtil.Show(ResourceKeys.AuditFail + "\r\n" + msgText);
} }
} }
} }
@@ -2401,4 +2402,36 @@ namespace Lskj.BaseAccraditation
string sqlValue = model.IsReadOnly || model.IsChart ? model.DetailSql : model.SystemModel.MenuSql; string sqlValue = model.IsReadOnly || model.IsChart ? model.DetailSql : model.SystemModel.MenuSql;
if (ReplaceHelper.IsSelect(sqlValue) && !string.IsNullOrEmpty(model.UnionValue)) 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;
}
}
}