From 39648cd9a90d6805ff2e89e7f1dd1cf0115259e2 Mon Sep 17 00:00:00 2001
From: chfei <chaihongfei@126.com>
Date: Mon, 7 Sep 2026 17:29:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85UI=20=E5=B8=83=E5=B1=80=E6=8E=A7=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OrderCtrls/OrderListRowItemCtrl.xaml      | 1162 ++++++-----------
 .../OrderCtrls/OrderListRowItemCtrl.xaml.cs   |   14 +-
 .../oms_wei_external_procurement_log_info.cs  |    4 +-
 .../Model/DBModel/oms_wei_order_item_info.cs  |    8 +-
 4 files changed, 431 insertions(+), 757 deletions(-)

diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
index 4ac76b6..52e3a27 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
@@ -7,6 +7,7 @@
 	xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.OrderCtrls"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	xmlns:uc="clr-namespace:_29WxOrderWpf.UserControls"
+	xmlns:wpf="WPFCommon"
 	d:Background="White"
 	d:DesignHeight="220"
 	d:DesignWidth="1300"
@@ -16,6 +17,14 @@
 		<conv:InverseVisibleToVisibilityConverter x:Key="InverseVisibleToVisibilityConverter" />
 		<conv:VisibleToVisibilityConverter x:Key="VisibleToVisibilityConverter" />
 		<conv:MoreThanZeroVisibilityConverter x:Key="MoreThanZeroVisibilityConverter" />
+
+		<Style BasedOn="{StaticResource TitleContentBaseStyle}" TargetType="wpf:TitleContent">
+			<Setter Property="Placement" Value="Left" />
+			<Setter Property="LeftTitlePadding" Value="0,0,0,0" />
+		</Style>
+		<Style TargetType="wpf:SpacingStackPanel">
+			<Setter Property="Margin" Value="3,0" />
+		</Style>
 	</UserControl.Resources>
 
 	<Grid>
@@ -32,8 +41,8 @@
 				<ColumnDefinition Width="36" />
 				<ColumnDefinition Width="28" />
 				<ColumnDefinition Width="200*" />
-				<ColumnDefinition Width="95*" />
-				<ColumnDefinition Width="75*" />
+				<ColumnDefinition Width="100*" MinWidth="200" />
+				<ColumnDefinition Width="75*" MinWidth="150" />
 				<ColumnDefinition Width="170*" />
 				<ColumnDefinition Width="120*" />
 				<ColumnDefinition Width="120*" />
@@ -75,8 +84,11 @@
 					MouseEnter="imgOrderItem_MouseEnter"
 					MouseLeave="imgOrderItem_MouseLeave" />
 
-				<Grid Grid.Column="1">
-					<Grid.RowDefinitions>
+				<wpf:SpacingStackPanel
+					Grid.Column="1"
+					Orientation="Vertical"
+					VerticalSpacing="2">
+					<!--<Grid.RowDefinitions>
 						<RowDefinition Height="*" />
 						<RowDefinition Height="Auto" />
 						<RowDefinition Height="Auto" />
@@ -87,14 +99,11 @@
 						<RowDefinition Height="Auto" />
 						<RowDefinition Height="Auto" />
 						<RowDefinition Height="*" />
-					</Grid.RowDefinitions>
+					</Grid.RowDefinitions>-->
 
 					<!--<Image Grid.RowSpan="20" Grid.Column="0" Height="80" Width="80" Margin="0,0,8,0" Source="{DynamicResource imgErrPic}"></Image>-->
 					<uc:UcWaterMarkTextBox1
 						x:Name="txtGoodsName"
-						Grid.Row="1"
-						Grid.Column="0"
-						Margin="0,2,4,2"
 						HorizontalAlignment="Left"
 						d:Text="商品名称"
 						d:Visibility="Visible"
@@ -105,75 +114,31 @@
 						Text="{Binding title}"
 						TextWrapping="Wrap"
 						WaterMark="商品名称" />
-					<!--<Grid Grid.Row="1">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="auto" />
-                            <ColumnDefinition Width="*" />
-                        </Grid.ColumnDefinitions>
 
-                        <Border Grid.Column="1" Grid.Row="1" Width="12" Background="Transparent" Height="12" VerticalAlignment="Center" Cursor="Hand" HorizontalAlignment="Left"
-                                MouseLeftButtonDown="pathCopyProdName_MouseLeftButtonDown" Visibility="{Binding ElementName=txtUserAddress,Path=Visibility}">
-                            <Path Margin="0,0,0,0" Fill="{StaticResource PageLinkBrush}" MouseLeftButtonDown="pathCopyProdName_MouseLeftButtonDown" Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z    M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z" Stretch="Uniform" />
-                        </Border>
-                    </Grid>-->
-
-					<TextBox
-						Grid.Row="2"
-						Grid.Column="1"
-						Margin="0,2,4,2"
-						VerticalAlignment="Top"
-						Background="Transparent"
-						BorderThickness="0"
-						IsReadOnly="True"
-						Text="数量：" />
-					<uc:UcWaterMarkTextBox1
-						Grid.Row="2"
-						Grid.Column="1"
-						Margin="36,2,4,2"
-						VerticalAlignment="Top"
-						Background="Transparent"
-						BorderThickness="0"
-						IsReadOnly="True"
-						Text="{Binding sku_cnt}"
-						TextWrapping="Wrap"
-						WaterMark="SKU数量" />
-
-					<TextBox
-						Grid.Row="3"
-						Grid.Column="1"
-						Margin="0,2,4,2"
-						VerticalAlignment="Top"
-						Background="Transparent"
-						BorderThickness="0"
-						IsReadOnly="True"
-						Text="规格：" />
-					<uc:UcWaterMarkTextBox1
-						Grid.Row="3"
-						Grid.Column="1"
-						Margin="36,2,4,2"
-						VerticalAlignment="Top"
-						Background="Transparent"
-						BorderThickness="0"
-						IsReadOnly="True"
-						Text="{Binding sku_attr_str}"
-						TextWrapping="Wrap"
-						WaterMark="规格" />
-
-					<WrapPanel Grid.Row="4">
-						<TextBox
-							Grid.Row="4"
-							Grid.Column="1"
-							Margin="0,2,4,2"
+					<wpf:TitleContent Title="数量：">
+						<uc:UcWaterMarkTextBox1
+							d:DataContext="数量"
+							BorderThickness="0"
+							IsReadOnly="True"
+							Text="{Binding sku_cnt}"
+							TextWrapping="Wrap"
+							WaterMark="SKU数量" />
+					</wpf:TitleContent>
+					<wpf:TitleContent Title="规格：">
+						<uc:UcWaterMarkTextBox1
 							VerticalAlignment="Top"
 							Background="Transparent"
 							BorderThickness="0"
 							IsReadOnly="True"
-							Text="平台商品ID：" />
+							Text="{Binding sku_attr_str}"
+							TextWrapping="Wrap"
+							WaterMark="规格" />
+					</wpf:TitleContent>
+					<WrapPanel>
+						<TextBlock VerticalAlignment="Center" Text="平台商品ID：" />
 						<uc:UcWaterMarkTextBox1
-							Grid.Row="4"
-							Grid.Column="1"
-							Margin="-9,2,4,2"
 							VerticalAlignment="Top"
+							d:Text="平台ID"
 							Background="Transparent"
 							BorderThickness="0"
 							IsReadOnly="True"
