SVN r292

SVN-Revision: r292

插件库/Lskj.PubAccraditation/FrmAccraditation.cs

@@ -880,38 +880,27 @@ namespace Lskj.PubAccraditation
         {
             List<GridDetailModel> details = new List<GridDetailModel>();
 
-            if (ProcessExists)
+            DataTable table = BaseAuditImpl.GetAttachTabs(this.SysModel.ModuleCode, this.SysModel.StepCode);
+            foreach (DataRow item in table.Rows)
             {
-                DataTable table = Lskj.Data.Caches.CacheSYSConfig.Instance().AccessToContent();
+                if (table.Columns.Contains("privilegeoper"))
-                foreach (DataRow item in table.Rows)
                 {
-                    DataTable dtGridColumns = Lskj.Data.Caches.CacheSYSConfig.Instance().GetReportDetailColumns(item["formKey"] + "");//获取报表明细列
+                    string privilegeoper = item["privilegeoper"] + "";//配置的权限人员
-                    details.Add(new GridDetailModel(item, dtGridColumns, GridCustomColumnStruct.AuditPopupBasicInfoGridView + item["formKey"] + ""));
+                    if (string.IsNullOrWhiteSpace(privilegeoper) || privilegeoper.Split(',').Contains(ERPInfo.Instance.UserName))
-                }
-            }
-            else
-            {
-                DataTable table = BaseAuditImpl.GetAttachTabs(this.SysModel.ModuleCode, this.SysModel.StepCode);
-                foreach (DataRow item in table.Rows)
-                {
-                    if (table.Columns.Contains("privilegeoper"))
-                    {
-                        string privilegeoper = item["privilegeoper"] + "";//配置的权限人员
-                        if (string.IsNullOrWhiteSpace(privilegeoper) || privilegeoper.Split(',').Contains(ERPInfo.Instance.UserName))
-                        {
-                            DataTable dtGridColumns = BaseAuditImpl.GetBottomBasicInformation(item["formKey"] + "");
-                            details.Add(new GridDetailModel(item, dtGridColumns, GridCustomColumnStruct.AuditPopupBasicInfoGridView + item["formKey"] + ""));
-                        }
-                    }
-                    else
                     {
                         DataTable dtGridColumns = BaseAuditImpl.GetBottomBasicInformation(item["formKey"] + "");
                         details.Add(new GridDetailModel(item, dtGridColumns, GridCustomColumnStruct.AuditPopupBasicInfoGridView + item["formKey"] + ""));
                     }
-
                 }
+                else
+                {
+                    DataTable dtGridColumns = BaseAuditImpl.GetBottomBasicInformation(item["formKey"] + "");
+                    details.Add(new GridDetailModel(item, dtGridColumns, GridCustomColumnStruct.AuditPopupBasicInfoGridView + item["formKey"] + ""));
+                }
+
             }
 
+
             return details;
         }
         #endregion
@@ -1885,6 +1874,7 @@ namespace Lskj.PubAccraditation
                 //frmBackSelNew.FrmBackSelectEx.StepSelection.Hide();
                 frmBackSelNew.SysModel = this.SysModel;
                 frmBackSelNew.BillModelObj = this.BillModelObj;
+                frmBackSelNew.FrmBackSelectEx.LabelAdvice.EditText = this.CheckSuggestion.EditText;
                 frmBackSelNew.InitControlSpecial();
                 if (frmBackSelNew.ShowDialog() != DialogResult.OK) return -9;
                 this._auditAdvice = frmBackSelNew.ComfirmMsg;
@@ -1894,6 +1884,7 @@ namespace Lskj.PubAccraditation
             FrmBackSelect frmBackSel = new FrmBackSelect();
             frmBackSel.SysModel = this.SysModel;
             frmBackSel.BillModelObj = this.BillModelObj;
+            frmBackSel.FrmBackSelectEx.LabelAdvice.EditText = this.CheckSuggestion.EditText;
             frmBackSel.InitControl();
             if (frmBackSel.ShowDialog() != DialogResult.OK) return -9;
             this._auditAdvice = frmBackSel.ComfirmMsg;
