1

BBWY.Client/APIServices/PackTaskService.cs

@@ -191,40 +191,39 @@ namespace BBWY.Client.APIServices
         }
 
 
-        //public ApiResponse<object> AddTaskPeople(long taskId, string packUserId, int FeesTypeId,
-        //    int FeesItemId, decimal PackNumber)
-        //{
-
-
-
-        //    return SendRequest<object>(globalContext.QKApiHost, "api/PackTask/AddTaskPeople", new
-        //    {
-        //        taskId = taskId,
-        //        packUserId = packUserId,
-        //        FeesTypeId = FeesTypeId,
-        //        FeesItemId = FeesItemId,
-        //        PackNumber = PackNumber
-        //    }
-        // , null, HttpMethod.Post);
-
-        //}
-
-        //public ApiResponse<object> AddTaskPeople(List<PackUserRequest> packUsers)
-        //{
-        //    return SendRequest<object>(globalContext.QKApiHost, "api/PackTask/AddTaskPeoples", packUsers
-        // , null, HttpMethod.Post);
-        //}
-
-
-        //public ApiResponse<object> AddConsumables(long taskId, long[] consumableIds)
-        //{
-        //    return SendRequest<object>(globalContext.QKApiHost, "api/PackTask/AddConsumables", new AddConsumableRequest
-        //    {
-        //        TaskId= taskId,
-        //        ConsumableIds = consumableIds
-        //    }
-        // , null, HttpMethod.Post);
-        //}
+        public ApiResponse<ShopTotalResponse> ShopTotal(string skuId = null, string taskId = null,
+                                                  DateTime? startTime = null,
+                                                  DateTime? endTime = null,
+                                                  string ShopName = null,
+                                                  string DepartmentName = null,
+                                                  int pageIndex = 1,
+                                                  int pageSize = 10
+
+                                                 )
+        {
+            return SendRequest<ShopTotalResponse>(globalContext.QKApiHost, "api/PackTask/ShopTotal", new
+            {
+
+                SkuId = skuId,
+                TaskId = taskId,
+                StartTime = startTime,
+                EndTime = endTime,
+                DepartmentName,
+                ShopName,
+                PageIndex = pageIndex,
+                PageSize = pageSize
+               
+            }, null, HttpMethod.Post);
+        }
+        public ApiResponse<ShopTotalResponse> BatchSettle(params long[] taskIds)
+        {
+            return SendRequest<ShopTotalResponse>(globalContext.QKApiHost, "api/PackTask/BatchSettle", new
+            {
+                taskIds=  taskIds,
+                userId= globalContext.User.Id.ToString(),
+
+            }, null, HttpMethod.Post);
+        }
     }
 
     public class AddConsumableRequest
@@ -298,6 +297,14 @@ namespace BBWY.Client.APIServices
         //public IncreateMemberModel[] IncreateMembers { get; set; }
 
         //public ProcessMemberModel[] ProcessMembers { get; set; }
+
+        public decimal? IncreaseFees { get; set; }
+
+        public decimal? PackFees { get; set; }
+
+        public decimal? ConsumableFees { get; set; }
+
+        public decimal? DiscountPrice { get; set; }
     }
 
     public class PersonTaskModel

BBWY.Client/BBWYAppSettings.json

@@ -4,6 +4,6 @@
   "MDSApiHost": "http://mdsapi.qiyue666.com",
   "JOSApiHost": "",
   "1688ApiHost": "",
-  //"QKApiHost": "http://localhost:8080"
-  "QKApiHost": "http://qiku.qiyue666.com"
+  "QKApiHost": "http://localhost:8080"
+  //"QKApiHost": "http://qiku.qiyue666.com"
 }

BBWY.Client/Models/Enums.cs

@@ -379,4 +379,9 @@
     {
         待付款 = 0, 待发货 = 1, 待收货 = 2, 待质检 = 3, 待打包 = 4, 待结算 = 5, 已完成 = 6, 已取消 = 7
     }
+    public enum Settle
+    {
+        未结算 = 0,
+        已结清 = 1
+    }
 }

BBWY.Client/Models/PackTask/ShopTotal.cs

