pengcong001
/
bbwy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1

AddValidOverTime
506583276@qq.com 2 years ago
parent
36a0fefe70
commit
d103cf000e
2 changed files with 14 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
  2. 19
      BBWY.Client/Views/QualityTask/QualityWindow.xaml

10
BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
View File

@ -440,11 +440,11 @@ namespace BBWY.Client.ViewModels
MessageBox.Show("无可用的合格证打印！"); MessageBox.Show("无可用的合格证打印！");
return; return;
} }
if (PurchaseSkuList.Where(p => p.IsSetCertificate).Count() > 0) //if (PurchaseSkuList.Where(p => p.IsSetCertificate).Count() > 0)
{ //{
MessageBox.Show("存在未确认的合格证,请先完成确认！"); // MessageBox.Show("存在未确认的合格证,请先完成确认！");
return; // return;
} //}
if (PurchaseSkuList.Where(p => p.IsNeedCer && p.CerDTO.Id > 0).Count() <= 0) if (PurchaseSkuList.Where(p => p.IsNeedCer && p.CerDTO.Id > 0).Count() <= 0)
{ {
MessageBox.Show("无可选的合格证打印！"); MessageBox.Show("无可选的合格证打印！");

19
BBWY.Client/Views/QualityTask/QualityWindow.xaml
View File

@ -136,8 +136,8 @@
<Run Text="份数:"/> <Run Text="份数:"/>
<Run Text="{Binding WareHourseCount,Mode=TwoWay}"/> <Run Text="{Binding WareHourseCount,Mode=TwoWay}"/>
</TextBlock> </TextBlock>
<UniformGrid Columns="3" Margin="45 0 0 0" Height="30"> <StackPanel Orientation="Horizontal" Margin="45 0 0 0" Height="30">
<TextBlock Text="预计完成时间: " VerticalAlignment="Center"/> <TextBlock Text="预计完成时间: " VerticalAlignment="Center" Width="60"/>
<Border BorderBrush="{StaticResource Border.Brush}" Height="30" BorderThickness="1"> <Border BorderBrush="{StaticResource Border.Brush}" Height="30" BorderThickness="1">
<hc:ComboBox BorderThickness="0" ItemsSource="{Binding PreCompeteTimeDayList}" SelectedIndex="0" Text="{Binding PreCompeteTimeDay}"> <hc:ComboBox BorderThickness="0" ItemsSource="{Binding PreCompeteTimeDayList}" SelectedIndex="0" Text="{Binding PreCompeteTimeDay}">
@ -148,7 +148,7 @@
</hc:ComboBox> </hc:ComboBox>
</Border> </Border>
</UniformGrid> </StackPanel>
</StackPanel> </StackPanel>
@ -280,11 +280,10 @@
<StackPanel Orientation="Horizontal" <StackPanel Orientation="Horizontal"
Visibility="{Binding IsNeedCer, Converter={StaticResource objConverter}, ConverterParameter=true:Collapsed:Visible }"> Visibility="{Binding IsNeedCer, Converter={StaticResource objConverter}, ConverterParameter=true:Collapsed:Visible }">
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" >
Visibility="{Binding IsSetCertificate, Converter={StaticResource objConverter}, ConverterParameter=false:Visible:Collapsed }"> <!--Visibility="{Binding IsSetCertificate, Converter={StaticResource objConverter}, ConverterParameter=false:Visible:Collapsed }"-->
<c:BButton Content="无需合格证" Style="{StaticResource LinkButton}" Height="15" Margin="5 0 0 0" <TextBlock Text="无需合格证" Height="15" Margin="5 0 0 0"
CommandParameter="{Binding PurchaseSkuId}" />
Command="{Binding DataContext. LookCerCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"/>
<c:BButton Content="修改" Style="{StaticResource LinkButton}" Width="35" Height="15" CommandParameter="{Binding }" <c:BButton Content="修改" Style="{StaticResource LinkButton}" Width="35" Height="15" CommandParameter="{Binding }"
Command="{Binding DataContext.SetCertificateCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}" Command="{Binding DataContext.SetCertificateCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
/> />
@ -355,8 +354,8 @@
<StackPanel Orientation="Horizontal" <StackPanel Orientation="Horizontal"
Visibility="{Binding IsNeedCer, Converter={StaticResource objConverter}, ConverterParameter=true:Collapsed:Visible }"> Visibility="{Binding IsNeedCer, Converter={StaticResource objConverter}, ConverterParameter=true:Collapsed:Visible }">
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" <StackPanel Orientation="Horizontal" HorizontalAlignment="Center"
Visibility="{Binding IsSetCertificate, Converter={StaticResource objConverter}, ConverterParameter=false:Visible:Collapsed }"> >
<TextBlock Text="无需合格证" Height="15" Margin="0 0 0 0" <TextBlock Text="无需合格证" Height="15" Margin="5 0 0 0"
/> />
<!--<c:BButton Content="无需合格证" Style="{StaticResource LinkButton}" Height="15" Margin="5 0 0 0" <!--<c:BButton Content="无需合格证" Style="{StaticResource LinkButton}" Height="15" Margin="5 0 0 0"
CommandParameter="{Binding PurchaseSkuId}" CommandParameter="{Binding PurchaseSkuId}"

Write Preview
Loading…
Cancel
Save