From d5972ea8ab8fd13bcfad2c1e410428d29f96d4fd Mon Sep 17 00:00:00 2001
From: "506583276@qq.com" <506583276@qq.com>
Date: Fri, 7 Jul 2023 22:18:37 +0800
Subject: [PATCH] 1

---
 .../PackTask/PublishTaskViewModel.cs          | 23 +++++----
 .../Views/PackTask/PublishTaskWindow.xaml     | 50 +++++++++++++------
 2 files changed, 48 insertions(+), 25 deletions(-)

diff --git a/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs b/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs
index ae3f115b..9086b75a 100644
--- a/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs
@@ -256,6 +256,14 @@ namespace BBWY.Client.ViewModels.PackTask
         /// </summary>
         public CertificatePosition CertificatePosition { get => certificatePosition; set { Set(ref certificatePosition, value); } }
 
+
+      
+        private string showMarkMessage;
+        /// <summary>
+        /// 显示对接备注消息
+        /// </summary>
+        public string ShowMarkMessage { get => showMarkMessage; set { Set(ref showMarkMessage, value); } }
+
         /// <summary>
         /// 注意事项（对接备注）
         /// </summary>
@@ -495,17 +503,11 @@ namespace BBWY.Client.ViewModels.PackTask
                     GoodsNumber = config.GoodsNumber;
                     PackType = (PackType)config.PackType;
                     BasicPack = (BasicPack)config.BasicPack;
-                    //Availability = (TaskState)config.Availability;
-                    MarkMessage = config.MarkMessage;
                     CertificatePosition = config.CertificatePosition == null ? CertificatePosition.无需合格证 : (CertificatePosition)config.CertificatePosition.Value;
-                    // Increment1 = config.Increment1;
                     string[] increateDatas = config.Increment1.Split(',');
                     IsNeedBarCode = config.NeedBar ? Need.需要 : Need.不需要;
                     IsNeedCertificateModel = config.NeedCer ? Need.需要 : Need.不需要;
-
                     IsSetBarCode = !config.NeedBar;