@@ -190,20 +155,8 @@
 							Content="优化订单商品"
 							Style="{StaticResource BasePageButtonLightStyle}" />
 					</WrapPanel>
-					<WrapPanel Grid.Row="5">
-						<TextBox
-							Grid.Row="5"
-							Grid.Column="1"
-							Margin="0,2,4,2"
-							VerticalAlignment="Top"
-							Background="Transparent"
-							BorderThickness="0"
-							IsReadOnly="True"
-							Text="系统商品ID：" />
+					<wpf:TitleContent Title="系统商品ID：">
 						<uc:UcWaterMarkTextBox1
-							Grid.Row="5"
-							Grid.Column="1"
-							Margin="-9,2,4,2"
 							VerticalAlignment="Top"
 							Background="Transparent"
 							BorderThickness="0"
@@ -211,287 +164,144 @@
 							Text="{Binding out_product_id}"
 							TextWrapping="Wrap"
 							WaterMark="系统商品ID" />
-					</WrapPanel>
+					</wpf:TitleContent>
 
-					<TextBox
-						Grid.Row="6"
-						Grid.Column="1"
-						Margin="0,2,4,2"
-						VerticalAlignment="Top"
-						Background="Transparent"
-						BorderThickness="0"
-						IsReadOnly="True"
-						Text="系统sku编码：" />
-					<uc:UcWaterMarkTextBox1
-						Grid.Row="6"
-						Grid.Column="1"
-						Margin="78,2,4,2"
-						VerticalAlignment="Top"
-						Background="Transparent"
-						BorderThickness="0"
-						IsReadOnly="True"
-						Text="{Binding out_sku_id}"
-						TextWrapping="Wrap"
-						WaterMark="系统sku编码" />
-				</Grid>
+					<wpf:TitleContent Title="系统sku编码：">
+						<uc:UcWaterMarkTextBox1
+							VerticalAlignment="Top"
+							Background="Transparent"
+							BorderThickness="0"
+							IsReadOnly="True"
+							Text="{Binding out_sku_id}"
+							TextWrapping="Wrap"
+							WaterMark="系统sku编码" />
+					</wpf:TitleContent>
+				</wpf:SpacingStackPanel>
 			</Grid>
 			<!--  订单时间信息  -->
-			<Grid
+			<wpf:SpacingStackPanel
 				Grid.Column="3"
 				VerticalAlignment="Center"
-				Background="Transparent">
-				<Grid.RowDefinitions>
-					<RowDefinition Height="*" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="*" />
-				</Grid.RowDefinitions>
-				<TextBox
-					Grid.Row="1"
-					Grid.Column="1"
-					Margin="0,2,4,2"
-					VerticalAlignment="Top"
-					Background="Transparent"
-					BorderThickness="0"
-					IsReadOnly="True"
-					Text="成交时间：" />
-				<uc:UcWaterMarkTextBox1
-					Grid.Row="1"
-					Grid.Column="1"
-					Margin="60,2,4,2"
-					VerticalAlignment="Top"
-					Background="Transparent"
-					BorderThickness="0"
-					IsReadOnly="True"
-					Text="{Binding CreateDateTimeStr}"
-					TextWrapping="Wrap"
-					WaterMark="成交时间" />
-				<TextBox
-					Grid.Row="2"
-					Grid.Column="1"
-					Margin="0,2,4,2"
-					VerticalAlignment="Top"
-					Background="Transparent"
-					BorderThickness="0"
-					IsReadOnly="True"
-					Text="发货时间："
-					Visibility="{Binding ItemOrder.ship_done_time_visibility}" />
-				<uc:UcWaterMarkTextBox1
-					Grid.Row="2"
-					Grid.Column="1"
-					Margin="60,2,4,2"
-					VerticalAlignment="Top"
-					Background="Transparent"
-					BorderThickness="0"
-					IsReadOnly="True"
-					Text="{Binding ItemOrder.ship_done_time_str}"
-					TextWrapping="Wrap"
-					Visibility="{Binding ItemOrder.ship_done_time_visibility}"
-					WaterMark="发货时间" />
-				<TextBox
-					Grid.Row="3"
-					Grid.Column="1"
-					Margin="0,2,4,2"
-					VerticalAlignment="Top"
-					Background="Transparent"
-					BorderThickness="0"
-					IsReadOnly="True"
-					Text="退款时间："
-					Visibility="{Binding RefundTimeVisibility}" />
-				<uc:UcWaterMarkTextBox1
-					Grid.Row="3"
-					Grid.Column="1"
-					Margin="60,2,4,2"
-					VerticalAlignment="Top"
-					Background="Transparent"
-					BorderThickness="0"
-					IsReadOnly="True"
-					Text="{Binding RefundDateTimeStr}"
-					TextWrapping="Wrap"
-					Visibility="{Binding RefundTimeVisibility}"
-					WaterMark="退款时间" />
+				Orientation="Vertical"
+				VerticalSpacing="2">
+				<wpf:TitleContent Title="成交时间：">
+					<uc:UcWaterMarkTextBox1
+						d:Text="2000-01-01 01:01:01"
+						Background="Transparent"
+						BorderThickness="0"
+						IsReadOnly="True"
+						Text="{Binding CreateDateTimeStr}"
+						TextWrapping="Wrap"
+						WaterMark="成交时间" />
+				</wpf:TitleContent>
+
+				<wpf:TitleContent Title="发货时间：" Visibility="{Binding ItemOrder.ship_done_time_visibility}">
+					<uc:UcWaterMarkTextBox1
+						Background="Transparent"
+						BorderThickness="0"
+						IsReadOnly="True"
+						Text="{Binding ItemOrder.ship_done_time_str}"
+						TextWrapping="Wrap"
+						WaterMark="发货时间" />
+				</wpf:TitleContent>
+
+				<wpf:TitleContent Title="退款时间：" Visibility="{Binding RefundTimeVisibility}">
+					<uc:UcWaterMarkTextBox1
+						Background="Transparent"
+						BorderThickness="0"
+						IsReadOnly="True"
+						Text="{Binding RefundDateTimeStr}"
+						TextWrapping="Wrap"
+						WaterMark="退款时间" />
+				</wpf:TitleContent>
 				<!--<TextBox Text="更新时间：" Grid.Column="1" Grid.Row="4" Margin="0,2,4,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
                 <uc:UcWaterMarkTextBox1 WaterMark="更新时间" Text="{Binding UpdateDateTimeStr}" Grid.Column="1" Grid.Row="4" Margin="60,2,4,2" VerticalAlignment="Top"
                                    Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>-->
-			</Grid>
+			</wpf:SpacingStackPanel>
 			<!--  订单利润  -->
-			<Grid
+			<wpf:SpacingStackPanel
 				Grid.Column="4"
 				VerticalAlignment="Center"
