From a7d084b4c715e9a34d02b4f9cd877cc9dfe40d7a Mon Sep 17 00:00:00 2001
From: wule <jtt_fan@qq.com>
Date: Tue, 23 Jun 2026 01:36:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=8D=95=E5=8F=B7=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Ctrls/OrderCtrls/OrderListCtrl.xaml       | 34 +++++++++++--------
 .../Ctrls/OrderCtrls/OrderListCtrl.xaml.cs    |  4 +++
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml
index 8df7233..738e640 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml
@@ -21,6 +21,7 @@
         </Grid.RowDefinitions>
         <Grid x:Name="gridSearch" Margin="8,0">
             <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"></ColumnDefinition>
                 <ColumnDefinition Width="*"></ColumnDefinition>
                 <ColumnDefinition Width="Auto"></ColumnDefinition>
                 <ColumnDefinition Width="*"></ColumnDefinition>
@@ -35,27 +36,32 @@
                 <ColumnDefinition Width="Auto"></ColumnDefinition>
                 <ColumnDefinition Width="Auto"></ColumnDefinition>
             </Grid.ColumnDefinitions>
-            <usercontrols:UcWaterMarkTextBox x:Name="txtShopName" Grid.Column="0" Margin="8,0,-4,0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1" Height="28" VerticalContentAlignment="Center"
+            <usercontrols:UcWaterMarkTextBox x:Name="txtOrderId" WaterMark="111" DataContext="{Binding ElementName=txtOrderId,Path=DataContext}" Grid.Column="0" Margin="0,0,0,0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1" Height="28" VerticalContentAlignment="Center"
+                    Style="{StaticResource BaseRoundCornerTextBoxStyle}" />
+            <TextBlock Text="店铺单号" Grid.Column="0" Margin="4,0,4,0" VerticalAlignment="Center" IsHitTestVisible="False" Foreground="LightGray" Visibility="{Binding ElementName=txtOrderId,Path=Text,Converter={StaticResource NotHasTextVisibility}}"></TextBlock>
+
+
+            <usercontrols:UcWaterMarkTextBox x:Name="txtShopName" Grid.Column="1" Margin="8,0,-4,0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1" Height="28" VerticalContentAlignment="Center"
                      Style="{StaticResource BaseRoundCornerTextBoxStyle}" />
-            <TextBlock Text="全部店铺" Grid.Column="0" Margin="12,0,8,0" VerticalAlignment="Center" IsHitTestVisible="False" Foreground="LightGray" Visibility="{Binding ElementName=txtShopName,Path=Text,Converter={StaticResource NotHasTextVisibility}}"></TextBlock>
-            <Button Grid.Column="1" x:Name="btnMultiShopChoice" Style="{StaticResource BasePageButtonStyle}" Margin="-4,0,0,0" Grid.Row="4" Content=" ... " Width="28" Height="28" Click="btnMultiShopChoice_Click"></Button>
-            <TextBox x:Name="txtGoodsName" Grid.Column="2" Margin="8,0,0,0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1" Height="28" VerticalContentAlignment="Center" 
+            <TextBlock Text="全部店铺" Grid.Column="1" Margin="12,0,8,0" VerticalAlignment="Center" IsHitTestVisible="False" Foreground="LightGray" Visibility="{Binding ElementName=txtShopName,Path=Text,Converter={StaticResource NotHasTextVisibility}}"></TextBlock>
+            <Button Grid.Column="2" x:Name="btnMultiShopChoice" Style="{StaticResource BasePageButtonStyle}" Margin="-4,0,0,0" Grid.Row="4" Content=" ... " Width="28" Height="28" Click="btnMultiShopChoice_Click"></Button>
+            <TextBox x:Name="txtGoodsName" Grid.Column="3" Margin="8,0,0,0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1" Height="28" VerticalContentAlignment="Center" 
                      Style="{StaticResource BaseRoundCornerTextBoxStyle}"/>
-            <TextBlock Text="商品标题" Grid.Column="2" Margin="12,0,0,0" VerticalAlignment="Center" IsHitTestVisible="False" Foreground="LightGray" Visibility="{Binding ElementName=txtGoodsName,Path=Text,Converter={StaticResource NotHasTextVisibility}}"></TextBlock>
+            <TextBlock Text="商品标题" Grid.Column="3" Margin="12,0,0,0" VerticalAlignment="Center" IsHitTestVisible="False" Foreground="LightGray" Visibility="{Binding ElementName=txtGoodsName,Path=Text,Converter={StaticResource NotHasTextVisibility}}"></TextBlock>
 
 
 