@@ -0,0 +1,81 @@
+using BBWY.Client.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BBWY.Client.Models.PackTask
+{
+    public class ShopTotal  :NotifyObject
+    {
+        private long id;
+        public long Id { get => id; set { Set(ref id, value); } }
+
+        private bool taskChecked;
+        public bool TaskChecked { get => taskChecked; set { Set(ref taskChecked, value); } }
+
+
+
+        public long TaskId { get; set; }
+        /// <summary>
+        /// 需求方创建日期
+        /// </summary>
+        public DateTime CreateTime { get; set; }
+        /// <summary>
+        /// 是否结清
+        /// </summary>
+        //
+        public Settle IsSettle { get; set; }
+        /// <summary>
+        /// 部门
+        /// </summary>
+        public string DepartmentName { get; set; }
+        /// <summary>
+        /// 店铺
+        /// </summary>
+        public string ShopName { get; set; }
+        /// <summary>
+        /// 对接人
+        /// </summary>
+        public string AcceptUserName { get; set; }
+        /// <summary>
+        /// sku
+        /// </summary>
+        public string SkuName { get; set; }
+        /// <summary>
+        /// sku数量(任务数量)
+        /// </summary>
+        public int SkuCount { get; set; }
+
+        public decimal IncreaseFees { get; set; }
+
+        public decimal PackFees { get; set; }
+
+        public decimal ConsumableFees { get; set; }
+
+        public decimal Price { get; set; }
+
+        public decimal Discount { get; set; }
+
+        public decimal DiscountPrice { get; set; }
+        /// <summary>
+        /// 注意事项（对接备注）
+        /// </summary>
+        public string MarkMessage { get; set; }
+
+        public override string ToString()
+        {
+            return $"{TaskId},{CreateTime.ToString("yyyy-MM-dd")},{IsSettle},{DepartmentName},{ShopName}" +
+                $",{AcceptUserName},{SkuName},{SkuCount},{IncreaseFees},{PackFees},{ConsumableFees},{Price},{Discount},{DiscountPrice},{MarkMessage}";
+        }
+    }
+
+    public class ShopTotalResponse
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        public int TotalCount { get; set; }
+
+        public ShopTotal[] ShopTotals { get; set; }
+    }
+}

BBWY.Client/Models/PackTask/WorkProcessModel.cs

@@ -1,7 +1,4 @@
-using Org.BouncyCastle.Asn1.Esf;
-using System;
-using System.Collections.Generic;
-using System.Text;
+
 
 namespace BBWY.Client.Models.PackTask
 {

BBWY.Client/ViewModels/MainViewModel.cs

@@ -130,7 +130,8 @@ namespace BBWY.Client.ViewModels
                         ChildList = new List<MenuModel>()
                     {
                          new MenuModel(){ Name="打包任务",Url="/Views/PackTask/WareHouseList.xaml" },
-                         new MenuModel(){ Name="耗材管理",Url="/Views/PackTask/Consumable.xaml" }
+                         new MenuModel(){ Name="耗材管理",Url="/Views/PackTask/Consumable.xaml" },
+                          new MenuModel(){ Name="账单管理",Url="/Views/PackTask/PackTaskTotal.xaml" }
 
                     }
                     });
@@ -208,8 +209,8 @@ namespace BBWY.Client.ViewModels
                             ChildList = new List<MenuModel>()
                                        {
                          new MenuModel(){ Name="打包任务",Url="/Views/PackTask/WareHouseList.xaml" },
-                         new MenuModel(){ Name="耗材管理",Url="/Views/PackTask/Consumable.xaml" }
-
+                         new MenuModel(){ Name="耗材管理",Url="/Views/PackTask/Consumable.xaml" },
+                         new MenuModel(){ Name="账单管理",Url="/Views/PackTask/PackTaskTotal.xaml" }
                                      }
                         });
                     });

BBWY.Client/ViewModels/PackTask/PackServiceViewModel.cs

@@ -328,7 +328,7 @@ namespace BBWY.Client.ViewModels.PackTask
             decimal AllFees = 0;
             decimal price = 0;
 