-				Background="Transparent">
-				<Grid.RowDefinitions>
-					<RowDefinition Height="*" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="*" />
-				</Grid.RowDefinitions>
-				<TextBox
-					Grid.Row="1"
-					Grid.Column="1"
-					Margin="0,0,4,0"
-					VerticalAlignment="Top"
-					Background="Transparent"
-					BorderThickness="0"
-					IsReadOnly="True"
-					Text="售价：" />
-				<uc:UcWaterMarkTextBox1
-					Grid.Row="1"
-					Grid.Column="1"
-					Margin="36,0,4,0"
-					VerticalAlignment="Top"
-					Background="Transparent"
-					BorderThickness="0"
-					IsReadOnly="True"
-					Text="{Binding RealPriceStr}"
-					TextWrapping="Wrap"
-					WaterMark="售价" />
-				<TextBox
-					Grid.Row="2"
-					Grid.Column="1"
-					Margin="0,0,4,0"
-					VerticalAlignment="Top"
-					Background="Transparent"
-					BorderThickness="0"
-					IsReadOnly="True"
-					Text="平台优惠：" />
-				<uc:UcWaterMarkTextBox1
-					Grid.Row="2"
-					Grid.Column="1"
-					Margin="60,0,4,0"
-					VerticalAlignment="Top"
-					Background="Transparent"
-					BorderThickness="0"
-					IsReadOnly="True"
-					Text="{Binding CashCouponDiscountedPriceStr}"
-					TextWrapping="Wrap"
-					WaterMark="平台优惠" />
-				<TextBox
-					Grid.Row="3"
-					Grid.Column="1"
-					Margin="0,0,4,0"
-					VerticalAlignment="Top"
-					Background="Transparent"
-					BorderThickness="0"
-					IsReadOnly="True"
-					Text="进价："
-					Visibility="{Binding purchase_price_visibility}" />
-				<uc:UcWaterMarkTextBox1
-					Grid.Row="3"
-					Grid.Column="1"
-					Margin="36,0,4,0"
-					VerticalAlignment="Top"
-					Background="Transparent"
-					BorderThickness="0"
-					IsReadOnly="True"
-					Text="{Binding purchase_price_str}"
-					TextWrapping="Wrap"
-					Visibility="{Binding purchase_price_visibility}"
-					WaterMark="进价" />
-				<TextBox
-					Grid.Row="4"
-					Grid.Column="1"
-					Margin="0,0,4,0"
-					VerticalAlignment="Top"
-					Background="Transparent"
-					BorderThickness="0"
-					IsReadOnly="True"
-					Text="运费："
-					Visibility="{Binding FreightVisibility}" />
-				<uc:UcWaterMarkTextBox1
-					Grid.Row="4"
-					Grid.Column="1"
-					Margin="36,0,4,0"
-					VerticalAlignment="Top"
-					Background="Transparent"
-					BorderThickness="0"
-					IsReadOnly="True"
-					Text="{Binding freight_str}"
-					TextWrapping="Wrap"
-					Visibility="{Binding FreightVisibility}"
-					WaterMark="运费" />
-				<TextBox
-					Grid.Row="5"
-					Grid.Column="1"
-					Margin="0,0,4,0"
-					VerticalAlignment="Top"
-					Background="Transparent"
-					BorderThickness="0"
-					IsReadOnly="True"
-					Text="平台服务费：" />
-				<uc:UcWaterMarkTextBox1
-					Grid.Row="5"
-					Margin="72,0,4,0"
-					VerticalAlignment="Center"
-					Background="Transparent"
-					BorderThickness="0"
-					IsReadOnly="True"
-					Text="{Binding predict_commission_fee_str}"
-					TextWrapping="Wrap"
-					WaterMark="平台服务费" />
-				<TextBox
-					Grid.Row="6"
-					Grid.Column="1"
-					Margin="0,0,4,0"
-					VerticalAlignment="Top"
-					Background="Transparent"
-					BorderThickness="0"
-					IsReadOnly="True"
-					Text="达人佣金：" />
-				<uc:UcWaterMarkTextBox1
-					Grid.Row="6"
-					Margin="60,0,4,0"
-					VerticalAlignment="Center"
-					Background="Transparent"
-					BorderThickness="0"
-					IsReadOnly="True"
-					Text="{Binding commission_amount_str}"
-					TextWrapping="Wrap"
-					WaterMark="达人佣金" />
-				<TextBox
-					Grid.Row="7"
-					Grid.Column="1"
-					Margin="0,0,4,0"
-					VerticalAlignment="Top"
-					Background="Transparent"
-					BorderThickness="0"
-					IsReadOnly="True"
-					Text="外采金额：" />
-				<uc:UcWaterMarkTextBox1
-					Grid.Row="7"
-					Margin="60,0,4,0"
-					VerticalAlignment="Center"
-					Background="Transparent"
-					BorderThickness="0"
-					IsReadOnly="True"
-					Text="{Binding out_amount_str}"
-					TextWrapping="Wrap"
-					WaterMark="外采金额" />
-				<WrapPanel Grid.Row="8" Grid.Column="1">
-					<!--<TextBox Text="预估" x:Name="txtProfitForecast" Grid.Column="1" Grid.Row="8" Margin="0,0,-4,0" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True"
-                             BorderThickness="0" Visibility="Collapsed"/>-->
-					<TextBox
-						Grid.Row="8"
-						Grid.Column="1"
-						Margin="0,0,-4,0"
-						VerticalAlignment="Top"
+				Orientation="Vertical"
+				VerticalSpacing="2">
+
+				<wpf:TitleContent Title="售价：">
+					<uc:UcWaterMarkTextBox1
 						Background="Transparent"
 						BorderThickness="0"
 						IsReadOnly="True"
-						Text="利润：" />
+						Text="{Binding RealPriceStr}"
+						TextWrapping="Wrap"
+						WaterMark="售价" />
+				</wpf:TitleContent>
+
+				<wpf:TitleContent Title="平台优惠：">
+					<uc:UcWaterMarkTextBox1
+						d:Text="￥100.00"
+						Background="Transparent"
+						BorderThickness="0"
+						IsReadOnly="True"
+						Text="{Binding CashCouponDiscountedPriceStr}"
+						TextWrapping="Wrap"
+						WaterMark="平台优惠" />
+				</wpf:TitleContent>
+
+				<wpf:TitleContent Title="进价：" Visibility="{Binding purchase_price_visibility}">
+					<uc:UcWaterMarkTextBox1
+						d:Text="￥100.00"
+						Background="Transparent"
+						BorderThickness="0"
+						IsReadOnly="True"
+						Text="{Binding purchase_price_str}"
+						TextWrapping="Wrap"
+						Visibility="{Binding purchase_price_visibility}"
+						WaterMark="进价" />
+				</wpf:TitleContent>
+
+				<wpf:TitleContent Title="运费：" Visibility="{Binding FreightVisibility}">
+					<uc:UcWaterMarkTextBox1
+						Background="Transparent"
+						BorderThickness="0"
+						IsReadOnly="True"
+						Text="{Binding freight_str}"
+						TextWrapping="Wrap"
+						Visibility="{Binding FreightVisibility}"
+						WaterMark="运费" />
+				</wpf:TitleContent>
+
+				<wpf:TitleContent Title="平台服务费：">
+					<uc:UcWaterMarkTextBox1
+						d:Text="￥100.00"
+						Background="Transparent"
+						BorderThickness="0"
+						IsReadOnly="True"
+						Text="{Binding predict_commission_fee_str}"
+						TextWrapping="Wrap"
+						WaterMark="平台服务费" />
+				</wpf:TitleContent>
+
+				<wpf:TitleContent Title="达人佣金：">
+					<uc:UcWaterMarkTextBox1
+						Background="Transparent"
+						BorderThickness="0"
+						IsReadOnly="True"
+						Text="{Binding commission_amount_str}"
+						TextWrapping="Wrap"
+						WaterMark="达人佣金" />
+				</wpf:TitleContent>
+
+				<wpf:TitleContent Title="外采金额：">
+					<uc:UcWaterMarkTextBox1
+						Background="Transparent"
+						BorderThickness="0"
+						IsReadOnly="True"
+						Text="{Binding out_amount_str}"
+						TextWrapping="Wrap"
+						WaterMark="外采金额" />
+				</wpf:TitleContent>
+
+				<wpf:TitleContent Title="利润：">
 					<uc:UcWaterMarkTextBox1
