1

BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs

@@ -16,6 +16,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Input;
 using BBWY.Common.Extensions;
+using BBWY.Client.Views.FinancialTerminal;
 
 namespace BBWY.Client.ViewModels
 {
@@ -570,17 +571,40 @@ namespace BBWY.Client.ViewModels
             if (ShowAuditPayBillList.Count == 0)
                 return;
             var shopNames = string.Join(',', SelectedDepartment.ShopList.Where(s => s.IsSelected).Select(s => s.ShopName));
-            var sfd = new SaveFileDialog() { FileName = $"{StartDate:yyyy-MM-dd}_{EndDate:yyyy-MM-dd}_{shopNames}_审计结果.csv" };
+
+            var ew = new ProcurementAuditExcelExport();
+            if (ew.ShowDialog() != true)
+                return;
+
+            var fileName = string.Empty;
+            var saveList = new List<string>();
+            if (ew.Type == 0)
+            {
+                fileName = $"{StartDate:yyyy-MM-dd}_{EndDate:yyyy-MM-dd}_{shopNames}_审计结果.csv";
+                saveList.AddRange(ShowAuditPayBillList.Select(p => p.ToString()).ToList());
+                saveList.Insert(0, AuditPayBill.ExportTitle);
+            }
+            else
+            {
+                fileName = $"{StartDate:yyyy-MM-dd}_{EndDate:yyyy-MM-dd}_{shopNames}_资金类型汇总.csv";
+                saveList.Add($"序号,资金类型,{string.Join(',', SelectedDepartment.ShopList)},汇总");
+                var capitalGroups = ShowAuditPayBillList.GroupBy(p=>p.AuditCapitalType);
+                foreach (var capitalGroup in capitalGroups)
+                { 
+                    
+                }
+               
+            }
+
+            var sfd = new SaveFileDialog() { FileName = fileName };
             if (sfd.ShowDialog() != true)
                 return;
             var path = sfd.FileName;
 
             try
             {
-                var list = ShowAuditPayBillList.Select(p => p.ToString()).ToList();
+                File.WriteAllLines(path, saveList, Encoding.UTF8);
-                list.Insert(0, AuditPayBill.ExportTitle);
+                MessageBox.Show("导出成功", "提示");
-                File.WriteAllLines(path, list, Encoding.UTF8);
-                MessageBox.Show("导出成功", "导出审计结果");
             }
             catch (Exception ex)
             {

BBWY.Client/Views/FinancialTerminal/ProcurementAuditExcelExport.xaml

@@ -0,0 +1,28 @@
+<c:BWindow x:Class="BBWY.Client.Views.FinancialTerminal.ProcurementAuditExcelExport"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:BBWY.Client.Views.FinancialTerminal"
+        mc:Ignorable="d"
+        xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
+        Title="导出提示"
+        Style="{StaticResource bwstyle}"
+        MinButtonVisibility="Collapsed"
+        MaxButtonVisibility="Collapsed"
+        Height="150" Width="300">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="30"/>
+            <RowDefinition/>
+        </Grid.RowDefinitions>
+        <Border BorderThickness="0,0,0,1" BorderBrush="{StaticResource MainMenu.BorderBrush}"
+                Background="{StaticResource Border.Background}">
+            <TextBlock Text="选择导出类型" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+        </Border>
+        <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Center">
+            <c:BButton Content="当前表格内容" Width="100" Click="BButton_Click"/>
+            <c:BButton Content="资金类型汇总" Width="100" Margin="10,0,0,0" Click="BButton_Click_1"/>
+        </StackPanel>
+    </Grid>
+</c:BWindow>

BBWY.Client/Views/FinancialTerminal/ProcurementAuditExcelExport.xaml.cs

@@ -0,0 +1,34 @@
+using BBWY.Controls;
+
+namespace BBWY.Client.Views.FinancialTerminal
+{
+    /// <summary>
+    /// ProcurementAuditExcelExport.xaml 的交互逻辑
+    /// </summary>
+    public partial class ProcurementAuditExcelExport : BWindow
+    {
+        public ProcurementAuditExcelExport()
+        {
+            InitializeComponent();
+        }
+
+        /// <summary>
+        /// 当前表格内容=0,资金类型汇总=1
+        /// </summary>
+        public int Type { get; private set; }
+
+        private void BButton_Click(object sender, System.Windows.RoutedEventArgs e)
+        {
+            Type = 0;
+            DialogResult = true;
+            Close();
+        }
+
+        private void BButton_Click_1(object sender, System.Windows.RoutedEventArgs e)
+        {
+            Type = 1;
+            DialogResult = true;
+            Close();
+        }
+    }
+}

BBWY.Client/Views/MainWindow.xaml

@@ -26,7 +26,7 @@
                 <!--<TextBlock Text="{Binding GlobalContext.User.TeamName}" Margin="5,0,0,0"/>
                 <TextBlock Text="{Binding GlobalContext.User.Shop.Platform}" Margin="5,0,0,0"/>-->
                 <TextBlock Text="{Binding GlobalContext.User.Shop.ShopName}"  Margin="5,0,0,0"/>
-                <TextBlock Text="v10053" Margin="5,0,0,0"/>
+                <TextBlock Text="v10054" Margin="5,0,0,0"/>
             </StackPanel>
         </Border>
         <Grid Grid.Row="1">