diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml index 3a6c34b..bb04fa4 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml @@ -1270,7 +1270,8 @@ d:Content="创建" Click="btnReturnOrder_Click" Content="{Binding AddEditTransitWarehouseReturnOrderStr}" - Style="{StaticResource LinkButton}" /> + Style="{StaticResource BasePageButtonLightStyle}" /> + diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs index 8423cf1..ce6f4d9 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs @@ -1559,8 +1559,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls { if (this.DataContext is oms_wei_order_item_info orderItem) { - if (sender == btnRetrunOrder && (orderItem.AddEditTransitWarehouseReturnOrderStr == "未创建" || orderItem.AddEditTransitWarehouseReturnOrderStr == "创建失败")) - return; + //if (sender == btnRetrunOrder && (orderItem.AddEditTransitWarehouseReturnOrderStr == "未创建" || orderItem.AddEditTransitWarehouseReturnOrderStr == "创建失败")) + // return; //if (orderItem.ItemTransitOrder?.warehouse_status != 2 && orderItem.AddEditTransitWarehouseAfterSaleStr == "添加") //{ @@ -1910,7 +1910,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls 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 directOrder = orderItem.DirectPddBuyerOrder;