-            <ComboBox x:Name="cmbUserNameMobile" Margin="12,0,4,0" VerticalContentAlignment="Center" Style="{StaticResource BaseComboBoxStyle}" Grid.Column="3" Width="70" Height="28" Text="成交时间"/>
-            <Border Grid.Column="3" Margin="8,0,0,0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1,1,1,1" Height="28" VerticalAlignment="Center" CornerRadius="4,0,0,4"/>
-            <Border Grid.Column="4" Margin="0,0,0,0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="0,1,1,1" Height="28" VerticalAlignment="Center" CornerRadius="0,0,0,0"/>
-            <DatePicker x:Name="dateStart" Grid.Column="4" Margin="0,0,4,0" VerticalAlignment="Center" BorderThickness="0" />
+            <ComboBox Grid.Column="4" x:Name="cmbUserNameMobile" Margin="12,0,4,0" VerticalContentAlignment="Center" Style="{StaticResource BaseComboBoxStyle}" Width="70" Height="28" Text="成交时间"/>
+            <Border Grid.Column="4" Margin="8,0,0,0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1,1,1,1" Height="28" VerticalAlignment="Center" CornerRadius="4,0,0,4"/>
+            <Border Grid.Column="5" Margin="0,0,0,0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="0,1,1,1" Height="28" VerticalAlignment="Center" CornerRadius="0,0,0,0"/>
+            <DatePicker x:Name="dateStart" Grid.Column="5" Margin="0,0,4,0" VerticalAlignment="Center" BorderThickness="0" />
 
-            <Border Grid.Column="5" Margin="0,0,0,0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="0,1,1,1" Height="28" VerticalAlignment="Center" CornerRadius="0,4,4,0"/>
-            <DatePicker x:Name="dateEnd" Grid.Column="5"  Margin="0,0,4,0" VerticalAlignment="Center" BorderThickness="0" />
+            <Border Grid.Column="6" Margin="0,0,0,0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="0,1,1,1" Height="28" VerticalAlignment="Center" CornerRadius="0,4,4,0"/>
+            <DatePicker x:Name="dateEnd" Grid.Column="6"  Margin="0,0,4,0" VerticalAlignment="Center" BorderThickness="0" />
 
-            <Button Grid.Column="10" x:Name="btnFilter" Style="{StaticResource BasePageButtonStyle}" Margin="4,0,0,0" Grid.Row="4" Content="过滤" Width="48" Height="24" Click="btnFilter_Click"></Button>
-            <Button Grid.Column="11" x:Name="btnSearch" Style="{StaticResource BasePageButtonStyle}" Margin="4,0,4,0" Grid.Row="4" Content="读单" Width="48" Height="24" Click="btnSearch_Click"></Button>
-            <Image Grid.Column="12" Source="{StaticResource loading_pic}" Width="20" Height="20">
+            <Button Grid.Column="11" x:Name="btnFilter" Style="{StaticResource BasePageButtonStyle}" Margin="4,0,0,0" Grid.Row="4" Content="过滤" Width="48" Height="24" Click="btnFilter_Click"></Button>
+            <Button Grid.Column="12" x:Name="btnSearch" Style="{StaticResource BasePageButtonStyle}" Margin="4,0,4,0" Grid.Row="4" Content="读单" Width="48" Height="24" Click="btnSearch_Click"></Button>
+            <Image Grid.Column="13" Source="{StaticResource loading_pic}" Width="20" Height="20">
                 <!--<Image.Triggers>
                     <EventTrigger RoutedEvent="Image.Loaded">
                         <BeginStoryboard>
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
index 7996b06..5ac4736 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
@@ -337,6 +337,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
             {
                 return true;
             }
+            if (!string.IsNullOrEmpty(txtOrderId.Text.Trim()) && !(";" + txtOrderId.Text.Trim() + ";").Contains(";" + order.order_id + ";"))
+            {
+                return true;
+            }
 
             return false;
         }