diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs
index f4d6d646..8b89fb91 100644
--- a/BBWY.Client/GlobalContext.cs
+++ b/BBWY.Client/GlobalContext.cs
@@ -13,7 +13,7 @@ namespace BBWY.Client
         {
             ShopServiceGroupList = new List<string>();
             ShopServiceGroupLowerList = new List<string>();
-            ClientVersion = "10196";
+            ClientVersion = "10197";
         }
 
 
diff --git a/BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs b/BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs
index 15b8eaea..a6bdcd72 100644
--- a/BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs
+++ b/BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs
@@ -87,7 +87,7 @@ namespace BBWY.Client.Models.APIModel
         /// <summary>
         /// 打包类型（单件=0，多件=1）
         /// </summary>
-        public int PackType { get; set; }
+        public PackType PackType { get; set; }
 
         /// <summary>
         /// 落仓(本地仓=0，云仓=1，京仓=2,聚水潭=3)
@@ -97,20 +97,13 @@ namespace BBWY.Client.Models.APIModel
         /// <summary>
         /// 基础包装（快递袋=0，纸箱=1，麻袋=2）
         /// </summary>
-        public int BasicPack { get; set; }
+        public BasicPack BasicPack { get; set; }
 
         /// <summary>
         /// 增量1()
         /// </summary>
         public string Increment1 { get; set; }
 
-
-        ///// <summary>
-        ///// 到货情况(待收货=0，部分收货=1，已到货=2)
-        ///// </summary>
-        //public int Availability { get; set; }
-
-
         /// <summary>
         /// 服务费用数据
         /// </summary>
@@ -120,7 +113,7 @@ namespace BBWY.Client.Models.APIModel
         /// <summary>
         /// 合格证位置（外部包装=0，产品包装=1）
         /// </summary>
-        public int? CertificatePosition { get; set; }
+        public CertificatePosition? CertificatePosition { get; set; }
 
 
         /// <summary>
@@ -133,13 +126,6 @@ namespace BBWY.Client.Models.APIModel
         /// </summary>
         public int GoodsNumber { get; set; }
 
-
-        ///// <summary>
-        ///// 注意事项（对接备注）
-        ///// </summary>
-        //public string MarkMessage { get; set; }
-
-
         /// <summary>
         /// 条形码数据
         /// </summary>
@@ -150,12 +136,6 @@ namespace BBWY.Client.Models.APIModel
         /// </summary>
         public CertificateModel[] Cers { get; set; }
 
-
-        ///// <summary>
-        ///// 品牌
-        ///// </summary>
-        //public string Brand { get; set; }
-
         public string OrderId { get; set; }
 
         ///// <summary>
@@ -188,10 +168,7 @@ namespace BBWY.Client.Models.APIModel
         /// 打包超时备注信息
         /// </summary>
         public string PackOverTimeMarkMsg { get; set; }
-        /// <summary>
-        /// 备注消息列表
-        /// </summary>
-        public string ShowMarkMessage { get; set; }
+
         /// <summary>
         /// 采购方案
         /// </summary>
@@ -225,6 +202,11 @@ namespace BBWY.Client.Models.APIModel
         /// 物流状态
         /// </summary>
         public List<ExpressOrderResponse> ExpressOrderResponses { get; set; }
+
+        /// <summary>
+        /// 消息列表
+        /// </summary>
+        public List<MarkMessageModel> MarkMessageModelList { get; set; }
     }
     public class ExpressOrderResponse
     {
diff --git a/BBWY.Client/Models/PackTask/PackTaskModel.cs b/BBWY.Client/Models/PackTask/PackTaskModel.cs
index 7bc93642..aa5c7e29 100644
--- a/BBWY.Client/Models/PackTask/PackTaskModel.cs
+++ b/BBWY.Client/Models/PackTask/PackTaskModel.cs
@@ -25,6 +25,26 @@ namespace BBWY.Client.Models
     /// </summary>
     public class PackTaskModel : BaseVM
     {
+        private bool showSendMsg = false;
+        /// <summary>
+        /// 展示留言信息
+        /// </summary>
+        public bool ShowSendMsg { get => showSendMsg; set { Set(ref showSendMsg, value); } }
+
+
+        private string taskMarkMsg;
+        /// <summary>
+        /// 展示留言信息
+        /// </summary>
+        public string TaskMarkMsg { get => taskMarkMsg; set { Set(ref taskMarkMsg, value); } }
+
+
+
+        private bool showMoreMsg = false;
+        /// <summary>
+        /// 展示留言信息
+        /// </summary>
+        public bool ShowMoreMsg { get => showMoreMsg; set { Set(ref showMoreMsg, value); } }
 
         private bool isShowFees;
         public bool IsShowFees { get => isShowFees; set { Set(ref isShowFees, value); } }
@@ -458,14 +478,12 @@ namespace BBWY.Client.Models
         /// 打包超时备注信息
         /// </summary>
         public string PackOverTimeMarkMsg { get => packOverTimeMarkMsg; set { Set(ref packOverTimeMarkMsg, value); } }
+
+
         /// <summary>
-        /// 
-        /// </summary>
-        private string showMarkMessage;
-        /// <summary>
-        /// 备注消息列表
+        /// 消息列表
         /// </summary>
-        public string ShowMarkMessage { get => showMarkMessage; set { Set(ref showMarkMessage, value); } }
+        public List<MarkMessageModel> MarkMessageModelList { get; set; }
 
         /// <summary>
         /// 采购方案
diff --git a/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs b/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs
index d0e2e983..e0490434 100644
--- a/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs
@@ -30,6 +30,7 @@ using BBWY.Client.ViewModels.SealBox;
 using BBWY.Client.Views.FallWare;
 using BBWY.Client.Models.FallWare;
 using BBWY.Client.Views.TaskOverTime;
+using BBWY.Client.APIServices.QiKu;
 
 namespace BBWY.Client.ViewModels.PackTask
 {
@@ -272,10 +273,85 @@ namespace BBWY.Client.ViewModels.PackTask
 
 
 
-        public TaskListViewModel(PackTaskService packTaskService, GlobalContext globalContext, SealBoxService sealBoxService, ProductService productService)
+
+        /// <summary>
+        /// 设置仓库类型
+        /// </summary>
+        public ICommand SetWareTypeCommand { get; set; }
+        /// <summary>
+        /// 修改任务状态
+        /// </summary>
+        public ICommand UpdateTaskStateCommand { get; set; }
+
+        public ICommand LoadSealBoxSkuDataCommand { get; set; }
+
+        /// <summary>
+        /// 添加封箱商品
+        /// </summary>
+        public ICommand AddSealBoxProductCommand { get; set; }
+        /// <summary>
+        /// 提交过期时间数据
+        /// </summary>
+        public ICommand SubmitOverTimeMarkMsgCommand { get; set; }
+        /// <summary>
+        /// 设置落仓配置信息(上传材料)
+        /// </summary>
+        public ICommand SetFallWareConfiguredCommand { get; set; }
+        /// <summary>
+        /// 修改封箱数据
+        /// </summary>
+        public ICommand UpdateSealBoxConfiguredCommand { get; set; }
+        /// <summary>
+        /// 配置封箱策略
+        /// </summary>
+        public ICommand ConfiguredSealBoxCommand { get; set; }
+        /// <summary>
+        /// 待配置 /已配置
+        /// </summary>
+        public ICommand SetSealBoxConfigureTypeCommand { get; set; }
+
+        /// <summary>
+        /// 筛选数据 
+        /// </summary>
+        public ICommand SetTaskStateCommand { get; set; }
+        /// <summary>
+        /// 搜索数据
+        /// </summary>
+        public ICommand SearchTaskCommand { get; set; }
+
+        /// <summary>
+        /// 创建任务
+        /// </summary>
+        public ICommand CreateTaskCommand { get; set; }
+
+        /// <summary>
+        /// 页面改变事件
+        /// </summary>
+        public ICommand TaskPageIndexChangedCommand { get; set; }
+
+        /// <summary>
+        /// 打开图片链接
+        /// </summary>
+        public ICommand OpenSkuDetailCommand { get; set; }
+
+
+        /// <summary>
+        /// 删除任务
+        /// </summary>
+        public ICommand DeletedTaskCommand { get; set; }
+
+
+
+        public ICommand ShowMoreMessageCommand { get; set; }
+
+        public ICommand PackTaskMarkMessageCommand { get; set; }
+
+        public ICommand AppendMarkMessageCommand { get; set; }
+
+        public TaskListViewModel(PackTaskService packTaskService, GlobalContext globalContext, SealBoxService sealBoxService, ProductService productService, MarkMessageService markMessageService)
         {
             this.globalContext = globalContext;
-
+            this.markMessageService = markMessageService;
             this.packTaskService = packTaskService;
             PackTaskList = new ObservableCollection<PackTaskModel>();//初始化数据
 
@@ -333,9 +409,62 @@ namespace BBWY.Client.ViewModels.PackTask
                 SearchTaskList();
             });
 
+            ShowMoreMessageCommand = new RelayCommand<long>(ShowMoreMessage);
+            PackTaskMarkMessageCommand = new RelayCommand<long>(PackTaskMarkMessage);
 
+            AppendMarkMessageCommand = new RelayCommand<long>(AppendMarkMessage);
 
         }
+        MarkMessageService markMessageService;
+
+        private void AppendMarkMessage(long taskId)
+        {
+            var model = PackTaskList?.SingleOrDefault(p => p.TaskId == taskId);
+            if (model != null)
+            {
+
+                var res = markMessageService.AppendMarkMessage(taskId, model.TaskMarkMsg, globalContext.User.Name);
+                if (res == null)
+                {
+
+                    return;
+                }
+                if (!res.Success)
+                {
+                    MessageBox.Show(res.Msg);
+                    return;
+                }
+
+                model.TaskMarkMsg = string.Empty;
+
+                model.ShowSendMsg = false;
+
+                ReflashTask();
+
+            }
+
+
+        }
+
+        private void PackTaskMarkMessage(long taskId)
+        {
+            var model = PackTaskList?.SingleOrDefault(p => p.TaskId == taskId);
+            if (model != null)
+            {
+                model.ShowSendMsg = !model.ShowSendMsg;
+            }
+        }
+        private void ShowMoreMessage(long taskId)
+        {
+            var model = PackTaskList?.SingleOrDefault(p => p.TaskId == taskId);
+            if (model != null)
+            {
+                model.ShowMoreMsg = !model.ShowMoreMsg;
+
+
+
+            }
+        }
         private void UpdateTaskState(object obj)
         {
             var model = (PackTaskModel)obj;
@@ -611,9 +740,9 @@ namespace BBWY.Client.ViewModels.PackTask
                     //WaitCompleted = packTaskResult.Data.WaitCompleted?.ToString();
                     WaitScheduleCount = packTaskResult.Data.WaitScheduleCount?.ToString();
 
-        
-      WaitTransportCount  =packTaskResult.Data.WaitTransportCount?.ToString();
-    }));
+
+                    WaitTransportCount = packTaskResult.Data.WaitTransportCount?.ToString();
+                }));
             }
         }
 
@@ -630,71 +759,7 @@ namespace BBWY.Client.ViewModels.PackTask
 
 
 
-        /// <summary>
-        /// 设置仓库类型
-        /// </summary>
-        public ICommand SetWareTypeCommand { get; set; }
-        /// <summary>
-        /// 修改任务状态
-        /// </summary>
-        public ICommand UpdateTaskStateCommand { get; set; }
 
