From d577ffa73beaf0a52073f4268ac90c751d7908d5 Mon Sep 17 00:00:00 2001
From: xxe <xxe@163.com>
Date: Fri, 9 Sep 2022 10:39:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E8=B4=B9=E7=BB=88=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 HKCardOUT/Logic/Service/HKCore.cs     |  2 +-
 HKCardOUT/ViewModels/RootViewModel.cs | 11 ++--
 HKCardOUT/Views/RootView.xaml         | 73 ++++++++++++++++++++-------
 3 files changed, 61 insertions(+), 25 deletions(-)

diff --git a/HKCardOUT/Logic/Service/HKCore.cs b/HKCardOUT/Logic/Service/HKCore.cs
index 82fc257..346712f 100644
--- a/HKCardOUT/Logic/Service/HKCore.cs
+++ b/HKCardOUT/Logic/Service/HKCore.cs
@@ -42,7 +42,7 @@ namespace HKCardOUT.Logic.Service
             return DbContext.Context.Queryable<SaleLog>()
                    .Where(t => t.CreateTime >= Begin)
                    .Where(t => t.CreateTime < End)
-                   .OrderByDescending(t => t.CreateTime).ToPageList(0, 10);
+                   .OrderByDescending(t => t.CreateTime).ToPageList(0, 100);
         }
     }
 }
diff --git a/HKCardOUT/ViewModels/RootViewModel.cs b/HKCardOUT/ViewModels/RootViewModel.cs
index 061698b..76ba912 100644
--- a/HKCardOUT/ViewModels/RootViewModel.cs
+++ b/HKCardOUT/ViewModels/RootViewModel.cs
@@ -21,12 +21,11 @@ namespace HKCardOUT.ViewModels
 
         protected override void OnViewLoaded()
         {
-            Result = new ObservableCollection<SaleLog>(this.Container.Get<HKCore>().PullDaySaleLog());
-            //ThreadManage.GetInstance().Start(() =>
-            //{
-            //    Result = new ObservableCollection<SaleLog>(this.Container.Get<HKCore>().PullDaySaleLog());
-            //    Thread.Sleep(3000);
-            //}, "消费记录查询");
+            ThreadManage.GetInstance().Start(() =>
+            {
+                Result = new ObservableCollection<SaleLog>(this.Container.Get<HKCore>().PullDaySaleLog());
+                Thread.Sleep(3000);
+            }, "消费记录查询");
         }
 
         #region 属性
diff --git a/HKCardOUT/Views/RootView.xaml b/HKCardOUT/Views/RootView.xaml
index 43a5997..400110f 100644
--- a/HKCardOUT/Views/RootView.xaml
+++ b/HKCardOUT/Views/RootView.xaml
@@ -11,32 +11,69 @@
     ShowMaxButton="False"
     ShowMinButton="False"
     ShowTitle="True"
-    Topmost="True"
     WindowStartupLocation="CenterScreen"
     WindowState="Maximized"
     mc:Ignorable="d">
+    <hc:Window.Resources>
+        <Style x:Key="SaleLogHeader" TargetType="DataGridColumnHeader">
+            <Setter Property="FontSize" Value="18" />
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="Foreground" Value="White" />
+            <Setter Property="HorizontalAlignment" Value="Center" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+        </Style>
+        <Style x:Key="CenterAlignmentStyle" TargetType="TextBlock">
+            <Setter Property="TextAlignment" Value="Center" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="Foreground" Value="White" />
+            <Setter Property="FontSize" Value="15" />
+            <Setter Property="Background" Value="Transparent" />
+        </Style>
+    </hc:Window.Resources>
     <hc:Window.Background>
         <ImageBrush ImageSource="/HKResouces/背景.jpg" />
     </hc:Window.Background>
     <DataGrid
         AutoGenerateColumns="False"
         Background="Transparent"
-        ItemsSource="{Binding Result}">
-        <DataGridTextColumn
-            Width="120"
-            Binding="{Binding CardNo}"
-            Header="卡号" />
-        <DataGridTextColumn
-            Width="120"
-            Binding="{Binding Money}"
-            Header="金额" />
-        <DataGridTextColumn
-            Width="120"
-            Binding="{Binding Location}"
-            Header="档口" />
-        <DataGridTextColumn
-            Width="120"
-            Binding="{Binding CreateTime}"
-            Header="消费时间" />
+        IsReadOnly="True"
+        ItemsSource="{Binding Result}"
+        Style="{StaticResource DataGridBaseStyle}">
+        <DataGrid.RowStyle>
+            <Style BasedOn="{StaticResource DataGridRowStyle}" TargetType="DataGridRow">
+                <Setter Property="Background" Value="Transparent" />
+                <Style.Triggers>
+                    <Trigger Property="UIElement.IsMouseOver" Value="true">
+                        <Setter Property="Background" Value="Transparent" />
+                    </Trigger>
+                </Style.Triggers>
+            </Style>
+        </DataGrid.RowStyle>
+        <DataGrid.Columns>
+            <DataGridTextColumn
+                Width="230"
+                Binding="{Binding CardNo}"
+                ElementStyle="{StaticResource CenterAlignmentStyle}"
+                Header="卡号"
+                HeaderStyle="{StaticResource SaleLogHeader}" />
+            <DataGridTextColumn
+                Width="230"
+                Binding="{Binding Money}"
+                ElementStyle="{StaticResource CenterAlignmentStyle}"
+                Header="金额"
+                HeaderStyle="{StaticResource SaleLogHeader}" />
+            <DataGridTextColumn
+                Width="230"
+                Binding="{Binding Location}"
+                ElementStyle="{StaticResource CenterAlignmentStyle}"
+                Header="档口"
+                HeaderStyle="{StaticResource SaleLogHeader}" />
+            <DataGridTextColumn
+                Width="230"
+                Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                ElementStyle="{StaticResource CenterAlignmentStyle}"
+                Header="消费时间"
+                HeaderStyle="{StaticResource SaleLogHeader}" />
+        </DataGrid.Columns>
     </DataGrid>
 </hc:Window>