-						Grid.Row="8"
-						Margin="0,0,4,0"
-						VerticalAlignment="Center"
 						Background="Transparent"
 						BorderThickness="0"
 						FontWeight="Bold"
@@ -500,8 +310,9 @@
 						Text="{Binding ProfitCountStr}"
 						TextWrapping="Wrap"
 						WaterMark="利润" />
-				</WrapPanel>
-			</Grid>
+				</wpf:TitleContent>
+
+			</wpf:SpacingStackPanel>
 			<!--  订单状态/地址  -->
 			<Grid
 				Grid.Column="5"
@@ -810,40 +621,24 @@
 				</WrapPanel>
 			</Grid>
 			<!--  单号  -->
-			<Grid
+			<wpf:SpacingStackPanel
 				Grid.Column="6"
 				VerticalAlignment="Center"
-				Background="Transparent">
-				<Grid.RowDefinitions>
-					<RowDefinition Height="*" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="*" />
-				</Grid.RowDefinitions>
+				Orientation="Vertical"
+				VerticalSpacing="2">
 
+				<!--  状态标签行（原 Row 1-2）  -->
 				<WrapPanel
 					x:Name="wpTransitBuyerRefundStatus"
-					Grid.Row="1"
 					HorizontalAlignment="Center"
 					VerticalAlignment="Center" />
+
 				<WrapPanel
 					x:Name="wpTransitWaybillStatus"
-					Grid.Row="2"
 					Margin="0,0,0,4"
 					HorizontalAlignment="Center">
 					<Border
 						x:Name="borderBuyStatas"
-						Grid.Row="1"
 						Height="auto"
 						MinWidth="30"
 						Margin="0,0,4,0"
@@ -857,9 +652,7 @@
 						Visibility="{Binding BuyerTransitWaybillStatusStr, Converter={StaticResource HasTextVisibility}}">
 						<TextBox
 							x:Name="txtBuyStatus"
-							Grid.Column="1"
 							MinWidth="20"
-							Margin="0,0,0,0"
 							VerticalAlignment="Center"
 							VerticalContentAlignment="Center"
 							d:Text="买手状态"
@@ -871,7 +664,6 @@
 					</Border>
 					<Border
 						x:Name="borderWarehouseStatas"
-						Grid.Row="1"
 						Height="auto"
 						MinWidth="30"
 						Margin="0,0,4,0"
@@ -885,9 +677,7 @@
 						Visibility="{Binding WarehouseWaybillStatusStr, Converter={StaticResource HasTextVisibility}}">
 						<TextBox
 							x:Name="txtWarehouseStatus"
-							Grid.Column="1"
 							MinWidth="20"
-							Margin="0,0,0,0"
 							VerticalAlignment="Center"
 							VerticalContentAlignment="Center"
 							d:Text="仓库状态"
@@ -899,7 +689,6 @@
 							Text="{Binding WarehouseWaybillStatusStr}" />
 					</Border>
 					<Border
-						Grid.Row="1"
 						Height="auto"
 						MinWidth="30"
 						Margin="0,0,4,0"
@@ -910,9 +699,7 @@
 						CornerRadius="2"
 						Visibility="{Binding TransitRefundVoidStatusStr, Converter={StaticResource HasTextVisibility}}">
 						<TextBox
-							Grid.Column="1"
 							MinWidth="20"
-							Margin="0,0,0,0"
 							Padding="0"
 							VerticalAlignment="Center"
 							VerticalContentAlignment="Center"
@@ -925,122 +712,102 @@
 					</Border>
 				</WrapPanel>
 
-				<WrapPanel
+				<!--  采购账户  -->
+				<wpf:TitleContent
 					x:Name="wpBuyAccount"
-					Grid.Row="3"
-					Grid.Column="1"
-					Orientation="Horizontal">
-					<TextBlock
-						VerticalAlignment="Center"
-						Foreground="LightGray"
-						IsHitTestVisible="False"
-						Text="采购账户："
-						Visibility="{Binding ElementName=txtTransitOrderBuyerStr, Path=Text, Converter={StaticResource NotHasTextVisibility}}" />
-					<uc:UcWaterMarkTextBox1
-						x:Name="txtTransitOrderBuyerStr"
-						Grid.Row="1"
-						Grid.Column="1"
-						Margin="-2,2,4,2"
-						Padding="0"
-						VerticalAlignment="Top"
-						Background="Transparent"
-						BorderThickness="0"
-						Cursor="Hand"
-						Foreground="#0099ff"
-						IsReadOnly="True"
-						Text="{Binding ItemTransitOrderWithVoid.OutOrderBuyerStr}"
-						TextWrapping="Wrap"
-						WaterMark="采购账户：" />
-					<Border
-						x:Name="borderTransitBuyerRefundStatus"
-						Grid.Row="1"
-						Height="auto"
-						MinWidth="30"
-						Margin="0,0,0,0"
-						HorizontalAlignment="Center"
-						d:Background="{StaticResource PageOkBrush}"
-						d:BorderBrush="{StaticResource PageOkBrush}"
-						Background="{Binding TransitRefundStatusBackColor}"
-						BorderBrush="{Binding TransitRefundStatusBackColor}"
-						BorderThickness="1"
-						CornerRadius="2"
-						Visibility="{Binding TransitRefundStatusStr, Converter={StaticResource HasTextVisibility}}">
-						<TextBox
-							x:Name="txtRefundStatus"
-							Grid.Column="1"
-							MinWidth="20"
-							Margin="0,0,0,0"
+					Title="采购账户："
+					Cursor="Hand"
+					Foreground="#0099ff"
+					MouseLeftButtonUp="TransitOrderBuye_Click">
+					<WrapPanel Orientation="Horizontal">
+						<uc:UcWaterMarkTextBox1
+							x:Name="txtTransitOrderBuyerStr"
+							Margin="-2,2,4,2"
 							Padding="0"
-							VerticalAlignment="Center"
-							VerticalContentAlignment="Center"
-							d:Text="买手退货状态"
+							VerticalAlignment="Top"
 							Background="Transparent"
 							BorderThickness="0"
-							Foreground="White"
+							Cursor="Hand"
+							Foreground="#0099ff"
 							IsReadOnly="True"
-							Text="{Binding TransitRefundStatusStr}" />
-					</Border>
-				</WrapPanel>
-				<WrapPanel
+							Text="{Binding ItemTransitOrderWithVoid.OutOrderBuyerStr}"
+							TextWrapping="Wrap"
+							WaterMark="采购账户：" />
+						<Border
+							x:Name="borderTransitBuyerRefundStatus"
+							Height="auto"
+							MinWidth="30"
+							HorizontalAlignment="Center"
+							d:Background="{StaticResource PageOkBrush}"
+							d:BorderBrush="{StaticResource PageOkBrush}"
+							Background="{Binding TransitRefundStatusBackColor}"
+							BorderBrush="{Binding TransitRefundStatusBackColor}"
+							BorderThickness="1"
+							CornerRadius="2"
+							Visibility="{Binding TransitRefundStatusStr, Converter={StaticResource HasTextVisibility}}">
+							<TextBox
+								x:Name="txtRefundStatus"
+								MinWidth="20"
+								Padding="0"
+								VerticalAlignment="Center"
+								VerticalContentAlignment="Center"
+								d:Text="买手退货状态"
+								Background="Transparent"
+								BorderThickness="0"
+								Foreground="White"
+								IsReadOnly="True"
+								Text="{Binding TransitRefundStatusStr}" />
+						</Border>
+					</WrapPanel>
+				</wpf:TitleContent>
+
+				<!--  采购单号  -->
+				<wpf:TitleContent
 					x:Name="wpBuyOrderId"