-
+            decimal IncreateFees = 0,PackFees=0,ConsumableFees=0,DiscountPrice=0;
             foreach (var item in IncreateList)//增值服务上传
             {
                 if (item.SelectId <= 0 || string.IsNullOrEmpty(item.SelectUserId) || item.ItemCount <= 0)
@@ -350,7 +350,7 @@ namespace BBWY.Client.ViewModels.PackTask
                 price = IncreateServiceList.First(i => i.Id == item.SelectId).Price;
                 singleFees += price;
                 AllFees += item.ItemCount * price;
-
+                IncreateFees += item.ItemCount * price;
 
 
 
@@ -417,7 +417,7 @@ namespace BBWY.Client.ViewModels.PackTask
                 price = PackServiceList.First(i => i.Id == item.SelectId).Price;
                 singleFees += price;
                 AllFees += item.ItemCount * price;
-
+                PackFees += item.ItemCount * price;
                 if (PackServiceMembers.Select(a => a.PackServiceId).Contains(item.SelectId))//存在累加
                 {
                     var inMembers = PackServiceMembers.SingleOrDefault(a => a.UserId == item.SelectUserId && a.PackServiceId == item.SelectId);
@@ -471,6 +471,7 @@ namespace BBWY.Client.ViewModels.PackTask
                 price = ConsumableList.First(i => i.Id == item.SelectId).Price.Value;
                 singleFees += price;
                 AllFees += item.ItemCount * price;
+                ConsumableFees += item.ItemCount * price;
                 if (allConsumableTasks.Select(a => a.ConsumableId).Contains(item.SelectId))//存在累加
                 {
                     var data = allConsumableTasks.SingleOrDefault(a => a.ConsumableId == item.SelectId);
@@ -528,8 +529,12 @@ namespace BBWY.Client.ViewModels.PackTask
             uploadService.AddPackServices = addDatas;
             uploadService.DeletedPackServices = del;
 
-            uploadService.AllFees = AllFees;
+            uploadService.AllFees = Convert.ToDecimal((AllFees).ToString("0.00")); ;
             uploadService.SingleFees = singleFees;
+            uploadService.IncreaseFees = Convert.ToDecimal((IncreateFees).ToString("0.00"));
+            uploadService.PackFees = Convert.ToDecimal((PackFees).ToString("0.00"));
+            uploadService.ConsumableFees = Convert.ToDecimal((ConsumableFees).ToString("0.00"));
+            uploadService. DiscountPrice = Convert.ToDecimal( (AllFees * upDisCount).ToString("0.00"));
             var res = packDetailService.UploadService(uploadService);
             if (res != null && res.Success)
             {

BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs

@@ -0,0 +1,243 @@
+using AutoMapper.Internal;
+using BBWY.Client.APIServices;
+using BBWY.Client.Helpers;
+using BBWY.Client.Models;
+using BBWY.Client.Models.PackTask;
+using BBWY.Client.Views.Order;
+using BBWY.Client.Views.PackTask;
+using BBWY.Common.Models;
+using BBWY.Controls;
+using GalaSoft.MvvmLight.Command;
+using Microsoft.Win32;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Input;
+
+namespace BBWY.Client.ViewModels.PackTask
+{
+    public class PackTaskTotalViewModel : BaseVM, IDenpendency
+    {
+        private readonly PackTaskService packTaskService;
+
+        private bool isLoading;
+        private DateTime startDate;
+        private DateTime endDate;
+        private int pageIndex = 1;
+        private int pageSize = 15;
+        private int orderCount;
+        private string searchTaskId;
+        private string searchDepartment;
+        private string searchShopName;
+        private string searchSkuId;
+        private ObservableCollection<ShopTotal> packTaskTotalList;
+        private bool isBatchChecked;
+
+        public bool IsBatchChecked { get => isBatchChecked; set { Set(ref isBatchChecked, value); } }
+        public ObservableCollection<ShopTotal> PackTaskTotalList { get => packTaskTotalList; set { Set(ref packTaskTotalList, value); } }
+        public string SearchSkuId { get => searchSkuId; set { Set(ref searchSkuId, value); } }
+        public string SearchShopName { get => searchShopName; set { Set(ref searchShopName, value); } }
+        public string SearchDepartment { get => searchDepartment; set { Set(ref searchDepartment, value); } }
+        public string SearchTaskId { get => searchTaskId; set { Set(ref searchTaskId, value); } }
+
+        public bool IsLoading { get => isLoading; set { Set(ref isLoading, value); } }
+
+
+        public DateTime StartDate { get => startDate; set { Set(ref startDate, value); } }
+
+        public DateTime EndDate { get => endDate; set { Set(ref endDate, value); } }
+
+        public int PageIndex { get => pageIndex; set { Set(ref pageIndex, value); } }
+
+        public int PageSize { get => pageSize; set { Set(ref pageSize, value); } }
+
+        public int OrderCount { get => orderCount; set { Set(ref orderCount, value); } }
+
+
+        public ICommand SetSearchDateCommand { get; set; }
+
+        public ICommand SearchTaskTotalCommand { get; set; }
+
+        public ICommand ExportCommand { get; set; }
+
+        public ICommand BatchSettleCommand { get; set; }
+
+        public ICommand SettleCommand { get; set; }
+
+        public ICommand OrderPageIndexChangedCommand { get; set; }
+
+        public ICommand BatchCheckedCommand { get; set; }
+
+        public ICommand CopyTextCommand { get; set; }
+
+        public PackTaskTotalViewModel(PackTaskService packTaskService)
+        {
+            this.packTaskService = packTaskService;
+
+
+            SearchTaskTotalCommand = new RelayCommand(SearchTaskTotal);
+
+
+            SetSearchDateCommand = new RelayCommand<int>(d =>
+            {
+                EndDate = d == 1 ? DateTime.Now.Date.AddDays(-1) : DateTime.Now;
+                StartDate = DateTime.Now.Date.AddDays(d * -1);
+                PageIndex = 1;
+                Task.Factory.StartNew(() => LoadOrder(1));  //点击日期查询订单
+            });
+
+            OrderPageIndexChangedCommand = new RelayCommand<PageArgs>(p =>
+            {
+                LoadOrder(p.PageIndex);
+            });
+
+            BatchCheckedCommand = new RelayCommand(BatchCheck);
+            CopyTextCommand = new RelayCommand<object>((obj) =>
+            {
+                try
+                {
+                    Clipboard.SetText(obj.ToString());
+                }
+                catch (Exception ex)
+                {
+                    Console.ForegroundColor = ConsoleColor.Red;
+                    Console.WriteLine(ex);
+                    Console.ResetColor();
+                }
+            });
+            BatchSettleCommand = new RelayCommand(BatchSettle);
+            SettleCommand = new RelayCommand<long>(SettleTask);
+            ExportCommand = new RelayCommand(Export);
+        }
+
+        private void Export()
+        {
+
+            SaveFileDialog save = new SaveFileDialog();
+            save.Filter = "csv files(*.csv)|*.csv";
+            var result = save.ShowDialog();
+            if (result == null || !result.Value)
+            {
+                return;
+            }
+
+            string fileName = save.FileName;
+
+            Task.Factory.StartNew(() =>
+            {
+                IsLoading = true;
+                var res = packTaskService.ShopTotal(SearchSkuId, SearchTaskId, StartDate, EndDate, SearchShopName,
+                    SearchDepartment, 0, 0);//获取全部数据
+                if (res.Success)
+                {
+                    string title = "任务ID,日期,是否结清,部门,店铺,对接人,sku名称,sku数量,增值服务,打包服务,耗材服务,原价,促销折扣,结算价格,对接备注";
+                    var excelList = res.Data.ShopTotals.Select(x => x.ToString()).ToList();
+                    excelList.Insert(0, title);
+                    System.IO.File.WriteAllLines(fileName, excelList, Encoding.UTF8);
+                }
+                IsLoading = false;
+
+            });
+
+        }
+
+        private void BatchCheck()
+        {
+
+            if (PackTaskTotalList.Count > 0)
+                App.Current.Dispatcher.Invoke(() =>
+                {
+                    PackTaskTotalList.ForAll(s =>
+                    {
+
+                        s.TaskChecked = IsBatchChecked;
+                    });
+
+                });
+
+        }
+
+        private void SettleTask(long obj)
+        {
+            MessageBoxResult result = MessageBox.Show($"是否结清任务:{obj} ?", "提示",
+                                           MessageBoxButton.YesNo,
+                                           MessageBoxImage.Warning);
+            if (result != MessageBoxResult.Yes) return;
+            SettlePackTask(obj);
+        }
+
+        private void BatchSettle()
+        {
+
+
+            var ids = PackTaskTotalList.Where(p => p.TaskChecked).Select(p => p.TaskId).ToArray();
+            if (ids.Length <= 0)
+                return;
+            MessageBoxResult result = MessageBox.Show("是否批量结清?", "提示",
+                                          MessageBoxButton.YesNo,
+                                          MessageBoxImage.Warning);
+            if (result != MessageBoxResult.Yes) return;
+            SettlePackTask(ids);
+        }
+        private void SettlePackTask(params long[] ids)
+        {
+            Task.Factory.StartNew(() =>
+            {
+                IsLoading = true;
+                var res = packTaskService.BatchSettle(ids);
+                if (res.Success)
+                {
+                    SearchTaskTotal();
+                }
+                IsLoading = false;
+            });
+
+        }
+
+        private void SearchTaskTotal()
+        {
+            if (IsBatchChecked)
+            {
+                BatchCheck();
+            }
+            PackTaskTotalList = new ObservableCollection<ShopTotal>();
+            Task.Factory.StartNew(() =>
+            {
+                IsLoading = true;
+                var res = packTaskService.ShopTotal(SearchSkuId, SearchTaskId, StartDate, EndDate, SearchShopName,
+                     SearchDepartment, PageIndex, PageSize);
+                if (res != null && res.Success)
+                {
+                    OrderCount = res.Data.TotalCount;
+                    foreach (var shopTotal in res.Data.ShopTotals)
+                    {
+                        App.Current.Dispatcher.Invoke(() =>
+                        {
+                            PackTaskTotalList.Add(shopTotal);
+                        });
+                    }
+
+                }
+
+                IsLoading = false;
+            });
+
+
+        }
+
+        private void LoadOrder(int pageIndex)
+        {
+            SearchTask(pageIndex);
+        }
+
+        private void SearchTask(int pageIndex)
+        {
+            PageIndex = pageIndex;
+            SearchTaskTotal();
+        }
+    }
+}

BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs

@@ -120,7 +120,7 @@ namespace BBWY.Client.ViewModels.PackTask
         /// </summary>
         public ObservableCollection<PackTaskModel> PackTaskList { get => packTaskList; set { Set(ref packTaskList, value); } }
 
-       
+
         #endregion
 
 
@@ -340,8 +340,9 @@ namespace BBWY.Client.ViewModels.PackTask
                                 data.FeesItemResponse = item.FeesItemResponse;
                                 data.FeesMoney = item.FeesItemResponse.SingleFees;
                                 data.IsShowFees = data.FeesMoney > 0 ? true : false;
-                                data.FeesItemResponse.DiscountSingleFees = item.FeesItemResponse.SingleFees *
-                            item.FeesItemResponse.disCount;
+                                data.FeesItemResponse.DiscountSingleFees = item.FeesItemResponse.SingleFees *item.FeesItemResponse.disCount;
+                                data.FeesItemResponse.DiscountAllFees = item.FeesItemResponse.AllFees * item.FeesItemResponse.disCount;
+
                             }
                             else
                             {
@@ -399,14 +400,14 @@ namespace BBWY.Client.ViewModels.PackTask
         {
             ViewModelLocator viewModel = new ViewModelLocator();
             var createViewModel = viewModel.CreateTaskView;
-            if (createViewModel.ReflashWindow==null)
+            if (createViewModel.ReflashWindow == null)
             {
                 createViewModel.ReflashWindow = ReflashTask;
             }
-           
-            
-            
-            
+
+
+
+
             CreatePackTask create = new CreatePackTask();
             create.SendData();
 

BBWY.Client/ViewModels/ViewModelLocator.cs

@@ -86,6 +86,17 @@ namespace BBWY.Client.ViewModels
             }
         }
 
+        public PackTaskTotalViewModel PackTaskTotal
+        {
+            get
+            {
+                using (var s = sp.CreateScope())
+                {
+                    return s.ServiceProvider.GetRequiredService<PackTaskTotalViewModel>();
+                }
+            }
+        }
+
         public ServiceOrderViewModel ServiceOrderList
         {
             get

BBWY.Client/Views/PackTask/FeesExcelControl.xaml.cs

@@ -179,7 +179,7 @@ namespace BBWY.Client.Views.PackTask
 
         private void LoadData(bool isPrice)
         {
-
+            isPrice = false;
             if (FeesItem == null || FeesItem.ServiceList.Count <= 0)
             {
                 return;

BBWY.Client/Views/PackTask/PackTaskTotal.xaml

@@ -6,9 +6,9 @@
       xmlns:local="clr-namespace:BBWY.Client.Views.PackTask"
       mc:Ignorable="d" 
       xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
-      DataContext="{Binding OrderList,Source={StaticResource Locator}}"
+      DataContext="{Binding PackTaskTotal,Source={StaticResource Locator}}"
       xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
-      mc:Ignorable="d" 
+      Background="White"
        xmlns:sys="clr-namespace:System;assembly=mscorlib"
       d:DesignHeight="450" d:DesignWidth="2048"
       Title="OrderList">
@@ -52,12 +52,11 @@
                     <DatePicker SelectedDate="{Binding StartDate}" Width="133.5" Height="30" VerticalContentAlignment="Center" FocusVisualStyle="{x:Null}" Margin="5,0,0,0"/>
                     <DatePicker SelectedDate="{Binding EndDate}" Width="133.5" Height="30" VerticalContentAlignment="Center" FocusVisualStyle="{x:Null}" Margin="5,0,0,0"/>
                     <TextBlock Text="任务ID:" Width="40" VerticalAlignment="Center" Margin="5,0,0,0"/>
-                    <c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchOrderId}" WaterRemark="精确匹配"/>
+                    <c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchTaskId}" WaterRemark="精确匹配"/>
                     <TextBlock Text="部门:" VerticalAlignment="Center" Margin="5,0,0,0"/>
-                    <c:BTextBox Width="150" Margin="5,0,0,0" WaterRemark="精确匹配" Text="{Binding SearchProductId}"/>
+                    <c:BTextBox Width="150" Margin="5,0,0,0" WaterRemark="精确匹配" Text="{Binding SearchDepartment}"/>
                     <TextBlock Text="店铺:" VerticalAlignment="Center" Margin="5,0,0,0"/>
-                    <c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchSku}" WaterRemark="精确匹配"/>
-                   
+                    <c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchShopName}" WaterRemark="精确匹配"/>
                 </StackPanel>
                 <StackPanel Orientation="Horizontal" Grid.Row="2" Margin="0,0,0,5" Height="30">
                     <c:BButton Content="今天" Width="50" Height="25" Margin="5,0,0,0"
@@ -78,26 +77,10 @@
                     <c:BButton Content="近30天" Width="50" Height="25" Margin="5,0,0,0"
                                Command="{Binding SetSearchDateCommand}"
                                CommandParameter="{StaticResource d30}"/>
-                    <!--<TextBlock Text="服务单" VerticalAlignment="Center" Margin="5,0,0,0"
-                               Visibility="{Binding IncludeAfterOrder,ConverterParameter=true:Visible:Collapsed,Converter={StaticResource objConverter}}"/>-->
-                    <!--<c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchServiceId}" WaterRemark="精确匹配"
-                               Visibility="{Binding IncludeAfterOrder,ConverterParameter=true:Visible:Collapsed,Converter={StaticResource objConverter}}"/>-->
                     <TextBlock Width="40" Text="    SKU:" VerticalAlignment="Center" Margin="5,0,0,0"
-                               Visibility="{Binding Visibility,ElementName=listbox_order}"/>
-                    <c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchWaybill}" WaterRemark="前缀模糊匹配"
-                                Visibility="{Binding Visibility,ElementName=listbox_order}"/>
-                  
-                   
-                    <c:BButton Content="同步" Width="50" Margin="5,0,0,0" Command="{Binding SyncOrderCommand}" ToolTipService.InitialShowDelay="0" ToolTipService.ShowDuration="10000"
-                               Visibility="Collapsed">
-                        <c:BButton.ToolTip>
-                            <StackPanel>
-                                <TextBlock Text="1.使用筛选条件中的开始时间和结束时间进行同步"/>
-                                <TextBlock Text="2.从开始时间起每次同步3小时时长的订单直到到达结束时间"/>
-                                <TextBlock Text="3.已存在未结束的同步任务将不会重复执行"/>
-                            </StackPanel>
-                        </c:BButton.ToolTip>
-                    </c:BButton>
+                              />
+                    <c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchSkuId}" 
+                               />
                 </StackPanel>
 
                 <Grid Grid.Column="1" Grid.RowSpan="3">
