From 643dac96ac29d097a23cc881bcfc5d56738d08e0 Mon Sep 17 00:00:00 2001
From: "506583276@qq.com" <506583276@qq.com>
Date: Fri, 12 May 2023 21:45:43 +0800
Subject: [PATCH] 1

---
 BBWY.Client/APIServices/PackTaskService.cs           |  1 -
 BBWY.Client/Models/BatchPurchase/BatchPublishTask.cs |  5 ++---
 BBWY.Client/Models/PackTask/ShopTotal.cs             |  5 +++--
 .../ViewModels/PackTask/PackTaskTotalViewModel.cs    |  3 ++-
 .../ViewModels/PackTask/PublishTaskViewModel.cs      | 12 ++++++------
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/BBWY.Client/APIServices/PackTaskService.cs b/BBWY.Client/APIServices/PackTaskService.cs
index 3ce41e77..b15250e7 100644
--- a/BBWY.Client/APIServices/PackTaskService.cs
+++ b/BBWY.Client/APIServices/PackTaskService.cs
@@ -199,7 +199,6 @@ namespace BBWY.Client.APIServices
                                                   string DepartmentName = null,
                                                   int pageIndex = 1,
                                                   int pageSize = 10
-
                                                  )
         {
             return SendRequest<ShopTotalResponse>(globalContext.QKApiHost, "api/PackTask/ShopTotal", new
diff --git a/BBWY.Client/Models/BatchPurchase/BatchPublishTask.cs b/BBWY.Client/Models/BatchPurchase/BatchPublishTask.cs
index f01a0921..4eb4e6bd 100644
--- a/BBWY.Client/Models/BatchPurchase/BatchPublishTask.cs
+++ b/BBWY.Client/Models/BatchPurchase/BatchPublishTask.cs
@@ -24,8 +24,8 @@ namespace BBWY.Client.Models
     {
 
         #region 属性
-        private bool isSelected;
-        public bool IsSelected { get => isSelected; set { Set(ref isSelected, value); } }
+        //private bool isSelected;
+        //public bool IsSelected { get => isSelected; set { Set(ref isSelected, value); } }
 
         private ObservableCollection<string> worryList = new ObservableCollection<string> {
                "否","是"
@@ -535,7 +535,6 @@ namespace BBWY.Client.Models
 
         public void InitData()
         {
-
             IncreateList = new ObservableCollection<IncreateModel>();
             SpuId = string.Empty;
             SaveTask = "发布";
diff --git a/BBWY.Client/Models/PackTask/ShopTotal.cs b/BBWY.Client/Models/PackTask/ShopTotal.cs
index b58e27b3..768f326a 100644
--- a/BBWY.Client/Models/PackTask/ShopTotal.cs
+++ b/BBWY.Client/Models/PackTask/ShopTotal.cs
@@ -91,8 +91,9 @@ namespace BBWY.Client.Models.PackTask
 
         public override string ToString()
         {
-            return $"{TaskId},{CreateTime.ToString("yyyy-MM-dd")},{IsSettle},{DepartmentName},{ShopName}" +
-                $",{AcceptUserName},{SkuName},{SkuCount},{IncreaseFees},{PackFees},{ConsumableFees},{Price},{Discount},{DiscountPrice},{MarkMessage}";
+            
+            return $"{TaskId},{CreateTime.ToString("MM-dd")},{IsSettle},{DepartmentName},{ShopName}" +
+                $",{SkuCount},{BoxConsumableFees},{AirConsumableFees},{TapeConsumableFees},{OtherConsumableFees},{ConsumableFees},{PackSingleFees},{PackAllFees},{Price},{Discount},{DiscountPrice}";
         }
     }
 
diff --git a/BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs b/BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs
index 5cd3bc6b..57fcaee4 100644
--- a/BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs
@@ -146,7 +146,8 @@ namespace BBWY.Client.ViewModels.PackTask
                     SearchDepartment, 0, 0);//获取全部数据
                 if (res.Success)
                 {
-                    string title = "任务ID,日期,是否结清,部门,店铺,对接人,sku名称,sku数量,增值服务,打包服务,耗材服务,原价,促销折扣,结算价格,对接备注";
+                    //string title = "任务ID,日期,是否结清,部门,店铺,对接人,sku名称,sku数量,增值服务,打包服务,耗材服务,原价,促销折扣,结算价格,对接备注";
+                    string title = "任务ID,日期,是否结清,所属部门,所属店铺,打包数量,箱子,气泡纸,胶带,其他,耗材总价,打包单价,打包总价,原价,促销折扣,总收费";
                     var excelList = res.Data.ShopTotals.Select(x => x.ToString()).ToList();
                     excelList.Insert(0, title);
                     System.IO.File.WriteAllLines(fileName, excelList, Encoding.UTF8);
diff --git a/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs b/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs
index 6783c61e..4a6a58fa 100644
--- a/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs
@@ -27,8 +27,8 @@ namespace BBWY.Client.ViewModels.PackTask
         public string SearchSkuId { get => searchSkuId; set { Set(ref searchSkuId, value); } }
 
         public long TaskId { get; set; }
-        private bool isSelected;
-        public bool IsSelected { get => isSelected; set { Set(ref isSelected, value); } }
+        //private bool isSelected;
+        //public bool IsSelected { get => isSelected; set { Set(ref isSelected, value); } }
 
         private ObservableCollection<string> worryList = new ObservableCollection<string> {
                "否","是"
@@ -633,20 +633,20 @@ namespace BBWY.Client.ViewModels.PackTask
             TaskId = model.TaskId;
             string[] increateDatas = model.Increment1.Split(',');
 
-            bool isSelected = false;
+            bool isTrue = false;
             foreach (var item in increates)
             {
-                isSelected = false;
+                isTrue = false;
                 if (increateDatas.Contains(item))
                 {
-                    isSelected = true;
+                    isTrue = true;
                 }
                 App.Current.Dispatcher.Invoke(() =>
                 {
                     IncreateList.Add(new IncreateModel
                     {
                         IncreateName = item,
-                        IsSelected = isSelected
+                        IsSelected = isTrue
                     });
                 });
             }