diff --git a/插件库/Lskj.PubBill/BillModule.cs b/插件库/Lskj.PubBill/BillModule.cs
index 27cabb5..b274232 100644
--- a/插件库/Lskj.PubBill/BillModule.cs
+++ b/插件库/Lskj.PubBill/BillModule.cs
@@ -2591,11 +2591,13 @@ namespace Lskj.PubBill
                         XtraTabPage page = this.tb_buttom.TabControlObj.TabPages[i];
                         if (page != null && page.Controls[0] is ModuleGridEx moduleGridEx)
                         {
-                            moduleGridEx.GridControlObj.GridView.OptionsBehavior.Editable = !isReadOnly;
+                            bool result = !isReadOnly;
+                            if (!string.IsNullOrWhiteSpace(this.BillModel.AdditionalCond)) result=ReplaceHelper.ReplaceRowParamCond(rowItem, this.BillModel.AdditionalCond);
+                            moduleGridEx.GridControlObj.GridView.OptionsBehavior.Editable = result;
                             if (moduleGridEx.SysModel != null && moduleGridEx.SysModel.IsCustomGroup == 1 && (moduleGridEx.GridControlObj.CustomGroupBandEx != null || moduleGridEx.GridControlObj.CustomGroupTreeBandEx != null))
                             {
-                                if (moduleGridEx.GridControlObj.CustomGroupBandEx != null) moduleGridEx.GridControlObj.CustomGroupBandEx.GridView.OptionsBehavior.Editable = !isReadOnly;
-                                if (moduleGridEx.GridControlObj.CustomGroupTreeBandEx != null) moduleGridEx.GridControlObj.CustomGroupTreeBandEx.TreeListObj.OptionsBehavior.Editable = !isReadOnly;
+                                if (moduleGridEx.GridControlObj.CustomGroupBandEx != null) moduleGridEx.GridControlObj.CustomGroupBandEx.GridView.OptionsBehavior.Editable = result;
+                                if (moduleGridEx.GridControlObj.CustomGroupTreeBandEx != null) moduleGridEx.GridControlObj.CustomGroupTreeBandEx.TreeListObj.OptionsBehavior.Editable = result;
                             }
                         }
                     }
@@ -4201,7 +4203,7 @@ namespace Lskj.PubBill
                             }
                             else if (!string.IsNullOrEmpty(model.DefaultValue))
                             {
-                                if (string.IsNullOrEmpty(newRow[col.FieldName] + ""))
+                                if (string.IsNullOrEmpty(newRow[col.FieldName] + "")|| this.BillModel.DragFixedDefault)
                                 {
                                     newRow[col.FieldName] = fieldValue;
                                 }
@@ -4399,7 +4401,7 @@ namespace Lskj.PubBill
                                     }
                                     else if (!string.IsNullOrEmpty(model.DefaultValue))
                                     {
-                                        if (string.IsNullOrEmpty(newRow[col.FieldName] + ""))
+                                        if (string.IsNullOrEmpty(newRow[col.FieldName] + "") || this.BillModel.DragFixedDefault)
                                         {
                                             newRow[col.FieldName] = fieldValue;
                                         }
@@ -4734,7 +4736,7 @@ namespace Lskj.PubBill
             }
             // 检测是否为提交或者终审模块
             string text = Business.Impl.LanguageTranslation.Translatable ? Business.Impl.LanguageTranslation.GetTranslatedText("已终审") : "已终审";
-            if (_waterMark.Text.Contains(text))
+            if (_waterMark.Text.Contains(text)&& !this.BillModel.BillFinalReviewAdd)
             {
                 MessageUtil.Show(ResourceKeys.AddBillDetailed);
                 return false;
@@ -5787,8 +5789,17 @@ namespace Lskj.PubBill
                     sqlValue = this.ControlObj.ReplaceControlValue(sqlValue);
                     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")
+
+                    if (unionModel.ModelObj.sourceDetailType == "1" && unionModel.TreeGridDetailControlObj.TreeListObj != null)
+                    {
+                        unionModel.TreeGridDetailControlObj.TreeListObj.DataSource = BillImpl.GetDataTableResult(sqlValue);
+                    }
+                    else 
+                    {
+                        unionModel.GridDetailControlObj.GridControl.DataSource = BillImpl.GetDataTableResult(sqlValue);
+                    }
+
+                    if (BillModel.drgFinishHide == "1"&& unionModel.GridDetailControlObj!=null)
                     {
                         DataTable finishHideTb = unionModel.GridDetailControlObj.GridControl.DataSourceTable();
                         //foreach (DataRow drItem in RemoveRowitem)
@@ -9192,7 +9203,7 @@ namespace Lskj.PubBill
             }
             // 检测是否为提交或者终审模块
             string text = Business.Impl.LanguageTranslation.Translatable ? Business.Impl.LanguageTranslation.GetTranslatedText("已终审") : "已终审";
-            if (_waterMark.Text.Contains(text))
+            if (_waterMark.Text.Contains(text) && !this.BillModel.BillFinalReviewAdd)
             {
                 MessageUtil.Show(ResourceKeys.AddBillDetailed);
                 return false;
@@ -9819,37 +9830,4 @@ namespace Lskj.PubBill
         /// </summary>
         /// <param name="dataRow"></param>
         public bool SetPrintButton(DataRow rowItem)
-        {
-            try
-            {
-                bool result = false;
-                //判断打印按钮条件
-                if (!string.IsNullOrWhiteSpace(this.BillModel.PrintingConditions))
-                {
-                    if (rowItem == null) return result;
-
-                    string cond = ReplaceHelper.ReplaceRowParam(rowItem, this.BillModel.PrintingConditions);
-                    if (cond.StartsWith("@") || cond.StartsWith("!"))
-                    {
-                        result = "1".Equals(BaseImpl.GetDefaultValue(cond));
-                    }
-                    else
-                    {
-                        result = ReplaceHelper.ReplaceRowParamCond(rowItem, cond);
-                    }
-                    return result;
-                }
-                else
-                {
-                    return true;
-                }
-            }
-            catch (Exception ex)
-            {
-                return false;
-            }
-        }
-
-
-    }
-}
\ No newline at end of file
+      
\ No newline at end of file