解决部分按钮不能点击的问题。
This commit is contained in:
1 parent
d109a90302
commit
0b47a16eb9
2 files changed
+5
-4
No files matched your search
@@ -1270,7 +1270,8 @@
|
|||||||
d:Content="创建"
|
d:Content="创建"
|
||||||
Click="btnReturnOrder_Click"
|
Click="btnReturnOrder_Click"
|
||||||
Content="{Binding AddEditTransitWarehouseReturnOrderStr}"
|
Content="{Binding AddEditTransitWarehouseReturnOrderStr}"
|
||||||
Style="{StaticResource LinkButton}" />
|
Style="{StaticResource BasePageButtonLightStyle}" />
|
||||||
|
<!-- Style="{StaticResource LinkButton}" -->
|
||||||
</WrapPanel>
|
</WrapPanel>
|
||||||
</wpf:TitleContent>
|
</wpf:TitleContent>
|
||||||
|
|
||||||
|
|||||||
@@ -1559,8 +1559,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
{
|
{
|
||||||
if (this.DataContext is oms_wei_order_item_info orderItem)
|
if (this.DataContext is oms_wei_order_item_info orderItem)
|
||||||
{
|
{
|
||||||
if (sender == btnRetrunOrder && (orderItem.AddEditTransitWarehouseReturnOrderStr == "未创建" || orderItem.AddEditTransitWarehouseReturnOrderStr == "创建失败"))
|
//if (sender == btnRetrunOrder && (orderItem.AddEditTransitWarehouseReturnOrderStr == "未创建" || orderItem.AddEditTransitWarehouseReturnOrderStr == "创建失败"))
|
||||||
return;
|
// return;
|
||||||
|
|
||||||
//if (orderItem.ItemTransitOrder?.warehouse_status != 2 && orderItem.AddEditTransitWarehouseAfterSaleStr == "添加")
|
//if (orderItem.ItemTransitOrder?.warehouse_status != 2 && orderItem.AddEditTransitWarehouseAfterSaleStr == "添加")
|
||||||
//{
|
//{
|
||||||
@@ -1910,7 +1910,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
|
|
||||||
private void btnTrySendSyncOrder_Click(object sender, RoutedEventArgs e)
|
private void btnTrySendSyncOrder_Click(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
if (this.DataContext is oms_wei_order_item_info orderItem && orderItem.ItemOrder != null && sender is Button btnSendSync && !btnSendSync.Tag.ParseToString().IsNullOrEmpty())
|
if (this.DataContext is oms_wei_order_item_info orderItem && orderItem.ItemOrder != null && sender is Button btnSendSync /*&& !btnSendSync.Tag.ParseToString().IsNullOrEmpty()*/)
|
||||||
{
|
{
|
||||||
//var orderSn = btnSendSync.Tag.ParseToString();
|
//var orderSn = btnSendSync.Tag.ParseToString();
|
||||||
var directOrder = orderItem.DirectPddBuyerOrder;
|
var directOrder = orderItem.DirectPddBuyerOrder;
|
||||||
|
|||||||
Reference in new issue
Block a user