-					Grid.Row="4"
-					Grid.Column="1"
-					Orientation="Horizontal">
-					<TextBlock
-						VerticalAlignment="Center"
-						Foreground="LightGray"
-						IsHitTestVisible="False"
-						Text="采购单号："
-						Visibility="{Binding ElementName=txtTransitOrderNumStr, Path=Text, Converter={StaticResource NotHasTextVisibility}}" />
-					<uc:UcWaterMarkTextBox1
-						x:Name="txtTransitOrderNumStr"
-						Grid.Row="1"
-						Grid.Column="1"
-						Margin="-2,2"
-						Padding="0"
-						VerticalAlignment="Top"
-						Background="Transparent"
-						BorderThickness="0"
-						Cursor="Hand"
-						Foreground="#0099ff"
-						IsReadOnly="True"
-						Text="{Binding ItemTransitOrderWithVoid.OutOrderNumStr}"
-						TextWrapping="Wrap"
-						WaterMark="采购单号：" />
-					<Border
-						Grid.Column="2"
-						Width="12"
-						Height="12"
-						Margin="4,0,0,0"
-						VerticalAlignment="Center"
-						Background="Transparent"
-						Cursor="Hand"
-						MouseLeftButtonDown="Path_MouseLeftButtonDown"
-						Tag="{Binding order_id}"
-						Visibility="{Binding ElementName=txtTransitOrderBuyerStr, Path=Text, Converter={StaticResource HasTextVisibility}}">
-						<Path
-							Margin="0,0,0,0"
-							Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z    M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z"
-							Fill="{StaticResource PageLinkBrush}"
+					Title="采购单号："
+					Cursor="Hand"
+					Foreground="#0099ff"
+					MouseLeftButtonUp="TransitOrderBuye_Click">
+					<WrapPanel Orientation="Horizontal">
+						<uc:UcWaterMarkTextBox1
+							x:Name="txtTransitOrderNumStr"
+							Margin="-2,2"
+							Padding="0"
+							VerticalAlignment="Top"
+							Background="Transparent"
+							BorderThickness="0"
+							Cursor="Hand"
+							Foreground="#0099ff"
+							IsReadOnly="True"
+							Text="{Binding ItemTransitOrderWithVoid.OutOrderNumStr}"
+							TextWrapping="Wrap"
+							WaterMark="采购单号：" />
+						<Border
+							Width="12"
+							Height="12"
+							Margin="4,0,0,0"
+							VerticalAlignment="Center"
+							Background="Transparent"
+							Cursor="Hand"
 							MouseLeftButtonDown="Path_MouseLeftButtonDown"
-							Stretch="Uniform" />
-					</Border>
-				</WrapPanel>
-				<WrapPanel
+							Tag="{Binding order_id}"
+							Visibility="{Binding ElementName=txtTransitOrderBuyerStr, Path=Text, Converter={StaticResource HasTextVisibility}}">
+							<Path
+								Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z    M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z"
+								Fill="{StaticResource PageLinkBrush}"
+								MouseLeftButtonDown="Path_MouseLeftButtonDown"
+								Stretch="Uniform" />
+						</Border>
+					</WrapPanel>
+				</wpf:TitleContent>
+
+				<!--  采购时间  -->
+				<wpf:TitleContent
 					x:Name="wpBuyTime"
-					Grid.Row="5"
-					Grid.Column="1"
-					Orientation="Horizontal">
-					<TextBlock
-						VerticalAlignment="Center"
-						Foreground="LightGray"
-						IsHitTestVisible="False"
-						Text="采购时间："
-						Visibility="{Binding ElementName=txtOutOrderTimeQualifiedStr, Path=Text, Converter={StaticResource NotHasTextVisibility}}" />
+					Title="采购时间："
+					Foreground="{Binding OutOrderTimeQualifiedBrush}">
 					<uc:UcWaterMarkTextBox1
 						x:Name="txtOutOrderTimeQualifiedStr"
-						Grid.Row="1"
-						Grid.Column="1"
 						Margin="-2,2"
 						Padding="0"
 						VerticalAlignment="Top"
@@ -1051,26 +818,14 @@
 						Text="{Binding OutOrderTimeQualifiedStr}"
 						TextWrapping="Wrap"
 						WaterMark="采购时间：" />
-					<!--<Border Grid.Column="2" Margin="4,0,0,0" Width="12" Background="Transparent" Height="12" VerticalAlignment="Center" Cursor="Hand" Visibility="{Binding ElementName=txtOutOrderTimeQualifiedStr,Path=Text,Converter={StaticResource HasTextVisibility}}"
-                            Tag="{Binding order_id}" MouseLeftButtonDown="Path_MouseLeftButtonDown">
-                        <Path Margin="0,0,0,0" Fill="{StaticResource PageLinkBrush}" MouseLeftButtonDown="Path_MouseLeftButtonDown" Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z    M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z" Stretch="Uniform" />
-                    </Border>-->
-				</WrapPanel>
+				</wpf:TitleContent>
 
-				<WrapPanel
-					Grid.Row="6"
-					Grid.Column="1"
-					Orientation="Horizontal"
+				<!--  取号物流  -->
+				<wpf:TitleContent
+					Title="取号物流："
+					Foreground="{StaticResource PageOkBrush}"
 					Visibility="{Binding TransitOrderWaybillToWareHouseStr, Converter={StaticResource HasTextVisibility}}">
-					<TextBlock
-						VerticalAlignment="Center"
-						Foreground="LightGray"
-						IsHitTestVisible="False"
-						Text="取号物流："
-						Visibility="{Binding TransitOrderWaybillToWareHouseStr, Converter={StaticResource NotHasTextVisibility}}" />
 					<uc:UcWaterMarkTextBox1
-						Grid.Row="1"
-						Grid.Column="1"
 						Margin="-2,2"
 						Padding="0"
 						VerticalAlignment="Top"
@@ -1081,22 +836,11 @@
 						Text="{Binding TransitOrderWaybillToWareHouseStr}"
 						TextWrapping="Wrap"
 						WaterMark="取号物流" />
-				</WrapPanel>
-				<!--<WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="6" Visibility="{Binding TransitOrderWaybillFakeStr, Converter={StaticResource HasTextVisibility}}">-->
-				<WrapPanel
-					Grid.Row="7"
-					Grid.Column="1"
-					Orientation="Horizontal"
-					Visibility="Collapsed">
-					<TextBlock
-						VerticalAlignment="Center"
-						Foreground="LightGray"
-						IsHitTestVisible="False"
-						Text="提前物流："
-						Visibility="{Binding TransitOrderWaybillFakeStr, Converter={StaticResource NotHasTextVisibility}}" />
+				</wpf:TitleContent>
+
+				<!--  提前物流（已隐藏）  -->
+				<wpf:TitleContent Title="提前物流：" Visibility="Collapsed">
 					<uc:UcWaterMarkTextBox1
