提交当前本机整理版本

插件库/Lskj.PubAccraditation/DllBaseClass.cs

@@ -37,4 +37,28 @@ namespace Lskj.PubAccraditation
                 if (obj.Length >= 8 && !string.IsNullOrEmpty(obj[7]) && !string.IsNullOrEmpty(obj[8]) && !string.IsNullOrEmpty(obj[9]))
                 {
                     FrmAccraditation popupForm = new FrmAccraditation();
-                    popupFor
+                    popupForm.SysModel = new DynamicPubAccraditionPopModel(obj);
+                    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 DynamicPubAccraditionModel(obj);
+                    main.SysModel.DataCaches = new Dictionary<object, Hashtable>();
+                    if(SystemInfo.Instance.OptimizationSpeed) main.GetDataCaches(main.SysModel.DataCaches);
+                }
+            }
+            catch (Exception ex)
+            {
+                LogUtil.WriteError("Lskj.PubAccraditation.dll--参数错误-->" + obj.ToString(), ex);
+            }
+
+        }
+
+        public Form SubForm { get; set; }
+    }
+}

插件库/Lskj.PubAccraditation/FrmAccraditation.Designer.cs

@@ -749,4 +749,22 @@
         private DevExpress.XtraEditors.SimpleButton btnAttach;
         private DevExpress.XtraEditors.SimpleButton btnSpare;
         private DevExpress.XtraEditors.DropDownButton btnPrint;
-        private DevExpress.XtraEditors.SimpleButton btnClose;
+        private DevExpress.XtraEditors.SimpleButton btnClose;
+        private DevExpress.XtraEditors.SimpleButton btnRemindBack;
+        private DevExpress.XtraEditors.SimpleButton btnBack;
+        private DevExpress.XtraEditors.SimpleButton btnRemindAccradit;
+        private DevExpress.XtraEditors.SimpleButton btnAccradit;
+        private Control.LabelDateEdit label_date;
+        private Control.LabelTextEdit label_managerAudit;
+        private Control.LabelComboxEdit CheckSuggestion;
+        private DevExpress.XtraEditors.XtraScrollableControl pl_detail;
+        private Control.GridControlEx gridBillInfo;
+        private DevExpress.XtraEditors.DropDownButton dbpFP;
+        private DevExpress.XtraBars.BarDockControl barDockControl3;
+        private DevExpress.XtraBars.BarDockControl barDockControl5;
+        private DevExpress.XtraBars.BarDockControl barDockControl2;
+        private DevExpress.XtraBars.BarDockControl barDockControl1;
+        private DevExpress.XtraBars.PopupMenu pmFP;
+        private DevExpress.XtraBars.BarManager barManager2;
+    }
+}

插件库/Lskj.PubAccraditation/FrmAccraditation.cs

@@ -4525,4 +4525,35 @@ namespace Lskj.PubAccraditation
 
                     Object moduleObject = tabPage.Controls.Cast<Object>().FirstOrDefault();
                     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.BillDocumentId);
+            foreach (string item in FieldList)
+            {
+                this.ControlObj.SetBackgroundColor(item);
+            }
+        }
+
+
+
+    }
+}

插件库/Lskj.PubAccraditation/FrmBackSelect.cs

@@ -113,4 +113,33 @@ 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

@@ -410,4 +410,26 @@ namespace Lskj.PubAccraditation
         /// <para>修改人：</para>
         /// <para>修改日期：</para>
         /// <para>修改备注：</para>
-        /// <p
+        /// <para>版本：1.0</para>
+        /// </summary>
+        private void refreshThePage(string promptInformation, string id)
+        {
+            //刷新界面
+            this.auditPanelEx.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.PubAccraditation/FrmSpare.Designer.cs

@@ -200,4 +200,26 @@
             this.groupControl2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.groupControl)).EndInit();
             this.groupControl.ResumeLayout(false);
-            ((System
+            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
+            this.panelControl1.ResumeLayout(false);
+            this.splitebillhistory_Page.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
+        private DevExpress.XtraTab.XtraTabPage splitebill_Page;
+        private DevExpress.XtraTab.XtraTabPage splitebillhistory_Page;
+        private DevExpress.XtraEditors.GroupControl groupControl;
+        private DevExpress.XtraEditors.PanelControl panelControl1;
+        private DevExpress.XtraEditors.GroupControl groupControl2;
+        private Control.GridControlEx gridNew;
+        private Control.GridControlEx gridOld;
+        private Control.GridControlEx gridHistory;
+        private DevExpress.XtraEditors.SimpleButton simpleButton2;
+        private DevExpress.XtraEditors.SimpleButton simpleButton1;
+        private DevExpress.XtraEditors.PanelControl panelMain;
+    }
+}

插件库/Lskj.PubAccraditation/FrmSpare.cs

@@ -217,4 +217,34 @@ namespace Lskj.PubAccraditation
         {
             try
             {
-                this.DialogResult = MessageUtil.Show(ResourceKeys.ConfirmSpliterBill, MessageBoxButtons.YesNo) == DialogResult.Yes ? DialogResult.OK
+                this.DialogResult = MessageUtil.Show(ResourceKeys.ConfirmSpliterBill, MessageBoxButtons.YesNo) == DialogResult.Yes ? DialogResult.OK : DialogResult.No;
+                this.Close();
+            }
+            catch (Exception ex)
+            {
+                //MessageUtil.Show(ex);
+                string Message = ErrorMessage.PromptErrorMessage(ex);
+                MessageUtil.Show(Message,ex.Message);
+            }
+        }
+        #endregion
+
+        #region 关闭
+        /// <summary>
+        /// <para>说明：关闭事件</para>
+        /// <para>创建人：龚宇超</para>
+        /// <para>创建日期：2017-01-30</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 btnClose_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+        #endregion
+    }
+}

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

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