chenx/qhmes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化桌面端无用菜单和地磅数据可手动功能。

Browse Source
This commit is contained in:
geht
2026-05-18 15:55:11 +08:00
parent 5800b6b61c
commit c11f3104cb
18 changed files with 628 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
yy-admin-master/YY.Admin/Views/WeightRecord/WeightRecordOperationView.xaml
View File

@@ -540,9 +540,14 @@
<RowDefinition Height="Auto"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<StackPanel Grid.Row="0" Orientation="Horizontal" Margin="0,0,0,4">
<StackPanel Grid.Row="0" Orientation="Horizontal" Margin="0,0,0,4" VerticalAlignment="Center">
<Border Width="4" Height="18" CornerRadius="2" Background="{StaticResource SectionBorderBrush}"/>
<TextBlock Text="重量信息" Style="{StaticResource SectionTitleStyle}"/>
<CheckBox Margin="16,0,0,0" VerticalAlignment="Center"
Content="手动输入重量"
IsChecked="{Binding IsManualWeightEntry, Mode=TwoWay}"/>
<TextBlock Margin="8,0,0,0" VerticalAlignment="Center"
FontSize="11" Foreground="#ff9800" Text="（仅限测试）"/>
</StackPanel>
<!-- 毛重 / 皮重并排 -->
@@ -568,20 +573,44 @@
<TextBlock Text="毛 重（KG）" FontSize="12" Foreground="{DynamicResource SecondaryTextBrush}"
Margin="0,0,0,4" HorizontalAlignment="Center"/>
<Border CornerRadius="8" Padding="10,10" Background="{DynamicResource RegionBrush}">
<TextBlock Text="{Binding GrossWeight, StringFormat=N2, FallbackValue=—, TargetNullValue=—}"
HorizontalAlignment="Center" FontSize="20" FontWeight="Bold"
FontFamily="Consolas">
<TextBlock.Style>
<Style TargetType="TextBlock">
<Setter Property="Foreground" Value="{DynamicResource SecondaryTextBrush}"/>
<Style.Triggers>
<DataTrigger Binding="{Binding GrossWeightCaptured}" Value="True">
<Setter Property="Foreground" Value="#4caf50"/>
</DataTrigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
</TextBlock>
<Grid MinHeight="40">
<TextBlock HorizontalAlignment="Center" FontSize="20" FontWeight="Bold"
FontFamily="Consolas" VerticalAlignment="Center">
<TextBlock.Text>
<Binding Path="GrossWeight" StringFormat="N2" TargetNullValue="—"/>
</TextBlock.Text>
<TextBlock.Style>
<Style TargetType="TextBlock">
<Setter Property="Foreground" Value="{DynamicResource SecondaryTextBrush}"/>
<Setter Property="Visibility" Value="Visible"/>
<Style.Triggers>
<DataTrigger Binding="{Binding GrossWeightCaptured}" Value="True">
<Setter Property="Foreground" Value="#4caf50"/>
</DataTrigger>
<DataTrigger Binding="{Binding IsManualWeightEntry}" Value="True">
<Setter Property="Visibility" Value="Collapsed"/>
</DataTrigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
</TextBlock>
<hc:NumericUpDown Value="{Binding GrossWeight, Mode=TwoWay}"
Minimum="0"
DecimalPlaces="2"
HorizontalAlignment="Stretch"
VerticalAlignment="Center">
<hc:NumericUpDown.Style>
<Style TargetType="hc:NumericUpDown" BasedOn="{StaticResource NumericUpDownPlus}">
<Setter Property="Visibility" Value="Collapsed"/>
<Style.Triggers>
<DataTrigger Binding="{Binding IsManualWeightEntry}" Value="True">
<Setter Property="Visibility" Value="Visible"/>
</DataTrigger>
</Style.Triggers>
</Style>
</hc:NumericUpDown.Style>
</hc:NumericUpDown>
</Grid>
</Border>
<Border Margin="0,6,0,0" Height="32" CornerRadius="6">
<Border.Style>
@@ -632,12 +661,44 @@
<TextBlock Text="皮 重（KG）" FontSize="12" Foreground="{DynamicResource SecondaryTextBrush}"
Margin="0,0,0,4" HorizontalAlignment="Center"/>
<Border CornerRadius="8" Padding="10,10" Background="{DynamicResource RegionBrush}">
<TextBlock HorizontalAlignment="Center" FontSize="20" FontWeight="Bold"
FontFamily="Consolas" Foreground="{DynamicResource SecondaryTextBrush}">
<TextBlock.Text>
<Binding Path="TareWeight" StringFormat="N2" FallbackValue="—" TargetNullValue="—"/>
</TextBlock.Text>
</TextBlock>
<Grid MinHeight="40">
<TextBlock HorizontalAlignment="Center" FontSize="20" FontWeight="Bold"
FontFamily="Consolas" VerticalAlignment="Center">
<TextBlock.Text>
<Binding Path="TareWeight" StringFormat="N2" TargetNullValue="—"/>
</TextBlock.Text>
<TextBlock.Style>
<Style TargetType="TextBlock">
<Setter Property="Foreground" Value="{DynamicResource SecondaryTextBrush}"/>
<Setter Property="Visibility" Value="Visible"/>
<Style.Triggers>
<DataTrigger Binding="{Binding TareWeightCaptured}" Value="True">
<Setter Property="Foreground" Value="#4caf50"/>
</DataTrigger>
<DataTrigger Binding="{Binding IsManualWeightEntry}" Value="True">
<Setter Property="Visibility" Value="Collapsed"/>
</DataTrigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
</TextBlock>
<hc:NumericUpDown Value="{Binding TareWeight, Mode=TwoWay}"
Minimum="0"
DecimalPlaces="2"
HorizontalAlignment="Stretch"
VerticalAlignment="Center">
<hc:NumericUpDown.Style>
<Style TargetType="hc:NumericUpDown" BasedOn="{StaticResource NumericUpDownPlus}">
<Setter Property="Visibility" Value="Collapsed"/>
<Style.Triggers>
<DataTrigger Binding="{Binding IsManualWeightEntry}" Value="True">
<Setter Property="Visibility" Value="Visible"/>
</DataTrigger>
</Style.Triggers>
</Style>
</hc:NumericUpDown.Style>
</hc:NumericUpDown>
</Grid>
</Border>
<Border Margin="0,6,0,0" Height="32" CornerRadius="6">
<Border.Style>