-        public ICommand LoadSealBoxSkuDataCommand { get; set; }
-
-        /// <summary>
-        /// 添加封箱商品
-        /// </summary>
-        public ICommand AddSealBoxProductCommand { get; set; }
-        /// <summary>
-        /// 提交过期时间数据
-        /// </summary>
-        public ICommand SubmitOverTimeMarkMsgCommand { get; set; }
-        /// <summary>
-        /// 设置落仓配置信息(上传材料)
-        /// </summary>
-        public ICommand SetFallWareConfiguredCommand { get; set; }
-        /// <summary>
-        /// 修改封箱数据
-        /// </summary>
-        public ICommand UpdateSealBoxConfiguredCommand { get; set; }
-        /// <summary>
-        /// 配置封箱策略
-        /// </summary>
-        public ICommand ConfiguredSealBoxCommand { get; set; }
-        /// <summary>
-        /// 待配置 /已配置
-        /// </summary>
-        public ICommand SetSealBoxConfigureTypeCommand { get; set; }
-
-        /// <summary>
-        /// 筛选数据 
-        /// </summary>
-        public ICommand SetTaskStateCommand { get; set; }
-        /// <summary>
-        /// 搜索数据
-        /// </summary>
-        public ICommand SearchTaskCommand { get; set; }
-
-        /// <summary>
-        /// 创建任务
-        /// </summary>
-        public ICommand CreateTaskCommand { get; set; }
-
-        /// <summary>
-        /// 页面改变事件
-        /// </summary>
-        public ICommand TaskPageIndexChangedCommand { get; set; }
-
-        /// <summary>
-        /// 打开图片链接
-        /// </summary>
-        public ICommand OpenSkuDetailCommand { get; set; }
-
-
-        /// <summary>
-        /// 删除任务
-        /// </summary>
-        public ICommand DeletedTaskCommand { get; set; }
 
         public void SetTaskState(TaskState? taskState)
         {
@@ -765,45 +830,18 @@ namespace BBWY.Client.ViewModels.PackTask
                             foreach (var item in dataModel.Items)
                             {
 
-                                var data = new PackTaskModel()
-                                {
-                                    SkuId = item.SkuId,
-                                    AcceptName = item.UserName,
-                                    BasicPack = (BasicPack)item.BasicPack,
-                                    DepartmentName = item.DepartmentName,
-                                    CertificatePosition = (CertificatePosition)item.CertificatePosition,
-                                    GoodsNumber = item.GoodsNumber,
-                                    Increment1 = item.Increment1,
-                                    ItemList = new List<SkuMessage>() { new SkuMessage
+                                var data = JsonConvert.DeserializeObject<PackTaskModel>(JsonConvert.SerializeObject(item));
+
+                                data.ItemList = new List<SkuMessage>() { new SkuMessage
                             {    BrandName = item.BrandName,
                                  GoodsNo = item.ProductItemNum, Logo= item.Logo,
-                                  SkuName = item.SkuName,
-                                  SkuId = item.SkuId,
-
-
-                            } },
-                                    ShowMarkMessage = item.ShowMarkMessage,
-                                    PackType = (PackType)item.PackType,
-
-                                    PositionType = item.PositionType,
-                                    SkuCount = item.SkuCount,
-                                    SkuTitle = item.SkuGoodsTitle,
-                                    TaskId = item.TaskId,
-
-                                    EndTime = item.CreateTime,
-                                    BrandName = item.BrandName,
-                                    OrderId = item.OrderId,
-                                    TaskState = item.TaskState,
-                                    QualityCompletionOverTime = item.QualityCompletionOverTime,
-                                    PackCompletionOverTime = item.PackCompletionOverTime,
-                                    ShopName = item.ShopName,
-                                    SkuPurchaseSchemeId = item.SkuPurchaseSchemeId,
-                                    ScheduleOverTimeMarkMsg = item.ScheduleOverTimeMarkMsg,
-                                    ScheduleOverTime = item.ScheduleOverTime,
-                                    PackProcessType = item.PackProcessType,
-                                    SendToSetSkuConfigureTime = item.SendToSetSkuConfigureTime,
-                                    ExpressOrderList =item.ExpressOrderResponses
-                                };
+                                 SkuName = item.SkuName,
+                                 SkuId = item.SkuId
+                            } };
+                                data.ExpressOrderList = item.ExpressOrderResponses;
+                                data.EndTime = item.CreateTime;
+                                data.SkuTitle = item.SkuGoodsTitle;
+                                data.AcceptName = item.UserName;
 
                                 if (!item.OrderId.IsNullOrEmpty() && !item.SkuId.IsNullOrEmpty())//加载物流信息
                                 {
@@ -1304,7 +1342,7 @@ namespace BBWY.Client.ViewModels.PackTask
                     PageSize = 20;
 
                     WaitTransportList = new ObservableCollection<WareWaitTransport>();
-                    var datas = sealBoxService.GetWareWaitTransportList(SelectWareType, PageSize, PageIndex,globalContext.User.Shop.ShopId.ToString());
+                    var datas = sealBoxService.GetWareWaitTransportList(SelectWareType, PageSize, PageIndex, globalContext.User.Shop.ShopId.ToString());
                     if (datas != null && datas.Data != null && datas.Success)
                     {
                         var dataModel = datas.Data;
@@ -1371,7 +1409,7 @@ namespace BBWY.Client.ViewModels.PackTask
                     });
                     IsLoading = false;
                 }
-                
+
             }
         }
 
diff --git a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
index 45d8ace4..46eebddd 100644
--- a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
@@ -595,7 +595,146 @@ namespace BBWY.Client.ViewModels.PackTask
         private readonly PackTaskService packTaskService;
         private readonly SealBoxService sealBoxService;
         public GlobalContext globalContext;
-        public WareHouseListViewModel(PackTaskService packTaskService, GlobalContext globalContext, SealBoxService sealBoxService, PackUserService packUserService)
+
+
+        /// <summary>
+        /// 推送sku配置状态
+        /// </summary>
+        public ICommand SendToSetSkuConfigureCommand { get; set; }
+        /// <summary>
+        /// 提交超时原因
+        /// </summary>
+        public ICommand SubmitOverTimeMarkMsgCommand { get; set; }
+        /// <summary>
+        /// 查看揽收单
+        /// </summary>
+        public ICommand LookLSOrderConfigureCommand { get; set; }
+        /// <summary>
+        /// 打印揽收单
+        /// </summary>
+        public ICommand PrintLSOrderConfigureCommand { get; set; }
+        /// <summary>
+        /// 打印封箱明细
+        /// </summary>
+        public ICommand PrintSealBoxDetailsCommand { get; set; }
+        /// <summary>
+        /// 待完结 完成事件
+        /// </summary>
+        public ICommand CompeteWaitCompletedCommand { get; set; }
+
+        /// <summary>
+        /// 待转运 完成事件
+        /// </summary>
+        public ICommand CompeteWaitTransportCommand { get; set; }
+
+        /// <summary>
+        /// 设置仓库类型
+        /// </summary>
+        public ICommand SetWareTypeCommand { get; set; }
+
+        /// <summary>
+        /// 查看箱唛配置
+        /// </summary>
+        public ICommand LookBoxConfigureCommand { get; set; }
+        /// <summary>
+        /// 待配置 /已配置
+        /// </summary>
+        public ICommand SetSealBoxConfigureTypeCommand { get; set; }
+        public ICommand CompeteFallWareCommand { get; set; }
+        public ICommand CompeteSealBoxCommand { get; set; }
+
+        public ICommand CompletedPackTaskCommand { get; set; }
+
+
+        /// <summary>
+        /// 打开图片链接
+        /// </summary>
+        public ICommand OpenSkuDetailCommand { get; set; }
+
+
+        /// <summary>
+        /// 筛选数据 
+        /// </summary>
+        public ICommand SetTaskStateCommand { get; set; }
+
+        /// <summary>
+        /// 修改任务状态
+        /// </summary>
+        public ICommand UpdateTaskStateCommand { get; set; }
+        /// <summary>
+        /// 搜索数据
+        /// </summary>
+        public ICommand SearchTaskCommand { get; set; }
+
+        /// <summary>
+        /// 创建任务
+        /// </summary>
+        public ICommand CreateTaskCommand { get; set; }
+
+        /// <summary>
+        /// 页面改变事件
+        /// </summary>
+        public ICommand TaskPageIndexChangedCommand { get; set; }
+
+        /// <summary>
+        /// 设置分箱数量
+        /// </summary>
+        public ICommand SetSealBoxCommand { get; set; }
+
+
+        /// <summary>
+        /// 打印封箱数据
+        /// </summary>
+        public ICommand PrintBoxConfigureCommand { get; set; }
+
+
+        /// <summary>
+        /// 删除任务
+        /// </summary>
+        public ICommand DeletedTaskCommand { get; set; }
+
+
+        /// <summary>
+        /// 商家自取
+        /// </summary>
+        public ICommand StoreGetBySelfCommand { get; set; }
+
+
+        /// <summary>
+        /// 加载事件(待封箱)
+        /// </summary>
+        public ICommand LoadSkuDataCommand { get; set; }
+
+        /// <summary>
+        /// 加载事件(封箱已配置)
+        /// </summary>
+        public ICommand LoadSealBoxSkuDataCommand { get; set; }
+
+        /// <summary>
+        /// 落仓
+        /// </summary>
+        public ICommand LoadFallWareSkuDataCommand { get; set; }
+
+        /// <summary>
+        /// 转运
+        /// </summary>
+        public ICommand LoadTransportSkuDataCommand { get; set; }
+
+
+
+
+        /// <summary>
+        /// 待完结
+        /// </summary>
+        public ICommand LoadCompletedSkuDataCommand { get; set; }
+
+
+        public ICommand ShowMoreMessageCommand { get; set; }
+
+        public ICommand PackTaskMarkMessageCommand { get; set; }
+
+        public ICommand AppendMarkMessageCommand { get; set; }
+        public WareHouseListViewModel(PackTaskService packTaskService, GlobalContext globalContext, SealBoxService sealBoxService, PackUserService packUserService, MarkMessageService markMessageService)
         {
 
 
@@ -603,7 +742,8 @@ namespace BBWY.Client.ViewModels.PackTask
             this.globalContext = globalContext;
             this.sealBoxService = sealBoxService;
             this.packTaskService = packTaskService;
-
+            this.packUserService = packUserService;
+            this.markMessageService = markMessageService;
             //Messenger.Default.Send(globalContext, "AcceptGlobalContext");
             PackTaskList = new ObservableCollection<PackTaskModel>();//初始化数据
 
@@ -686,7 +826,60 @@ namespace BBWY.Client.ViewModels.PackTask
             LoadTransportSkuDataCommand = new RelayCommand<WareWaitTransport>(LoadTransportSkuData);
 
             LoadCompletedSkuDataCommand = new RelayCommand<WareWaitCompleted>(LoadCompletedSkuData);
-            this.packUserService = packUserService;
+            ShowMoreMessageCommand = new RelayCommand<long>(ShowMoreMessage);
+            PackTaskMarkMessageCommand = new RelayCommand<long>(PackTaskMarkMessage);
+
+            AppendMarkMessageCommand = new RelayCommand<long>(AppendMarkMessage);
+
+        }
+        MarkMessageService markMessageService;
+        private void AppendMarkMessage(long taskId)
+        {
+            var model = PackTaskList?.SingleOrDefault(p => p.TaskId == taskId);
+            if (model != null)
+            {
+
+                var res = markMessageService.AppendMarkMessage(taskId, model.TaskMarkMsg, globalContext.User.Name);
+                if (res == null)
+                {
+
+                    return;
+                }
+                if (!res.Success)
+                {
+                    MessageBox.Show(res.Msg);
+                    return;
+                }
+
+                model.TaskMarkMsg = string.Empty;
+
+                model.ShowSendMsg = false;
+
+                ReflashTask();
+
+            }
+
+
+        }
+
+        private void PackTaskMarkMessage(long taskId)
+        {
+            var model = PackTaskList?.SingleOrDefault(p => p.TaskId == taskId);
+            if (model != null)
+            {
+                model.ShowSendMsg = !model.ShowSendMsg;
+            }
+        }
+        private void ShowMoreMessage(long taskId)
+        {
+            var model = PackTaskList?.SingleOrDefault(p => p.TaskId == taskId);
+            if (model != null)
+            {
+                model.ShowMoreMsg = !model.ShowMoreMsg;
+
+
+
+            }
         }
 
         private void LoadCompletedSkuData(WareWaitCompleted model)