@@ -2787,7 +2778,7 @@ namespace Lskj.PubAccraditation
                     StringBuilder fields = new StringBuilder();
                     StringBuilder values = new StringBuilder();
                     string detailSql = @"insert into " + BillModelObj.DetailTable + "_temp" + "({0}) values({1})";
-                    
+
                     fields.Append("sysstr,");
                     values.Append("'" + guid + "',");
                     foreach (DataColumn item in detailTable.Columns)

插件库/Lskj.PubAccraditation/FrmBackSelect.cs

@@ -113,33 +113,4 @@ namespace Lskj.PubAccraditation
             catch (Exception ex)
             {
                 string Message = ErrorMessage.PromptErrorMessage(ex);
-                MessageUtil.Show(Message,ex.Message);
+         
-            }
-        }
-
-        /// <summary>
-        /// <para>说明:取消事件</para>
-        /// <para>创建人：龚宇超</para>
-        /// <para>创建日期：2018-01-23</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 btnCancel_CallBack(object sender, EventArgs e)
-        {
-            try
-            {
-                this.DialogResult = DialogResult.Cancel;
-                this.Close();
-            }
-            catch (Exception ex)
-            {
-                string Message = ErrorMessage.PromptErrorMessage(ex);
-                MessageUtil.Show(Message,ex.Message);
-            }
-        }
-    }
-}

插件库/Lskj.PubAccraditation/FrmMain.cs

@@ -251,6 +251,7 @@ namespace Lskj.PubAccraditation
                 string[] args = defaultArgs.Concat(menuArgs).ToArray();
                 FrmAccraditation frm = new FrmAccraditation();
                 frm.SysModel = new DynamicPubAccraditionPopModel(args);
+                frm.SysModel.DataCaches = new Dictionary<object, Hashtable>();
                 if (SystemInfo.Instance.OptimizationSpeed) frm.GetDataCaches(frm.SysModel.DataCaches);
                 frm.Text = this.Text;
 
@@ -277,7 +278,8 @@ namespace Lskj.PubAccraditation
                         DllName = "",
                         Id = SysModel.ModuleId + "",
                         Name = SysModel.FormText,
-                        BeforePage = ERPInfo.Instance.PageControl.SelectedTabPage
+                        BeforePage = ERPInfo.Instance.PageControl.SelectedTabPage,
+                        ModuleForm = frm
                     };
                     frm.refreshThePage += new FrmAccraditation.RefreshThePage(refreshThePage);
                     string guid = Guid.NewGuid().ToString();
@@ -334,7 +336,10 @@ namespace Lskj.PubAccraditation
                 string[] menuArgs = { this.SysModel.ModuleId + "", "", dr[this.auditPanelEx.TmpPrefix + this.BaseAccraditModelObj.DefaultStepField] + "", dr[this.auditPanelEx.TmpPrefix + this.BaseAccraditModelObj.DefaultParmaryField] + "", "", "1" };
                 string[] args = defaultArgs.Concat(menuArgs).ToArray();
                 FrmAccraditation frm = new FrmAccraditation();
+               
                 frm.SysModel = new DynamicPubAccraditionPopModel(args);
+                frm.SysModel.DataCaches = new Dictionary<object, Hashtable>();
+                if (SystemInfo.Instance.OptimizationSpeed) frm.GetDataCaches(frm.SysModel.DataCaches);
                 frm.Text = this.Text;
 
                 if (SystemInfo.Instance.PageOpen)
@@ -359,7 +364,8 @@ namespace Lskj.PubAccraditation
                         DllName = "",
                         Id = SysModel.ModuleId + "",
                         Name = SysModel.FormText,
-                        BeforePage = ERPInfo.Instance.PageControl.SelectedTabPage
+                        BeforePage = ERPInfo.Instance.PageControl.SelectedTabPage,
+                        ModuleForm = frm
                     };
                     frm.refreshThePage += new FrmAccraditation.RefreshThePage(refreshThePage);
                     string guid = Guid.NewGuid().ToString();