diff --git a/BBWY.Client/App.xaml.cs b/BBWY.Client/App.xaml.cs
index c1d660c5..996de55e 100644
--- a/BBWY.Client/App.xaml.cs
+++ b/BBWY.Client/App.xaml.cs
@@ -31,8 +31,11 @@ namespace BBWY.Client
             var gl = new GlobalContext();
             string userToken = string.Empty;
 #if DEBUG
+            //齐越山鸡
+            userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNjk0NjY5NjkxfQ.cSwro-7bGwOu92YejH9JhMenTai7Mvf99i2paQCmxIw";
+
             //齐越小戴
-            userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDM5OTEyNjg0MDk4MTYyNjg4IiwidGVhbUlkIjoiMTQzOTg5ODY0MDU0OTE1NDgxNiIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE2OTQ0OTQ1MDZ9.LxA_vc_YyXxgQjSQi4XVg2B-fdvAz3mIT0Bgg3Uuul8";
+            //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDM5OTEyNjg0MDk4MTYyNjg4IiwidGVhbUlkIjoiMTQzOTg5ODY0MDU0OTE1NDgxNiIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE2OTQ0OTQ1MDZ9.LxA_vc_YyXxgQjSQi4XVg2B-fdvAz3mIT0Bgg3Uuul8";
             //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDE1OTMxMjU4NjEzMDEwNDMyIiwidGVhbUlkIjoiMTQxNDkzNTcwNDQ2MjQzMDIwOCIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE2OTQxMDY1MjV9.XeMruS0YkwI7B6nODGe-vbdUqA_PSAt4EacfRAHIjV0"; //齐越文魁
             //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDA1MTUxNjE5NTk0NTg4MTYwIiwidGVhbUlkIjoiMTQxMDk1NTYwNDYxMjA5MTkwNCIsImV4cCI6MTY4NjQ4MjU0M30.emnQNDcbqnuO2jH0Kgfk2Ui7crrwzRb986Sa511iS-U";  //齐越小一
 
diff --git a/BBWY.Client/Models/Enums.cs b/BBWY.Client/Models/Enums.cs
index aebdfec9..a3f797b9 100644
--- a/BBWY.Client/Models/Enums.cs
+++ b/BBWY.Client/Models/Enums.cs
@@ -126,38 +126,29 @@
     }
 
     /// <summary>
-    /// 审计结果资金类型
-    /// <para>
-    ///商品采购 = 0,
-    ///商品退款 = 1,
-    ///批量采购商品 = 2,
-    ///入仓运费 = 3,
-    ///售后成本 = 4,
-    ///发票点数 = 5,
-    ///快递单号 = 6,
-    ///采购运费 = 7,
-    ///诚e赊还款 = 8,
-    ///空单号 = 9,
-    ///手机费 = 10,
-    ///刷单 = 11,
-    ///质检报告 = 12
-    /// </para>
+    /// 账单类型
     /// </summary>
     public enum AuditCapitalType
     {
-        商品采购 = 0,
-        商品退款 = 1,
-        批量采购商品 = 2,
-        入仓运费 = 3,
-        售后成本 = 4,
-        发票点数 = 5,
-        快递单号 = 6,
-        采购运费 = 7,
-        诚e赊还款 = 8,
-        空单号 = 9,
-        手机费 = 10,
-        刷单 = 11,
-        质检报告 = 12
+        当月商品采购 = 0,
+        当月商品退款 = 1,
+        上月商品采购 = 2,
+        上月商品退款 = 3,
+        批量采购商品 = 4,
+        采购运费 = 5,
+        入仓运费 = 6,
+        售后成本 = 7,
+        发票点数 = 8,
+        快递单号 = 9,
+        诚e赊还款 = 10,
+        空单号 = 11,
+        购买刷单号 = 12,
+        手机费 = 13,
+        质检报告 = 14,
+        备用金转入 = 15,
+        平台补贴 = 16,
+        快递赔付 = 17,
+        自定义 = 18
     }
 
     /// <summary>
