diff --git a/插件库/Lskj.PubBill/BillModule.Designer.cs b/插件库/Lskj.PubBill/BillModule.Designer.cs
index 6356e9f..e3d159b 100644
--- a/插件库/Lskj.PubBill/BillModule.Designer.cs
+++ b/插件库/Lskj.PubBill/BillModule.Designer.cs
@@ -404,13 +404,13 @@
             this.dbpFP.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.dbpFP.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.dbpFP.Appearance.Options.UseFont = true;
-            this.dbpFP.DropDownArrowStyle = DevExpress.XtraEditors.DropDownArrowStyle.Show;
             this.dbpFP.DropDownControl = this.pmFP;
-            this.dbpFP.Location = new System.Drawing.Point(356, 7);
+            this.dbpFP.Location = new System.Drawing.Point(350, 7);
             this.dbpFP.Name = "dbpFP";
-            this.dbpFP.Size = new System.Drawing.Size(52, 26);
+            this.dbpFP.Size = new System.Drawing.Size(58, 26);
             this.dbpFP.TabIndex = 34;
             this.dbpFP.Text = "分配";
+            this.dbpFP.Click += new System.EventHandler(this.OnBtnFPOldClick);
             // 
             // pmFP
             // 
diff --git a/插件库/Lskj.PubBill/BillModule.cs b/插件库/Lskj.PubBill/BillModule.cs
index 2d6ca7c..66c7cac 100644
--- a/插件库/Lskj.PubBill/BillModule.cs
+++ b/插件库/Lskj.PubBill/BillModule.cs
@@ -843,9 +843,6 @@ namespace Lskj.PubBill
             BarButtonItem itemExport = new BarButtonItem();
             itemExport.Caption = "导出Excel文件";
             itemExport.ItemClick += new ItemClickEventHandler(OnExportItemClick);
-            BarButtonItem itemFPNormal = new BarButtonItem();
-            itemFPNormal.Caption = "普通分配";
-            itemFPNormal.ItemClick += new ItemClickEventHandler(OnBtnFPOldClick);
             BarButtonItem itemFPBatch = new BarButtonItem();
             itemFPBatch.Caption = "批量分配";
             itemFPBatch.ItemClick += new ItemClickEventHandler(OnBtnFPNewClick);
@@ -869,7 +866,7 @@ namespace Lskj.PubBill
                 this.pmBillExp.AddItems(new BarItem[] { _itemImport, _itemImportUpdate });
             }
             //分配
-            this.pmFP.AddItems(new BarItem[] { itemFPNormal, itemFPBatch });
+            this.pmFP.AddItems(new BarItem[] { itemFPBatch });
             // 打印模版
             string[] files = this.BillModel.PrintFile.Split('|');
             for (int i = 0; i < files.Length; i++)
@@ -7501,37 +7498,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 XXXX, <
\ No newline at end of file
diff --git a/插件库/Lskj.PubBill/BillModule.resx b/插件库/Lskj.PubBill/BillModule.resx
index 6043357..7fb4829 100644
--- a/插件库/Lskj.PubBill/BillModule.resx
+++ b/插件库/Lskj.PubBill/BillModule.resx
@@ -117,14 +117,26 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="pmFP.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1078, 23</value>
+  </metadata>
   <metadata name="barManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>642, 21</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>83</value>
   </metadata>
-  <metadata name="pmFP.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1078, 23</value>
+  <metadata name="pmBillExp.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>873, 21</value>
+  </metadata>
+  <metadata name="pmBill.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>983, 21</value>
+  </metadata>
+  <metadata name="pMprint.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>773, 21</value>
+  </metadata>
+  <metadata name="pMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>548, 21</value>
   </metadata>
   <metadata name="pmBillExp.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>873, 21</value>