@@ -965,35 +1158,8 @@ namespace BBWY.Client.ViewModels.PackTask
         private void CompletedPackTask(object obj)
         {
             var model = (PackTaskModel)obj;
-
-            //if (model == null || model.FeesItemResponse == null || model.FeesItemResponse.AllFees == 0)
-            //{
-            //    System.Windows.MessageBox.Show("请先设置打包费用!");
-            //    return;
-            //}
-            //if (System.Windows.MessageBox.Show("是否完成打包?", "提示",
-            //             MessageBoxButton.YesNo,
-            //             MessageBoxImage.Warning) != MessageBoxResult.Yes)
-            //    return;
-
-
             AddOneItemWeightWindow addOneItemWeightWindow = new AddOneItemWeightWindow(ReflashTask, packUserService, model.TaskId);
             addOneItemWeightWindow.ShowDialog();
-
-
-            //var res = packTaskService.CompletedPackTask(model.TaskId);
-            //if (res == null)
-            //{
-            //    return;
-            //}
-            //if (!res.Success)
-            //{
-            //    System.Windows.MessageBox.Show(res.Msg);
-            //    return;
-            //}
-
-
-            //Task.Factory.StartNew(() => SearchTaskList());
         }
 
         private void StoreGetBySelf(long taskId)
@@ -1152,136 +1318,7 @@ namespace BBWY.Client.ViewModels.PackTask
         #region 事件绑定 
 
 
-        /// <summary>
-        /// 推送sku配置状态
-        /// </summary>
-        public ICommand SendToSetSkuConfigureCommand { get; set; }
-        /// <summary>
-        /// 提交超时原因
-        /// </summary>
-        public ICommand SubmitOverTimeMarkMsgCommand { get; set; }
-        /// <summary>
-        /// 查看揽收单
-        /// </summary>
-        public ICommand LookLSOrderConfigureCommand { get; set; }
-        /// <summary>
-        /// 打印揽收单
-        /// </summary>
-        public ICommand PrintLSOrderConfigureCommand { get; set; }
-        /// <summary>
-        /// 打印封箱明细
-        /// </summary>
-        public ICommand PrintSealBoxDetailsCommand { get; set; }
-        /// <summary>
-        /// 待完结 完成事件
-        /// </summary>
-        public ICommand CompeteWaitCompletedCommand { get; set; }
-
-        /// <summary>
-        /// 待转运 完成事件
-        /// </summary>
-        public ICommand CompeteWaitTransportCommand { get; set; }
-
-        /// <summary>
-        /// 设置仓库类型
-        /// </summary>
-        public ICommand SetWareTypeCommand { get; set; }
-
-        /// <summary>
-        /// 查看箱唛配置
-        /// </summary>
-        public ICommand LookBoxConfigureCommand { get; set; }
-        /// <summary>
-        /// 待配置 /已配置
-        /// </summary>
-        public ICommand SetSealBoxConfigureTypeCommand { get; set; }
-        public ICommand CompeteFallWareCommand { get; set; }
-        public ICommand CompeteSealBoxCommand { get; set; }
-
-        public ICommand CompletedPackTaskCommand { get; set; }
-
-
-        /// <summary>
-        /// 打开图片链接
-        /// </summary>
-        public ICommand OpenSkuDetailCommand { get; set; }
-
-
-        /// <summary>
-        /// 筛选数据 
-        /// </summary>
-        public ICommand SetTaskStateCommand { get; set; }
-
-        /// <summary>
-        /// 修改任务状态
-        /// </summary>
-        public ICommand UpdateTaskStateCommand { get; set; }
-        /// <summary>
-        /// 搜索数据
-        /// </summary>
-        public ICommand SearchTaskCommand { get; set; }
-
-        /// <summary>
-        /// 创建任务
-        /// </summary>
-        public ICommand CreateTaskCommand { get; set; }
-
-        /// <summary>
-        /// 页面改变事件
-        /// </summary>
-        public ICommand TaskPageIndexChangedCommand { get; set; }
-
-        /// <summary>
-        /// 设置分箱数量
-        /// </summary>
-        public ICommand SetSealBoxCommand { get; set; }
-
-
-        /// <summary>
-        /// 打印封箱数据
-        /// </summary>
-        public ICommand PrintBoxConfigureCommand { get; set; }
-
-
-        /// <summary>
-        /// 删除任务
-        /// </summary>
-        public ICommand DeletedTaskCommand { get; set; }
-
-
-        /// <summary>
-        /// 商家自取
-        /// </summary>
-        public ICommand StoreGetBySelfCommand { get; set; }
-
-
-        /// <summary>
-        /// 加载事件(待封箱)
-        /// </summary>
-        public ICommand LoadSkuDataCommand { get; set; }
-
-        /// <summary>
-        /// 加载事件(封箱已配置)
-        /// </summary>
-        public ICommand LoadSealBoxSkuDataCommand { get; set; }
 
-        /// <summary>
-        /// 落仓
-        /// </summary>
-        public ICommand LoadFallWareSkuDataCommand { get; set; }
-
-        /// <summary>
-        /// 转运
-        /// </summary>
-        public ICommand LoadTransportSkuDataCommand { get; set; }
-
-
-
-
-        /// <summary>
-        /// 待完结
-        /// </summary>
-        public ICommand LoadCompletedSkuDataCommand { get; set; }
         /// <summary>
         /// 完成封箱
         /// </summary>