diff --git a/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs b/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs
index a915deb7..dfc71899 100644
--- a/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs
+++ b/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs
@@ -184,12 +184,18 @@ namespace BBWY.Client.ViewModels
 
                     if (relationPurchaseOrder == null)
                     {
+                        if (payBill.IncomeAmount > 0 && StartDate.Day == 1)
+                        {
+                            payBill.AuditCapitalType = AuditCapitalType.上月商品退款;
+                            continue;
+                        }
+
                         if (payBill.IsSupportMerchantOrderNo)
                         {
-                            if (payBill.MerchantOrderNo.StartsWith("XP"))
-                                payBill.AuditCapitalType = AuditCapitalType.商品采购;
-                            else
-                                payBill.ErrorMessage = "未匹配采购单";
+                            //if (payBill.MerchantOrderNo.StartsWith("XP"))
+                            //    payBill.AuditCapitalType = AuditCapitalType.商品采购;
+                            //else
+                            payBill.ErrorMessage = "未匹配采购单";
                         }
                         else
                             payBill.ErrorMessage = "未选资金类型";
@@ -201,9 +207,9 @@ namespace BBWY.Client.ViewModels
                     payBill.BelongShopId = relationPurchaseOrder.ShopId;
                     payBill.BelongShop = shopList.FirstOrDefault(s => s.ShopId == relationPurchaseOrder.ShopId)?.ShopName;
                     if (payBill.IncomeAmount > 0)
-                        payBill.AuditCapitalType = AuditCapitalType.商品退款;
+                        payBill.AuditCapitalType = AuditCapitalType.当月商品退款;
                     else
-                        payBill.AuditCapitalType = AuditCapitalType.商品采购;
+                        payBill.AuditCapitalType = AuditCapitalType.当月商品采购;
                     #endregion
                 }
 
diff --git a/BBWY.Client/ViewModels/MainViewModel.cs b/BBWY.Client/ViewModels/MainViewModel.cs
index 3c276cee..1b92c212 100644
--- a/BBWY.Client/ViewModels/MainViewModel.cs
+++ b/BBWY.Client/ViewModels/MainViewModel.cs
@@ -178,7 +178,8 @@ namespace BBWY.Client.ViewModels
                     if (!response.Success)
                         throw new Exception(response.Msg);
                     departmentList = response.Data;
