diff --git a/插件库/Lskj.PubBill/BillModule.cs b/插件库/Lskj.PubBill/BillModule.cs
index 2f5e419..41a067e 100644
--- a/插件库/Lskj.PubBill/BillModule.cs
+++ b/插件库/Lskj.PubBill/BillModule.cs
@@ -2043,6 +2043,7 @@ namespace Lskj.PubBill
                     DataView dataView = dt.AsDataView();
                     dataView.Sort = this.BillModel.DetailOrderField;
                     dt = dataView.ToTable();
+                    dt.AcceptChanges();
                 }
 
                 if (this.BillModel.DetailTreeTable)
@@ -2942,14 +2943,6 @@ namespace Lskj.PubBill
                 {
                     WaitForm.ShowForm();
                     unionModel.GridDetailControlObj.GridControl.DataSource = BillImpl.GetDataTableResult(sqlValue);
-                    if (BillModel.drgFinishHide == "1")
-                    {
-                        //DataTable finishHideTb = unionModel.GridDetailControlObj.GridControl.DataSourceTable();
-                        //foreach (DataRow drItem in RemoveRowitem)
-                        //{
-                        //    if (finishHideTb.Select().Contains(drItem)) finishHideTb.Rows.Remove(drItem);
-                        //}
-                    }
                 }
                 catch (Exception ex)
                 {
@@ -3060,14 +3053,7 @@ namespace Lskj.PubBill
                         DataTable gridTable = (this.gcMain.GridControl.DataSource as DataTable).TrimDeleteRows();
                         gridTable.OrderBy(this.BillModel.DetailOrderField);
                     }
-                    if (BillModel.drgFinishHide == "1")
-                    {
-                        DataTable finishHideTb = unionModel.GridDetailControlObj.GridControl.DataSourceTable();
-                        //foreach (DataRow drItem in RemoveRowitem)
-                        //{
-                        //    if (finishHideTb.Select().Contains(drItem)) finishHideTb.Rows.Remove(drItem);
-                        //}
-                    }
+                    
                 }
                 catch (Exception ex)
                 {
@@ -3823,12 +3809,10 @@ namespace Lskj.PubBill
                             if (unionModel.GridDetailControlObj.GridControl.DataSourceTable().Rows.IndexOf(rowItem) >= 0)
                             {
                                 unionModel.GridDetailControlObj.GridControl.DataSourceTable().Rows.Remove(rowItem);
-                                //RemoveRowitem.Add(rowItem);
                             }
                             if (unionModel.GridDetailDetailControlObj != null && unionModel.GridDetailDetailControlObj.GridControl.DataSourceTable().Rows.IndexOf(rowItem) >= 0)
                             {
                                 unionModel.GridDetailDetailControlObj.GridControl.DataSourceTable().Rows.Remove(rowItem);
-                                //RemoveRowitem.Add(rowItem);
                             }
 
 
@@ -4268,7 +4252,7 @@ namespace Lskj.PubBill
         /// <para>创建日期：2017-12-07 </para>
         /// <para>修改人：</para>
         /// <para>修改日期：</para>
-        /// <para>修改备注：</para>
+        /// <para>修改备注：</para>lserp_jt
         /// <para>版本：1.0</para>
         /// </summary>
         /// <returns>System.String.</returns>
@@ -4363,8 +4347,6 @@ namespace Lskj.PubBill
                             }
                             if (gridColumns.Count() == 0) continue;
                         }
-
-
                         fields.Append(item.ColumnName + ",");
                         string fieldValue = dataRow.Table.Columns.Contains(item.ColumnName) ? dataRow[item.ColumnName] + "" : string.Empty;
                         if (addRowList != null && addRowList.Contains(dataRow) && Autogrowcolumn.Equals(item.ColumnName))
@@ -4863,14 +4845,6 @@ namespace Lskj.PubBill
                     if (unionModel.SearchObj != null) sqlValue = unionModel.SearchObj.ReplaceControlValue(sqlValue);
                     sqlValue = ReplaceHelper.ReplaceParamToValue(sqlValue, e.Node.Name);
                     unionModel.GridDetailControlObj.GridControl.DataSource = BillImpl.GetDataTableResult(sqlValue);
-                    if (BillModel.drgFinishHide == "1")
-                    {
-                        DataTable finishHideTb = unionModel.GridDetailControlObj.GridControl.DataSourceTable();
-                        //foreach (DataRow drItem in RemoveRowitem)
-                        //{
-                        //    if (finishHideTb.Select().Contains(drItem)) finishHideTb.Rows.Remove(drItem);
-                        //}
-                    }
                 }
                 catch (Exception ex)
                 {
@@ -7969,34 +7943,4 @@ namespace Lskj.PubBill
         /// </summary>
         /// <param name="cond">The cond.</param>
         /// <param name="dataRow">The data row.</param>
-        /// <returns><c>true</c> if XXXX, <c>false</c> otherwise.</returns>
-        private bool ValidateCond(string cond, DataRow dataRow)
-        {
-            bool result = false;
-            string condition = cond;
-            try
-            {
-                if (string.IsNullOrWhiteSpace(cond)) return true;//如果值是空格或者空行，默认正确
-                cond = ReplaceHelper.ReplaceRowParam(dataRow, cond);
-                if (cond.StartsWith("@") || cond.StartsWith("!"))
-                {
-                    result = "1".Equals(BaseImpl.GetDefaultValue(cond));
-                }
-                else if (dataRow == null)
-                {
-                    result = ReplaceHelper.EvalCond(cond);
-                }
-                else
-                {
-                    result = ReplaceHelper.ReplaceRowParamCond(dataRow, cond);
-                }
-                return result;
-            }
-            catch (Exception ex)
-            {
-
-            }
-            return result;
-        }
-    }
-}
\ No newline at end of file
+        /// <returns><c>true</c> if X
\ No newline at end of file