@@ -1798,46 +1835,20 @@ namespace BBWY.Client.ViewModels.PackTask
                         OrderCount = dataModel.TotalCount;
                         foreach (var item in dataModel.Items)
                         {
-                            var data = new PackTaskModel()
-                            {
-                                AcceptName = item.UserName,
-                                BasicPack = (BasicPack)item.BasicPack,
-                                DepartmentName = item.DepartmentName,
-                                CertificatePosition = (CertificatePosition)item.CertificatePosition,
-
-                                GoodsNumber = item.GoodsNumber,
-                                Increment1 = item.Increment1,
-                                ItemList = new List<SkuMessage>() { new SkuMessage
+
+                            var data = JsonConvert.DeserializeObject<PackTaskModel>( JsonConvert.SerializeObject(item));
+
+
+                            data.ItemList = new List<SkuMessage>() { new SkuMessage
                             {    BrandName = item.BrandName,
                                  GoodsNo = item.ProductItemNum, Logo= item.Logo,
                                  SkuName = item.SkuName,
                                  SkuId = item.SkuId
-                            } },
-                                PackType = (PackType)item.PackType,
-                                TaskState = item.TaskState,
-                                PositionType = item.PositionType,
-                                SkuCount = item.SkuCount,
-                                SkuTitle = item.SkuGoodsTitle,
-                                TaskId = item.TaskId,
-                                EndTime = item.CreateTime,
-                                OrderId = item.OrderId,
-                                SkuId = item.SkuId,
-                                SkuName = item.SkuName,
-                                FloorDragNumber = item.FloorDragNumber,
-                                QualityCompletionOverTime = item.QualityCompletionOverTime,
-                                PackCompletionOverTime = item.PackCompletionOverTime,
-                                ShopName = item.ShopName,
-                                QualityOverTimeMarkMsg = item.QualityOverTimeMarkMsg,
-                                PackOverTimeMarkMsg = item.PackOverTimeMarkMsg,
-                                ShowMarkMessage = item.ShowMarkMessage,
-                                SkuPurchaseSchemeId = item.SkuPurchaseSchemeId,
-                                ScheduleOverTimeMarkMsg = item.ScheduleOverTimeMarkMsg,
-                                ScheduleOverTime = item.ScheduleOverTime,
-                                PackProcessType = item.PackProcessType,
-                                ShopId = item.ShopId,
-                                SendToSetSkuConfigureTime = item.SendToSetSkuConfigureTime,
-                                ExpressOrderList = item.ExpressOrderResponses
-                            };
+                            } };
+                            data.ExpressOrderList = item.ExpressOrderResponses;
+                            data.EndTime = item.CreateTime;
+                            data.SkuTitle = item.SkuGoodsTitle;
+                            data.AcceptName = item.UserName;
                             if (item.BarCodeDTO != null && item.BarCodeDTO.Id > 0)
                             {
 
diff --git a/BBWY.Client/ViewModels/PackerTask/PackerTaskViewModel.cs b/BBWY.Client/ViewModels/PackerTask/PackerTaskViewModel.cs
index 711d8604..03baaa99 100644
--- a/BBWY.Client/ViewModels/PackerTask/PackerTaskViewModel.cs
+++ b/BBWY.Client/ViewModels/PackerTask/PackerTaskViewModel.cs
@@ -343,6 +343,40 @@ namespace BBWY.Client.ViewModels.PackerTask
 
         #endregion
 
+
+        PackUserService packUserService;
+
+        PackTaskService packTaskService;
+        /// <summary>
+        /// 提交超时原因
+        /// </summary>
+        public ICommand SubmitOverTimeMarkMsgCommand { get; set; }
+        /// <summary>
+        /// 打开图片链接
+        /// </summary>
+        public ICommand OpenSkuDetailCommand { get; set; }
+        public ICommand SearchTaskCommand { get; set; }
+        /// <summary>
+        /// 页面改变事件
+        /// </summary>
+        public ICommand TaskPageIndexChangedCommand { get; set; }
+
+        public ICommand LookCerCommand { get; set; }
+        public ICommand LookBarCommand { get; set; }
+
+        public ICommand SetTaskStateCommand { get; set; }
+
+        public ICommand CompletedPackTaskCommand { get; set; }
+        public ICommand PackTaskMarkMessageCommand { get; set; }
+        public ICommand AppendMarkMessageCommand { get; set; }
+
+        public ICommand ShowMoreMessageCommand { get; set; }
+
+        public ICommand PrintBarcodeCommand { get; set; }
+        public ICommand PrintCerCommand { get; set; }
+
+
+
         /// <summary>
         /// 构造函数
         /// </summary>
@@ -494,36 +528,7 @@ namespace BBWY.Client.ViewModels.PackerTask
 
 
         #region 方法
-        PackUserService packUserService;
 
-        PackTaskService packTaskService;
-        /// <summary>
-        /// 提交超时原因
-        /// </summary>
-        public ICommand SubmitOverTimeMarkMsgCommand { get; set; }
-        /// <summary>
-        /// 打开图片链接
-        /// </summary>
-        public ICommand OpenSkuDetailCommand { get; set; }
-        public ICommand SearchTaskCommand { get; set; }
-        /// <summary>
-        /// 页面改变事件
-        /// </summary>
-        public ICommand TaskPageIndexChangedCommand { get; set; }
-
-        public ICommand LookCerCommand { get; set; }
-        public ICommand LookBarCommand { get; set; }
-
-        public ICommand SetTaskStateCommand { get; set; }
-
-        public ICommand CompletedPackTaskCommand { get; set; }
-        public ICommand PackTaskMarkMessageCommand { get; set; }
-        public ICommand AppendMarkMessageCommand { get; set; }
-
-        public ICommand ShowMoreMessageCommand { get; set; }
-
-        public ICommand PrintBarcodeCommand { get; set; }
-        public ICommand PrintCerCommand { get; set; }
         public void SetTaskState()
         {
             PageIndex = 1;
diff --git a/BBWY.Client/Views/PackTask/FeesExcelV2Control.xaml.cs b/BBWY.Client/Views/PackTask/FeesExcelV2Control.xaml.cs
index 753df95c..3dd46a13 100644
--- a/BBWY.Client/Views/PackTask/FeesExcelV2Control.xaml.cs
+++ b/BBWY.Client/Views/PackTask/FeesExcelV2Control.xaml.cs
@@ -181,7 +181,7 @@ namespace BBWY.Client.Views.PackTask
         private void LoadData()
         {
 
-            if (FeesItem == null || FeesItem.ProcessComboTaskCount <= 0)
+            if (FeesItem == null )
             {
                 return;
             }
diff --git a/BBWY.Client/Views/PackTask/ShopWaitPackageControl.xaml b/BBWY.Client/Views/PackTask/ShopWaitPackageControl.xaml
index 1fd0dc8c..0281bcb2 100644
--- a/BBWY.Client/Views/PackTask/ShopWaitPackageControl.xaml
+++ b/BBWY.Client/Views/PackTask/ShopWaitPackageControl.xaml
@@ -40,7 +40,7 @@
                 <ColumnDefinition  Width="100"/>
                 <ColumnDefinition Width="140"/>
                 <ColumnDefinition MinWidth="140"/>
-              
+                <ColumnDefinition Width="140"/>
             </Grid.ColumnDefinitions>
             <TextBlock Text="商品信息" Style="{StaticResource middleTextBlock}"/>
             <TextBlock Text="数量" Grid.Column="1" Style="{StaticResource middleTextBlock}"/>
@@ -51,7 +51,7 @@
             <TextBlock Text="合格证.条形码"   Grid.Column="6"  Style="{StaticResource middleTextBlock}"/>
             <TextBlock Text="包装费用"   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="8"  Style="{StaticResource middleTextBlock}"/>
             <TextBlock Text="注意事项/对接备注" Grid.Column="9" Style="{StaticResource middleTextBlock}"/>
             <TextBlock Text="服务 耗材费用" Grid.Column="10" Style="{StaticResource middleTextBlock}"/>
@@ -102,6 +102,7 @@
                                 <ColumnDefinition  Width="100"/>
                                 <ColumnDefinition Width="140"/>
                                 <ColumnDefinition MinWidth="140"/>
+                                <ColumnDefinition Width="140"/>
                             </Grid.ColumnDefinitions>
                             <StackPanel Orientation="Horizontal" Grid.Column="0" Grid.ColumnSpan="11">
                                 <TextBlock VerticalAlignment="Center" Text="提交时间:" Margin="14,0,0,0" />
@@ -154,6 +155,7 @@
                             <Grid.RowDefinitions>
                                 <RowDefinition/>
                                 <RowDefinition/>
+                                <RowDefinition/>
                             </Grid.RowDefinitions>
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="300"/>
@@ -165,6 +167,7 @@
                                 <ColumnDefinition  Width="100"/>
                                 <ColumnDefinition Width="140"/>
                                 <ColumnDefinition MinWidth="140"/>
+                                <ColumnDefinition Width="140"/>
                             </Grid.ColumnDefinitions>
                             <ListBox x:Name="listbox_orerSku"   ItemsSource="{Binding ItemList}"
                                          Style="{StaticResource NoScrollViewListBoxStyle}" BorderThickness="0"
@@ -441,28 +444,100 @@
 
                                 </StackPanel>
                             </Grid>-->
-                            <!--<Grid Grid.Column="9" >
+                            <Grid Grid.Column="9" >
 
+                                <c:BButton  HorizontalAlignment="Stretch"   Style="{StaticResource LinkButton}"  Margin="0 5 0 5 "    VerticalAlignment="Center" Content="{Binding ShowSendMsg,Converter={StaticResource objConverter},ConverterParameter=False:任务备注:取消备注}" 
+ CommandParameter="{Binding TaskId}"
+ Command="{Binding DataContext.PackTaskMarkMessageCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}"
+/>
 
-                                <StackPanel Grid.Column="12" Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center" 
-                                  Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货|待验收:Visible:Collapsed}"
-                                        >
-                                    --><!-- --><!--
-                                    <c:BButton Command="{Binding UpdateTaskCommand}" Style="{StaticResource LinkButton}"       Content="修改" />
-                                    <c:BButton Command="{Binding DataContext.DeletedTaskCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" CommandParameter="{Binding}"
-                                   Margin="0,10,0,0" Style="{StaticResource LinkButton}"       Content="取消"/>
-                                </StackPanel>
 
-                            </Grid>-->
+                            </Grid>
                             <!--<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/>-->
                             <!--<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="1"/>-->
 
-                            <Border  BorderBrush="{StaticResource Border.Brush}" Margin="10 2 10 2" 
-                                      Visibility="{Binding ShowMarkMessage,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
-                                    CornerRadius="0" Grid.Row="1" MaxHeight="66" Grid.ColumnSpan="100">
-                                <TextBox  Text="{Binding ShowMarkMessage}"  HorizontalAlignment="Stretch" VerticalAlignment="Top"  Margin="0 5 0 5"   ScrollViewer.VerticalScrollBarVisibility="Visible"
-                                       AcceptsReturn="True" TextWrapping="Wrap"  IsReadOnly="True" BorderThickness="0"/>
-                            </Border>
+                            <Grid Grid.Row="1"  Grid.ColumnSpan="5" Visibility="{Binding MarkMessageModelList,Converter={StaticResource objConverter}, ConverterParameter=#null:Collapsed:Visible}" Margin="10 0 0 0">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="30"/>
+                                    <ColumnDefinition/>
+                                </Grid.ColumnDefinitions>
+                                <c:BButton Margin="0" Panel.ZIndex="100"    HorizontalAlignment="Stretch" VerticalAlignment="Top"  Grid.ColumnSpan="2" Background="Transparent"
+                    Command="{Binding DataContext.ShowMoreMessageCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}" CommandParameter="{Binding TaskId}"/>
+                                <c:BButton Margin="0"  Content="{Binding ShowMoreMsg,Converter={StaticResource objConverter},ConverterParameter=false:∨:∧}" Style="{StaticResource LinkButton}"  HorizontalAlignment="Left" VerticalAlignment="Top" Height="30" 
+                                                    />
+                                <ListBox   Grid.Column="1"    x:Name="listbox_message"               Grid.Row="2"    Margin=" 0"
+ItemsSource="{Binding MarkMessageModelList}"      Height="{Binding ShowMoreMsg,Converter={StaticResource objConverter},ConverterParameter=false:30:*}"        
+ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"  ScrollViewer.VerticalScrollBarVisibility="Hidden"
+BorderBrush="{StaticResource Border.Brush}"
+BorderThickness="0,0,0,0"
+Foreground="{StaticResource Text.Color}">
+                                    <ListBox.ItemTemplate>
+                                        <DataTemplate>
+                                            <Grid Width="{Binding ActualWidth,ElementName=listbox_message,Converter={StaticResource widthConverter},ConverterParameter=-0}" MinHeight="30">
+                                                <DockPanel  VerticalAlignment="Center">
+                                                    <TextBlock HorizontalAlignment="Left" Text="{Binding CreateTime,StringFormat=yyyy-MM-dd HH:mm:ss}"/>
+                                                    <TextBlock HorizontalAlignment="Left" Text="   "/>
+                                                    <TextBlock HorizontalAlignment="Left" Text="{Binding UserName}"/>
+                                                    <TextBlock HorizontalAlignment="Left" Text=" :  "/>
+                                                    <TextBlock HorizontalAlignment="Left" Text="{Binding MarkMessage}" Foreground="Red" TextWrapping="Wrap"/>
+
+                                                </DockPanel>
+                                            </Grid>
+                                        </DataTemplate>
+                                    </ListBox.ItemTemplate>
+                                </ListBox>
+                            </Grid>
+
+                            <Border Width="1" Grid.Row="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="4"/>
+
+                            <Grid Grid.Row="1"  Grid.Column="5" Grid.ColumnSpan="6"   >
+                                <Grid Visibility="{Binding  DataContext.TaskState,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}},Converter={StaticResource objConverter},ConverterParameter=待包装:Visible:Collapsed}">
+                                    <TextBlock Grid.Row="1"  Grid.Column="4" Grid.ColumnSpan="6"   
+                                   Visibility="{Binding PackOverTimeMarkMsg,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
+                                   HorizontalAlignment="Stretch" VerticalAlignment="Top"  Margin="5 5 0 5"   ScrollViewer.VerticalScrollBarVisibility="Visible"  TextWrapping="Wrap"  >
+                                        <TextBlock.ToolTip>
+                                            <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
+                                                <TextBlock Text="{Binding PackOverTimeMarkMsg}"/>
+                                            </ToolTip>
+                                        </TextBlock.ToolTip>
+<Run Text="超时原因:"/>
+ <Run Text="{Binding PackOverTimeMarkMsg}" Foreground="Red" />
+                                </TextBlock>
+                                </Grid>
+                                <Grid Visibility="{Binding DataContext.TaskState,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}},Converter={StaticResource objConverter},ConverterParameter=待排单:Visible:Collapsed}">
+                                    <TextBlock Grid.Row="1"  Grid.Column="4" Grid.ColumnSpan="6"   
+                                   Visibility="{Binding ScheduleOverTimeMarkMsg,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
+                                   HorizontalAlignment="Stretch" VerticalAlignment="Top"  Margin="5 5 0 5"   ScrollViewer.VerticalScrollBarVisibility="Visible"  TextWrapping="Wrap"  >
+                                        <TextBlock.ToolTip>
+                                            <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
+                                                <TextBlock Text="{Binding ScheduleOverTimeMarkMsg}"/>
+                                            </ToolTip>
+                                        </TextBlock.ToolTip>
+<Run Text="超时原因:"/>
+ <Run Text="{Binding ScheduleOverTimeMarkMsg}" Foreground="Red" />
+                                </TextBlock>
+                                </Grid>
+                            </Grid>
+
+                            <Grid Grid.Row="3" Grid.ColumnSpan="100" MinHeight="40" Visibility="{Binding ShowSendMsg,Converter={StaticResource objConverter},ConverterParameter=false:Collapsed:Visible}">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="300"/>
+                                    <ColumnDefinition Width="90"/>
+                                    <ColumnDefinition Width="140"/>
+                                    <ColumnDefinition Width="100"/>
+                                    <ColumnDefinition Width="120"/>
+                                    <ColumnDefinition Width="140"/>
+                                    <ColumnDefinition MinWidth="100"/>
+                                    <ColumnDefinition  Width="100"/>
+                                    <ColumnDefinition Width="150"/>
+                                    <ColumnDefinition Width="120"/>
+                                </Grid.ColumnDefinitions>
+                                <Border Height="1" VerticalAlignment="Top" Background="{StaticResource Border.Brush}" Grid.ColumnSpan="100"/>
+                                <c:BTextBox Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="9"  Height="30" Margin="5 0 0 0" Text="{Binding TaskMarkMsg}" AcceptsReturn="True"/>
+                                <c:BButton Grid.Column="10" Content="提交备注" Width="80"    Command="{Binding DataContext.AppendMarkMessageCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}"
+CommandParameter="{Binding  TaskId}"/>
+                            </Grid>
+
                             <Border Grid.Row="1" VerticalAlignment="Top" Height="1" Background="{StaticResource Border.Brush}" Grid.ColumnSpan="100"/>
 
 
diff --git a/BBWY.Client/Views/PackTask/TaskListControl.xaml b/BBWY.Client/Views/PackTask/TaskListControl.xaml
index db101f18..11e8c7e7 100644
--- a/BBWY.Client/Views/PackTask/TaskListControl.xaml
+++ b/BBWY.Client/Views/PackTask/TaskListControl.xaml
@@ -121,7 +121,8 @@
                         </Grid>
                         <Grid Grid.Row="1">
                             <Grid.RowDefinitions>
-                                <RowDefinition MinHeight="90"/>
+                                <RowDefinition />
+                                <RowDefinition />
                                 <RowDefinition />
                             </Grid.RowDefinitions>
                             <Grid.ColumnDefinitions>
@@ -425,17 +426,110 @@ Visibility="{Binding OrderId,Converter={StaticResource objConverter},ConverterPa
                                         </c:BButton>
 
                                     </Grid>
+                                    <c:BButton Grid.Column="11" HorizontalAlignment="Stretch"   Style="{StaticResource LinkButton}"  Margin="0 10 0 5 "    VerticalAlignment="Center" Content="{Binding ShowSendMsg,Converter={StaticResource objConverter},ConverterParameter=False:任务备注:取消备注}" 
+ CommandParameter="{Binding TaskId}"
+ Command="{Binding DataContext.PackTaskMarkMessageCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}"
+/>
 
                                 </StackPanel>
                                
                             </Grid>
 
-                            <Border  BorderBrush="{StaticResource Border.Brush}" Margin="10 2 10 2" 
-                                      Visibility="{Binding ShowMarkMessage,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
-                                    CornerRadius="0" Grid.Row="1" MaxHeight="66" Grid.ColumnSpan="100">
-                                <TextBox  Text="{Binding ShowMarkMessage}"  HorizontalAlignment="Stretch" VerticalAlignment="Top"  Margin="0 5 0 5"   ScrollViewer.VerticalScrollBarVisibility="Visible"
-                                       AcceptsReturn="True" TextWrapping="Wrap"  IsReadOnly="True" BorderThickness="0"/>
-                            </Border>
+                            <Grid Grid.Row="1"  Grid.ColumnSpan="6" Visibility="{Binding MarkMessageModelList,Converter={StaticResource objConverter}, ConverterParameter=#null:Collapsed:Visible}" Margin="10 0 0 0">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="30"/>
+                                    <ColumnDefinition/>
+                                </Grid.ColumnDefinitions>
+                                <c:BButton Margin="0" Panel.ZIndex="100"    HorizontalAlignment="Stretch" VerticalAlignment="Top"  Grid.ColumnSpan="2" Background="Transparent"
+                    Command="{Binding DataContext.ShowMoreMessageCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}" CommandParameter="{Binding TaskId}"/>
+                                <c:BButton Margin="0"  Content="{Binding ShowMoreMsg,Converter={StaticResource objConverter},ConverterParameter=false:∨:∧}" Style="{StaticResource LinkButton}"  HorizontalAlignment="Left" VerticalAlignment="Top" Height="30" 
+                                                    />
+                                <ListBox   Grid.Column="1"    x:Name="listbox_message"               Grid.Row="2"    Margin=" 0"
+ItemsSource="{Binding MarkMessageModelList}"      Height="{Binding ShowMoreMsg,Converter={StaticResource objConverter},ConverterParameter=false:30:*}"        
+ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"  ScrollViewer.VerticalScrollBarVisibility="Hidden"
+BorderBrush="{StaticResource Border.Brush}"
+BorderThickness="0,0,0,0"
+Foreground="{StaticResource Text.Color}">
+                                    <ListBox.ItemTemplate>
+                                        <DataTemplate>
+                                            <Grid Width="{Binding ActualWidth,ElementName=listbox_message,Converter={StaticResource widthConverter},ConverterParameter=-0}" MinHeight="30">
+                                                <DockPanel  VerticalAlignment="Center">
+                                                    <TextBlock HorizontalAlignment="Left" Text="{Binding CreateTime,StringFormat=yyyy-MM-dd HH:mm:ss}"/>
+                                                    <TextBlock HorizontalAlignment="Left" Text="   "/>
+                                                    <TextBlock HorizontalAlignment="Left" Text="{Binding UserName}"/>
+                                                    <TextBlock HorizontalAlignment="Left" Text=" :  "/>
+                                                    <TextBlock HorizontalAlignment="Left" Text="{Binding MarkMessage}" Foreground="Red" TextWrapping="Wrap"/>
+
+                                                </DockPanel>
+                                            </Grid>
+                                        </DataTemplate>
+                                    </ListBox.ItemTemplate>
+                                </ListBox>
+                            </Grid>
+
+                            <Border Width="1" Grid.Row="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="5"/>
+
+                            <Grid Grid.Row="1"  Grid.Column="6" Grid.ColumnSpan="6"   >
+                                <Grid Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待包装:Visible:Collapsed}">
+                                    <TextBlock Grid.Row="1"  Grid.Column="4" Grid.ColumnSpan="6"   
+                                   Visibility="{Binding PackOverTimeMarkMsg,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
+                                   HorizontalAlignment="Stretch" VerticalAlignment="Top"  Margin="5 5 0 5"   ScrollViewer.VerticalScrollBarVisibility="Visible"  TextWrapping="Wrap"  >
+                                        <TextBlock.ToolTip>
+                                            <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
+                                                <TextBlock Text="{Binding PackOverTimeMarkMsg}"/>
+                                            </ToolTip>
+                                        </TextBlock.ToolTip>
+<Run Text="超时原因:"/>
+ <Run Text="{Binding PackOverTimeMarkMsg}" Foreground="Red" />
+                                </TextBlock>
+                                </Grid>
+                                <Grid Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待排单:Visible:Collapsed}">
+                                    <TextBlock Grid.Row="1"  Grid.Column="4" Grid.ColumnSpan="6"   
+                                   Visibility="{Binding ScheduleOverTimeMarkMsg,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
+                                   HorizontalAlignment="Stretch" VerticalAlignment="Top"  Margin="5 5 0 5"   ScrollViewer.VerticalScrollBarVisibility="Visible"  TextWrapping="Wrap"  >
+                                        <TextBlock.ToolTip>
+                                            <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
+                                                <TextBlock Text="{Binding ScheduleOverTimeMarkMsg}"/>
+                                            </ToolTip>
+                                        </TextBlock.ToolTip>
+<Run Text="超时原因:"/>
+ <Run Text="{Binding ScheduleOverTimeMarkMsg}" Foreground="Red" />
+                                </TextBlock>
+                                </Grid>
+                                <Grid Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:Visible:Collapsed}">
+                                    <TextBlock Grid.Row="1"  Grid.Column="4" Grid.ColumnSpan="6"   
+                                   Visibility="{Binding QualityOverTimeMarkMsg,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
+                                   HorizontalAlignment="Stretch" VerticalAlignment="Top"  Margin="5 5 0 5"   ScrollViewer.VerticalScrollBarVisibility="Visible"  TextWrapping="Wrap"  >
+                                        <TextBlock.ToolTip>
+                                            <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
+                                                <TextBlock Text="{Binding QualityOverTimeMarkMsg}"/>
+                                            </ToolTip>
+                                        </TextBlock.ToolTip>
+<Run Text="超时原因:"/>
+ <Run Text="{Binding QualityOverTimeMarkMsg}" Foreground="Red" />
+                                </TextBlock>
+                                </Grid>
+                            </Grid>
+
+                            <Grid Grid.Row="3" Grid.ColumnSpan="100" MinHeight="40" Visibility="{Binding ShowSendMsg,Converter={StaticResource objConverter},ConverterParameter=false:Collapsed:Visible}">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="300"/>
+                                    <ColumnDefinition Width="90"/>
+                                    <ColumnDefinition Width="140"/>
+                                    <ColumnDefinition Width="100"/>
+                                    <ColumnDefinition Width="120"/>
+                                    <ColumnDefinition Width="140"/>
+                                    <ColumnDefinition MinWidth="100"/>
+                                    <ColumnDefinition  Width="100"/>
+                                    <ColumnDefinition Width="150"/>
+                                    <ColumnDefinition Width="120"/>
+                                </Grid.ColumnDefinitions>
+                                <Border Height="1" VerticalAlignment="Top" Background="{StaticResource Border.Brush}" Grid.ColumnSpan="100"/>
+                                <c:BTextBox Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="9"  Height="30" Margin="5 0 0 0" Text="{Binding TaskMarkMsg}" AcceptsReturn="True"/>
+                                <c:BButton Grid.Column="10" Content="提交备注" Width="80"    Command="{Binding DataContext.AppendMarkMessageCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}"
+CommandParameter="{Binding  TaskId}"/>
+                            </Grid>
+
                             <Border Grid.Row="1" VerticalAlignment="Top" Height="1" Background="{StaticResource Border.Brush}" Grid.ColumnSpan="100"/>
 
                             <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
