From e87064be3af8aa7440fdf02b2b23d5e7e191eaef Mon Sep 17 00:00:00 2001
From: wyf <wyf@local>
Date: Wed, 10 Sep 2025 06:43:07 +0000
Subject: [PATCH] SVN r981

SVN-Revision: r981
---
 .../FrmBaseAccraditation.cs                   | 41 +++++++++++++++++--
 1 file changed, 37 insertions(+), 4 deletions(-)

diff --git a/插件库/Lskj.BaseAccraditation/FrmBaseAccraditation.cs b/插件库/Lskj.BaseAccraditation/FrmBaseAccraditation.cs
index 648ac8e..6a37ea2 100644
--- a/插件库/Lskj.BaseAccraditation/FrmBaseAccraditation.cs
+++ b/插件库/Lskj.BaseAccraditation/FrmBaseAccraditation.cs
@@ -1961,7 +1961,8 @@ namespace Lskj.BaseAccraditation
                                 }
                             }
                             #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();
                             if ("1".Equals(result))
                             {
@@ -2026,13 +2027,13 @@ namespace Lskj.BaseAccraditation
                                 }
                                 else
                                 {
-                                    MessageUtil.Show("配置新版审批失败！" + "\r\n" + result);
+                                    MessageUtil.Show("配置新版审批失败！" + "\r\n" + msgText);
                                 }
 
                             }
                             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;
             if (ReplaceHelper.IsSelect(sqlValue) && !string.IsNullOrEmpty(model.UnionValue))
             {
-         
\ No newline at end of file
+                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;
+        }
+
+
+    }
+}