-                    //IsSetCertificate = config.CertificatePosition== (int)CertificatePosition.无需合格证;
-
                     bool isSelected = false;
                     foreach (var item in increates)
                     {
@@ -573,6 +575,10 @@ namespace BBWY.Client.ViewModels.PackTask
         public void InitData(PackTaskModel model = null)
         {
 
+            //展示数据
+
+
+
             IncreateList = new ObservableCollection<IncreateModel>();
             SpuId = string.Empty;
             if (model == null)
@@ -590,7 +596,6 @@ namespace BBWY.Client.ViewModels.PackTask
                 ProductNo = string.Empty;
                 Brand = string.Empty;
                 BrandName = string.Empty;
-                this.MarkMessage = "";
                 IsSetBarCode = true;
                 IsSetCertificate = true;
                 BarCodeModel = null;
@@ -618,7 +623,7 @@ namespace BBWY.Client.ViewModels.PackTask
             ProductNo = model.ItemList[0].GoodsNo;
             Brand = model.Brand;
             BrandName = model.ItemList[0].BrandName;
-            this.MarkMessage = model.MarkMessage;
+     
             IsSetBarCode = model.BarCodeModel != null ? false : true;
             IsSetCertificate = model.CertificateModel != null ? false : true;
             BarCodeModel = model.BarCodeModel;
@@ -629,7 +634,7 @@ namespace BBWY.Client.ViewModels.PackTask
 
             try
             {
-                PositionType = model.PositionType.ToEnum<PositionType>();//多个仓库异常
+                PositionType = model.PositionType.ToEnum<PositionType>();//多个仓库异常    todo:  
             }
             catch
             {
diff --git a/BBWY.Client/Views/PackTask/PublishTaskWindow.xaml b/BBWY.Client/Views/PackTask/PublishTaskWindow.xaml
index 61300bf2..8078c876 100644
--- a/BBWY.Client/Views/PackTask/PublishTaskWindow.xaml
+++ b/BBWY.Client/Views/PackTask/PublishTaskWindow.xaml
@@ -34,7 +34,7 @@
             <ctr:MultiParameterTransferConverter x:Key="mptConverter"/>
             <ctr:SaleGrossProfitConverter x:Key="sgpcConverter"/>
         </ResourceDictionary>
-      
+
     </Window.Resources>
 
     <Grid>
@@ -121,8 +121,8 @@
             </StackPanel>
             <Grid Grid.Column="1">
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="3*"/>
-                    <RowDefinition Height="2*"/>
+                    <RowDefinition Height="100"/>
+                    <RowDefinition Height="*"/>
                 </Grid.RowDefinitions>
                 <StackPanel  Orientation="Vertical">
                     <TextBlock Text="任务信息" FontWeight="Bold" Margin="19 23 0 0"  HorizontalAlignment="Left" VerticalAlignment="Top"/>
@@ -141,25 +141,23 @@
 
                             </ComboBox>
                         </Border>
-                        
+
                         <!--<TextBlock  Margin="30 0 0 0" Text="加急:" VerticalAlignment="Center"/>
                                     <ComboBox  VerticalContentAlignment="Center"  ItemsSource="{Binding WorryList}"  Text="{Binding IsWorry}"   >
                                        
                                     </ComboBox>-->
                     </StackPanel>
-                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Top" 
-                                            Margin="19 23 0 0">
-                    
-                        <c:BTextBox    Text="{Binding MarkMessage}"   VerticalAlignment="Top"   Width="467" Height="85"
-                                    WaterRemark="打包备注"     AcceptsReturn="True" TextWrapping="Wrap" >
-
-                        </c:BTextBox>
-                    </StackPanel>
-
                 </StackPanel>
                 <Grid Grid.Row="1">
-                    <TextBlock Text="打包配置" FontWeight="Bold" Margin="19 23 "  HorizontalAlignment="Left" VerticalAlignment="Top"/>
-                    <Grid Height="70"   Margin="20 54 20 0">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="50"/>
+                        <RowDefinition Height="80"/>
+                        <RowDefinition/>
+                        <RowDefinition Height="40"/>
+                    </Grid.RowDefinitions>
+
+                    <TextBlock Grid.Row="0" Text="打包配置" FontWeight="Bold"   HorizontalAlignment="Left" VerticalAlignment="Center" Margin="20 0 0 0"/>
+                    <Grid Height="70" Grid.Row="1"  Margin="20 0 20 0">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="77"/>
                             <ColumnDefinition Width="77"/>
@@ -235,7 +233,7 @@
                                 </hc:CheckComboBox.ItemContainerStyle>
                             </hc:CheckComboBox>
                         </Grid>
-                        
+
                         <Grid Grid.Row="1" Grid.Column="5" >
                             <ComboBox VerticalContentAlignment="Center" BorderThickness="0" Margin="1" ItemsSource="{Binding IsNeedBarCodeList}"  Text="{Binding IsNeedBarCode,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
 
@@ -252,6 +250,26 @@
                             </ComboBox>
                         </Grid>
                     </Grid>
+
+
+                    <Border BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" CornerRadius="0" Grid.Row="2"   Margin="20 ">
+                        <TextBox   Text="{Binding ShowMarkMessage}"  HorizontalAlignment="Stretch" VerticalAlignment="Stretch"    
+                                       AcceptsReturn="True" TextWrapping="Wrap"  IsReadOnly="True" BorderThickness="0"/>
+
+
+                    </Border>
+                    <Grid Grid.Row="3" Margin="20 0 0 0">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition/>
+                            <ColumnDefinition Width="120"/>
+                        </Grid.ColumnDefinitions>
+                        <c:BTextBox WaterRemark="添加备注" Height="30"  HorizontalAlignment="Stretch"  Text="{Binding MarkMessage}" />
+                        <c:BButton  Grid.Column="1" Content="提交备注" Width="100"  HorizontalAlignment="Right"  VerticalAlignment="Stretch" Margin="0,2,5,2" 
+                    Command="{Binding CreateTaskCommand}"
+                    CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type c:BWindow}}}"
+                    Background="{StaticResource Button.Background}" BorderThickness="0" Foreground="White"/>
+                    </Grid>
+
                 </Grid>
 
             </Grid>