diff --git a/BBWY.Client/Views/PackTask/WaitPackageControl.xaml b/BBWY.Client/Views/PackTask/WaitPackageControl.xaml
index 69707b61..750e4cc4 100644
--- a/BBWY.Client/Views/PackTask/WaitPackageControl.xaml
+++ b/BBWY.Client/Views/PackTask/WaitPackageControl.xaml
@@ -281,6 +281,7 @@
                                 <Grid.RowDefinitions>
                                     <RowDefinition/>
                                     <RowDefinition/>
+                                    <RowDefinition/>
                                 </Grid.RowDefinitions>
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="300"/>
@@ -672,12 +673,22 @@ Margin=" 5,0,7,0">
                                             </c:BButton>
 
                                         </Grid>
+
+
+
+
                                         <c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center"  Grid.Row="1"  Content="商家自取" 
                                                   CommandParameter="{Binding TaskId}"
                                                   Command="{Binding DataContext.StoreGetBySelfCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
                                                    Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待排单|待包装:Visible:Collapsed}" 
                                                     />
-                                        <hc:SplitButton Content="更多操作" Foreground="{StaticResource Button.Background}" BorderThickness="0"   HorizontalAlignment="Stretch">
+
+                                        <c:BButton Grid.Column="11" HorizontalAlignment="Stretch"   Style="{StaticResource LinkButton}"  Margin="0 5 0 5 "    VerticalAlignment="Center" Content="{Binding ShowSendMsg,Converter={StaticResource objConverter},ConverterParameter=False:任务备注:取消备注}" 
+ CommandParameter="{Binding TaskId}"
+ Command="{Binding DataContext.PackTaskMarkMessageCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}"
+/>
+
+                                        <!--<hc:SplitButton Content="更多操作" Foreground="{StaticResource Button.Background}" BorderThickness="0"   HorizontalAlignment="Stretch">
                                             <hc:SplitButton.Resources>
                                                 <ResourceDictionary>
                                                     <ResourceDictionary.MergedDictionaries>
@@ -690,24 +701,101 @@ Margin=" 5,0,7,0">
                                                 <StackPanel  >
                                                     <MenuItem Header="打印条码" Command="{Binding PrintBarcodeCommand}" HorizontalAlignment="Center"/>
                                                     <MenuItem Header="打印合格证" Command="{Binding PrintCerCommand}" HorizontalAlignment="Center" />
-                                                    <!--<MenuItem Header="商家自取" HorizontalAlignment="Center"
+                                                    --><!--<MenuItem Header="商家自取" HorizontalAlignment="Center"
                                                           Command="{Binding  DataContext.StoreGetBySelfCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}"
                                                            CommandParameter="{Binding TaskId}" 
-                                                          />-->
+                                                          />--><!--
                                                 </StackPanel>
                                             </hc:SplitButton.DropDownContent>
-                                        </hc:SplitButton>
+                                        </hc:SplitButton>-->
 
 
                                     </StackPanel>
                                 </Grid>
 
