Browse Source

移除仓库取消任务

AddValidOverTime
506583276@qq.com 2 years ago
parent
commit
754a26d723
  1. 2
      BBWY.Client/GlobalContext.cs
  2. 2
      BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
  3. 4
      BBWY.Client/Views/PackTask/WareHouseListControl.xaml
  4. 4
      BBWY.Client/Views/QualityTask/WaitQualityControl.xaml

2
BBWY.Client/GlobalContext.cs

@ -13,7 +13,7 @@ namespace BBWY.Client
{ {
ShopServiceGroupList = new List<string>(); ShopServiceGroupList = new List<string>();
ShopServiceGroupLowerList = new List<string>(); ShopServiceGroupLowerList = new List<string>();
ClientVersion = "10150"; ClientVersion = "10151";
} }
private User user; private User user;

2
BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs

@ -144,7 +144,7 @@ namespace BBWY.Client.ViewModels.PackTask
{ {
if (SelectTaskId == "任务ID") if (SelectTaskId == "任务ID")
{ {
searchOrderSn = null; SearchOrderSn = null;
} }
if (SelectTaskId == "拳探订单号") if (SelectTaskId == "拳探订单号")
{ {

4
BBWY.Client/Views/PackTask/WareHouseListControl.xaml

@ -260,8 +260,8 @@
> >
<!-- --> <!-- -->
<c:BButton Command="{Binding UpdateTaskCommand}" Style="{StaticResource LinkButton}" Content="修改" /> <c:BButton Command="{Binding UpdateTaskCommand}" Style="{StaticResource LinkButton}" Content="修改" />
<c:BButton Command="{Binding DataContext.DeletedTaskCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" CommandParameter="{Binding}" <!--<c:BButton Command="{Binding DataContext.DeletedTaskCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" CommandParameter="{Binding}"
Margin="5,0,0,0" Style="{StaticResource LinkButton}" Content="取消"/> Margin="5,0,0,0" Style="{StaticResource LinkButton}" Content="取消"/>-->
</StackPanel> </StackPanel>
</Grid> </Grid>
<Grid Grid.Row="1"> <Grid Grid.Row="1">

4
BBWY.Client/Views/QualityTask/WaitQualityControl.xaml

@ -269,8 +269,8 @@
> >
<!-- --> <!-- -->
<c:BButton Command="{Binding UpdateTaskCommand}" Style="{StaticResource LinkButton}" Content="修改" /> <c:BButton Command="{Binding UpdateTaskCommand}" Style="{StaticResource LinkButton}" Content="修改" />
<c:BButton Command="{Binding DataContext.DeletedTaskCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" CommandParameter="{Binding}" <!--<c:BButton Command="{Binding DataContext.DeletedTaskCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" CommandParameter="{Binding}"
Margin="5,0,0,0" Style="{StaticResource LinkButton}" Content="取消"/> Margin="5,0,0,0" Style="{StaticResource LinkButton}" Content="取消"/>-->
</StackPanel> </StackPanel>
</Grid> </Grid>
<Grid Grid.Row="1"> <Grid Grid.Row="1">

Loading…
Cancel
Save