diff --git a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs index 35ddd5bc..0faa711f 100644 --- a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs +++ b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs @@ -452,7 +452,7 @@ namespace BBWY.Client.ViewModels } else if (order.StorageType == StorageType.SD) { - var sd = new SD(order.Id, false, order.VenderRemark, order.Flag, order.SDKey, order.SDPayChannel, order.SDPayBillNo, order.SDOperator, order.OrderCost.SDCommissionAmount, order.OrderCost.DeliveryExpressFreight); + var sd = new SD(order.Id, false, order.VenderRemark, order.Flag, order.SDKey, order.SDPayChannel, order.SDPayBillNo, order.SDOperator, order.OrderCost.SDCommissionAmount, order.OrderCost.DeliveryExpressFreight, order.SDType ?? SDType.自刷); sd.Closed += Sd_Closed; sd.ShowDialog(); } diff --git a/BBWY.Client/Views/Order/OrderList.xaml b/BBWY.Client/Views/Order/OrderList.xaml index 0664b3eb..307c2a5b 100644 --- a/BBWY.Client/Views/Order/OrderList.xaml +++ b/BBWY.Client/Views/Order/OrderList.xaml @@ -658,7 +658,7 @@ - + diff --git a/BBWY.Client/Views/Order/SD.xaml b/BBWY.Client/Views/Order/SD.xaml index 4873bb2b..085a228f 100644 --- a/BBWY.Client/Views/Order/SD.xaml +++ b/BBWY.Client/Views/Order/SD.xaml @@ -55,13 +55,14 @@ - + diff --git a/BBWY.Client/Views/Order/SD.xaml.cs b/BBWY.Client/Views/Order/SD.xaml.cs index cd29a78d..f3960de9 100644 --- a/BBWY.Client/Views/Order/SD.xaml.cs +++ b/BBWY.Client/Views/Order/SD.xaml.cs @@ -34,7 +34,7 @@ namespace BBWY.Client.Views.Order public string SdOperator { get; set; } - public SD(string orderId, bool isSetStorageType, string venderRemark, string flag, string sdKey, PayBillType? payChannel, string sdPayBillNo, string sdOperator, decimal sdCommissionAmount, decimal deliveryExpressFreight) + public SD(string orderId, bool isSetStorageType, string venderRemark, string flag, string sdKey, PayBillType? payChannel, string sdPayBillNo, string sdOperator, decimal sdCommissionAmount, decimal deliveryExpressFreight, SDType sDType = Models.SDType.自刷) { InitializeComponent(); this.OrderId = orderId; @@ -47,10 +47,12 @@ namespace BBWY.Client.Views.Order this.SdOperator = sdOperator; this.SDCommissionAmount = sdCommissionAmount; this.DeliveryExpressFreight = deliveryExpressFreight; + this.SDType = sDType; } private void BWindow_Loaded(object sender, RoutedEventArgs e) { txtVenderRemark.Text = VenderRemark; + cbx_sdType.SelectedItem = SDType; var flagList = new List() { new KVModel() {Key="灰色",Value="Gray"}, @@ -71,6 +73,8 @@ namespace BBWY.Client.Views.Order this.txt_SDOperator.Text = SdOperator; this.txtDeliveryExpressFreight.Text = DeliveryExpressFreight.ToString(); this.txtSDCommissionAmount.Text = SDCommissionAmount.ToString(); + + lblSDCommissionAmount.Text = (SDType)cbx_sdType.SelectedItem == Models.SDType.自刷 ? "空单号/刷单号" : "佣金"; } private void btn_Save_Click(object sender, RoutedEventArgs e) @@ -97,6 +101,11 @@ namespace BBWY.Client.Views.Order this.Close(); } - + private void cbx_sdType_SelectionChanged(object sender, SelectionChangedEventArgs e) + { + if (lblSDCommissionAmount == null) + return; + lblSDCommissionAmount.Text = (SDType)cbx_sdType.SelectedItem == Models.SDType.自刷 ? "空单号/刷单号" : "佣金"; + } } }