-                                <Border  BorderBrush="{StaticResource Border.Brush}" Margin="10 2 10 2" 
-                                      Visibility="{Binding ShowMarkMessage,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
-                                    CornerRadius="0" Grid.Row="1" MaxHeight="66" Grid.ColumnSpan="100">
-                                    <TextBox  Text="{Binding ShowMarkMessage}"  HorizontalAlignment="Stretch" VerticalAlignment="Top"  Margin="0 5 0 5"   ScrollViewer.VerticalScrollBarVisibility="Visible"
-                                       AcceptsReturn="True" TextWrapping="Wrap"  IsReadOnly="True" BorderThickness="0"/>
-                                </Border>
+                                <Grid Grid.Row="1"  Grid.ColumnSpan="4" Visibility="{Binding MarkMessageModelList,Converter={StaticResource objConverter}, ConverterParameter=#null:Collapsed:Visible}" Margin="10 0 0 0">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="30"/>
+                                        <ColumnDefinition/>
+                                    </Grid.ColumnDefinitions>
+                                    <c:BButton Margin="0" Panel.ZIndex="100"    HorizontalAlignment="Stretch" VerticalAlignment="Top"  Grid.ColumnSpan="2" Background="Transparent"
+                    Command="{Binding DataContext.ShowMoreMessageCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}" CommandParameter="{Binding TaskId}"/>
+                                    <c:BButton Margin="0"  Content="{Binding ShowMoreMsg,Converter={StaticResource objConverter},ConverterParameter=false:∨:∧}" Style="{StaticResource LinkButton}"  HorizontalAlignment="Left" VerticalAlignment="Top" Height="30" 
+                                                    />
+                                    <ListBox   Grid.Column="1"    x:Name="listbox_message"               Grid.Row="2"    Margin=" 0"
+ItemsSource="{Binding MarkMessageModelList}"      Height="{Binding ShowMoreMsg,Converter={StaticResource objConverter},ConverterParameter=false:30:*}"        
+ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"  ScrollViewer.VerticalScrollBarVisibility="Hidden"
+BorderBrush="{StaticResource Border.Brush}"
+BorderThickness="0,0,0,0"
+Foreground="{StaticResource Text.Color}">
+                                        <ListBox.ItemTemplate>
+                                            <DataTemplate>
+                                                <Grid Width="{Binding ActualWidth,ElementName=listbox_message,Converter={StaticResource widthConverter},ConverterParameter=-0}" MinHeight="30">
+                                                    <DockPanel  VerticalAlignment="Center">
+                                                        <TextBlock HorizontalAlignment="Left" Text="{Binding CreateTime,StringFormat=yyyy-MM-dd HH:mm:ss}"/>
+                                                        <TextBlock HorizontalAlignment="Left" Text="   "/>
+                                                        <TextBlock HorizontalAlignment="Left" Text="{Binding UserName}"/>
+                                                        <TextBlock HorizontalAlignment="Left" Text=" :  "/>
+                                                        <TextBlock HorizontalAlignment="Left" Text="{Binding MarkMessage}" Foreground="Red" TextWrapping="Wrap"/>
+
+                                                    </DockPanel>
+                                                </Grid>
+                                            </DataTemplate>
+                                        </ListBox.ItemTemplate>
+                                    </ListBox>
+                                </Grid>
+
+                                <Border Width="1" Grid.Row="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="3"/>
+
+                                <Grid Grid.Row="1"  Grid.Column="4" Grid.ColumnSpan="6"   >
+                                    <Grid Visibility="{Binding  DataContext.TaskState,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}},Converter={StaticResource objConverter},ConverterParameter=待包装:Visible:Collapsed}">
+                                        <TextBlock Grid.Row="1"  Grid.Column="4" Grid.ColumnSpan="6"   
+                                   Visibility="{Binding PackOverTimeMarkMsg,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
+                                   HorizontalAlignment="Stretch" VerticalAlignment="Top"  Margin="5 5 0 5"   ScrollViewer.VerticalScrollBarVisibility="Visible"  TextWrapping="Wrap"  >
+                                            <TextBlock.ToolTip>
+                                                <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
+                                                    <TextBlock Text="{Binding PackOverTimeMarkMsg}"/>
+                                                </ToolTip>
+                                            </TextBlock.ToolTip>
+<Run Text="超时原因:"/>
+ <Run Text="{Binding PackOverTimeMarkMsg}" Foreground="Red" />
+                                </TextBlock>
+                                    </Grid>
+                                    <Grid Visibility="{Binding DataContext.TaskState,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}},Converter={StaticResource objConverter},ConverterParameter=待排单:Visible:Collapsed}">
+                                        <TextBlock Grid.Row="1"  Grid.Column="4" Grid.ColumnSpan="6"   
+                                   Visibility="{Binding ScheduleOverTimeMarkMsg,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
+                                   HorizontalAlignment="Stretch" VerticalAlignment="Top"  Margin="5 5 0 5"   ScrollViewer.VerticalScrollBarVisibility="Visible"  TextWrapping="Wrap"  >
+                                            <TextBlock.ToolTip>
+                                                <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
+                                                    <TextBlock Text="{Binding ScheduleOverTimeMarkMsg}"/>
+                                                </ToolTip>
+                                            </TextBlock.ToolTip>
+<Run Text="超时原因:"/>
+ <Run Text="{Binding ScheduleOverTimeMarkMsg}" Foreground="Red" />
+                                </TextBlock>
+                                    </Grid>
+                                </Grid>
+
+                                <Grid Grid.Row="3" Grid.ColumnSpan="100" MinHeight="40" Visibility="{Binding ShowSendMsg,Converter={StaticResource objConverter},ConverterParameter=false:Collapsed:Visible}">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="300"/>
+                                        <ColumnDefinition Width="90"/>
+                                        <ColumnDefinition Width="140"/>
+                                        <ColumnDefinition Width="100"/>
+                                        <ColumnDefinition Width="120"/>
+                                        <ColumnDefinition Width="140"/>
+                                        <ColumnDefinition MinWidth="100"/>
+                                        <ColumnDefinition  Width="100"/>
+                                        <ColumnDefinition Width="150"/>
+                                        <ColumnDefinition Width="120"/>
+                                    </Grid.ColumnDefinitions>
+                                    <Border Height="1" VerticalAlignment="Top" Background="{StaticResource Border.Brush}" Grid.ColumnSpan="100"/>
+                                    <c:BTextBox Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="9"  Height="30" Margin="5 0 0 0" Text="{Binding TaskMarkMsg}" AcceptsReturn="True"/>
+                                    <c:BButton Grid.Column="10" Content="提交备注" Width="80"    Command="{Binding DataContext.AppendMarkMessageCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}"
+CommandParameter="{Binding  TaskId}"/>
+                                </Grid>
+
+
                                 <Border Grid.Row="1" VerticalAlignment="Top" Height="1" Background="{StaticResource Border.Brush}" Grid.ColumnSpan="100"/>
 
                                 <!--<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/>-->
diff --git a/BBWY.Client/Views/PackTask/WareHouseListControl.xaml b/BBWY.Client/Views/PackTask/WareHouseListControl.xaml
index 5555e294..acd1750a 100644
--- a/BBWY.Client/Views/PackTask/WareHouseListControl.xaml
+++ b/BBWY.Client/Views/PackTask/WareHouseListControl.xaml
@@ -140,7 +140,7 @@
                     </Border>
 
                     <Grid Grid.Column="1" Grid.Row="1" Margin="5,0,0,0"   
-                          Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货:Visible:Collapsed}"
+                          Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=#null|未到货|部分到货:Visible:Collapsed}"
                           >
                         <Rectangle Stroke="{StaticResource Border.Brush}" StrokeThickness="1"/>
                         <StackPanel Orientation="Horizontal" Margin="1">
@@ -284,6 +284,7 @@
                                 <Grid.RowDefinitions>
                                     <RowDefinition/>
                                     <RowDefinition/>
+                                    <RowDefinition/>
                                 </Grid.RowDefinitions>
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="300"/>
@@ -470,17 +471,6 @@
                                     </ListBox>
                                 </Grid>
 
-                                <!--<Grid Grid.Column="6" >
-                                    <StackPanel VerticalAlignment="Center"  HorizontalAlignment="Center">
-                                        <TextBlock 
-                                               Text="{Binding MarkMessage}" 
-                                               TextWrapping="Wrap"
-                                               HorizontalAlignment="Center"
-                                               />
-
-
-                                    </StackPanel>
-                                </Grid>-->
                                 <Grid Grid.Column="7">
 
                                     <Grid>
@@ -573,17 +563,117 @@
 
                                         </Grid>
 
+                                        <c:BButton Grid.Column="11" HorizontalAlignment="Stretch"   Style="{StaticResource LinkButton}"  Margin="0 5 0 5 "    VerticalAlignment="Center" Content="{Binding ShowSendMsg,Converter={StaticResource objConverter},ConverterParameter=False:任务备注:取消备注}" 
+ CommandParameter="{Binding TaskId}"
+ Command="{Binding DataContext.PackTaskMarkMessageCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}"
+/>
+
 
                                     </StackPanel>
                                 </Grid>
 
 
