提交当前本机整理版本

插件库/Lskj.BaseAccraditation/DllBaseClass.cs

@@ -71,4 +71,29 @@ namespace Lskj.BaseAccraditation
                         return;
                     }
                     FrmBaseAccraditation popupForm = new FrmBaseAccraditation();
-                    popupForm.SysModel = DynamicBaseM
+                    popupForm.SysModel = DynamicBaseModel;
+                    popupForm.Opacity = 0;
+                    popupForm.SysModel.DataCaches = new Dictionary<object, Hashtable>();
+                    if (SystemInfo.Instance.OptimizationSpeed) popupForm.GetDataCaches(popupForm.SysModel.DataCaches);
+                    this.SubForm = popupForm;
+                    
+                }
+                else
+                {
+                    FrmMain main = new FrmMain();
+                    this.SubForm = main;
+                    main.SysModel = new DynamicBaseAccraditionModel(obj);
+                    main.SysModel.DataCaches = new Dictionary<object, Hashtable>();
+                    if (SystemInfo.Instance.OptimizationSpeed) main.GetDataCaches(main.SysModel.DataCaches);
+                }
+            }
+            catch (Exception ex)
+            {
+                LogUtil.WriteError("Lskj.BaseAccraditation.dll--参数错误-->" + obj.ToString(), ex);
+            }
+
+        }
+
+        public Form SubForm { get; set; }
+    }
+}

插件库/Lskj.BaseAccraditation/FrmBaseAccraditation.Designer.cs

@@ -649,4 +649,21 @@
         private DevExpress.XtraBars.PopupMenu pMprint;
         private DevExpress.XtraEditors.PanelControl pl_right_bottom;
         private DevExpress.XtraEditors.PanelControl pl_right_bottom2;
-        private DevExpress.XtraEd
+        private DevExpress.XtraEditors.SimpleButton btnRemindBack;
+        private DevExpress.XtraEditors.SimpleButton btnRemindAccradit;
+        private Control.LabelDateEdit labeldate_happendTime;
+        private DevExpress.XtraEditors.SimpleButton btnAudit;
+        private DevExpress.XtraEditors.SimpleButton btnClose;
+        private Control.LabelTextEdit labeltxt_managerAudit;
+        private Control.LabelComboxEdit combox_Suggestion;
+        private DevExpress.XtraEditors.SimpleButton btnReturnd;
+        private DevExpress.XtraEditors.PanelControl pl_right_center;
+        private System.Windows.Forms.TextBox txt_remark;
+        private DevExpress.XtraEditors.LabelControl label_auditPerson;
+        private DevExpress.XtraEditors.SplitContainerControl splitContainer;
+        private DevExpress.XtraEditors.XtraScrollableControl pl_main;
+        private DevExpress.XtraEditors.LabelControl label_status;
+        private Control.TabControlEx tab_basicInfo;
+        private DevExpress.XtraEditors.DropDownButton btnPrint;
+    }
+}

插件库/Lskj.BaseAccraditation/FrmBaseAccraditation.cs

@@ -2886,4 +2886,34 @@ namespace Lskj.BaseAccraditation
                     GridDetailModel model = this.tab_basicInfo.GetGridDetailModel(tabPage);
 
                     Object moduleObject = tabPage.Controls.Cast<Object>().FirstOrDefault();
-                    if (moduleObject is ModuleGridEx)
+                    if (moduleObject is ModuleGridEx)
+                    {
+                        ModuleGridEx moduleGridEx = moduleObject as ModuleGridEx;
+                        if (moduleGridEx.GridControlObj.IsDataNotSaved() && moduleGridEx.BtnSave.Visible && moduleGridEx.BtnSave.Enabled)
+                        {
+                            moduleGridEx.BtnSave.PerformClick();
+                        }
+                    }
+                }
+            }
+            catch (Exception ex) 
+            {
+                string Message = ErrorMessage.PromptErrorMessage(ex);
+                MessageUtil.Show(Message, ex.Message);
+            }
+        }
+
+        /// <summary>
+        /// 设置修改过的控件颜色
+        /// </summary>
+        public void SetColor()
+        {
+            List<string> FieldList = AuditChangeLog.GetChangeLogFields(this.SysModel.PrimaryValue);
+            foreach (string item in FieldList)
+            {
+                this.ControlObj.SetBackgroundColor(item);
+            }
+        }
+
+    }
+}

插件库/Lskj.BaseAccraditation/FrmMain.cs

@@ -509,4 +509,25 @@ namespace Lskj.BaseAccraditation
         /// <para>创建日期：2021-11-23 </para>
         /// <para>修改人：</para>
         /// <para>修改日期：</para>
-        /// <para>修改��
+        /// <para>修改备注：</para>
+        /// <para>版本：1.0</para>
+        /// </summary>
+        public void refreshThePage(string promptInformation, string id)
+        {
+            this.auditPanelObj.RefreshTabPage();
+            if (!string.IsNullOrWhiteSpace(promptInformation)) MessageUtil.Show(promptInformation);
+            //上一次点开page
+            XtraTabPage beforePage = ERPInfo.Instance.ModuleForms[id].BeforePage;
+            //要删除的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);
+        }
+    }
+}

插件库/Lskj.BaseAccraditation/Properties/licenses.licx

@@ -0,0 +1,2 @@
+DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v15.2, Version=15.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a