@@ -109,16 +92,16 @@
                         <RowDefinition/>
                         <RowDefinition/>
                     </Grid.RowDefinitions>
-                    <Button Content="搜索" Width="50" VerticalAlignment="Stretch" Margin="5,0,0,0" Command="{Binding SearchOrderCommand}"
+                    <Button Content="搜索" Width="50" VerticalAlignment="Stretch" Margin="5,0,0,0" Command="{Binding SearchTaskTotalCommand}"
                            Grid.RowSpan="2" Background="#8080ff" BorderThickness="0" Foreground="White"/>
                     <Button Grid.RowSpan="2" Content="导出" Command="{Binding ExportCommand}" Width="50" Grid.Column="1"
-                               Visibility="{Binding Visibility,ElementName=listbox_order}" Background="#02a7f0" BorderThickness="0" Foreground="White"/>
-                   
+                               Background="#02a7f0" BorderThickness="0" Foreground="White"/>
+
                 </Grid>
             </Grid>
 
             <Grid Grid.Row="1" HorizontalAlignment="Left">
-                <Button Content="批量结清" Width="100" VerticalAlignment="Stretch"  Command="{Binding SearchOrderCommand}"
+                <Button Content="批量结清" Width="100" VerticalAlignment="Stretch"  Command="{Binding BatchSettleCommand}"
                            Grid.RowSpan="2" Background="#8080ff" BorderThickness="0" Foreground="White"/>
             </Grid>
 
