SVN r989
SVN-Revision: r989
This commit is contained in:
@@ -1484,7 +1484,7 @@ namespace Lskj.BaseAccraditation
|
|||||||
List<int> targetPrivTypeIds = new List<int>();
|
List<int> targetPrivTypeIds = new List<int>();
|
||||||
foreach (string permission in control.Model.PrivilegeOper.Split(','))
|
foreach (string permission in control.Model.PrivilegeOper.Split(','))
|
||||||
{
|
{
|
||||||
targetPrivTypeIds.Add(int.Parse(permission));
|
if (!string.IsNullOrWhiteSpace(permission)) targetPrivTypeIds.Add(int.Parse(permission));
|
||||||
}
|
}
|
||||||
//获取权限对应的人员名称
|
//获取权限对应的人员名称
|
||||||
string userString = string.Join(",", AuthorityTable.AsEnumerable()
|
string userString = string.Join(",", AuthorityTable.AsEnumerable()
|
||||||
@@ -2194,7 +2194,9 @@ namespace Lskj.BaseAccraditation
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, this.SysModel, this.SysModel.StepCode, this.SysModel.PrimaryValue, "", this.BaseAuditModelObj.ProcedureName, "R", "", _auditAdvic, "", "", true, returnd, 0, true);
|
//string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, this.SysModel, this.SysModel.StepCode, this.SysModel.PrimaryValue, "", this.BaseAuditModelObj.ProcedureName, "R", "", _auditAdvic, "", "", true, returnd, 0, true);
|
||||||
|
string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, out string msgText,this.SysModel, this.SysModel.StepCode, this.SysModel.PrimaryValue, "", this.BaseAuditModelObj.ProcedureName, "R", "", _auditAdvic, "", "", true, returnd, 0, true);
|
||||||
|
|
||||||
if ("1".Equals(result))
|
if ("1".Equals(result))
|
||||||
{
|
{
|
||||||
MessageUtil.Show(ResourceKeys.ForcedSuccess);
|
MessageUtil.Show(ResourceKeys.ForcedSuccess);
|
||||||
@@ -2216,7 +2218,7 @@ namespace Lskj.BaseAccraditation
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
MessageUtil.Show(ResourceKeys.ForcedFail + "\r\n" + result);
|
MessageUtil.Show(ResourceKeys.ForcedFail + "\r\n" + msgText);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2233,7 +2235,10 @@ namespace Lskj.BaseAccraditation
|
|||||||
}
|
}
|
||||||
|
|
||||||
string confirmOpers = string.Empty, remindOpers = string.Empty;
|
string confirmOpers = string.Empty, remindOpers = string.Empty;
|
||||||
string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, this.SysModel, this.SysModel.StepCode, this.SysModel.PrimaryValue, "", this.BaseAuditModelObj.ProcedureName, "R", "", _auditAdvic, remindOpers, confirmOpers, true, returnd);
|
//string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, this.SysModel, this.SysModel.StepCode, this.SysModel.PrimaryValue, "", this.BaseAuditModelObj.ProcedureName, "R", "", _auditAdvic, remindOpers, confirmOpers, true, returnd);
|
||||||
|
string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, out string msgText, this.SysModel, this.SysModel.StepCode, this.SysModel.PrimaryValue, "", this.BaseAuditModelObj.ProcedureName, "R", "", _auditAdvic, remindOpers, confirmOpers, true, returnd);
|
||||||
|
|
||||||
|
|
||||||
if (result == "1")
|
if (result == "1")
|
||||||
{
|
{
|
||||||
MessageUtil.Show(ResourceKeys.ForcedSuccess);
|
MessageUtil.Show(ResourceKeys.ForcedSuccess);
|
||||||
@@ -2245,7 +2250,7 @@ namespace Lskj.BaseAccraditation
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
MessageUtil.Show(string.Format(ResourceKeys.ForcedFail, result));
|
MessageUtil.Show(string.Format(ResourceKeys.ForcedFail, msgText));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2402,36 +2407,4 @@ 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;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user