From 0499d48243ef19ae03513a6749ca3a0e2102bf7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A3=9E=E9=B1=BC?= <506583276@qq.com>
Date: Tue, 9 Apr 2024 11:47:36 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BD=90=E5=BA=93=E5=AE=8C=E6=88=90=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=98=BE=E7=A4=BA=E6=89=93=E5=8D=B0=E5=90=88=E6=A0=BC?=
 =?UTF-8?q?=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Client/GlobalContext.cs                              | 2 +-
 BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs | 4 ----
 BBWY.Client/Views/PackTask/WaitPackageControl.xaml        | 8 ++++----
 BBWY.Client/Views/PackTask/WareHouseList.xaml             | 4 ++--
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs
index ad6034e0..31d3e793 100644
--- a/BBWY.Client/GlobalContext.cs
+++ b/BBWY.Client/GlobalContext.cs
@@ -13,7 +13,7 @@ namespace BBWY.Client
         {
             ShopServiceGroupList = new List<string>();
             ShopServiceGroupLowerList = new List<string>();
-            ClientVersion = "10234";
+            ClientVersion = "10235";
         }
 
 
diff --git a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
index 8efb5100..bf26838d 100644
--- a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
@@ -2485,10 +2485,6 @@ namespace BBWY.Client.ViewModels.PackTask
                                         }
                                     }
                                 }
-
-
-
-
                             });
                         }
                         else
diff --git a/BBWY.Client/Views/PackTask/WaitPackageControl.xaml b/BBWY.Client/Views/PackTask/WaitPackageControl.xaml
index a484d780..ddaa3dd1 100644
--- a/BBWY.Client/Views/PackTask/WaitPackageControl.xaml
+++ b/BBWY.Client/Views/PackTask/WaitPackageControl.xaml
@@ -185,7 +185,7 @@
                     <ColumnDefinition Width="130"/>
                     <ColumnDefinition Width="100"/>
                     <ColumnDefinition Width="120"/>
-                    <ColumnDefinition  Width="140"/>
+                    <ColumnDefinition Width="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=已完成:0:140  }"/>
                     <ColumnDefinition Width="120"/>
                 </Grid.ColumnDefinitions>
                 <TextBlock Text="商品信息" Style="{StaticResource middleTextBlock}"/>
@@ -197,7 +197,7 @@
                 <TextBlock Text="合格证、条形码"   Grid.Column="6" Style="{StaticResource middleTextBlock}"/>
                 <TextBlock Text="合格证位置"   Grid.Column="7" Style="{StaticResource middleTextBlock}"/>
                 <TextBlock Text="服务、耗材费用" Grid.Column="8" Style="{StaticResource middleTextBlock}"/>
-                <TextBlock Text="任务时间" Grid.Column="9" Style="{StaticResource middleTextBlock}"/>
+                <TextBlock  Text="任务时间" Grid.Column="9" Style="{StaticResource middleTextBlock}" Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=已完成:Collapsed:Visible  }" />
                 <TextBlock Text="操作" Grid.Column="10"   Style="{StaticResource middleTextBlock}"/>
 
                 <Border Height="1" VerticalAlignment="Top" Background="{StaticResource Border.Brush}" Grid.ColumnSpan="13"/>
@@ -244,7 +244,7 @@
                                     <ColumnDefinition Width="130"/>
                                     <ColumnDefinition Width="100"/>
                                     <ColumnDefinition Width="120"/>
-                                    <ColumnDefinition  Width="140"/>
+                                    <ColumnDefinition  Width="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=已完成:0:140}"/>
                                     <ColumnDefinition Width="120"/>
                                 </Grid.ColumnDefinitions>
                                 <StackPanel Orientation="Horizontal" Grid.Column="0" Grid.ColumnSpan="11">
@@ -293,7 +293,7 @@
                                     <ColumnDefinition Width="130"/>
                                     <ColumnDefinition Width="100"/>
                                     <ColumnDefinition Width="120"/>
-                                    <ColumnDefinition  Width="140"/>
+                                    <ColumnDefinition Width="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=已完成:0:140}"/>
                                     <ColumnDefinition Width="120"/>
                                 </Grid.ColumnDefinitions>
                                 <ListBox x:Name="listbox_orerSku"   ItemsSource="{Binding ItemList}"
diff --git a/BBWY.Client/Views/PackTask/WareHouseList.xaml b/BBWY.Client/Views/PackTask/WareHouseList.xaml
index 7bf2cbf2..285cafd4 100644
--- a/BBWY.Client/Views/PackTask/WareHouseList.xaml
+++ b/BBWY.Client/Views/PackTask/WareHouseList.xaml
@@ -148,10 +148,10 @@
 
             <Grid Grid.Row="1" Margin="0,5,0,0">
                 <fallware:WareFallWareListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待落仓:Visible:Collapsed}"    />
-                <local:WareHouseListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱|待落仓|待验收|待包装|待转运|已超时|待出库|待排单|商家自取:Collapsed:Visible}" />
+                <local:WareHouseListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=已完成|待封箱|待落仓|待验收|待包装|待转运|已超时|待出库|待排单|商家自取:Collapsed:Visible}" />
                 <fallware:WareFallWareListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱:Visible:Collapsed}"    />
                 <waitquality:WaitQualityList Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:Visible:Collapsed}"    />
-                <local:WaitPackageControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待排单:Visible:Collapsed}"  />
+                <local:WaitPackageControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=已完成|待排单:Visible:Collapsed}"  />
                 <packagingtask:PackagingTaskList  Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待包装:Visible:Collapsed}"  />
                 <waittransport:WareWaitTransportListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待转运:Visible:Collapsed}"  />
                 <taskovertime:WareTaskOverTimeControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=已超时:Visible:Collapsed}"  />