From 384f428963ab215bd9cb6e00f75500388418c3e2 Mon Sep 17 00:00:00 2001
From: yibo <361071264@qq.com>
Date: Wed, 18 Apr 2018 22:18:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=98=E6=AC=BE=E5=AF=BC=E5=87=BA=E5=8A=A0?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/B3QingDaoWanFu/Reports/PayInfoExport.cs             | 3 ++-
 .../Pages/B3QingDaoWanFu/Reports/PayInfoExport.xml            | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/PayInfoExport.cs b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/PayInfoExport.cs
index ef18ac5..ba31fcf 100644
--- a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/PayInfoExport.cs
+++ b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/PayInfoExport.cs
@@ -52,12 +52,13 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Reports
       layout.Add("Date", new SimpleLabel("付款日期"), QueryCreator.DateRange(mDFInfo.Fields["Date"], mQueryContainer, "MinDate", "MaxDate", DateTime.Today, null));
       layout["Date"].NotAutoAddToContainer = true;
 
-      var config = new AutoLayoutConfig { Cols = 2 };
+      var config = new AutoLayoutConfig { Cols = 4 };
       config.Add("Date");
       config.Add("ID");
       config.Add("AccountingUnit_ID");
       config.Add("Supplier_ID");
       config.Add("PurchaseType_ID");
+      config.Add("BillState");
 
       layout.Config = config;
       vPanel.Add(layout.CreateLayout());
diff --git a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/PayInfoExport.xml b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/PayInfoExport.xml
index 1262b74..8659d33 100644
--- a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/PayInfoExport.xml
+++ b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/PayInfoExport.xml
@@ -28,6 +28,10 @@
         <Field name="Date"/>
         <QBE paramName="MaxDate"/>
       </LessThanOrEqual>
+      <EQ>
+        <Field name="BillState"/>
+        <QBE paramName="BillState"/>
+      </EQ>
     </And>
   </Where>
 </Select>
\ No newline at end of file