@@ -130,38 +113,40 @@
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="30"/>
+                        <ColumnDefinition Width="60"/>
                         <ColumnDefinition Width="80"/>
+                        <ColumnDefinition Width="50"/>
+                        <ColumnDefinition Width="130"/>
+                        <ColumnDefinition Width="130"/>
                         <ColumnDefinition Width="80"/>
-                        <ColumnDefinition Width="80"/>
-                        <ColumnDefinition Width="100"/>
-                        <ColumnDefinition Width="80"/>
-                        <ColumnDefinition Width="80"/>
-                        <ColumnDefinition Width="80"/>
-                        <ColumnDefinition Width="70"/>
-                        <ColumnDefinition Width="80"/>
-                        <ColumnDefinition Width="80"/>
-                        <ColumnDefinition Width="80"/>
-                        <ColumnDefinition Width="80"/>
-                        <ColumnDefinition Width="80"/>
+                        <ColumnDefinition MinWidth="80"/>
+                        <ColumnDefinition Width="60"/>
+                        <ColumnDefinition Width="60"/>
+                        <ColumnDefinition Width="60"/>
+                        <ColumnDefinition Width="60"/>
+                        <ColumnDefinition Width="60"/>
+                        <ColumnDefinition Width="60"/>
+                        <ColumnDefinition Width="60"/>
                         <ColumnDefinition MinWidth="100"/>
                         <ColumnDefinition Width="60"/>
                     </Grid.ColumnDefinitions>