-                                <Border  BorderBrush="{StaticResource Border.Brush}" Margin="10 2 10 2" 
-                                      Visibility="{Binding ShowMarkMessage,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
-                                    CornerRadius="0" Grid.Row="1" MaxHeight="66" Grid.ColumnSpan="100">
-                                    <TextBox  Text="{Binding ShowMarkMessage}"  HorizontalAlignment="Stretch" VerticalAlignment="Top"  Margin="0 5 0 5"   ScrollViewer.VerticalScrollBarVisibility="Visible"
-                                       AcceptsReturn="True" TextWrapping="Wrap"  IsReadOnly="True" BorderThickness="0"/>
-                                </Border>
+                                <Grid Grid.Row="1"  Grid.ColumnSpan="5" Visibility="{Binding MarkMessageModelList,Converter={StaticResource objConverter}, ConverterParameter=#null:Collapsed:Visible}" Margin="10 0 0 0">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="30"/>
+                                        <ColumnDefinition/>
+                                    </Grid.ColumnDefinitions>
+                                    <c:BButton Margin="0"     HorizontalAlignment="Stretch" VerticalAlignment="Top"  Grid.ColumnSpan="2" Panel.ZIndex="100" Background="Transparent"
+                    Command="{Binding DataContext.ShowMoreMessageCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}" CommandParameter="{Binding TaskId}"/>
+                                    <c:BButton Margin="0"  Content="{Binding ShowMoreMsg,Converter={StaticResource objConverter},ConverterParameter=false:∨:∧}" Style="{StaticResource LinkButton}"  HorizontalAlignment="Left" VerticalAlignment="Top" Height="30" 
+                                                    />
+                                    <ListBox   Grid.Column="1"    x:Name="listbox_message"               ScrollViewer.VerticalScrollBarVisibility="Hidden"
+ItemsSource="{Binding MarkMessageModelList}"      Height="{Binding ShowMoreMsg,Converter={StaticResource objConverter},ConverterParameter=false:30:*}"        
+ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}" 
+BorderBrush="{StaticResource Border.Brush}"
+BorderThickness="0,0,0,0"
+Foreground="{StaticResource Text.Color}">
+                                        <ListBox.ItemTemplate>
+                                            <DataTemplate>
+                                                <Grid Width="{Binding ActualWidth,ElementName=listbox_message,Converter={StaticResource widthConverter},ConverterParameter=-0}" MinHeight="30">
+                                                    <DockPanel  VerticalAlignment="Center" >
+                                                        <TextBlock HorizontalAlignment="Left" Text="{Binding CreateTime,StringFormat=yyyy-MM-dd HH:mm:ss}"/>
+                                                        <TextBlock HorizontalAlignment="Left" Text="   "/>
+                                                        <TextBlock HorizontalAlignment="Left" Text="{Binding UserName}"/>
+                                                        <TextBlock HorizontalAlignment="Left" Text=" :  "/>
+                                                        <TextBlock HorizontalAlignment="Left" Text="{Binding MarkMessage}" Foreground="Red"  TextWrapping="Wrap" TextTrimming="CharacterEllipsis" Panel.ZIndex="101">
+                                                            <TextBlock.ToolTip>
+                                                                <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
+                                                                    <TextBlock Text="{Binding MarkMessage}"/>
+                                                                </ToolTip>
+                                                            </TextBlock.ToolTip>
+                                                        </TextBlock>
+
+                                                    </DockPanel>
+                                                </Grid>
+                                            </DataTemplate>
+                                        </ListBox.ItemTemplate>
+                                    </ListBox>
+                                </Grid>
+
+
+                                <Border Width="1" Grid.Row="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="4"/>
+
+                                <Grid Grid.Row="1"  Grid.Column="5" Grid.ColumnSpan="6"   >
+                                    <Grid Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待包装:Visible:Collapsed}">
+                                        <TextBlock Grid.Row="1"  Grid.Column="4" Grid.ColumnSpan="6"   
+                                   Visibility="{Binding PackOverTimeMarkMsg,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
+                                   HorizontalAlignment="Stretch" VerticalAlignment="Top"  Margin="5 5 0 5"   ScrollViewer.VerticalScrollBarVisibility="Visible"  TextWrapping="Wrap"  >
+                                            <TextBlock.ToolTip>
+                                                <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
+                                                    <TextBlock Text="{Binding PackOverTimeMarkMsg}"/>
+                                                </ToolTip>
+                                            </TextBlock.ToolTip>
+<Run Text="超时原因:"/>
+ <Run Text="{Binding PackOverTimeMarkMsg}" Foreground="Red" />
+                                </TextBlock>
+                                    </Grid>
+                                    <Grid Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待排单:Visible:Collapsed}">
+                                        <TextBlock Grid.Row="1"  Grid.Column="4" Grid.ColumnSpan="6"   
+                                   Visibility="{Binding ScheduleOverTimeMarkMsg,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
+                                   HorizontalAlignment="Stretch" VerticalAlignment="Top"  Margin="5 5 0 5"   ScrollViewer.VerticalScrollBarVisibility="Visible"  TextWrapping="Wrap"  >
+                                            <TextBlock.ToolTip>
+                                                <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
+                                                    <TextBlock Text="{Binding ScheduleOverTimeMarkMsg}"/>
+                                                </ToolTip>
+                                            </TextBlock.ToolTip>
+<Run Text="超时原因:"/>
+ <Run Text="{Binding ScheduleOverTimeMarkMsg}" Foreground="Red" />
+                                </TextBlock>
+                                    </Grid>
+                                    <Grid Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:Visible:Collapsed}">
+                                        <TextBlock Grid.Row="1"  Grid.Column="4" Grid.ColumnSpan="6"   
+                                   Visibility="{Binding QualityOverTimeMarkMsg,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
+                                   HorizontalAlignment="Stretch" VerticalAlignment="Top"  Margin="5 5 0 5"   ScrollViewer.VerticalScrollBarVisibility="Visible"  TextWrapping="Wrap"  >
+                                            <TextBlock.ToolTip>
+                                                <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
+                                                    <TextBlock Text="{Binding QualityOverTimeMarkMsg}"/>
+                                                </ToolTip>
+                                            </TextBlock.ToolTip>
+<Run Text="超时原因:"/>
+ <Run Text="{Binding QualityOverTimeMarkMsg}" Foreground="Red" />
+                                </TextBlock>
+                                    </Grid>
+                                </Grid>
+
+                                <Grid Grid.Row="3" Grid.ColumnSpan="100" MinHeight="40" Visibility="{Binding ShowSendMsg,Converter={StaticResource objConverter},ConverterParameter=false:Collapsed:Visible}">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="300"/>
+                                        <ColumnDefinition Width="90"/>
+                                        <ColumnDefinition Width="140"/>
+                                        <ColumnDefinition Width="100"/>
+                                        <ColumnDefinition Width="120"/>
+                                        <ColumnDefinition Width="140"/>
+                                        <ColumnDefinition MinWidth="100"/>
+                                        <ColumnDefinition  Width="100"/>
+                                        <ColumnDefinition Width="150"/>
+                                        <ColumnDefinition Width="120"/>
+                                    </Grid.ColumnDefinitions>
+                                    <Border Height="1" VerticalAlignment="Top" Background="{StaticResource Border.Brush}" Grid.ColumnSpan="100"/>
+                                    <c:BTextBox Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="9"  Height="30" Margin="5 0 0 0" Text="{Binding TaskMarkMsg}" AcceptsReturn="True"/>
+                                    <c:BButton Grid.Column="10" Content="提交备注" Width="80"    Command="{Binding DataContext.AppendMarkMessageCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}"
+CommandParameter="{Binding  TaskId}"/>
+                                </Grid>
                                 <Border Grid.Row="1" VerticalAlignment="Top" Height="1" Background="{StaticResource Border.Brush}" Grid.ColumnSpan="100"/>
                                 <!--<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/>-->
                                 <!--<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="1"/>-->
diff --git a/BBWY.Client/Views/PackerTask/PackerPackCompletedControl.xaml b/BBWY.Client/Views/PackerTask/PackerPackCompletedControl.xaml
index 20623881..554f0717 100644
--- a/BBWY.Client/Views/PackerTask/PackerPackCompletedControl.xaml
+++ b/BBWY.Client/Views/PackerTask/PackerPackCompletedControl.xaml
@@ -568,21 +568,21 @@ Foreground="{StaticResource Text.Color}">
                                                     />
                                     <ListBox   Grid.Column="1"    x:Name="listbox_message"               Grid.Row="2"    Margin=" 0"
 ItemsSource="{Binding MarkMessageModelList}"      Height="{Binding ShowMoreMsg,Converter={StaticResource objConverter},ConverterParameter=false:30:*}"        
-ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
+ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}" ScrollViewer.VerticalScrollBarVisibility="Hidden"
 BorderBrush="{StaticResource Border.Brush}"
 BorderThickness="0,0,0,0"
 Foreground="{StaticResource Text.Color}">
                                         <ListBox.ItemTemplate>
                                             <DataTemplate>
                                                 <Grid Width="{Binding ActualWidth,ElementName=listbox_message,Converter={StaticResource widthConverter},ConverterParameter=-0}" MinHeight="30">
-                                                    <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+                                                    <DockPanel  VerticalAlignment="Center">
                                                         <TextBlock HorizontalAlignment="Left" Text="{Binding CreateTime,StringFormat=yyyy-MM-dd HH:mm:ss}"/>
                                                         <TextBlock HorizontalAlignment="Left" Text="   "/>
                                                         <TextBlock HorizontalAlignment="Left" Text="{Binding UserName}"/>
                                                         <TextBlock HorizontalAlignment="Left" Text=" :  "/>
                                                         <TextBlock HorizontalAlignment="Left" Text="{Binding MarkMessage}" Foreground="Red"/>
 
-                                                    </StackPanel>
+                                                    </DockPanel>
                                                 </Grid>
                                             </DataTemplate>
                                         </ListBox.ItemTemplate>
diff --git a/BBWY.Client/Views/PackerTask/PackerWaitPackageControl.xaml b/BBWY.Client/Views/PackerTask/PackerWaitPackageControl.xaml
index d8941b78..61453521 100644
--- a/BBWY.Client/Views/PackerTask/PackerWaitPackageControl.xaml
+++ b/BBWY.Client/Views/PackerTask/PackerWaitPackageControl.xaml
@@ -541,7 +541,8 @@ TextWrapping="Wrap"
                                     <c:BButton Margin="0" Panel.ZIndex="100"    HorizontalAlignment="Stretch" VerticalAlignment="Top"  Grid.ColumnSpan="2" Background="Transparent"
                     Command="{Binding DataContext.ShowMoreMessageCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}" CommandParameter="{Binding TaskId}"/>
                                     <c:BButton Margin="0"  Content="{Binding ShowMoreMsg,Converter={StaticResource objConverter},ConverterParameter=false:∨:∧}" Style="{StaticResource LinkButton}"  HorizontalAlignment="Left" VerticalAlignment="Top" Height="30" 
-                                                    />
+                                                  
+                                               />
                                     <ListBox   Grid.Column="1"    x:Name="listbox_message"               Grid.Row="2"    Margin=" 0"
 ItemsSource="{Binding MarkMessageModelList}"      Height="{Binding ShowMoreMsg,Converter={StaticResource objConverter},ConverterParameter=false:30:*}"        
 ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
@@ -551,14 +552,14 @@ Foreground="{StaticResource Text.Color}">
                                         <ListBox.ItemTemplate>
                                             <DataTemplate>
                                                 <Grid Width="{Binding ActualWidth,ElementName=listbox_message,Converter={StaticResource widthConverter},ConverterParameter=-0}" MinHeight="30">
-                                                    <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+                                                    <DockPanel  VerticalAlignment="Center">
                                                         <TextBlock HorizontalAlignment="Left" Text="{Binding CreateTime,StringFormat=yyyy-MM-dd HH:mm:ss}"/>
                                                         <TextBlock HorizontalAlignment="Left" Text="   "/>
                                                         <TextBlock HorizontalAlignment="Left" Text="{Binding UserName}"/>
                                                         <TextBlock HorizontalAlignment="Left" Text=" :  "/>
                                                         <TextBlock HorizontalAlignment="Left" Text="{Binding MarkMessage}" Foreground="Red"/>
 
-                                                    </StackPanel>
+                                                    </DockPanel>
                                                 </Grid>
                                             </DataTemplate>
                                         </ListBox.ItemTemplate>
diff --git a/BBWY.Client/Views/QualityTask/ShopWaitQualityControl.xaml b/BBWY.Client/Views/QualityTask/ShopWaitQualityControl.xaml
index 7971f5ad..ee2f720d 100644
--- a/BBWY.Client/Views/QualityTask/ShopWaitQualityControl.xaml
+++ b/BBWY.Client/Views/QualityTask/ShopWaitQualityControl.xaml
@@ -135,6 +135,7 @@
                             <Grid.RowDefinitions>
                                 <RowDefinition/>
                                 <RowDefinition/>
+                                <RowDefinition/>
                             </Grid.RowDefinitions>
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="300"/>
@@ -353,16 +354,85 @@
                                         <c:BButton Command="{Binding UpdateTaskCommand}" Style="{StaticResource LinkButton}"       Content="修改" />
                                         <c:BButton Command="{Binding DataContext.DeletedTaskCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" CommandParameter="{Binding}"
                                    Margin="0,10,0,0" Style="{StaticResource LinkButton}"       Content="取消"/>
-                                    </StackPanel>
 
