修复关联失败问题 继续优化读单
This commit is contained in:
1 parent
a786ba6ce9
commit
7df2cc0957
5 files changed
+135
-55
No files matched your search
@@ -702,7 +702,7 @@
|
||||
BorderBrush="{Binding TransitRefundStatusBackColor}"
|
||||
BorderThickness="1"
|
||||
CornerRadius="2"
|
||||
Visibility="{Binding TransitRefundStatusStr, Converter={StaticResource HasTextVisibility}}">
|
||||
Visibility="{Binding TransitRefundStatusStrVisibility}">
|
||||
<TextBlock
|
||||
x:Name="txtRefundStatus"
|
||||
MinWidth="20"
|
||||
@@ -722,7 +722,7 @@
|
||||
Title="采购单号:"
|
||||
Cursor="Hand"
|
||||
Foreground="#0099ff"
|
||||
Visibility="{Binding ItemTransitOrderWithVoid.OutOrderNumStr, Converter={StaticResource HasTextVisibility}}">
|
||||
Visibility="{Binding ItemTransitOutOrderNoStrVisibility}">
|
||||
<WrapPanel Orientation="Horizontal">
|
||||
<uc:UcWaterMarkTextBox1
|
||||
x:Name="txtTransitOrderNumStr"
|
||||
@@ -746,8 +746,7 @@
|
||||
Background="Transparent"
|
||||
Cursor="Hand"
|
||||
MouseLeftButtonDown="Path_MouseLeftButtonDown"
|
||||
Tag="{Binding order_id}"
|
||||
Visibility="{Binding ElementName=txtTransitOrderBuyerStr, Path=Text, Converter={StaticResource HasTextVisibility}}">
|
||||
Tag="{Binding order_id}">
|
||||
<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}"
|
||||
@@ -762,7 +761,7 @@
|
||||
x:Name="wpBuyTime"
|
||||
Title="采购时间:"
|
||||
Foreground="{Binding OutOrderTimeQualifiedBrush}"
|
||||
Visibility="{Binding ElementName=txtOutOrderTimeQualifiedStr, Path=Text, Converter={StaticResource HasTextVisibility}}">
|
||||
Visibility="{Binding OutOrderTimeQualifiedStrVisibility}">
|
||||
<uc:UcWaterMarkTextBox1
|
||||
x:Name="txtOutOrderTimeQualifiedStr"
|
||||
Margin="-2,0"
|
||||
@@ -781,7 +780,7 @@
|
||||
<wpf:TitleContent
|
||||
Title="取号物流:"
|
||||
Foreground="{StaticResource PageOkBrush}"
|
||||
Visibility="{Binding TransitOrderWaybillToWareHouseStr, Converter={StaticResource HasTextVisibility}}">
|
||||
Visibility="{Binding TransitOrderWaybillToWareHouseStrVisibility}">
|
||||
<uc:UcWaterMarkTextBox1
|
||||
Margin="-2,0"
|
||||
Padding="0"
|
||||
@@ -811,7 +810,7 @@
|
||||
</wpf:TitleContent>
|
||||
|
||||
<!-- 仓库物流 -->
|
||||
<wpf:TitleContent Title="仓库物流:" Visibility="{Binding TransitOrderWaybillFromWareHouseStr, Converter={StaticResource HasTextVisibility}}">
|
||||
<wpf:TitleContent Title="仓库物流:" Visibility="{Binding TransitOrderWaybillFromWareHouseStrVisibility}">
|
||||
<WrapPanel>
|
||||
<uc:UcWaterMarkTextBox1
|
||||
Margin="-2,0"
|
||||
@@ -835,7 +834,7 @@
|
||||
</wpf:TitleContent>
|
||||
|
||||
<!-- 仓库物流 -->
|
||||
<wpf:TitleContent Title="补发物流:" Visibility="{Binding TransitExtraPackageWaybillStr, Converter={StaticResource HasTextVisibility}}">
|
||||
<wpf:TitleContent Title="补发物流:" Visibility="{Binding TransitExtraPackageWaybillStrVisibility}">
|
||||
<WrapPanel>
|
||||
<uc:UcWaterMarkTextBox1
|
||||
Margin="-2,0"
|
||||
@@ -855,7 +854,7 @@
|
||||
Click="btnVoidTransitExtraOrder_Click"
|
||||
Content="{Binding TransitExtraPackageWaybillBtnStr}"
|
||||
Style="{StaticResource LinkButton}"
|
||||
Visibility="{Binding TransitExtraPackageWaybillBtnStr, Converter={StaticResource HasTextVisibility}}" />
|
||||
Visibility="{Binding TransitExtraPackageWaybillBtnStrVisibility}" />
|
||||
</WrapPanel>
|
||||
</wpf:TitleContent>
|
||||
|
||||
@@ -942,7 +941,7 @@
|
||||
<wpf:TitleContent
|
||||
x:Name="wpDirectBuyTime"
|
||||
Title="外采时间:"
|
||||
Visibility="{Binding ElementName=txtDirectOrderBuyTimeStr, Path=Text, Converter={StaticResource HasTextVisibility}}">
|
||||
Visibility="{Binding DirectOrderBuyTimeStrVisibility}">
|
||||
<uc:UcWaterMarkTextBox1
|
||||
x:Name="txtDirectOrderBuyTimeStr"
|
||||
Margin="-2,2"
|
||||
@@ -1293,7 +1292,7 @@
|
||||
</wpf:TitleContent>
|
||||
|
||||
<!-- 总店地址 -->
|
||||
<wpf:TitleContent Title="总店地址:" Visibility="{Binding PddBuyerAfterSaleAddressStr, Converter={StaticResource HasTextVisibility}}">
|
||||
<wpf:TitleContent Title="总店地址:" Visibility="{Binding PddBuyerAfterSaleAddressStrVisibility}">
|
||||
<WrapPanel Orientation="Horizontal">
|
||||
<uc:UcWaterMarkTextBox1
|
||||
x:Name="txtBuyerRefundAddress"
|
||||
@@ -1303,10 +1302,9 @@
|
||||
Background="Transparent"
|
||||
BorderThickness="1"
|
||||
IsReadOnly="True"
|
||||
Text="{Binding PddBuyerAfterSaleAddressStr, Converter={StaticResource TextEllipsisConverter}}"
|
||||
Text="{Binding PddBuyerAfterSaleAddressShortStr}"
|
||||
TextWrapping="Wrap"
|
||||
ToolTip="{Binding PddBuyerAfterSaleAddressStr}"
|
||||
Visibility="{Binding Text, RelativeSource={RelativeSource Self}, Converter={StaticResource HasTextVisibility}}"
|
||||
WaterMark="总店退货地址" />
|
||||
<Border
|
||||
Width="12"
|
||||
@@ -1326,7 +1324,7 @@
|
||||
</wpf:TitleContent>
|
||||
|
||||
<!-- 直发总店 -->
|
||||
<wpf:TitleContent Title="直发总店:" Visibility="{Binding DirectPddBuyerAfterSaleAddressStr, Converter={StaticResource HasTextVisibility}}">
|
||||
<wpf:TitleContent Title="直发总店:" Visibility="{Binding DirectPddBuyerAfterSaleAddressStrVisibility}">
|
||||
<WrapPanel Orientation="Horizontal">
|
||||
<uc:UcWaterMarkTextBox1
|
||||
x:Name="txtDirectBuyerRefundAddress"
|
||||
@@ -1336,10 +1334,9 @@
|
||||
Background="Transparent"
|
||||
BorderThickness="1"
|
||||
IsReadOnly="True"
|
||||
Text="{Binding DirectPddBuyerAfterSaleAddressStr, Converter={StaticResource TextEllipsisConverter}}"
|
||||
Text="{Binding DirectPddBuyerAfterSaleAddressShortStr}"
|
||||
TextWrapping="Wrap"
|
||||
ToolTip="{Binding DirectPddBuyerAfterSaleAddressStr}"
|
||||
Visibility="{Binding Text, RelativeSource={RelativeSource Self}, Converter={StaticResource HasTextVisibility}}"
|
||||
WaterMark="总店退货地址" />
|
||||
<Border
|
||||
Width="12"
|
||||
|
||||
Reference in new issue
Block a user