修复备注编辑不显示问题
This commit is contained in:
1 parent
cbacc242db
commit
f3fa093709
2 files changed
+11
-1
No files matched your search
@@ -233,6 +233,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
txtShopRemark.SetValue(WidthProperty, Double.NaN);
|
txtShopRemark.SetValue(WidthProperty, Double.NaN);
|
||||||
txtShopRemark.BorderBrush = new SolidColorBrush(Color.FromArgb(0, 0, 50, 150));
|
txtShopRemark.BorderBrush = new SolidColorBrush(Color.FromArgb(0, 0, 50, 150));
|
||||||
txtShopRemark.IsReadOnly = true;
|
txtShopRemark.IsReadOnly = true;
|
||||||
|
if (txtShopRemark.Text.IsNullOrEmpty())
|
||||||
|
txtShopRemark.Visibility = Visibility.Collapsed;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -241,6 +243,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
txtShopRemark.SetValue(WidthProperty, 135.0);
|
txtShopRemark.SetValue(WidthProperty, 135.0);
|
||||||
txtShopRemark.BorderBrush = new SolidColorBrush(Color.FromArgb(50, 0, 50, 150));
|
txtShopRemark.BorderBrush = new SolidColorBrush(Color.FromArgb(50, 0, 50, 150));
|
||||||
txtShopRemark.IsReadOnly = false;
|
txtShopRemark.IsReadOnly = false;
|
||||||
|
txtShopRemark.Visibility = Visibility.Visible;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -252,6 +255,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
txtShopRemark.SetValue(WidthProperty, Double.NaN);
|
txtShopRemark.SetValue(WidthProperty, Double.NaN);
|
||||||
txtShopRemark.BorderBrush = new SolidColorBrush(Color.FromArgb(0, 0, 50, 150));
|
txtShopRemark.BorderBrush = new SolidColorBrush(Color.FromArgb(0, 0, 50, 150));
|
||||||
txtShopRemark.IsReadOnly = true;
|
txtShopRemark.IsReadOnly = true;
|
||||||
|
if (txtShopRemark.Text.IsNullOrEmpty())
|
||||||
|
txtShopRemark.Visibility = Visibility.Collapsed;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void btnEditAppRemark_Click(object sender, RoutedEventArgs e)
|
private void btnEditAppRemark_Click(object sender, RoutedEventArgs e)
|
||||||
@@ -289,6 +294,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
txtAppRemark.SetValue(WidthProperty, Double.NaN);
|
txtAppRemark.SetValue(WidthProperty, Double.NaN);
|
||||||
txtAppRemark.BorderBrush = new SolidColorBrush(Color.FromArgb(0, 0, 50, 150));
|
txtAppRemark.BorderBrush = new SolidColorBrush(Color.FromArgb(0, 0, 50, 150));
|
||||||
txtAppRemark.IsReadOnly = true;
|
txtAppRemark.IsReadOnly = true;
|
||||||
|
if (txtAppRemark.Text.IsNullOrEmpty())
|
||||||
|
txtAppRemark.Visibility = Visibility.Collapsed;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -297,6 +304,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
txtAppRemark.SetValue(WidthProperty, 135.0);
|
txtAppRemark.SetValue(WidthProperty, 135.0);
|
||||||
txtAppRemark.BorderBrush = new SolidColorBrush(Color.FromArgb(50, 0, 50, 150));
|
txtAppRemark.BorderBrush = new SolidColorBrush(Color.FromArgb(50, 0, 50, 150));
|
||||||
txtAppRemark.IsReadOnly = false;
|
txtAppRemark.IsReadOnly = false;
|
||||||
|
txtAppRemark.Visibility = Visibility.Visible;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -308,6 +316,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
txtAppRemark.SetValue(WidthProperty, Double.NaN);
|
txtAppRemark.SetValue(WidthProperty, Double.NaN);
|
||||||
txtAppRemark.BorderBrush = new SolidColorBrush(Color.FromArgb(0, 0, 50, 150));
|
txtAppRemark.BorderBrush = new SolidColorBrush(Color.FromArgb(0, 0, 50, 150));
|
||||||
txtAppRemark.IsReadOnly = true;
|
txtAppRemark.IsReadOnly = true;
|
||||||
|
if (txtAppRemark.Text.IsNullOrEmpty())
|
||||||
|
txtAppRemark.Visibility = Visibility.Collapsed;
|
||||||
}
|
}
|
||||||
|
|
||||||
private async void btnBuyOrder_Click(object sender, RoutedEventArgs e)
|
private async void btnBuyOrder_Click(object sender, RoutedEventArgs e)
|
||||||
|
|||||||
@@ -320,7 +320,7 @@ namespace AllBase.Model.DBModel
|
|||||||
AddEditTransitWarehouseAfterSaleStr = "已添加";
|
AddEditTransitWarehouseAfterSaleStr = "已添加";
|
||||||
if (this.ItemTransitOrderAfterSale != null && (ItemTransitOrderWithVoid.intercept_return_status == 1 || !string.IsNullOrEmpty(ItemTransitOrderAfterSale.downstream_waybill)))
|
if (this.ItemTransitOrderAfterSale != null && (ItemTransitOrderWithVoid.intercept_return_status == 1 || !string.IsNullOrEmpty(ItemTransitOrderAfterSale.downstream_waybill)))
|
||||||
AddEditTransitWarehouseAfterSaleStr = "拦截成功";
|
AddEditTransitWarehouseAfterSaleStr = "拦截成功";
|
||||||
if (this.ItemTransitOrderAfterSale != null && (ItemTransitOrderWithVoid.intercept_return_status == 2 || ItemTransitOrderWithVoid.intercept_return_status == 3))
|
if (this.ItemTransitOrderAfterSale != null && ItemTransitOrderWithVoid.intercept_return_status == 2)
|
||||||
AddEditTransitWarehouseAfterSaleStr = "拦截失败";
|
AddEditTransitWarehouseAfterSaleStr = "拦截失败";
|
||||||
if (this.ItemTransitOrderWithVoid == null || (this.ItemRefund?.type != "REFUND" && !this.ItemOrder.IsAbnormal) ||
|
if (this.ItemTransitOrderWithVoid == null || (this.ItemRefund?.type != "REFUND" && !this.ItemOrder.IsAbnormal) ||
|
||||||
TransitRefundStatusStr.Contains("退款成功") ||
|
TransitRefundStatusStr.Contains("退款成功") ||
|
||||||
|
|||||||
Reference in new issue
Block a user