+                                    <c:BButton Grid.Column="11" HorizontalAlignment="Stretch"   Style="{StaticResource LinkButton}"  Margin="0 10 0 0 "    VerticalAlignment="Center" Content="{Binding ShowSendMsg,Converter={StaticResource objConverter},ConverterParameter=False:任务备注:取消备注}" 
+ CommandParameter="{Binding TaskId}"
+ Command="{Binding DataContext.PackTaskMarkMessageCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}"
+/>
+
+
+                                </StackPanel>
+                                
+
+                            </Grid>
+
+                            <Grid Grid.Row="1"  Grid.ColumnSpan="4" Visibility="{Binding MarkMessageModelList,Converter={StaticResource objConverter}, ConverterParameter=#null:Collapsed:Visible}" Margin="10 0 0 0">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="30"/>
+                                    <ColumnDefinition/>
+                                </Grid.ColumnDefinitions>
+                                <c:BButton Margin="0" Panel.ZIndex="100"    HorizontalAlignment="Stretch" VerticalAlignment="Top"  Grid.ColumnSpan="2" Background="Transparent"
+                    Command="{Binding DataContext.ShowMoreMessageCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}" CommandParameter="{Binding TaskId}"/>
+                                <c:BButton Margin="0"  Content="{Binding ShowMoreMsg,Converter={StaticResource objConverter},ConverterParameter=false:∨:∧}" Style="{StaticResource LinkButton}"  HorizontalAlignment="Left" VerticalAlignment="Top" Height="30" 
+                                                    />
+                                <ListBox   Grid.Column="1"    x:Name="listbox_message"               Grid.Row="2"    Margin=" 0"
+ItemsSource="{Binding MarkMessageModelList}"      Height="{Binding ShowMoreMsg,Converter={StaticResource objConverter},ConverterParameter=false:30:*}"        
+ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"  ScrollViewer.VerticalScrollBarVisibility="Hidden"
+BorderBrush="{StaticResource Border.Brush}"
+BorderThickness="0,0,0,0"
+Foreground="{StaticResource Text.Color}">
+                                    <ListBox.ItemTemplate>
+                                        <DataTemplate>
+                                            <Grid Width="{Binding ActualWidth,ElementName=listbox_message,Converter={StaticResource widthConverter},ConverterParameter=-0}" MinHeight="30">
+                                                <DockPanel  VerticalAlignment="Center">
+                                                    <TextBlock HorizontalAlignment="Left" Text="{Binding CreateTime,StringFormat=yyyy-MM-dd HH:mm:ss}"/>
+                                                    <TextBlock HorizontalAlignment="Left" Text="   "/>
+                                                    <TextBlock HorizontalAlignment="Left" Text="{Binding UserName}"/>
+                                                    <TextBlock HorizontalAlignment="Left" Text=" :  "/>
+                                                    <TextBlock HorizontalAlignment="Left" Text="{Binding MarkMessage}" Foreground="Red" TextWrapping="Wrap"/>
+
+                                                </DockPanel>
+                                            </Grid>
+                                        </DataTemplate>
+                                    </ListBox.ItemTemplate>
+                                </ListBox>
+                            </Grid>
+
+                            <Border Width="1" Grid.Row="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="3"/>
+
+                            <Grid Grid.Row="1"  Grid.Column="4" Grid.ColumnSpan="4"   >
+                                <TextBlock Grid.Row="1"  Grid.Column="4" Grid.ColumnSpan="6"   
+                                   Visibility="{Binding QualityOverTimeMarkMsg,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
+                                   HorizontalAlignment="Stretch" VerticalAlignment="top"  Margin="5 5 0 5"   ScrollViewer.VerticalScrollBarVisibility="Visible"  TextWrapping="Wrap"  >
+                                    <TextBlock.ToolTip>
+                                        <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
+                                            <TextBlock Text="{Binding QualityOverTimeMarkMsg}"/>
+                                        </ToolTip>
+                                    </TextBlock.ToolTip>
+<Run Text="超时原因:"/>
+ <Run Text="{Binding QualityOverTimeMarkMsg}" Foreground="Red" />
+                                </TextBlock>
+                            </Grid>
+
+                            <Grid Grid.Row="3" Grid.ColumnSpan="100" MinHeight="40" Visibility="{Binding ShowSendMsg,Converter={StaticResource objConverter},ConverterParameter=false:Collapsed:Visible}">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="300"/>
+                                    <ColumnDefinition Width="90"/>
+                                    <ColumnDefinition Width="140"/>
+                                    <ColumnDefinition Width="100"/>
+                                    <ColumnDefinition Width="120"/>
+                                    <ColumnDefinition Width="140"/>
+                                    <ColumnDefinition MinWidth="100"/>
+                                    <ColumnDefinition  Width="100"/>
+                                    <ColumnDefinition Width="150"/>
+                                    <ColumnDefinition Width="120"/>
+                                </Grid.ColumnDefinitions>
+                                <Border Height="1" VerticalAlignment="Top" Background="{StaticResource Border.Brush}" Grid.ColumnSpan="100"/>
+                                <c:BTextBox Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="9"  Height="30" Margin="5 0 0 0" Text="{Binding TaskMarkMsg}" AcceptsReturn="True"/>
+                                <c:BButton Grid.Column="10" Content="提交备注" Width="80"    Command="{Binding DataContext.AppendMarkMessageCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}"
+CommandParameter="{Binding  TaskId}"/>
                             </Grid>
 
-                            <Border  BorderBrush="{StaticResource Border.Brush}" Margin="10 2 10 2" 
-                                      Visibility="{Binding ShowMarkMessage,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
-                                    CornerRadius="0" Grid.Row="1" MaxHeight="66" Grid.ColumnSpan="100">
-                                <TextBox  Text="{Binding ShowMarkMessage}"  HorizontalAlignment="Stretch" VerticalAlignment="Top"  Margin="0 5 0 5"   ScrollViewer.VerticalScrollBarVisibility="Visible"
-                                       AcceptsReturn="True" TextWrapping="Wrap"  IsReadOnly="True" BorderThickness="0"/>
-                            </Border>
                             <Border Grid.Row="1" VerticalAlignment="Top" Height="1" Background="{StaticResource Border.Brush}" Grid.ColumnSpan="100"/>
                             <!--<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/>-->
                             <!--<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="1"/>-->
diff --git a/BBWY.Client/Views/QualityTask/WaitQualityControl.xaml b/BBWY.Client/Views/QualityTask/WaitQualityControl.xaml
index 386a9875..b7524aa5 100644
--- a/BBWY.Client/Views/QualityTask/WaitQualityControl.xaml
+++ b/BBWY.Client/Views/QualityTask/WaitQualityControl.xaml
@@ -283,6 +283,7 @@
                                 <Grid.RowDefinitions>
                                     <RowDefinition/>
                                     <RowDefinition/>
+                                    <RowDefinition/>
                                 </Grid.RowDefinitions>
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="300"/>
@@ -601,7 +602,7 @@
                                       ConverterParameter=";:amp;:Visible:Collapsed:1">
                                                         <Binding Path="BarCodeModel"/>
                                                         <Binding Path="CertificateModel"/>
-                                                 
+
                                                     </MultiBinding>
 
                                                 </c:BButton.Visibility>
@@ -630,16 +631,82 @@
                                             </c:BButton>
 
                                         </Grid>
-
+                                        <c:BButton Grid.Column="11" HorizontalAlignment="Stretch"   Style="{StaticResource LinkButton}"  Margin="0 5 0 5 "    VerticalAlignment="Center" Content="{Binding ShowSendMsg,Converter={StaticResource objConverter},ConverterParameter=False:任务备注:取消备注}" 
+ CommandParameter="{Binding TaskId}"
+ Command="{Binding DataContext.PackTaskMarkMessageCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}"
+/>
 
                                     </StackPanel>
                                 </Grid>
-                                <Border  BorderBrush="{StaticResource Border.Brush}" Margin="10 2 10 2" 
-                                      Visibility="{Binding ShowMarkMessage,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
-                                    CornerRadius="0" Grid.Row="1" MaxHeight="66" Grid.ColumnSpan="100">
-                                    <TextBox  Text="{Binding ShowMarkMessage}"  HorizontalAlignment="Stretch" VerticalAlignment="Top"  Margin="0 5 0 5"   ScrollViewer.VerticalScrollBarVisibility="Visible"
-                                       AcceptsReturn="True" TextWrapping="Wrap"  IsReadOnly="True" BorderThickness="0"/>
-                                </Border>
+                                <Grid Grid.Row="1"  Grid.ColumnSpan="4" Visibility="{Binding MarkMessageModelList,Converter={StaticResource objConverter}, ConverterParameter=#null:Collapsed:Visible}" Margin="10 0 0 0">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="30"/>
+                                        <ColumnDefinition/>
+                                    </Grid.ColumnDefinitions>
+                                    <c:BButton Margin="0" Panel.ZIndex="100"    HorizontalAlignment="Stretch" VerticalAlignment="Top"  Grid.ColumnSpan="2" Background="Transparent"
+                    Command="{Binding DataContext.ShowMoreMessageCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}" CommandParameter="{Binding TaskId}"/>
+                                    <c:BButton Margin="0"  Content="{Binding ShowMoreMsg,Converter={StaticResource objConverter},ConverterParameter=false:∨:∧}" Style="{StaticResource LinkButton}"  HorizontalAlignment="Left" VerticalAlignment="Top" Height="30" 
+                                                    />
+                                    <ListBox   Grid.Column="1"    x:Name="listbox_message"               Grid.Row="2"    Margin=" 0"
+ItemsSource="{Binding MarkMessageModelList}"      Height="{Binding ShowMoreMsg,Converter={StaticResource objConverter},ConverterParameter=false:30:*}"        
+ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"  ScrollViewer.VerticalScrollBarVisibility="Hidden"
+BorderBrush="{StaticResource Border.Brush}"
+BorderThickness="0,0,0,0"
+Foreground="{StaticResource Text.Color}">
+                                        <ListBox.ItemTemplate>
+                                            <DataTemplate>
+                                                <Grid Width="{Binding ActualWidth,ElementName=listbox_message,Converter={StaticResource widthConverter},ConverterParameter=-0}" MinHeight="30">
+                                                    <DockPanel  VerticalAlignment="Center">
+                                                        <TextBlock HorizontalAlignment="Left" Text="{Binding CreateTime,StringFormat=yyyy-MM-dd HH:mm:ss}"/>
+                                                        <TextBlock HorizontalAlignment="Left" Text="   "/>
+                                                        <TextBlock HorizontalAlignment="Left" Text="{Binding UserName}"/>
+                                                        <TextBlock HorizontalAlignment="Left" Text=" :  "/>
+                                                        <TextBlock HorizontalAlignment="Left" Text="{Binding MarkMessage}" Foreground="Red" TextWrapping="Wrap"/>
+
+                                                    </DockPanel>
+                                                </Grid>
+                                            </DataTemplate>
+                                        </ListBox.ItemTemplate>
+                                    </ListBox>
+                                </Grid>
+
+                                <Border Width="1" Grid.Row="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="3"/>
+
+
+                                <TextBlock Grid.Row="1"  Grid.Column="4" Grid.ColumnSpan="6"   
+                                   Visibility="{Binding QualityOverTimeMarkMsg,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
+                                   HorizontalAlignment="Stretch" VerticalAlignment="Top"  Margin="5 5 0 5"   ScrollViewer.VerticalScrollBarVisibility="Visible"  TextWrapping="Wrap"  >
+                                    <TextBlock.ToolTip>
+                                        <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
+                                            <TextBlock Text="{Binding QualityOverTimeMarkMsg}"/>
+                                        </ToolTip>
+                                    </TextBlock.ToolTip>
+                                    <Run Text="超时原因:"/>
+                                    <Run Text="{Binding QualityOverTimeMarkMsg}" Foreground="Red" />
+                                </TextBlock>
+
+
+
+                                <Grid Grid.Row="3" Grid.ColumnSpan="100" MinHeight="40" Visibility="{Binding ShowSendMsg,Converter={StaticResource objConverter},ConverterParameter=false:Collapsed:Visible}">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="300"/>
+                                        <ColumnDefinition Width="90"/>
+                                        <ColumnDefinition Width="140"/>
+                                        <ColumnDefinition Width="100"/>
+                                        <ColumnDefinition Width="120"/>
+                                        <ColumnDefinition Width="140"/>
+                                        <ColumnDefinition MinWidth="100"/>
+                                        <ColumnDefinition  Width="100"/>
+                                        <ColumnDefinition Width="150"/>
+                                        <ColumnDefinition Width="120"/>
+                                    </Grid.ColumnDefinitions>
+                                    <Border Height="1" VerticalAlignment="Top" Background="{StaticResource Border.Brush}" Grid.ColumnSpan="100"/>
+                                    <c:BTextBox Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="9"  Height="30" Margin="5 0 0 0" Text="{Binding TaskMarkMsg}" AcceptsReturn="True"/>
+                                    <c:BButton Grid.Column="10" Content="提交备注" Width="80"    Command="{Binding DataContext.AppendMarkMessageCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}"
+CommandParameter="{Binding  TaskId}"/>
+                                </Grid>
+
+
                                 <Border Grid.Row="1" VerticalAlignment="Top" Height="1" Background="{StaticResource Border.Brush}" Grid.ColumnSpan="100"/>
                                 <!--<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/>-->
                                 <!--<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="1"/>-->