-						Grid.Row="1"
-						Grid.Column="1"
 						Margin="-2,2"
 						Padding="0"
 						VerticalAlignment="Top"
@@ -1107,21 +851,11 @@
 						Text="{Binding TransitOrderWaybillFakeStr}"
 						TextWrapping="Wrap"
 						WaterMark="提前物流" />
-				</WrapPanel>
-				<WrapPanel
-					Grid.Row="8"
-					Grid.Column="1"
-					Orientation="Horizontal"
-					Visibility="{Binding TransitOrderWaybillFromWareHouseStr, Converter={StaticResource HasTextVisibility}}">
-					<TextBlock
-						VerticalAlignment="Center"
-						Foreground="LightGray"
-						IsHitTestVisible="False"
-						Text="仓库物流："
-						Visibility="{Binding TransitOrderWaybillFromWareHouseStr, Converter={StaticResource NotHasTextVisibility}}" />
+				</wpf:TitleContent>
+
+				<!--  仓库物流  -->
+				<wpf:TitleContent Title="仓库物流：" Visibility="{Binding TransitOrderWaybillFromWareHouseStr, Converter={StaticResource HasTextVisibility}}">
 					<uc:UcWaterMarkTextBox1
-						Grid.Row="1"
-						Grid.Column="1"
 						Margin="-2,2"
 						Padding="0"
 						VerticalAlignment="Top"
@@ -1131,227 +865,165 @@
 						Text="{Binding TransitOrderWaybillFromWareHouseStr}"
 						TextWrapping="Wrap"
 						WaterMark="仓库物流" />
-				</WrapPanel>
+				</wpf:TitleContent>
 
-				<WrapPanel
-					Grid.Row="9"
-					Grid.Column="1"
-					Orientation="Horizontal"
-					Visibility="{Binding ItemOrder.out_account, Converter={StaticResource HasTextVisibility}}">
-					<TextBox
-						Grid.Row="1"
-						Grid.Column="1"
-						Margin="-2,2"
-						VerticalAlignment="Top"
-						Background="Transparent"
-						BorderThickness="0"
-						IsReadOnly="True"
-						Text="外采买手：" />
-					<uc:UcWaterMarkTextBox1
-						x:Name="txtDirectBuyer"
-						Grid.Row="1"
-						Grid.Column="1"
-						Margin="-2,2,4,2"
-						Padding="0"
-						VerticalAlignment="Top"
-						Background="Transparent"
-						BorderThickness="0"
-						Cursor="Hand"
-						Foreground="#0099ff"
-						IsReadOnly="True"
-						Text="{Binding ItemOrder.out_account}"
-						TextWrapping="Wrap"
-						WaterMark="外采买手：" />
-					<Border
-						x:Name="borderOutBuyerRefundStatus"
-						Grid.Row="1"
-						Height="auto"
-						MinWidth="30"
-						Margin="0,0,0,0"
-						HorizontalAlignment="Center"
-						d:Background="{StaticResource PageOkBrush}"
-						d:BorderBrush="{StaticResource PageOkBrush}"
-						Background="{Binding DirectRefundStatusBackColor}"
-						BorderBrush="{Binding DirectRefundStatusBackColor}"
-						BorderThickness="1"
-						CornerRadius="2"
-						Visibility="{Binding DirectRefundStatusStr, Converter={StaticResource HasTextVisibility}}">
-						<TextBox
-							x:Name="txtOutBuyerRefundStatus"
-							Grid.Column="1"
-							MinWidth="20"
-							Margin="0,0,0,0"
+				<!--  外采买手  -->
+				<wpf:TitleContent Title="外采买手：" Visibility="{Binding ItemOrder.out_account, Converter={StaticResource HasTextVisibility}}">
+					<WrapPanel Orientation="Horizontal">
+						<uc:UcWaterMarkTextBox1
+							x:Name="txtDirectBuyer"
+							Margin="-2,2,4,2"
 							Padding="0"
-							VerticalAlignment="Center"
-							VerticalContentAlignment="Center"
-							d:Text="直发买手退货状态"
+							VerticalAlignment="Top"
 							Background="Transparent"
 							BorderThickness="0"
-							Foreground="White"
+							Cursor="Hand"
+							Foreground="#0099ff"
 							IsReadOnly="True"
-							Text="{Binding DirectRefundStatusStr}" />
-					</Border>
+							Text="{Binding ItemOrder.out_account}"
+							TextWrapping="Wrap"
+							WaterMark="外采买手：" />
+						<Border
+							x:Name="borderOutBuyerRefundStatus"
+							Height="auto"
+							MinWidth="30"
+							HorizontalAlignment="Center"
+							d:Background="{StaticResource PageOkBrush}"
+							d:BorderBrush="{StaticResource PageOkBrush}"
+							Background="{Binding DirectRefundStatusBackColor}"
+							BorderBrush="{Binding DirectRefundStatusBackColor}"
+							BorderThickness="1"
+							CornerRadius="2"
+							Visibility="{Binding DirectRefundStatusStr, Converter={StaticResource HasTextVisibility}}">
+							<TextBox
+								x:Name="txtOutBuyerRefundStatus"
+								MinWidth="20"
+								Padding="0"
+								VerticalAlignment="Center"
+								VerticalContentAlignment="Center"
+								d:Text="直发买手退货状态"
+								Background="Transparent"
+								BorderThickness="0"
+								Foreground="White"
+								IsReadOnly="True"
+								Text="{Binding DirectRefundStatusStr}" />
+						</Border>
+					</WrapPanel>
+				</wpf:TitleContent>
 
-				</WrapPanel>
-				<WrapPanel
-					Grid.Row="10"
-					Grid.Column="1"
-					Orientation="Horizontal"
+				<!--  外采单号  -->
+				<wpf:TitleContent
+					Title="外采单号："
+					Foreground="#0099ff"
 					Visibility="{Binding ItemOrder.out_order_no, Converter={StaticResource HasTextVisibility}}">
-					<TextBox
-						Grid.Row="1"
-						Grid.Column="1"
-						Margin="-2,2"
-						VerticalAlignment="Top"
-						Background="Transparent"
-						BorderThickness="0"
-						IsReadOnly="True"
-						Text="外采单号：" />
-					<uc:UcWaterMarkTextBox1
-						x:Name="txtDirectBuyerOrderNo"
-						Grid.Row="1"
-						Grid.Column="1"
-						Margin="-2,2"
-						Padding="0"
-						VerticalAlignment="Top"
-						Background="Transparent"
-						BorderThickness="0"
-						Cursor="Hand"
-						Foreground="#0099ff"
-						IsReadOnly="True"
-						Text="{Binding ItemOrder.out_order_no}"
-						TextWrapping="Wrap"
-						WaterMark="外采单号" />
-					<Border
-						Grid.Column="2"
-						Width="12"
-						Height="12"
-						Margin="4,0,0,0"
-						VerticalAlignment="Center"
-						Background="Transparent"
-						Cursor="Hand"
-						MouseLeftButtonDown="PathCopyDirectBuyerOrderNo_MouseLeftButtonDown"
-						Visibility="{Binding ElementName=txtDirectBuyerOrderNo, Path=Text, Converter={StaticResource HasTextVisibility}}">
-						<Path
-							Margin="0,0,0,0"
-							Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z    M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z"
-							Fill="{StaticResource PageLinkBrush}"
+					<WrapPanel Orientation="Horizontal">
+						<uc:UcWaterMarkTextBox1
+							x:Name="txtDirectBuyerOrderNo"
+							Margin="-2,2"
+							Padding="0"
+							VerticalAlignment="Top"
+							Background="Transparent"
+							BorderThickness="0"
+							Cursor="Hand"
+							Foreground="#0099ff"
+							IsReadOnly="True"
+							Text="{Binding ItemOrder.out_order_no}"
+							TextWrapping="Wrap"
+							WaterMark="外采单号" />
+						<Border
+							Width="12"
+							Height="12"
+							Margin="4,0,0,0"
+							VerticalAlignment="Center"
+							Background="Transparent"
+							Cursor="Hand"
 							MouseLeftButtonDown="PathCopyDirectBuyerOrderNo_MouseLeftButtonDown"
