diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/CustomerStopByTaskReport.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/CustomerStopByTaskReport.cs
index dd72d4a..2cfaab7 100644
--- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/CustomerStopByTaskReport.cs
+++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/CustomerStopByTaskReport.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Web.UI.HtmlControls;
 using System.Web.UI.WebControls;
 using BWP.B3Frameworks;
 using BWP.B3Frameworks.BO;
@@ -15,6 +16,7 @@ using Forks.EnterpriseServices.DomainObjects2;
 using Forks.EnterpriseServices.DomainObjects2.DQuery;
 using Forks.EnterpriseServices.SqlDoms;
 using TSingSoft.WebControls2;
+using Forks.EnterpriseServices.DataForm;
 
 namespace BWP.Web.Pages.B3YunKen.Reports
 {
@@ -22,21 +24,42 @@ namespace BWP.Web.Pages.B3YunKen.Reports
   {
     protected override string Caption
     {
-      get { return "客户停用表"; }
+      get { return "公共客户池"; }
     }
     protected override string AccessRoleName
     {
-      get { return "B3_YunKen.报表.客户停用表"; }
+      get { return "B3_YunKen.报表.公共客户池"; }
     }
 
-//    protected override string QueryOptionsTabName
-//    {
-//      get
-//      {
-//        return "显示字段";
-//      }
-//    }
-//    ReportDisplayOptionHelper mDisplayHelper = new ReportDisplayOptionHelper();
+    //    protected override string QueryOptionsTabName
+    //    {
+    //      get
+    //      {
+    //        return "显示字段";
+    //      }
+    //    }
+    //    ReportDisplayOptionHelper mDisplayHelper = new ReportDisplayOptionHelper();
+
+    protected override void InitForm(HtmlForm form)
+    {
+      base.InitForm(form);
+      mQueryContainer.GetControl<DFBoolComboBox>("Stopped").Value=true;
+    }
+
+    protected override void CreateDFBrowseGridColumns(DFBrowseGrid grid)
+    {
+      base.CreateDFBrowseGridColumns(grid);
+      grid.DataFilter = delegate (DFDataTable tbl) {
+        foreach (DFDataRow row in tbl.Rows)
+        {
+          var val = (bool)row["是否停用"];
+          if (val)
+          {
+            row["移动电话"] = "";
+          }
+        }
+      };
+    }
 
     protected override void AddQueryControls(VLayoutPanel vPanel)
     {
@@ -48,7 +71,7 @@ namespace BWP.Web.Pages.B3YunKen.Reports
       config.Add("Name");
       config.Add("Department_ID");
       config.Add("Employee_ID");
-
+      config.Add("Stopped");
       config.Add("SaleZone_ID");
       config.Add("CustomerCatalog_ID");
       config.Add("AccountCustomer_ID");
@@ -77,8 +100,9 @@ namespace BWP.Web.Pages.B3YunKen.Reports
       _checkbox.Items.Add(new ListItem("销售人员", "Employee_Name"));
       _checkbox.Items.Add(new ListItem("信用政策", "PriceStrategy_Name"));
       _checkbox.Items.Add(new ListItem("上次停用时间", "StopedTime"));
+      _checkbox.Items.Add(new ListItem("是否停用", "Stopped"));
       _checkbox.Items.Add(new ListItem("停用原因", "停用原因"));
-      _checkbox.Items.Add(new ListItem("最后一次发货时间", "LastGoodsOutStoreDate"));
+      _checkbox.Items.Add(new ListItem("最后一次发货时间", "最后一次发货时间"));
     
 
       panel.EAdd(_checkbox);
@@ -147,6 +171,7 @@ namespace BWP.Web.Pages.B3YunKen.Reports
             case "销售地区":
             case "信用政策":
             case  "上次停用时间":
+            case "是否停用":
               query.Columns.Add(DQSelectColumn.Create(DQExpression.Field(field.Value), field.Text));
 //              query.GroupBy.Expressions.Add(DQExpression.Field( "Zone_Name"));
               break;
@@ -170,8 +195,8 @@ namespace BWP.Web.Pages.B3YunKen.Reports
           }
         }
       }
-      query.Where.Conditions.Add(DQCondition.EQ("Stopped", true));
-      query.Where.Conditions.Add(DQCondition.EQ("StopedByCustomerTask", true));
+      //query.Where.Conditions.Add(DQCondition.EQ("Stopped", true));
+      //query.Where.Conditions.Add(DQCondition.EQ("StopedByCustomerTask", true));
 
       return query;
     }
diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/CustomerStopByTaskReport.xml b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/CustomerStopByTaskReport.xml
index 7e60695..db8dee6 100644
--- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/CustomerStopByTaskReport.xml
+++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/CustomerStopByTaskReport.xml
@@ -86,6 +86,10 @@
         <Field name="IsDealers"/>
         <QBE paramName="IsDealers"/>
       </EQ>
+      <EQ>
+        <Field name="Stopped"/>
+        <QBE paramName="Stopped"/>
+      </EQ>
     </And>
   </Where>
 </Select>
diff --git a/WebFolder/Config/Plugins/B3_YunKen.Plugin b/WebFolder/Config/Plugins/B3_YunKen.Plugin
index 0765c38..6f4a7d8 100644
--- a/WebFolder/Config/Plugins/B3_YunKen.Plugin
+++ b/WebFolder/Config/Plugins/B3_YunKen.Plugin
@@ -34,7 +34,7 @@
     </FunctionGroup>
     
     <FunctionGroup name="报表" roleSchemas="employee">
-      <Function index="0" name="客户停用表" />
+      <Function index="0" name="公共客户池" />
     </FunctionGroup>
 
 	  <FunctionGroup name="产品包装物设置" roleSchemas="employee">
@@ -59,7 +59,7 @@
   <Menus>
     <Menu id="0001" name="/B3耘垦模块/销售预报调整" roles="B3_YunKen.销售预报调整.访问" url="B3YunKen/SaleForecastUpdateList_/SaleForecastUpdateList.aspx"/>
     <Menu id="0002" name="/B3耘垦模块/耘垦出库转验收" roles="B3_YunKen.耘垦销售出库转验收单.访问" url="B3YunKen/B3YunKenSaleOutStoreToCustomerAccept.aspx"/>    
-    <Menu id="0003" name="/B3耘垦模块/报表/客户停用表" roles="B3_YunKen.报表.客户停用表" url="B3YunKen/Reports/CustomerStopByTaskReport.aspx"/>
+    <Menu id="0003" name="/B3耘垦模块/报表/公共客户池" roles="B3_YunKen.报表.公共客户池" url="B3YunKen/Reports/CustomerStopByTaskReport.aspx"/>
 	<Menu id="0004" name="/B3耘垦模块/产品包装物设置" roles="B3_YunKen.产品包装物设置.访问" url="B3YunKen/Bill/GoodsPackageSet.aspx" />
     <Menu id="0005" name="/B3耘垦模块/生产计划/订单转生产" roles="B3_YunKen.订单转生产.访问" url="B3YunKen/ProductTask_/SaleOrderToProductNoticePage.aspx"/>
 	<Menu id="0006" name="/B3耘垦模块/报表分析/物流分析表" roles="B3_YunKen.报表分析.物流分析表" url="B3YunKen/Reports/LogisticsAnalysisReport.aspx"/>