Merge branch 'main' of http://27.223.88.102:33000/code/qhmes

yy-admin-master/YY.Admin/ViewModels/Supplier/SupplierListViewModel.cs

@@ -37,6 +37,8 @@ public class SupplierListViewModel : BaseViewModel
     public DelegateCommand<MesXslSupplier> EditCommand { get; }
     public DelegateCommand<MesXslSupplier> DeleteCommand { get; }
     public DelegateCommand<MesXslSupplier> ToggleStatusCommand { get; }
+    public DelegateCommand PrevPageCommand { get; }
+    public DelegateCommand NextPageCommand { get; }
 
     public SupplierListViewModel(
         ISupplierService supplierService,
@@ -47,17 +49,41 @@ public class SupplierListViewModel : BaseViewModel
     {
         _supplierService = supplierService;
         _dictSyncService = dictSyncService;
-        SearchCommand = new DelegateCommand(async () => { PageNo = 1; await LoadAsync(); });
+        SearchCommand = new DelegateCommand(async () =>
+        {
+            PageNo = 1;
+            RaisePropertyChanged(nameof(PageNo));
+            await LoadAsync();
+        });
         ResetCommand = new DelegateCommand(async () =>
         {
             FilterSupplierCode = FilterSupplierName = FilterSupplierShortName = FilterErpCode = FilterStatus = null;
             PageNo = 1;
+            RaisePropertyChanged(nameof(PageNo));
             await LoadAsync();
         });
         AddCommand = new DelegateCommand(async () => await ShowAddDialogAsync());
         EditCommand = new DelegateCommand<MesXslSupplier>(async s => await ShowEditDialogAsync(s));
         DeleteCommand = new DelegateCommand<MesXslSupplier>(async s => await DeleteAsync(s));
         ToggleStatusCommand = new DelegateCommand<MesXslSupplier>(async s => await ToggleStatusAsync(s));
+        PrevPageCommand = new DelegateCommand(async () =>
+        {
+            if (PageNo > 1)
+            {
+                PageNo--;
+                RaisePropertyChanged(nameof(PageNo));
+                await LoadAsync();
+            }
+        });
+        NextPageCommand = new DelegateCommand(async () =>
+        {
+            if ((long)PageNo * PageSize < Total)
+            {
+                PageNo++;
+                RaisePropertyChanged(nameof(PageNo));
+                await LoadAsync();
+            }
+        });
 
         _supplierChangedToken = _eventAggregator.GetEvent<SupplierChangedEvent>()
             .Subscribe(async p => await OnSupplierChangedAsync(p), ThreadOption.UIThread);

yy-admin-master/YY.Admin/Views/Supplier/SupplierListView.xaml

@@ -9,33 +9,115 @@
              prism:ViewModelLocator.AutoWireViewModel="True"
              mc:Ignorable="d">
     <Grid Style="{StaticResource BaseViewStyle}">
-        <Grid.RowDefinitions><RowDefinition Height="Auto"/><RowDefinition Height="Auto"/><RowDefinition Height="*"/></Grid.RowDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
         <Border Grid.Row="0" CornerRadius="4" Margin="0 0 -10 0">
             <hc:Row>
-                <hc:Col Layout="{hc:ColLayout Xs=12, Sm=8, Md=6, Lg=6, Xl=4}"><hc:TextBox Text="{Binding FilterSupplierCode}" Margin="0 0 10 10" hc:InfoElement.Title="供应商编码"/></hc:Col>
-                <hc:Col Layout="{hc:ColLayout Xs=12, Sm=8, Md=6, Lg=6, Xl=4}"><hc:TextBox Text="{Binding FilterSupplierName}" Margin="0 0 10 10" hc:InfoElement.Title="供应商名称"/></hc:Col>
-                <hc:Col Layout="{hc:ColLayout Xs=12, Sm=8, Md=6, Lg=6, Xl=4}"><hc:TextBox Text="{Binding FilterSupplierShortName}" Margin="0 0 10 10" hc:InfoElement.Title="供应商简称"/></hc:Col>
-                <hc:Col Layout="{hc:ColLayout Xs=12, Sm=8, Md=6, Lg=6, Xl=4}"><hc:TextBox Text="{Binding FilterErpCode}" Margin="0 0 10 10" hc:InfoElement.Title="ERP编码"/></hc:Col>
                 <hc:Col Layout="{hc:ColLayout Xs=12, Sm=8, Md=6, Lg=6, Xl=4}">
-                    <hc:ComboBox SelectedValuePath="Value" DisplayMemberPath="Key" ItemsSource="{Binding StatusOptions}" SelectedValue="{Binding FilterStatus}" Margin="0 0 10 10" hc:InfoElement.Title="状态"/>
+                    <hc:TextBox Text="{Binding FilterSupplierCode, UpdateSourceTrigger=PropertyChanged}"
+                                Margin="0 0 10 10"
+                                hc:InfoElement.Title="供应商编码"
+                                hc:InfoElement.TitlePlacement="Left"
+                                hc:InfoElement.TitleWidth="65"
+                                hc:InfoElement.Placeholder="请输入供应商编码"
+                                hc:InfoElement.ShowClearButton="True"/>
+                </hc:Col>
+                <hc:Col Layout="{hc:ColLayout Xs=12, Sm=8, Md=6, Lg=6, Xl=4}">
+                    <hc:TextBox Text="{Binding FilterSupplierName, UpdateSourceTrigger=PropertyChanged}"
+                                Margin="0 0 10 10"
+                                hc:InfoElement.Title="供应商名称"
+                                hc:InfoElement.TitlePlacement="Left"
+                                hc:InfoElement.TitleWidth="65"
+                                hc:InfoElement.Placeholder="请输入供应商名称"
+                                hc:InfoElement.ShowClearButton="True"/>
+                </hc:Col>
+                <hc:Col Layout="{hc:ColLayout Xs=12, Sm=8, Md=6, Lg=6, Xl=4}">
+                    <hc:TextBox Text="{Binding FilterSupplierShortName, UpdateSourceTrigger=PropertyChanged}"
+                                Margin="0 0 10 10"
+                                hc:InfoElement.Title="供应商简称"
+                                hc:InfoElement.TitlePlacement="Left"
+                                hc:InfoElement.TitleWidth="65"
+                                hc:InfoElement.Placeholder="请输入供应商简称"
+                                hc:InfoElement.ShowClearButton="True"/>
+                </hc:Col>
+                <hc:Col Layout="{hc:ColLayout Xs=12, Sm=8, Md=6, Lg=6, Xl=4}">
+                    <hc:TextBox Text="{Binding FilterErpCode, UpdateSourceTrigger=PropertyChanged}"
+                                Margin="0 0 10 10"
+                                hc:InfoElement.Title="ERP编码"
+                                hc:InfoElement.TitlePlacement="Left"
+                                hc:InfoElement.TitleWidth="65"
+                                hc:InfoElement.Placeholder="请输入ERP编码"
+                                hc:InfoElement.ShowClearButton="True"/>
+                </hc:Col>
+                <hc:Col Layout="{hc:ColLayout Xs=12, Sm=8, Md=6, Lg=6, Xl=4}">
+                    <hc:ComboBox SelectedValuePath="Value"
+                                 DisplayMemberPath="Key"
+                                 ItemsSource="{Binding StatusOptions}"
+                                 SelectedValue="{Binding FilterStatus}"
+                                 Margin="0 0 10 10"
+                                 hc:InfoElement.Title="状态"
+                                 hc:InfoElement.TitlePlacement="Left"
+                                 hc:InfoElement.TitleWidth="65"
+                                 hc:InfoElement.Placeholder="请选择状态"
+                                 hc:InfoElement.ShowClearButton="True"/>
                 </hc:Col>
             </hc:Row>
         </Border>
         <Border Grid.Row="1" Margin="0,10">
             <hc:UniformSpacingPanel Spacing="10">
-                <Button Style="{StaticResource ButtonPrimary}" Command="{Binding SearchCommand}"><StackPanel Orientation="Horizontal"><md:PackIcon Kind="Search"/><TextBlock Text="搜索" Style="{StaticResource IconButtonStyle}"/></StackPanel></Button>
-                <Button Style="{StaticResource ButtonDefault}" Command="{Binding ResetCommand}"><StackPanel Orientation="Horizontal"><md:PackIcon Kind="Refresh"/><TextBlock Text="重置" Style="{StaticResource IconButtonStyle}"/></StackPanel></Button>
-                <Button Style="{StaticResource ButtonSuccess}" Command="{Binding AddCommand}"><StackPanel Orientation="Horizontal"><md:PackIcon Kind="Plus"/><TextBlock Text="新增" Style="{StaticResource IconButtonStyle}"/></StackPanel></Button>
+                <Button Style="{StaticResource ButtonPrimary}" Command="{Binding SearchCommand}">
+                    <StackPanel Orientation="Horizontal">
+                        <md:PackIcon Kind="Search"/>
+                        <TextBlock Text="搜索" Style="{StaticResource IconButtonStyle}"/>
+                    </StackPanel>
+                </Button>
+                <Button Style="{StaticResource ButtonDefault}" Command="{Binding ResetCommand}">
+                    <StackPanel Orientation="Horizontal">
+                        <md:PackIcon Kind="Refresh"/>
+                        <TextBlock Text="重置" Style="{StaticResource IconButtonStyle}"/>
+                    </StackPanel>
+                </Button>
+                <Button Style="{StaticResource ButtonSuccess}" Command="{Binding AddCommand}">
+                    <StackPanel Orientation="Horizontal">
+                        <md:PackIcon Kind="Plus"/>
+                        <TextBlock Text="新增" Style="{StaticResource IconButtonStyle}"/>
+                    </StackPanel>
+                </Button>
             </hc:UniformSpacingPanel>
         </Border>
-        <DataGrid Grid.Row="2" ItemsSource="{Binding Suppliers}" AutoGenerateColumns="False" IsReadOnly="True" Style="{StaticResource CusDataGridStyle}">
+        <DataGrid Grid.Row="2"
+                  ItemsSource="{Binding Suppliers}"
+                  AutoGenerateColumns="False"
+                  IsReadOnly="True"
+                  CanUserAddRows="False"
+                  SelectionMode="Extended"
+                  SelectionUnit="FullRow"
+                  RowHeaderWidth="55"
+                  GridLinesVisibility="Horizontal"
+                  HorizontalGridLinesBrush="#FFEDEDED"
+                  VerticalGridLinesBrush="Transparent"
+                  HeadersVisibility="All"
+                  ColumnHeaderStyle="{StaticResource CusDataGridColumnHeaderStyle}"
+                  Style="{StaticResource CusDataGridStyle}"
+                  hc:DataGridAttach.ShowSelectAllButton="True"
+                  VerticalScrollBarVisibility="Auto"
+                  HorizontalScrollBarVisibility="Auto">
+            <DataGrid.RowHeaderTemplate>
+                <DataTemplate>
+                    <CheckBox IsChecked="{Binding IsSelected, RelativeSource={RelativeSource AncestorType=DataGridRow}}"/>
+                </DataTemplate>
+            </DataGrid.RowHeaderTemplate>
             <DataGrid.Columns>
-                <DataGridTextColumn Header="供应商编码" Binding="{Binding SupplierCode}" Width="120"/>
-                <DataGridTextColumn Header="供应商名称" Binding="{Binding SupplierName}" Width="160"/>
-                <DataGridTextColumn Header="供应商简称" Binding="{Binding SupplierShortName}" Width="140"/>
-                <DataGridTextColumn Header="ERP编码" Binding="{Binding ErpCode}" Width="120"/>
-                <DataGridTextColumn Header="备注" Binding="{Binding Remark}" Width="180"/>
-                <DataGridTextColumn Header="状态" Binding="{Binding StatusText}" Width="80"/>
+                <DataGridTextColumn Header="供应商编码" Binding="{Binding SupplierCode}" CellStyle="{StaticResource CusDataGridCellStyle}" Width="120"/>
+                <DataGridTextColumn Header="供应商名称" Binding="{Binding SupplierName}" CellStyle="{StaticResource CusDataGridCellStyle}" Width="160"/>
+                <DataGridTextColumn Header="供应商简称" Binding="{Binding SupplierShortName}" CellStyle="{StaticResource CusDataGridCellStyle}" Width="140"/>
+                <DataGridTextColumn Header="ERP编码" Binding="{Binding ErpCode}" CellStyle="{StaticResource CusDataGridCellStyle}" Width="120"/>
+                <DataGridTextColumn Header="备注" Binding="{Binding Remark}" CellStyle="{StaticResource CusDataGridCellStyle}" Width="180"/>
+                <DataGridTextColumn Header="状态" Binding="{Binding StatusText}" CellStyle="{StaticResource CusDataGridCellStyle}" Width="80"/>
                 <DataGridTemplateColumn Header="操作" Width="200" CellStyle="{StaticResource CusOperDataGridCellStyle}">
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
@@ -79,5 +161,15 @@
                 </DataGridTemplateColumn>
             </DataGrid.Columns>
         </DataGrid>
+
+        <!-- 分页 -->
+        <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,10,0,0">
+            <TextBlock Text="{Binding Total, StringFormat=共 {0} 条}" VerticalAlignment="Center" Margin="0,0,16,0"
+                       Foreground="{DynamicResource SecondaryTextBrush}"/>
+            <Button Content="上一页" Command="{Binding PrevPageCommand}" Style="{StaticResource ButtonDefault}" Margin="0,0,4,0" Width="80"/>
+            <TextBlock Text="{Binding PageNo, StringFormat=第 {0} 页}" VerticalAlignment="Center" Margin="8,0"
+                       Foreground="{DynamicResource PrimaryTextBrush}"/>
+            <Button Content="下一页" Command="{Binding NextPageCommand}" Style="{StaticResource ButtonDefault}" Width="80"/>
+        </StackPanel>
     </Grid>
 </UserControl>

yy-admin-master/YY.Admin/Views/Vehicle/VehicleListView.xaml

@@ -71,12 +71,6 @@
                         <TextBlock Text="重置" Style="{StaticResource IconButtonStyle}"/>
                     </StackPanel>
                 </Button>
-                <Button Style="{StaticResource ButtonSuccess}" Command="{Binding AddCommand}">
-                    <StackPanel Orientation="Horizontal">
-                        <md:PackIcon Kind="Plus"/>
-                        <TextBlock Text="新增" Style="{StaticResource IconButtonStyle}"/>
-                    </StackPanel>
-                </Button>
             </hc:UniformSpacingPanel>
         </Border>
 
@@ -114,36 +108,6 @@
                 <DataGridTextColumn Header="司机" Binding="{Binding DriverName}" CellStyle="{StaticResource CusDataGridCellStyle}" Width="100"/>
                 <DataGridTextColumn Header="联系电话" Binding="{Binding DriverPhone}" CellStyle="{StaticResource CusDataGridCellStyle}" Width="130"/>
                 <DataGridTextColumn Header="状态" Binding="{Binding StatusText}" CellStyle="{StaticResource CusDataGridCellStyle}" Width="80"/>
-                <DataGridTemplateColumn Header="操作" Width="150" CellStyle="{StaticResource CusOperDataGridCellStyle}">
-                    <DataGridTemplateColumn.CellTemplate>
-                        <DataTemplate>
-                            <hc:UniformSpacingPanel Spacing="5">
-                                <Border Style="{DynamicResource DataGridOpeButtonStyle}">
-                                    <Border.InputBindings>
-                                        <MouseBinding Command="{Binding DataContext.EditCommand, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                                      CommandParameter="{Binding}"
-                                                      MouseAction="LeftClick"/>
-                                    </Border.InputBindings>
-                                    <StackPanel Orientation="Horizontal">
-                                        <md:PackIcon Kind="SquareEditOutline" VerticalAlignment="Center"/>
-                                        <TextBlock Text="修改" VerticalAlignment="Center"/>
-                                    </StackPanel>
-                                </Border>
-                                <Border Style="{DynamicResource DataGridOpeButtonStyle}">
-                                    <Border.InputBindings>
-                                        <MouseBinding Command="{Binding DataContext.DeleteCommand, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                                      CommandParameter="{Binding}"
-                                                      MouseAction="LeftClick"/>
-                                    </Border.InputBindings>
-                                    <StackPanel Orientation="Horizontal">
-                                        <md:PackIcon Kind="TrashCanOutline" VerticalAlignment="Center"/>
-                                        <TextBlock Text="删除" VerticalAlignment="Center"/>
-                                    </StackPanel>
-                                </Border>
-                            </hc:UniformSpacingPanel>
-                        </DataTemplate>
-                    </DataGridTemplateColumn.CellTemplate>
-                </DataGridTemplateColumn>
             </DataGrid.Columns>
         </DataGrid>