-							Stretch="Uniform" />
-					</Border>
-				</WrapPanel>
-				<WrapPanel
-					Grid.Row="11"
-					Grid.Column="1"
-					Orientation="Horizontal"
-					Visibility="{Binding ItemOrder.OutExpressNoStr, Converter={StaticResource HasTextVisibility}}">
-					<TextBox
-						Grid.Row="1"
-						Grid.Column="1"
-						Margin="-2,2"
-						VerticalAlignment="Top"
-						Background="Transparent"
-						BorderThickness="0"
-						IsReadOnly="True"
-						Text="外采物流：" />
-					<uc:UcWaterMarkTextBox1
-						Grid.Row="1"
-						Grid.Column="1"
-						Margin="-2,2"
-						Padding="0"
-						VerticalAlignment="Top"
-						Background="Transparent"
-						BorderThickness="0"
-						Foreground="{Binding ItemOrder.OutExpressNoBrush}"
-						IsReadOnly="True"
-						Text="{Binding ItemOrder.out_express_company}"
-						TextWrapping="Wrap"
-						WaterMark="外采物流" />
-					<uc:UcWaterMarkTextBox1
-						Grid.Row="1"
-						Grid.Column="1"
-						Margin="-2,2"
-						Padding="0"
-						VerticalAlignment="Top"
-						Background="Transparent"
-						BorderThickness="0"
-						Foreground="{Binding ItemOrder.OutExpressNoBrush}"
-						IsReadOnly="True"
-						Text="-"
-						TextWrapping="Wrap"
-						WaterMark="-" />
-					<uc:UcWaterMarkTextBox1
-						Grid.Row="1"
-						Grid.Column="1"
-						Margin="-2,2,4,2"
-						Padding="0"
-						VerticalAlignment="Top"
-						Background="Transparent"
-						BorderThickness="0"
-						Foreground="{Binding ItemOrder.OutExpressNoBrush}"
-						IsReadOnly="True"
-						Text="{Binding ItemOrder.OutExpressNoStr}"
-						TextWrapping="Wrap"
-						WaterMark="外采物流" />
-				</WrapPanel>
-				<WrapPanel
-					Grid.Row="12"
-					Grid.Column="1"
-					Orientation="Horizontal"
-					Visibility="{Binding ReturnWaybillIdStr, Converter={StaticResource HasTextVisibility}}">
-					<TextBox
-						Grid.Row="1"
-						Grid.Column="1"
-						Margin="-2,2"
-						VerticalAlignment="Top"
-						Background="Transparent"
-						BorderThickness="0"
-						IsReadOnly="True"
-						Text="买家退货：" />
-					<uc:UcWaterMarkTextBox1
-						Grid.Row="1"
-						Grid.Column="1"
-						Margin="-2,2"
-						Padding="0"
-						VerticalAlignment="Top"
-						Background="Transparent"
-						BorderThickness="0"
-						IsReadOnly="True"
-						Text="{Binding ItemRefund.return_delivery_name}"
-						TextWrapping="Wrap"
-						WaterMark="买家退货" />
-					<uc:UcWaterMarkTextBox1
-						Grid.Row="1"
-						Grid.Column="1"
-						Margin="-2,2"
-						Padding="0"
-						VerticalAlignment="Top"
-						Background="Transparent"
-						BorderThickness="0"
-						IsReadOnly="True"
-						Text="-"
-						TextWrapping="Wrap"
-						WaterMark="-" />
-					<uc:UcWaterMarkTextBox1
-						Grid.Row="1"
-						Grid.Column="1"
-						Margin="-2,2,4,2"
-						Padding="0"
-						VerticalAlignment="Top"
-						Background="Transparent"
-						BorderThickness="0"
-						IsReadOnly="True"
-						Text="{Binding ReturnWaybillIdStr}"
-						TextWrapping="Wrap"
-						WaterMark="买家退货" />
-				</WrapPanel>
-				<!--
-                <TextBox Text="店铺备注：" Grid.Column="1" Grid.Row="2" Margin="0,2,0,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
-                <uc:UcWaterMarkTextBox WaterMark="店铺备注" Text="{Binding ItemOrder.shop_remark}" Grid.Column="1" Grid.Row="2" Margin="0,2,4,2" VerticalAlignment="Top"
-                           Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
-                <Button Grid.Column="1" Grid.Row="2" x:Name="btnCopyRemark" Background="Transparent" HorizontalAlignment="Center" Foreground="{StaticResource PageLinkBrush}" BorderBrush="Transparent"
-                Margin="4,0,0,0" Content="编辑" Click="btnCopyRemark_Click"></Button>-->
-			</Grid>
+							Visibility="{Binding ElementName=txtDirectBuyerOrderNo, Path=Text, Converter={StaticResource HasTextVisibility}}">
+							<Path
+								Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z    M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z"
+								Fill="{StaticResource PageLinkBrush}"
+								MouseLeftButtonDown="PathCopyDirectBuyerOrderNo_MouseLeftButtonDown"
+								Stretch="Uniform" />
+						</Border>
+					</WrapPanel>
+				</wpf:TitleContent>
+
+				<!--  外采物流  -->
+				<wpf:TitleContent Title="外采物流：" Visibility="{Binding ItemOrder.OutExpressNoStr, Converter={StaticResource HasTextVisibility}}">
+					<WrapPanel Orientation="Horizontal">
+						<uc:UcWaterMarkTextBox1
+							Margin="-2,2"
+							Padding="0"
+							VerticalAlignment="Top"
+							Background="Transparent"
+							BorderThickness="0"
+							Foreground="{Binding ItemOrder.OutExpressNoBrush}"
+							IsReadOnly="True"
+							Text="{Binding ItemOrder.out_express_company}"
+							TextWrapping="Wrap"
+							WaterMark="外采物流" />
+						<uc:UcWaterMarkTextBox1
+							Margin="-2,2"
+							Padding="0"
+							VerticalAlignment="Top"
+							Background="Transparent"
+							BorderThickness="0"
+							Foreground="{Binding ItemOrder.OutExpressNoBrush}"
+							IsReadOnly="True"
+							Text="-"
+							TextWrapping="Wrap"
+							WaterMark="-" />
+						<uc:UcWaterMarkTextBox1
+							Margin="-2,2,4,2"
+							Padding="0"
+							VerticalAlignment="Top"
+							Background="Transparent"
+							BorderThickness="0"
+							Foreground="{Binding ItemOrder.OutExpressNoBrush}"
+							IsReadOnly="True"
+							Text="{Binding ItemOrder.OutExpressNoStr}"
+							TextWrapping="Wrap"
+							WaterMark="外采物流" />
+					</WrapPanel>
+				</wpf:TitleContent>
+
+				<!--  买家退货  -->
+				<wpf:TitleContent Title="买家退货：" Visibility="{Binding ReturnWaybillIdStr, Converter={StaticResource HasTextVisibility}}">
+					<WrapPanel Orientation="Horizontal">
+						<uc:UcWaterMarkTextBox1
+							Margin="-2,2"
+							Padding="0"
+							VerticalAlignment="Top"
+							Background="Transparent"
+							BorderThickness="0"
+							IsReadOnly="True"
+							Text="{Binding ItemRefund.return_delivery_name}"
+							TextWrapping="Wrap"
+							WaterMark="买家退货" />
+						<uc:UcWaterMarkTextBox1
+							Margin="-2,2"
+							Padding="0"
+							VerticalAlignment="Top"
+							Background="Transparent"
+							BorderThickness="0"
+							IsReadOnly="True"
+							Text="-"
+							TextWrapping="Wrap"
+							WaterMark="-" />
+						<uc:UcWaterMarkTextBox1
+							Margin="-2,2,4,2"
+							Padding="0"
+							VerticalAlignment="Top"
+							Background="Transparent"
+							BorderThickness="0"
+							IsReadOnly="True"
+							Text="{Binding ReturnWaybillIdStr}"
+							TextWrapping="Wrap"
+							WaterMark="买家退货" />
+					</WrapPanel>
+				</wpf:TitleContent>
+
+			</wpf:SpacingStackPanel>
 			<!--  备注  -->
 			<Grid
 				Grid.Column="7"
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
index 38f303a..b0af945 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
@@ -50,12 +50,13 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 		public OrderListRowItemCtrl()
 		{
 			InitializeComponent();
-			txtTransitOrderBuyerStr.AddHandler(TextBox.MouseUpEvent, new MouseButtonEventHandler(txtTransitOrderNumStr_MouseLeftButtonUp), true);
-			txtTransitOrderNumStr.AddHandler(TextBox.MouseUpEvent, new MouseButtonEventHandler(txtTransitOrderNumStr_MouseLeftButtonUp), true);
+			txtTransitOrderBuyerStr.AddHandler(TextBox.MouseUpEvent, new MouseButtonEventHandler(TransitOrderBuye_Click), true);
+			txtTransitOrderNumStr.AddHandler(TextBox.MouseUpEvent, new MouseButtonEventHandler(TransitOrderBuye_Click), true);
 			txtDirectBuyer.AddHandler(TextBox.MouseUpEvent, new MouseButtonEventHandler(txtDirectOrderNumStr_MouseLeftButtonUp), true);
 			txtDirectBuyerOrderNo.AddHandler(TextBox.MouseUpEvent, new MouseButtonEventHandler(txtDirectOrderNumStr_MouseLeftButtonUp), true);
 			txtRefundId.AddHandler(TextBox.MouseUpEvent, new MouseButtonEventHandler(txtRefundId_MouseLeftButtonUp), true);
 
+
 			txtWarehouseStatus.AddHandler(TextBox.MouseEnterEvent, new MouseEventHandler(txtWarehouseStatus_MouseEnter), true);
 		}
 
