支持在订单列表页面重试发送同步单功能
This commit is contained in:
1 parent
e1e118cc61
commit
d9c0749093
3 files changed
+34
-13
No files matched your search
@@ -980,13 +980,14 @@
|
||||
Margin="-2,2,4,2"
|
||||
Padding="0"
|
||||
VerticalAlignment="Center"
|
||||
d:Text="外采物流单号"
|
||||
Background="Transparent"
|
||||
BorderThickness="0"
|
||||
Foreground="{Binding ItemOrder.OutExpressNoBrush}"
|
||||
IsReadOnly="True"
|
||||
Text="{Binding ItemOrder.OutExpressNoStr}"
|
||||
TextWrapping="Wrap"
|
||||
WaterMark="外采物流" />
|
||||
WaterMark="外采物流的那好" />
|
||||
|
||||
<Button
|
||||
x:Name="btnGetDirectWaybillDetail"
|
||||
@@ -998,7 +999,7 @@
|
||||
Style="{StaticResource LinkButton}" />
|
||||
</WrapPanel>
|
||||
</wpf:TitleContent>
|
||||
<wpf:TitleContent Title="同步物流:" Visibility="{Binding ItemOrder.SyncWaybillId, Converter={StaticResource HasTextVisibility}}">
|
||||
<wpf:TitleContent Title="同步物流:" Visibility="{Binding ItemOrder.SyncWaybillIdInfo, Converter={StaticResource HasTextVisibility}}">
|
||||
<WrapPanel Orientation="Horizontal">
|
||||
<!--<uc:UcWaterMarkTextBox1
|
||||
Margin="-2,2"
|
||||
@@ -1026,11 +1027,11 @@
|
||||
Margin="-2,2,4,2"
|
||||
Padding="0"
|
||||
VerticalAlignment="Center"
|
||||
d:Text="同步物流单"
|
||||
d:Text="物流单"
|
||||
Background="Transparent"
|
||||
BorderThickness="0"
|
||||
IsReadOnly="True"
|
||||
Text="{Binding ItemOrder.SyncWaybillId}"
|
||||
Text="{Binding ItemOrder.SyncWaybillIdInfo}"
|
||||
TextWrapping="Wrap"
|
||||
WaterMark="同步物流" />
|
||||
|
||||
@@ -1050,7 +1051,7 @@
|
||||
Margin="-2,2,4,2"
|
||||
Padding="0"
|
||||
VerticalAlignment="Center"
|
||||
d:Text="同步单信息"
|
||||
d:Text="报错信息"
|
||||
Background="Transparent"
|
||||
BorderThickness="0"
|
||||
IsReadOnly="True"
|
||||
@@ -1058,14 +1059,16 @@
|
||||
TextWrapping="Wrap"
|
||||
WaterMark="同步单信息" />
|
||||
|
||||
<!--<Button
|
||||
x:Name="btnGetSyncWaybillDetail"
|
||||
<Button
|
||||
x:Name="btnTrySendSyncOrder"
|
||||
Margin="4,0,0,0"
|
||||
Padding="0,0,0,0"
|
||||
d:Content="查看"
|
||||
Click="btnGetSyncWaybillDetail_Click"
|
||||
Content="{Binding LatestDirectEWaybill.StatusStr}"
|
||||
Style="{StaticResource LinkButton}" />-->
|
||||
d:Content="发送"
|
||||
Click="btnTrySendSyncOrder_Click"
|
||||
Content="发送"
|
||||
Style="{StaticResource LinkButton}"
|
||||
Tag="{Binding ItemOrder.OutExpressNoStr}"
|
||||
Visibility="{Binding ItemOrder.RealSyncWaybillId, Converter={StaticResource NotHasTextVisibility}}" />
|
||||
</WrapPanel>
|
||||
</wpf:TitleContent>
|
||||
|
||||
|
||||
Reference in new issue
Block a user