-
+                    if (departmentList.Count == 0)
+                        throw new Exception("缺少有效的部门数据");
                     if (departmentList.Count == 1 && departmentList[0].ShopList.Count == 1)
                     {
                         ShowShopChoosePanel = false;
diff --git a/BBWY.Client/Views/FinancialTerminal/ProcurementAudit.xaml b/BBWY.Client/Views/FinancialTerminal/ProcurementAudit.xaml
index 46e49eda..32d03a13 100644
--- a/BBWY.Client/Views/FinancialTerminal/ProcurementAudit.xaml
+++ b/BBWY.Client/Views/FinancialTerminal/ProcurementAudit.xaml
@@ -64,7 +64,7 @@
                     </hc:CheckComboBox>
                     <DatePicker Width="100" Height="30" Margin="5,0,0,0" SelectedDate="{Binding StartDate,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
                     <DatePicker Width="100" Height="30" Margin="5,0,0,0" SelectedDate="{Binding EndDate,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
-                    <c:BButton Content="执行" Margin="5,0,0,0" Padding="10,0" Command="{Binding AuditCommand}"/>
+                    <c:BButton Content="审计" Margin="5,0,0,0" Padding="10,0" Command="{Binding AuditCommand}"/>
                     <c:BButton Content="清空" Margin="5,0,0,0" Padding="10,0" Command="{Binding ClearAuditCommand}"/>
                 </StackPanel>
             </Border>
@@ -159,9 +159,18 @@
                       Grid.Row="7"
                       Visibility="{Binding IsShowPayBillPanel,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}"
                       BorderThickness="1,1,0,0"
-                      BorderBrush="{StaticResource Border.Brush}">
+                      BorderBrush="{StaticResource Border.Brush}"
+                      VirtualizingPanel.IsVirtualizing="True">
                 <DataGrid.Columns>
                     <DataGridTextColumn Header="账单流水号" Width="145" Binding="{Binding PayBillNo}" ElementStyle="{StaticResource verticalCenterTextBlock}"/>
+                    <DataGridTemplateColumn Header="商户订单号" Width="200">
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate>
+                                <TextBox Text="{Binding SourceMerchantOrderNo}" Background="Transparent" BorderThickness="0"
+                                         IsReadOnly="True" VerticalAlignment="Center"/>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+                    </DataGridTemplateColumn>
                     <DataGridTextColumn Header="账单平台" Width="60" Binding="{Binding PayBillType}" ElementStyle="{StaticResource middleTextBlock}"/>
                     <DataGridTextColumn Header="支付时间" Width="130" Binding="{Binding PayTime,StringFormat=yyyy-MM-dd HH:mm:ss}" ElementStyle="{StaticResource verticalCenterTextBlock}"/>
                     <DataGridTextColumn Header="对方账号" Width="100" Binding="{Binding OppositeAccount}" ElementStyle="{StaticResource verticalCenterTextBlock}"/>
@@ -177,14 +186,7 @@
                         </DataGridTemplateColumn.CellTemplate>
                     </DataGridTemplateColumn>
                     <!--<DataGridTextColumn Header="商户订单号" Width="200" Binding="{Binding SourceMerchantOrderNo}" ElementStyle="{StaticResource verticalCenterTextBlock}"/>-->
-                    <DataGridTemplateColumn Header="商户订单号" Width="200">
-                        <DataGridTemplateColumn.CellTemplate>
-                            <DataTemplate>
-                                <TextBox Text="{Binding SourceMerchantOrderNo}" Background="Transparent" BorderThickness="0"
-                                         IsReadOnly="True" VerticalAlignment="Center"/>
-                            </DataTemplate>
-                        </DataGridTemplateColumn.CellTemplate>
-                    </DataGridTemplateColumn>
+                   
                     <DataGridTextColumn Header="归属店铺" Width="100" Binding="{Binding BelongShop}" ElementStyle="{StaticResource verticalCenterTextBlock}"/>
                     <DataGridTextColumn Header="关联采购单" Width="140" Binding="{Binding RelationPurchaseOrderId}" ElementStyle="{StaticResource verticalCenterTextBlock}"/>
                     <DataGridTextColumn Header="关联销售单" Width="120" Binding="{Binding RelationShopOrderId}" ElementStyle="{StaticResource verticalCenterTextBlock}"/>
@@ -192,34 +194,6 @@
                     <DataGridTextColumn Header="异常内容" Width="*" Binding="{Binding ErrorMessage}" Foreground="Red" ElementStyle="{StaticResource verticalCenterTextBlock}"/>
                 </DataGrid.Columns>
             </DataGrid>
-
-            <!--<DataGrid ItemsSource="{Binding ShowAuditPurchaseOrderList}"
-                      Grid.Row="7"
-                      Visibility="{Binding IsShowPurchaseOrderPanel,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}">
-                <DataGrid.Columns>
-                    <DataGridTextColumn Header="采购单号" Width="145" Binding="{Binding PurchaseOrderId}" ElementStyle="{StaticResource verticalCenterTextBlock}"/>
-                    <DataGridTextColumn Header="采购平台" Width="60" Binding="{Binding Platform}" ElementStyle="{StaticResource middleTextBlock}"/>
-                    <DataGridTextColumn Header="创建时间" Width="130" Binding="{Binding CreateTime,StringFormat=yyyy-MM-dd HH:mm:ss}" 
-                                        ElementStyle="{StaticResource verticalCenterTextBlock}"/>
-                    <DataGridTextColumn Header="付款时间" Width="130" Binding="{Binding CreateTime,StringFormat=yyyy-MM-dd HH:mm:ss}"
-                                        ElementStyle="{StaticResource verticalCenterTextBlock}"/>
-                    <DataGridTextColumn Header="货品总价" Width="60" Binding="{Binding ProductAmount}" ElementStyle="{StaticResource middleTextBlock}"/>
-                    <DataGridTextColumn Header="运费" Width="60" Binding="{Binding Freight}" ElementStyle="{StaticResource middleTextBlock}"/>
-                    <DataGridTextColumn Header="联系人" Width="60" Binding="{Binding ContactName}" ElementStyle="{StaticResource middleTextBlock}"/>
-                    <DataGridTextColumn Header="手机号" Width="90" Binding="{Binding Phone}" ElementStyle="{StaticResource verticalCenterTextBlock}"/>
-                    <DataGridTextColumn Header="收货地址" Width="150" Binding="{Binding Address}"/>
-                    <DataGridTextColumn Header="归属店铺" Width="100" Binding="{Binding BelongShop}" ElementStyle="{StaticResource verticalCenterTextBlock}"/>
-                    <DataGridTextColumn Header="关联账单" Width="140" Binding="{Binding RelationPayBillNo}" ElementStyle="{StaticResource verticalCenterTextBlock}"/>
-                    <DataGridTextColumn Header="关联销售单" Width="140" Binding="{Binding RelationShopOrderId}" ElementStyle="{StaticResource verticalCenterTextBlock}"/>
-                    <DataGridTextColumn Header="异常内容" Width="*" Binding="{Binding ErrorMessage}" Foreground="Red" ElementStyle="{StaticResource verticalCenterTextBlock}"/>
-                </DataGrid.Columns>
-            </DataGrid>
-
-            <DataGrid ItemsSource="{Binding ShowAuditShopOrderList}"
-                      Grid.Row="7"
-                      Visibility="{Binding IsShowShopOrderPanel,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}">
-
-            </DataGrid>-->
         </Grid>
     </Grid>
 </Page>