Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
adc3649b59 | ||
|
|
2d788bd8b1 |
No files matched your search
@@ -1374,7 +1374,6 @@
|
|||||||
</wpf:SpacingStackPanel>
|
</wpf:SpacingStackPanel>
|
||||||
<!-- 操作 -->
|
<!-- 操作 -->
|
||||||
|
|
||||||
|
|
||||||
<wpf:SpacingStackPanel
|
<wpf:SpacingStackPanel
|
||||||
Grid.Column="8"
|
Grid.Column="8"
|
||||||
HorizontalAlignment="Right"
|
HorizontalAlignment="Right"
|
||||||
@@ -1392,8 +1391,17 @@
|
|||||||
Orientation="Vertical"
|
Orientation="Vertical"
|
||||||
VerticalSpacing="6">
|
VerticalSpacing="6">
|
||||||
|
|
||||||
|
<Button
|
||||||
|
x:Name="btnTransitInfo"
|
||||||
|
Height="22"
|
||||||
|
MinWidth="38"
|
||||||
|
Margin="0,0,0,0"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
Click="btnTransitInfo_Click"
|
||||||
|
Content="云仓详情"
|
||||||
|
Style="{StaticResource BasePageButtonLightStyle}"
|
||||||
|
Visibility="{Binding MapSkusBtnVisibility}" />
|
||||||
|
|
||||||
<wpf:TitleContent>
|
|
||||||
<Button
|
<Button
|
||||||
x:Name="btnMapSkus"
|
x:Name="btnMapSkus"
|
||||||
Height="22"
|
Height="22"
|
||||||
@@ -1404,9 +1412,7 @@
|
|||||||
Content="选择SKU"
|
Content="选择SKU"
|
||||||
Style="{StaticResource BasePageButtonLightStyle}"
|
Style="{StaticResource BasePageButtonLightStyle}"
|
||||||
Visibility="{Binding MapSkusBtnVisibility}" />
|
Visibility="{Binding MapSkusBtnVisibility}" />
|
||||||
</wpf:TitleContent>
|
|
||||||
|
|
||||||
<wpf:TitleContent>
|
|
||||||
<Button
|
<Button
|
||||||
x:Name="btnBuyOrder"
|
x:Name="btnBuyOrder"
|
||||||
Height="22"
|
Height="22"
|
||||||
@@ -1427,8 +1433,6 @@
|
|||||||
Style="{StaticResource BasePageButtonLightStyle}"
|
Style="{StaticResource BasePageButtonLightStyle}"
|
||||||
Visibility="{Binding ItemOrder.IsWaitBuy, Converter={StaticResource visibleToVisibilityConverter}}" />
|
Visibility="{Binding ItemOrder.IsWaitBuy, Converter={StaticResource visibleToVisibilityConverter}}" />
|
||||||
|
|
||||||
</wpf:TitleContent>
|
|
||||||
<wpf:TitleContent>
|
|
||||||
<Button
|
<Button
|
||||||
x:Name="btnVoidTransitOrder"
|
x:Name="btnVoidTransitOrder"
|
||||||
Height="22"
|
Height="22"
|
||||||
@@ -1440,9 +1444,7 @@
|
|||||||
Content="作废重拍"
|
Content="作废重拍"
|
||||||
Style="{StaticResource BasePageButtonLightStyle}"
|
Style="{StaticResource BasePageButtonLightStyle}"
|
||||||
Visibility="{Binding BtnVoidTransitOrderVisibility}" />
|
Visibility="{Binding BtnVoidTransitOrderVisibility}" />
|
||||||
</wpf:TitleContent>
|
|
||||||
|
|
||||||
<wpf:TitleContent>
|
|
||||||
<Button
|
<Button
|
||||||
x:Name="btnAbnormalOrderRebuy"
|
x:Name="btnAbnormalOrderRebuy"
|
||||||
Height="22"
|
Height="22"
|
||||||
@@ -1454,11 +1456,8 @@
|
|||||||
Content="异常重拍"
|
Content="异常重拍"
|
||||||
Style="{StaticResource BasePageButtonLightStyle}"
|
Style="{StaticResource BasePageButtonLightStyle}"
|
||||||
Visibility="{Binding BtnAbnormalOrderRebuyVisibility}" />
|
Visibility="{Binding BtnAbnormalOrderRebuyVisibility}" />
|
||||||
</wpf:TitleContent>
|
|
||||||
|
|
||||||
|
|
||||||
<!-- 直发拍单 -->
|
<!-- 直发拍单 -->
|
||||||
<wpf:TitleContent>
|
|
||||||
<Button
|
<Button
|
||||||
x:Name="btnDirectBuyOrder"
|
x:Name="btnDirectBuyOrder"
|
||||||
Height="22"
|
Height="22"
|
||||||
@@ -1469,22 +1468,18 @@
|
|||||||
Content="直发拍单"
|
Content="直发拍单"
|
||||||
Style="{StaticResource BasePageButtonLightStyle}"
|
Style="{StaticResource BasePageButtonLightStyle}"
|
||||||
Visibility="{Binding BtnDirectBuyOrderVisibility}" />
|
Visibility="{Binding BtnDirectBuyOrderVisibility}" />
|
||||||
</wpf:TitleContent>
|
|
||||||
|
|
||||||
<!-- 礼品发货 -->
|
<!-- 礼品发货 -->
|
||||||
<wpf:TitleContent>
|
|
||||||
<Button
|
<Button
|
||||||
x:Name="btnShipGift"
|
x:Name="btnShipGift"
|
||||||
Height="22"
|
Height="22"
|
||||||
MinWidth="38"
|
MinWidth="38"
|
||||||
Margin="0,0,0,0"
|
Margin="0,0,0,0"
|
||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
d:Visibility="Visible"
|
|
||||||
Click="btn_ShipGiftCommand"
|
Click="btn_ShipGiftCommand"
|
||||||
Content="礼品发货"
|
Content="礼品发货"
|
||||||
Style="{StaticResource BasePageButtonLightStyle}"
|
Style="{StaticResource BasePageButtonLightStyle}"
|
||||||
Visibility="{Binding ItemOrder.IsWaitSend, Converter={StaticResource VisibleToVisibilityConverter}}" />
|
Visibility="{Binding ItemOrder.IsWaitSend, Converter={StaticResource VisibleToVisibilityConverter}}" />
|
||||||
</wpf:TitleContent>
|
|
||||||
</wpf:SpacingStackPanel>
|
</wpf:SpacingStackPanel>
|
||||||
|
|
||||||
<wpf:SpacingStackPanel
|
<wpf:SpacingStackPanel
|
||||||
|
|||||||
@@ -2134,6 +2134,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
}
|
}
|
||||||
|
|
||||||
private async void borderWarehouseStatas_MouseUp(object sender, MouseButtonEventArgs e)
|
private async void borderWarehouseStatas_MouseUp(object sender, MouseButtonEventArgs e)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
private void btnTransitInfo_Click(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
//return;
|
//return;
|
||||||
if (this.DataContext is oms_wei_order_item_info orderItem)
|
if (this.DataContext is oms_wei_order_item_info orderItem)
|
||||||
|
|||||||
Reference in new issue
Block a user