-                    <CheckBox   HorizontalAlignment="Center"   HorizontalContentAlignment="Center"  Grid.Column="0"/>
-                    <TextBlock Text="订单号" Grid.Column="1" Style="{StaticResource middleTextBlock}"/>
-                    <TextBlock Text="状态" Grid.Column="2" Style="{StaticResource middleTextBlock}"/>
-                    <TextBlock Text="部门" Grid.Column="3" Style="{StaticResource middleTextBlock}"/>
-                    <TextBlock Text="店铺名" Grid.Column="4" Style="{StaticResource middleTextBlock}"/>
-                    <TextBlock Text="对接人员" Grid.Column="5"  Style="{StaticResource middleTextBlock}"/>
-                    <TextBlock Text="采购SKU名称"   Grid.Column="6" Style="{StaticResource middleTextBlock}"/>
-                    <TextBlock Text="SKU数量" Grid.Column="7" Style="{StaticResource middleTextBlock}"/>
-                    <TextBlock Text="增值服务" Grid.Column="8" Style="{StaticResource middleTextBlock}"/>
-                    <TextBlock Text="打包服务" Grid.Column="9" Style="{StaticResource middleTextBlock}"/>
-                    <TextBlock Text="耗材服务" Grid.Column="10" Style="{StaticResource middleTextBlock}"/>
-                    <TextBlock Text="原始金额" Grid.Column="11" Style="{StaticResource middleTextBlock}"/>
-                    <TextBlock Text="促销折扣" Grid.Column="12" Style="{StaticResource middleTextBlock}"/>
-                    <TextBlock Text="结算金额" Grid.Column="13" Style="{StaticResource middleTextBlock}"/>
-                    <TextBlock Text="注意事项/对接备注" Grid.Column="14" Style="{StaticResource middleTextBlock}"/>
-                    <TextBlock Text="操作" Grid.Column="15" Style="{StaticResource middleTextBlock}"/>
+                    <CheckBox   HorizontalAlignment="Center" IsChecked="{Binding IsBatchChecked,Mode=TwoWay}" Command="{Binding BatchCheckedCommand}"  HorizontalContentAlignment="Center"  Grid.Column="0"/>
+                    <TextBlock Text="任务ID" Grid.Column="1" Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="日期" Grid.Column="2" Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="状态" Grid.Column="3" Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="部门" Grid.Column="4" Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="店铺名" Grid.Column="5" Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="对接人员" Grid.Column="6"  Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="采购SKU名称"   Grid.Column="7" Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="SKU数量" Grid.Column="8" Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="增值服务" Grid.Column="9" Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="打包服务" Grid.Column="10" Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="耗材服务" Grid.Column="11" Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="原始金额" Grid.Column="12" Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="促销折扣" Grid.Column="13" Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="结算金额" Grid.Column="14" Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="注意事项/对接备注" Grid.Column="15" Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="操作" Grid.Column="16" Style="{StaticResource middleTextBlock}"/>
 
                     <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/>
                     <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
