刷单组搜索

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";
             //齐越悠仁

BBWY.Client/Models/User/User.cs

@@ -23,5 +23,10 @@ namespace BBWY.Client.Models
 
         public IList<Department> DepartmentList { get; set; }
 
+        /// <summary>
+        /// 店铺列表 (暂时只有刷单组才需要)
+        /// </summary>
+        public IList<Shop> ShopList { get; set; }
+
     }
 }

BBWY.Client/ViewModels/MainViewModel.cs

@@ -196,8 +196,8 @@ namespace BBWY.Client.ViewModels
                 //    return;
 
                 IList<Department> departmentList = null;
-                if (GlobalContext.User.TeamName == "刷单组" || 
+                if (GlobalContext.User.TeamName == "刷单组" ||
-                    managerDepartment.Contains(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<IList<Department>>();
+
+                    if (GlobalContext.User.TeamName == "刷单组")
+                    {
+                        var shopList = new List<Shop>();
+                        foreach (var d in departmentList)
+                            shopList.AddRange(d.ShopList);
+                        GlobalContext.User.ShopList = shopList;
+                    }
                 }
                 else
                 {

BBWY.Client/Views/Order/OrderListControl.xaml

@@ -773,7 +773,7 @@
                                 </TextBlock>
 
                                 <TextBlock x:Name="txt_sdCommissionAmount">
-                                        <Run Text="SD佣金"/>
+                                        <Run Text="{Binding SDType,ConverterParameter=自刷:空单号费:佣金,Converter={StaticResource objConverter}}"/>
                                         <Run Text="{Binding OrderCost.SDCommissionAmount}"/>
                                 </TextBlock>
 

BBWY.Client/Views/Order/SD.xaml

@@ -57,7 +57,8 @@
             <TextBlock Text="刷单平台" HorizontalAlignment="Right" VerticalAlignment="Center" />
             <ComboBox x:Name="cbx_sdType" Grid.Column="1" ItemsSource="{Binding Source={StaticResource SDTypeProvider}}"
                       SelectedIndex="0" Height="25" Width="100" 
-                      HorizontalAlignment="Left" VerticalAlignment="Center" VerticalContentAlignment="Center" Margin="5,0,0,0"/>
+                      HorizontalAlignment="Left" VerticalAlignment="Center" VerticalContentAlignment="Center" Margin="5,0,0,0"
+                      SelectionChanged="cbx_sdType_SelectionChanged"/>
 
             <TextBlock Text="关键词" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Row="1"/>
             <c:BTextBox x:Name="txt_SDKey" Grid.Column="1" Grid.Row="1" Height="30" Width="150" HorizontalAlignment="Left" Margin="5,0,0,0"/>

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)
+        private void cbx_sdType_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        //{
+        {
-        //    if (lblSDCommissionAmount == null)
+            if (lblSDCommissionAmount == null)
-        //        return;
+                return;
-        //    lblSDCommissionAmount.Text = (SDType)cbx_sdType.SelectedItem == Models.SDType.自刷 ? "空单号/刷单号" : "佣金";
+            lblSDCommissionAmount.Text = (SDType)cbx_sdType.SelectedItem == Models.SDType.自刷 ? "空单号费" : "佣金";
-        //}
+        }
     }
 }

BBWY.Client/Views/Order/SDGroup.xaml

@@ -49,13 +49,18 @@
                   Visibility="{Binding SDGroupButtonIndex,ConverterParameter=0:Visible:Collapsed,Converter={StaticResource objConverter}}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock Text="店铺:" VerticalAlignment="Center" Margin="5,0,0,0"/>
-                    <selectShop:SelectShopDialog DepartmentList="{Binding globalContext.User.DepartmentList}" Height="30">
+                    <!--<selectShop:SelectShopDialog DepartmentList="{Binding globalContext.User.DepartmentList}" Height="30">
                         <b:Interaction.Triggers>
                             <b:EventTrigger EventName="OnShopChanged">
                                 <b:InvokeCommandAction Command="{Binding SDGroupSelectedShopChangedCommand}" PassEventArgsToCommand="True"/>
                             </b:EventTrigger>
                         </b:Interaction.Triggers>
-                    </selectShop:SelectShopDialog>
+                    </selectShop:SelectShopDialog>-->
+                    <ComboBox ItemsSource="{Binding globalContext.User.ShopList}" SelectedItem="{Binding SdGroupSelectedShop,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
+                              Height="30" MinWidth="100"
+                              IsEditable="True"
+                              VerticalAlignment="Center"
+                              VerticalContentAlignment="Center"/>
                     <TextBlock Text="订单号:" VerticalAlignment="Center" Margin="5,0,0,0"/>
                     <c:BTextBox Width="150" Height="30" Margin="5,0,0,0" Text="{Binding SearchOrderId}" WaterRemark="精确匹配"/>
                     <c:BButton Content="拉取" Height="30" Margin="5,0,0,0" Width="60" Command="{Binding SDGroupPullCommand}"/>