拍单功能继续优化
This commit is contained in:
1 parent
29042424dc
commit
34c51c6fcd
64 files changed
+7138
-305
No files matched your search
@@ -5,7 +5,7 @@
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.OrderCtrls"
|
||||
xmlns:uc="clr-namespace:_29WxOrderWpf.UserControls"
|
||||
mc:Ignorable="d"
|
||||
mc:Ignorable="d" DataContextChanged="UserControl_DataContextChanged"
|
||||
d:DesignHeight="250" d:DesignWidth="1200">
|
||||
|
||||
<Grid>
|
||||
@@ -154,26 +154,30 @@
|
||||
<RowDefinition Height="*"></RowDefinition>
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="3">
|
||||
<Border x:Name="borderDeadline" Grid.Row="1" Margin="8,0,0,0" Background="{Binding OrderItemStatusBackColor}" BorderBrush="{Binding OrderItemStatusBorderColor}"
|
||||
BorderThickness="1" MinWidth="30" Height="auto" CornerRadius="2" HorizontalAlignment="Center">
|
||||
<TextBox x:Name="txtDeadline" Grid.Column="1" Margin="2,0,2,1" Foreground="{Binding OrderItemStatusStrColor}" VerticalContentAlignment="Center" VerticalAlignment="Center"
|
||||
Background="Transparent" IsReadOnly="True" MinWidth="20" Text="{Binding OrderItemStatusStr}" BorderThickness="0" />
|
||||
</Border>
|
||||
<TextBox Text="{Binding item_refund.statusStr}" Grid.Column="1" Grid.Row="2" Margin="0,2,0,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True"
|
||||
x:Name="txtStatusStr" BorderThickness="0" Foreground="{Binding item_refund.refundStatusColor}" HorizontalAlignment="Center"
|
||||
Visibility="{Binding ElementName=txtStatusStr,Path=Text,Converter={StaticResource HasTextVisibility}}"/>
|
||||
<TextBox Text="{Binding item_refund.reasonTextStr}" Grid.Column="1" Grid.Row="3" Margin="0,2,0,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True"
|
||||
x:Name="txtRefundReasonTextStr" BorderThickness="0" Foreground="#f56c6c" HorizontalAlignment="Center"
|
||||
Visibility="{Binding ElementName=txtRefundReasonTextStr,Path=Text,Converter={StaticResource HasTextVisibility}}"/>
|
||||
<TextBox Text="{Binding refundResultStr}" Grid.Column="1" Grid.Row="4" Margin="0,2,0,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True"
|
||||
x:Name="txtRefundResult" BorderThickness="0" Foreground="#f56c6c" HorizontalAlignment="Center"
|
||||
Visibility="{Binding ElementName=txtRefundResult,Path=Text,Converter={StaticResource HasTextVisibility}}"/>
|
||||
|
||||
</WrapPanel>
|
||||
|
||||
<TextBox Text="{Binding item_refund.statusStr}" Grid.Column="1" Grid.Row="1" Margin="0,2,0,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True"
|
||||
BorderThickness="0" Foreground="{Binding item_refund.refundStatusColor}" HorizontalAlignment="Center"/>
|
||||
<TextBox Text="{Binding item_refund.reasonTextStr}" Grid.Column="1" Grid.Row="2" Margin="0,2,0,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True"
|
||||
BorderThickness="0" Foreground="#f56c6c" HorizontalAlignment="Center"/>
|
||||
<TextBox Text="{Binding refundResult}" Grid.Column="1" Grid.Row="3" Margin="0,2,0,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True"
|
||||
BorderThickness="0" Foreground="#f56c6c" HorizontalAlignment="Center"/>
|
||||
|
||||
<WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="4">
|
||||
<TextBox Text="收货地址:" Grid.Column="1" Grid.Row="1" Margin="0,2,0,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
|
||||
<uc:UcWaterMarkTextBox WaterMark="收货地址" Text="{Binding item_order.address_str}" Grid.Column="1" Grid.Row="1" Margin="0,2,4,2" VerticalAlignment="Top"
|
||||
<WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="5">
|
||||
<TextBox Text="收货地址:" Grid.Column="1" Grid.Row="5" Margin="0,2,0,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
|
||||
<uc:UcWaterMarkTextBox WaterMark="收货地址" Text="{Binding item_order.address_str}" Grid.Column="1" Grid.Row="5" Margin="0,2,4,2" VerticalAlignment="Top"
|
||||
Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
|
||||
<Button Grid.Column="10" x:Name="btnSeeAddressDetail" Background="Transparent" Foreground="#409eff" BorderBrush="Transparent"
|
||||
Margin="4,0,0,0" Content="👁" Click="btnSeeAddressDetail_Click" Tag="{Binding order_id}"></Button>
|
||||
</WrapPanel>
|
||||
<Button Grid.Column="1" Grid.Row="5" x:Name="btnGetRefundAddress" Background="Transparent" HorizontalAlignment="Center" Foreground="#409eff" BorderBrush="Transparent"
|
||||
Margin="4,0,0,0" Content="仓库退货地址:点击复制" Click="btnGetRefundAddress_Click" Tag="{Binding order_id}"></Button>
|
||||
<!--<Button Grid.Column="1" Grid.Row="6" x:Name="btnGetRefundAddress" Background="Transparent" HorizontalAlignment="Center" Foreground="#409eff" BorderBrush="Transparent"
|
||||
Margin="4,0,0,0" Content="仓库退货地址:点击复制" Click="btnGetRefundAddress_Click" Tag="{Binding order_id}"></Button>-->
|
||||
</Grid>
|
||||
|
||||
<!--单号-->
|
||||
@@ -249,6 +253,31 @@
|
||||
Margin="4,0,0,0" Content="编辑" Click="btnCopyRemark_Click"></Button>
|
||||
</WrapPanel>
|
||||
</Grid>
|
||||
|
||||
<!--备注-->
|
||||
<Grid Grid.Column="7" Background="Transparent" VerticalAlignment="Center">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="*"></RowDefinition>
|
||||
<RowDefinition Height="Auto"></RowDefinition>
|
||||
<RowDefinition Height="Auto"></RowDefinition>
|
||||
<RowDefinition Height="Auto"></RowDefinition>
|
||||
<RowDefinition Height="Auto"></RowDefinition>
|
||||
<RowDefinition Height="Auto"></RowDefinition>
|
||||
<RowDefinition Height="Auto"></RowDefinition>
|
||||
<RowDefinition Height="Auto"></RowDefinition>
|
||||
<RowDefinition Height="Auto"></RowDefinition>
|
||||
<RowDefinition Height="*"></RowDefinition>
|
||||
</Grid.RowDefinitions>
|
||||
<!--<Button Grid.Column="1" Grid.Row="2" Background="Transparent" HorizontalAlignment="Center"
|
||||
Foreground="#409eff" BorderBrush="Transparent" Margin="4,0,0,0" Content="核对拍单" Click=""></Button>-->
|
||||
<!--<Button Grid.Column="1" Grid.Row="1" Background="Transparent" x:Name="btnBuyOrder" Click="btnBuyOrder_Click"
|
||||
Visibility="{Binding item_order.IsWaitBuy, Converter={StaticResource visibleToVisibilityConverter}}"
|
||||
Style="{StaticResource BasePageButtonLightStyle}" Margin="4,0,0,0" Content="关联拍单" Width="56" Height="24"/>-->
|
||||
<Button Grid.Column="1" Grid.Row="1" Background="Transparent" x:Name="btnBuyOrder" Click="btnBuyOrder_Click"
|
||||
Visibility="{Binding item_order.IsWaitBuy, Converter={StaticResource visibleToVisibilityConverter}}"
|
||||
Style="{StaticResource BasePageButtonLightStyle}" Margin="4,0,0,0" Content="{Binding buy_map,Converter={StaticResource HasTextVisibility}}"
|
||||
HorizontalAlignment="Center" MinWidth="38" Height="24"/>
|
||||
</Grid>
|
||||
</Grid>
|
||||
</Grid>
|
||||
</UserControl>
|
||||
Reference in new issue
Block a user