@@ -176,9 +161,143 @@
                     <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="9"/>
                     <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="10"/>
                     <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="11"/>
+                    <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="12"/>
+                    <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="13"/>
+                    <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="14"/>
+                    <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="15"/>
+                    <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="16"/>
+                    <Border Height="1" VerticalAlignment="Top" Grid.ColumnSpan="17" Background="{StaticResource Border.Brush}" Grid.Row="0"/>
+
+                    <ListBox x:Name="listbox_order"
+                     Grid.Row="1"   Grid.ColumnSpan="17"
+                     ItemsSource="{Binding PackTaskTotalList}"              
+                     ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
+                     BorderBrush="{StaticResource Border.Brush}"
+                     BorderThickness="1,1,1,0"
+                     Foreground="{StaticResource Text.Color}">
+                        <ListBox.ItemTemplate>
+                            <DataTemplate>
+                                <Grid Width="{Binding ActualWidth,ElementName=listbox_order,Converter={StaticResource widthConverter},ConverterParameter=-0}"
+                              MinHeight="40">
+                                    <Grid >
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="30"/>
+                                            <ColumnDefinition Width="60"/>
+                                            <ColumnDefinition Width="80"/>
+                                            <ColumnDefinition Width="50"/>
+                                            <ColumnDefinition Width="130"/>
+                                            <ColumnDefinition Width="130"/>
+                                            <ColumnDefinition Width="80"/>
+                                            <ColumnDefinition MinWidth="80"/>
+                                            <ColumnDefinition Width="60"/>
+                                            <ColumnDefinition Width="60"/>
+                                            <ColumnDefinition Width="60"/>
+                                            <ColumnDefinition Width="60"/>
+                                            <ColumnDefinition Width="60"/>
+                                            <ColumnDefinition Width="60"/>
+                                            <ColumnDefinition Width="60"/>
+                                            <ColumnDefinition MinWidth="100"/>
+                                            <ColumnDefinition Width="60"/>
+                                        </Grid.ColumnDefinitions>
+                                        <Grid  Margin="0 0 1 0">
+                                            <CheckBox Grid.Column="8" IsChecked="{Binding TaskChecked,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  HorizontalAlignment="Center"   HorizontalContentAlignment="Center" />
+                                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
+                                        </Grid>
+
+                                        <Grid Grid.Column="1"  Margin="0 0 1 0" >
+                                            <c:BButton Content="{Binding TaskId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Center" VerticalAlignment="Center"
+                                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
+                                                                   CommandParameter="{Binding TaskId}"
+                                                                   Margin=" 5,0,0,0"/>
+                                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
+                                        </Grid>
+                                        <Grid Grid.Column="2"  Margin="0 0 1 0">
+                                            <TextBlock  Text="{Binding CreateTime,StringFormat=yyyy-MM-dd}" Style="{StaticResource middleTextBlock}"/>
+                                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
+                                        </Grid>
+                                        <Grid Grid.Column="3" Margin="0 0 1 0">
+                                            <TextBlock TextWrapping="Wrap"  Text="{Binding IsSettle}" Foreground="{Binding IsSettle,Converter={StaticResource objConverter},ConverterParameter=未结算:#ec808d:#00aaaa}"  Style="{StaticResource middleTextBlock}"/>
+                                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
+                                        </Grid>
+                                        <Grid Grid.Column="4" Margin="0 0 1 0">
+                                            <c:BButton  Content="{Binding DepartmentName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Center" VerticalAlignment="Center"
+                                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
+                                                                   CommandParameter="{Binding DepartmentName}"
+                                                                   Margin=" 5,0,0,0"/>
+                                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
+                                        </Grid>
+                                        <Grid Grid.Column="5" Margin="0 0 1 0">
+                                            <c:BButton Content="{Binding ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Center" VerticalAlignment="Center"
+                                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
+                                                                   CommandParameter="{Binding ShopName}"
+                                                                   Margin=" 5,0,0,0"/>
+                                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
+                                        </Grid>
+                                        <Grid Grid.Column="6" Margin="0 0 1 0">
+                                            <TextBlock  Text="{Binding AcceptUserName}" TextWrapping="Wrap" Style="{StaticResource middleTextBlock}"/>
+                                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
+                                        </Grid>
+                                        <Grid Grid.Column="7" Margin="0 0 1 0">
+                                            <TextBlock  Text="{Binding SkuName}" Style="{StaticResource middleTextBlock}"/>
+                                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
+                                        </Grid>
+                                        <Grid Grid.Column="8" Margin="0 0 1 0">
+                                            <TextBlock  Text="{Binding SkuCount}" Style="{StaticResource middleTextBlock}"/>
+                                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
+                                        </Grid>
+                                        <Grid Grid.Column="9" Margin="0 0 1 0">
+                                            <TextBlock  Text="{Binding IncreaseFees,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
+                                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
+                                        </Grid>
+                                        <Grid Grid.Column="10" Margin="0 0 1 0">
+                                            <TextBlock  Text="{Binding PackFees,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
+                                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
+                                        </Grid>
+                                        <Grid Grid.Column="11" Margin="0 0 1 0" >
+                                            <TextBlock  Text="{Binding ConsumableFees,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
+                                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
+                                        </Grid>
+                                        <Grid Grid.Column="12" Margin="0 0 1 0">
+                                            <TextBlock  Text="{Binding Price,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
+                                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
+                                        </Grid>
+                                        <Grid Grid.Column="13" Margin="0 0 1 0">
+                                            <TextBlock  Text="{Binding Discount,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
+                                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
+                                        </Grid>
+                                        <Grid Grid.Column="14" Margin="0 0 1 0">
+                                            <TextBlock  Text="{Binding DiscountPrice,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
+                                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
+                                        </Grid>
+                                        <Grid Grid.Column="15" Margin="0 0 1 0">
+                                            <TextBlock  Text="{Binding MarkMessage}" Style="{StaticResource middleTextBlock}"/>
+                                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
+                                        </Grid>
+
+                                        <Grid Grid.Column="16" Margin="0 0 1 0">
+                                            <c:BButton HorizontalAlignment="Center" Height="20" VerticalAlignment="Center" Background="Transparent"   Foreground="#02a7f0" Grid.Row="1"  Content="结清" 
+                                                   Command="{Binding DataContext.SettleCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
+                                                   CommandParameter="{Binding TaskId}"
+                                                   Visibility="Visible" />
+                                            <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
+                                        </Grid>
+
+
+
+
+                                    </Grid>
+                                    <Border Grid.Row="1" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>
+                                </Grid>
+
+                            </DataTemplate>
+                        </ListBox.ItemTemplate>
+                    </ListBox>
+
+
+
                 </Grid>