@@ -716,11 +717,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 
 			return true;
 		}
-
-		private void txtTransitOrderNumStr_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+		private void TransitOrderBuye_Click(object sender, MouseButtonEventArgs e)
 		{
-			var buyerName = txtTransitOrderBuyerStr.Text.Split('：').LastOrDefault();
-			var outOrderId = txtTransitOrderNumStr.Text.Split('：').LastOrDefault();
+			var buyerName = txtTransitOrderBuyerStr.Text;
+			var outOrderId = txtTransitOrderNumStr.Text;
 			if (string.IsNullOrEmpty(buyerName) || string.IsNullOrEmpty(outOrderId))
 			{
 				return;
@@ -1595,6 +1595,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 				window.Show();
 			}
 		}
+
+
 	}
 }
 
diff --git a/AllBase/Model/DBModel/oms_wei_external_procurement_log_info.cs b/AllBase/Model/DBModel/oms_wei_external_procurement_log_info.cs
index a10c3ff..1ae9d53 100644
--- a/AllBase/Model/DBModel/oms_wei_external_procurement_log_info.cs
+++ b/AllBase/Model/DBModel/oms_wei_external_procurement_log_info.cs
@@ -10,12 +10,12 @@ namespace AllBase.Model.DBModel
     {
         public string OutOrderNumStr
         {
-            get { return "采购单号：" + out_order_no; }
+            get { return out_order_no; }
             set { }
         }
         public string OutOrderBuyerStr
         {
-            get { return "采购账户：" + buyer_account; }
+            get { return  buyer_account; }
             set { }
         }
 
diff --git a/AllBase/Model/DBModel/oms_wei_order_item_info.cs b/AllBase/Model/DBModel/oms_wei_order_item_info.cs
index 89329da..308aa01 100644
--- a/AllBase/Model/DBModel/oms_wei_order_item_info.cs
+++ b/AllBase/Model/DBModel/oms_wei_order_item_info.cs
@@ -262,19 +262,19 @@ namespace AllBase.Model.DBModel
 			if (ItemTransitOrder?.pre_allocated_order_no != 1 && ItemTransitOrder?.pre_allocated_order_no != 3)
 				this.TransitOrderWaybillToWareHouseStr = null;
 			else
-				this.TransitOrderWaybillToWareHouseStr = "买手物流：" + ItemTransitOrder.express_1_company + "-" + ItemTransitOrder.express_1_waybill;
+				this.TransitOrderWaybillToWareHouseStr = ItemTransitOrder.express_1_company + "-" + ItemTransitOrder.express_1_waybill;
 
 			// 提前取号物流
 			if (ItemTransitOrder?.pre_allocated_order_no != 2)
 				this.TransitOrderWaybillFakeStr = null;
 			else
-				this.TransitOrderWaybillFakeStr = "取号物流：" + ItemTransitOrder.express_1_company + "-" + ItemTransitOrder.express_1_waybill;
+				this.TransitOrderWaybillFakeStr =  ItemTransitOrder.express_1_company + "-" + ItemTransitOrder.express_1_waybill;
 
 			// 仓库下游物流
 			if (ItemTransitOrder == null || ItemTransitOrder.express_2_company.IsNullOrEmpty() || ItemTransitOrder.express_2_waybill.IsNullOrEmpty())
 				TransitOrderWaybillFromWareHouseStr = null;
 			else
-				TransitOrderWaybillFromWareHouseStr = "仓库物流：" + ItemTransitOrder.express_2_company + "-" + ItemTransitOrder.express_2_waybill;
+				TransitOrderWaybillFromWareHouseStr =  ItemTransitOrder.express_2_company + "-" + ItemTransitOrder.express_2_waybill;
 
 			if (order_id == "3738461463336072960")
 			{
@@ -722,7 +722,7 @@ namespace AllBase.Model.DBModel
                 if (ItemTransitOrderWithVoid == null)
                     return "";
 
-                string timeStr = "采购时间：" + ItemTransitOrderWithVoid.created_time.ToString("yyyy-MM-dd HH:mm:ss");
+                string timeStr = ItemTransitOrderWithVoid.created_time.ToString("yyyy-MM-dd HH:mm:ss");
                 if (CreateDateTime.Date != ItemTransitOrderWithVoid.created_time.Date && ItemTransitOrderWithVoid.created_time > ItemTransitOrderWithVoid.created_time.Date.AddHours(1.5))
                     return timeStr + " ×";
                 return timeStr + " √";