From 3f14cdf3522c14264c811b81f20218e392621471 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Mon, 26 Sep 2022 02:32:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=B7=E5=8D=95=E7=BB=84=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWY.Client/App.xaml.cs | 4 ++-- BBWY.Client/Models/User/User.cs | 5 +++++ BBWY.Client/ViewModels/MainViewModel.cs | 12 ++++++++++-- BBWY.Client/Views/Order/OrderListControl.xaml | 2 +- BBWY.Client/Views/Order/SD.xaml | 3 ++- BBWY.Client/Views/Order/SD.xaml.cs | 14 +++++++------- BBWY.Client/Views/Order/SDGroup.xaml | 9 +++++++-- 7 files changed, 34 insertions(+), 15 deletions(-) diff --git a/BBWY.Client/App.xaml.cs b/BBWY.Client/App.xaml.cs index cc29e8ed..2b6ae76e 100644 --- a/BBWY.Client/App.xaml.cs +++ b/BBWY.Client/App.xaml.cs @@ -32,10 +32,10 @@ namespace BBWY.Client string userToken = string.Empty; #if DEBUG //齐越山鸡 - userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNjk0NjY5NjkxfQ.cSwro-7bGwOu92YejH9JhMenTai7Mvf99i2paQCmxIw"; + //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNjk0NjY5NjkxfQ.cSwro-7bGwOu92YejH9JhMenTai7Mvf99i2paQCmxIw"; //刷单组测试 - //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTcxODUyODE0OTAzMTUyNjQwIiwidGVhbUlkIjoiMTU3MTg1MjQ1MDI5NjUwMDIyNCIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE2OTUxNDc2ODh9.hVupdHnhgHHGo3QrMSDqhINqtq6Q5_RovWyXjiMkkEs"; + userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTcxODUyODE0OTAzMTUyNjQwIiwidGVhbUlkIjoiMTU3MTg1MjQ1MDI5NjUwMDIyNCIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE2OTUxNDc2ODh9.hVupdHnhgHHGo3QrMSDqhINqtq6Q5_RovWyXjiMkkEs"; //齐越愉辰 //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDM5OTEyNDU1MzExNDYyNDAwIiwidGVhbUlkIjoiMTQzOTg5ODYxNzM1ODg0ODAwMCIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE2OTUwNDA0ODZ9.0TvEhPzTeKvpQY31E5YhgfvRBJHYdvwWRrEHNnF9kkA"; //齐越悠仁 diff --git a/BBWY.Client/Models/User/User.cs b/BBWY.Client/Models/User/User.cs index 5ebc9a71..6561e164 100644 --- a/BBWY.Client/Models/User/User.cs +++ b/BBWY.Client/Models/User/User.cs @@ -23,5 +23,10 @@ namespace BBWY.Client.Models public IList DepartmentList { get; set; } + /// + /// 店铺列表 (暂时只有刷单组才需要) + /// + public IList ShopList { get; set; } + } } diff --git a/BBWY.Client/ViewModels/MainViewModel.cs b/BBWY.Client/ViewModels/MainViewModel.cs index 36b850c1..45663912 100644 --- a/BBWY.Client/ViewModels/MainViewModel.cs +++ b/BBWY.Client/ViewModels/MainViewModel.cs @@ -196,8 +196,8 @@ namespace BBWY.Client.ViewModels // return; IList departmentList = null; - if (GlobalContext.User.TeamName == "刷单组" || - managerDepartment.Contains(GlobalContext.User.TeamName) || + if (GlobalContext.User.TeamName == "刷单组" || + managerDepartment.Contains(GlobalContext.User.TeamName) || managerDepartment.Any(m => GlobalContext.User.SonDepartmentNames.Contains(m))) { ShowShopChoosePanel = true; @@ -205,6 +205,14 @@ namespace BBWY.Client.ViewModels if (!response.Success) throw new Exception(response.Msg); departmentList = response.Data.Map>(); + + if (GlobalContext.User.TeamName == "刷单组") + { + var shopList = new List(); + foreach (var d in departmentList) + shopList.AddRange(d.ShopList); + GlobalContext.User.ShopList = shopList; + } } else { diff --git a/BBWY.Client/Views/Order/OrderListControl.xaml b/BBWY.Client/Views/Order/OrderListControl.xaml index cdad3350..13f446df 100644 --- a/BBWY.Client/Views/Order/OrderListControl.xaml +++ b/BBWY.Client/Views/Order/OrderListControl.xaml @@ -773,7 +773,7 @@ - + diff --git a/BBWY.Client/Views/Order/SD.xaml b/BBWY.Client/Views/Order/SD.xaml index ec10702f..1209f9c9 100644 --- a/BBWY.Client/Views/Order/SD.xaml +++ b/BBWY.Client/Views/Order/SD.xaml @@ -57,7 +57,8 @@ + HorizontalAlignment="Left" VerticalAlignment="Center" VerticalContentAlignment="Center" Margin="5,0,0,0" + SelectionChanged="cbx_sdType_SelectionChanged"/> diff --git a/BBWY.Client/Views/Order/SD.xaml.cs b/BBWY.Client/Views/Order/SD.xaml.cs index b69438cd..f876d3ac 100644 --- a/BBWY.Client/Views/Order/SD.xaml.cs +++ b/BBWY.Client/Views/Order/SD.xaml.cs @@ -89,7 +89,7 @@ namespace BBWY.Client.Views.Order this.txtSDCommissionAmount.Text = SDCommissionAmount.ToString(); this.txtSDOrderAmount.Text = SDOrderAmount.ToString(); - //lblSDCommissionAmount.Text = (SDType)cbx_sdType.SelectedItem == Models.SDType.自刷 ? "空单号/刷单号" : "佣金"; + lblSDCommissionAmount.Text = (SDType)cbx_sdType.SelectedItem == Models.SDType.自刷 ? "空单号费" : "佣金"; } private void btn_Save_Click(object sender, RoutedEventArgs e) @@ -118,11 +118,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.自刷 ? "空单号/刷单号" : "佣金"; - //} + private void cbx_sdType_SelectionChanged(object sender, SelectionChangedEventArgs e) + { + if (lblSDCommissionAmount == null) + return; + lblSDCommissionAmount.Text = (SDType)cbx_sdType.SelectedItem == Models.SDType.自刷 ? "空单号费" : "佣金"; + } } } diff --git a/BBWY.Client/Views/Order/SDGroup.xaml b/BBWY.Client/Views/Order/SDGroup.xaml index 4a6e4a1b..353f104e 100644 --- a/BBWY.Client/Views/Order/SDGroup.xaml +++ b/BBWY.Client/Views/Order/SDGroup.xaml @@ -49,13 +49,18 @@ Visibility="{Binding SDGroupButtonIndex,ConverterParameter=0:Visible:Collapsed,Converter={StaticResource objConverter}}"> - + +