SVN r1217

SVN-Revision: r1217

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

@@ -649,21 +649,4 @@
         private DevExpress.XtraBars.PopupMenu pMprint;
         private DevExpress.XtraEditors.PanelControl pl_right_bottom;
         private DevExpress.XtraEditors.PanelControl pl_right_bottom2;
-        private DevExpress.XtraEditors.SimpleButton btnRemindBack;
+        private DevExpress.XtraEd
-        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

@@ -1559,6 +1559,7 @@ namespace Lskj.BaseAccraditation
                 this.InitTabData();
                 this.InitEditTabControl();
                 this.Opacity = 1;
+                this.SetColor();
             }
             catch (Exception ex)
             {
@@ -1842,6 +1843,8 @@ namespace Lskj.BaseAccraditation
                     {
                         if (this.ControlObj.SaveBaseModuleData(this.SysModel.ModuleCode, this.ModuleModelObj.MenuTable, this.ModuleModelObj.ParmaryKey, ref this.SysModel.PrimaryValue, false, "", true, ModuleModelObj.NewVer))
                         {
+                            AuditChangeLog.SaveHeaderChangeLog(this._baseRowData, this.ControlObj, this.SysModel.PrimaryValue, this.SysModel.StepCode, ERPInfo.Instance.UserId);
+
                             isSuccess = true;
                             foreach (XtraTabPage item in this.tab_basicInfo.TabControlObj.TabPages)
                             {
@@ -2001,6 +2004,8 @@ namespace Lskj.BaseAccraditation
                             string parmaryValue = this.SysModel.PrimaryValue;
                             if (this.ControlObj.SaveBaseModuleData(this.SysModel.ModuleCode, this.ModuleModelObj.MenuTable, this.ModuleModelObj.ParmaryKey, ref parmaryValue, false, "", false, this.ModuleModelObj.NewVer))
                             {
+                                AuditChangeLog.SaveHeaderChangeLog(this._baseRowData, this.ControlObj, parmaryValue, this.SysModel.StepCode, ERPInfo.Instance.UserId);
+
                                 //string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, this.SysModel, this.SysModel.StepCode, this.SysModel.PrimaryValue, "", this.BaseAuditModelObj.ProcedureName, "F", this._flowTypeStepModel.RemindSelect, this.txt_remark.Text, 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, this.txt_remark.Text, remindOpers, confirmOpers);
                                 string result = this.AuditMethod(out nextSelectStepCode, out nextSelectStepOper, out string msgText, this.SysModel, this.SysModel.StepCode, this.SysModel.PrimaryValue, "", this.BaseAuditModelObj.ProcedureName, "F", this._flowTypeStepModel.RemindSelect, this.txt_remark.Text, remindOpers, confirmOpers);
@@ -2127,6 +2132,9 @@ namespace Lskj.BaseAccraditation
                         string parmaryValue = this.SysModel.PrimaryValue;
                         if (this.ControlObj.SaveBaseModuleData(this.SysModel.ModuleCode, this.ModuleModelObj.MenuTable, this.ModuleModelObj.ParmaryKey, ref parmaryValue, false, "", false, this.ModuleModelObj.NewVer))
                         {
+                            AuditChangeLog.SaveHeaderChangeLog(this._baseRowData, this.ControlObj, parmaryValue, this.SysModel.StepCode, ERPInfo.Instance.UserId);
+
+
                             string opinion = this.txt_remark.Text;//审核意见
                             if (this.combox_Suggestion.EditText.Equals("不同意"))
                             {
@@ -2507,6 +2515,8 @@ namespace Lskj.BaseAccraditation
                         string parmaryValue = this.SysModel.PrimaryValue;
                         if (this.ControlObj.SaveBaseModuleData(this.SysModel.ModuleCode, this.ModuleModelObj.MenuTable, this.ModuleModelObj.ParmaryKey, ref parmaryValue, false, "", false, this.ModuleModelObj.NewVer))
                         {
+                            AuditChangeLog.SaveHeaderChangeLog(this._baseRowData, this.ControlObj, parmaryValue, this.SysModel.StepCode, ERPInfo.Instance.UserId);
+
                             //反审前调用Api
                             if (ApiHelper.IsExecEventApi(Interface.Api.OperateEvent.BeforeModuleAuditStateChange, this.SysModel.ModuleCode, 0))
                             {
@@ -2869,3 +2879,11 @@ namespace Lskj.BaseAccraditation
         /// <returns></returns>
         public void SaveAdditionalModules()
         {
+            try
+            {
+                foreach (XtraTabPage tabPage in this.tab_basicInfo.TabControlObj.TabPages)
+                {
+                    GridDetailModel model = this.tab_basicInfo.GetGridDetailModel(tabPage);
+
+                    Object moduleObject = tabPage.Controls.Cast<Object>().FirstOrDefault();
+                    if (moduleObject is ModuleGridEx)