1优化订单列表展示 2拍单逻辑优化调整 3自动拍单
This commit is contained in:
1 parent
b2d91563ed
commit
b03753e0cf
10 files changed
+309
-95
No files matched your search
@@ -51,7 +51,7 @@
|
||||
<ColumnDefinition Width="36" />
|
||||
<ColumnDefinition Width="28" />
|
||||
<ColumnDefinition Width="200*" />
|
||||
<ColumnDefinition Width="100*" MinWidth="200" />
|
||||
<ColumnDefinition Width="100*" MinWidth="180" />
|
||||
<ColumnDefinition Width="75*" MinWidth="130" />
|
||||
<ColumnDefinition Width="170*" MinWidth="280" />
|
||||
<ColumnDefinition Width="120*" />
|
||||
@@ -196,7 +196,7 @@
|
||||
VerticalSpacing="2">
|
||||
<wpf:TitleContent Title="成交时间:">
|
||||
<uc:UcWaterMarkTextBox1
|
||||
d:Text="2000-01-01 01:01:01"
|
||||
d:Text="00-01-01 01:01:01"
|
||||
Background="Transparent"
|
||||
BorderThickness="0"
|
||||
IsReadOnly="True"
|
||||
@@ -647,7 +647,8 @@
|
||||
Title="采购账户:"
|
||||
Cursor="Hand"
|
||||
Foreground="#0099ff"
|
||||
MouseLeftButtonUp="TransitOrderBuye_Click">
|
||||
MouseLeftButtonUp="TransitOrderBuye_Click"
|
||||
Visibility="{Binding ElementName=txtTransitOrderBuyerStr, Path=Text, Converter={StaticResource HasTextVisibility}}">
|
||||
<WrapPanel Orientation="Horizontal">
|
||||
<uc:UcWaterMarkTextBox1
|
||||
x:Name="txtTransitOrderBuyerStr"
|
||||
@@ -692,7 +693,8 @@
|
||||
x:Name="wpBuyOrderId"
|
||||
Title="采购单号:"
|
||||
Cursor="Hand"
|
||||
Foreground="#0099ff">
|
||||
Foreground="#0099ff"
|
||||
Visibility="{Binding ElementName=txtTransitOrderNumStr, Path=Text, Converter={StaticResource HasTextVisibility}}">
|
||||
<WrapPanel Orientation="Horizontal">
|
||||
<uc:UcWaterMarkTextBox1
|
||||
x:Name="txtTransitOrderNumStr"
|
||||
@@ -730,7 +732,8 @@
|
||||
<wpf:TitleContent
|
||||
x:Name="wpBuyTime"
|
||||
Title="采购时间:"
|
||||
Foreground="{Binding OutOrderTimeQualifiedBrush}">
|
||||
Foreground="{Binding OutOrderTimeQualifiedBrush}"
|
||||
Visibility="{Binding ElementName=txtOutOrderTimeQualifiedStr, Path=Text, Converter={StaticResource HasTextVisibility}}">
|
||||
<uc:UcWaterMarkTextBox1
|
||||
x:Name="txtOutOrderTimeQualifiedStr"
|
||||
Margin="-2,2"
|
||||
@@ -869,6 +872,23 @@
|
||||
</Border>
|
||||
</WrapPanel>
|
||||
</wpf:TitleContent>
|
||||
<!-- 采购时间 -->
|
||||
<wpf:TitleContent
|
||||
x:Name="wpDirectBuyTime"
|
||||
Title="外采时间:"
|
||||
Visibility="{Binding ElementName=txtDirectOrderBuyTimeStr, Path=Text, Converter={StaticResource HasTextVisibility}}">
|
||||
<uc:UcWaterMarkTextBox1
|
||||
x:Name="txtDirectOrderBuyTimeStr"
|
||||
Margin="-2,2"
|
||||
Padding="0"
|
||||
VerticalAlignment="Top"
|
||||
Background="Transparent"
|
||||
BorderThickness="0"
|
||||
IsReadOnly="True"
|
||||
Text="{Binding DirectOrderBuyTimeStr}"
|
||||
TextWrapping="Wrap"
|
||||
WaterMark="采购时间:" />
|
||||
</wpf:TitleContent>
|
||||
|
||||
<!-- 外采物流 -->
|
||||
<wpf:TitleContent Title="外采物流:" Visibility="{Binding ItemOrder.OutExpressNoStr, Converter={StaticResource HasTextVisibility}}">
|
||||
@@ -956,12 +976,12 @@
|
||||
<!-- 买家留言 -->
|
||||
<wpf:TitleContent Title="买家留言:">
|
||||
<uc:UcWaterMarkTextBox1
|
||||
d:Text="留言留言"
|
||||
Background="Transparent"
|
||||
BorderThickness="1"
|
||||
IsReadOnly="True"
|
||||
Text=""
|
||||
TextWrapping="Wrap"
|
||||
WaterMark="买家留言" />
|
||||
TextWrapping="Wrap" />
|
||||
</wpf:TitleContent>
|
||||
|
||||
<!-- 店铺备注 -->
|
||||
@@ -1166,20 +1186,24 @@
|
||||
Grid.Column="8"
|
||||
VerticalAlignment="Center"
|
||||
Orientation="Vertical"
|
||||
VerticalSpacing="5">
|
||||
VerticalSpacing="6">
|
||||
|
||||
<wpf:TitleContent>
|
||||
<Button
|
||||
x:Name="btnMapSkus"
|
||||
Height="24"
|
||||
MinWidth="38"
|
||||
Margin="4,0,0,0"
|
||||
HorizontalAlignment="Center"
|
||||
Click="btnMapSkus_Click"
|
||||
Content="选择SKU"
|
||||
Style="{StaticResource BasePageButtonLightStyle}"
|
||||
Visibility="{Binding MapSkusBtnVisibility}" />
|
||||
</wpf:TitleContent>
|
||||
<!-- 操作按钮行(原 Row 1) -->
|
||||
<wpf:TitleContent>
|
||||
<WrapPanel HorizontalAlignment="Center" Orientation="Vertical">
|
||||
<Button
|
||||
x:Name="btnMapSkus"
|
||||
Height="24"
|
||||
MinWidth="38"
|
||||
Margin="4,4,0,4"
|
||||
HorizontalAlignment="Center"
|
||||
Click="btnMapSkus_Click"
|
||||
Content="选择SKU"
|
||||
Style="{StaticResource BasePageButtonLightStyle}"
|
||||
Visibility="{Binding MapSkusBtnVisibility}" />
|
||||
|
||||
|
||||
<Button
|
||||
x:Name="btnBuyOrder"
|
||||
|
||||
Reference in new issue
Block a user