-       
-            
+
+
             </Grid>
 
 

BBWY.Client/Views/PackTask/PackTotalWindow.xaml

@@ -1,12 +0,0 @@
-<Window x:Class="BBWY.Client.Views.PackTask.PackTotalWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:BBWY.Client.Views.PackTask"
-        mc:Ignorable="d"
-        Title="PackTotalWindow" Height="450" Width="800">
-    <Grid>
-        
-    </Grid>
-</Window>

BBWY.Client/Views/PackTask/PackTotalWindow.xaml.cs

@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
-
-namespace BBWY.Client.Views.PackTask
-{
-    /// <summary>
-    /// PackTotalWindow.xaml 的交互逻辑
-    /// </summary>
-    public partial class PackTotalWindow : Window
-    {
-        public PackTotalWindow()
-        {
-            InitializeComponent();
-        }
-    }
-}

BBWY.Client/Views/PackTask/TaskListControl.xaml

@@ -342,7 +342,7 @@
                                         <TextBlock  TextWrapping="Wrap"
                                             TextAlignment="Center"   VerticalAlignment="Center" HorizontalAlignment="Center" >
                                             <Run Text="收费:"/>
-                                            <Run Text="{Binding FeesItemResponse.DiscountSingleFees,StringFormat=0.00}" 
+                                            <Run Text="{Binding FeesItemResponse.DiscountAllFees,StringFormat=0.00}" 
                                               />
                                         </TextBlock>
                                         <Path x:Name="path_purchaseAmount_question"