Browse Source

1

AddValidOverTime
506583276@qq.com 2 years ago
parent
commit
4a2721ab69
  1. 10
      BBWY.Client/Views/PackTask/MinFeesExcelControl.xaml.cs
  2. 2
      BBWY.Client/Views/PackTask/ServiceWindow.xaml

10
BBWY.Client/Views/PackTask/MinFeesExcelControl.xaml.cs

@ -269,7 +269,7 @@ namespace BBWY.Client.Views.PackTask
<RowDefinition Height=""*""/> <RowDefinition Height=""*""/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Border Width=""1"" HorizontalAlignment=""Left"" BorderBrush=""#D7D7D7"" Grid.RowSpan=""2"" BorderThickness=""0,0,1,0""/> <Border Width=""1"" HorizontalAlignment=""Left"" BorderBrush=""#D7D7D7"" Grid.RowSpan=""2"" BorderThickness=""0,0,1,0""/>
<TextBlock Text="""" Grid.Row=""0"" VerticalAlignment=""Center"" HorizontalAlignment=""Center""/> <TextBlock Text="" "" Grid.Row=""0"" VerticalAlignment=""Center"" HorizontalAlignment=""Center""/>
<TextBlock Text=""[:FeesMode:]"" Grid.Row=""1"" VerticalAlignment=""Center"" HorizontalAlignment=""Center""/> <TextBlock Text=""[:FeesMode:]"" Grid.Row=""1"" VerticalAlignment=""Center"" HorizontalAlignment=""Center""/>
</Grid>"; </Grid>";
@ -279,7 +279,7 @@ namespace BBWY.Client.Views.PackTask
<RowDefinition Height=""*""/> <RowDefinition Height=""*""/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Border Width=""1"" HorizontalAlignment=""Left"" BorderBrush=""#D7D7D7"" Grid.RowSpan=""2"" BorderThickness=""0,0,1,0""/> <Border Width=""1"" HorizontalAlignment=""Left"" BorderBrush=""#D7D7D7"" Grid.RowSpan=""2"" BorderThickness=""0,0,1,0""/>
<TextBlock Text="""" Grid.Row=""0"" VerticalAlignment=""Center"" HorizontalAlignment=""Center""/> <TextBlock Text="" "" Grid.Row=""0"" VerticalAlignment=""Center"" HorizontalAlignment=""Center""/>
<TextBlock Text=""[:DiscountFactor:]"" Grid.Row=""1"" VerticalAlignment=""Center"" HorizontalAlignment=""Center""/> <TextBlock Text=""[:DiscountFactor:]"" Grid.Row=""1"" VerticalAlignment=""Center"" HorizontalAlignment=""Center""/>
</Grid>"; </Grid>";
//string processFeesStr = @" //string processFeesStr = @"
@ -383,7 +383,7 @@ namespace BBWY.Client.Views.PackTask
for (int i = 0; i < basicProcessList.Count; i++) for (int i = 0; i < basicProcessList.Count; i++)
{ {
basicSB.AppendLine(basicProcessdata.Replace("[:index:]", $"{i}") basicSB.AppendLine(basicProcessdata.Replace("[:index:]", $"{i}")
.Replace("[:ServiceName:]", $"{basicProcessList[i].ItemName}") .Replace("[:ServiceName:]", $" {basicProcessList[i].ItemName} ")
.Replace("[:ServiceCount:]", $"{basicProcessList[i].ItemPrice}*{basicProcessList[i].ItemCount}")); .Replace("[:ServiceCount:]", $"{basicProcessList[i].ItemPrice}*{basicProcessList[i].ItemCount}"));
basiccolumns.AppendLine(columnStr); basiccolumns.AppendLine(columnStr);
} }
@ -406,7 +406,7 @@ namespace BBWY.Client.Views.PackTask
for (int i = 0; i < increateProcessList.Count(); i++) for (int i = 0; i < increateProcessList.Count(); i++)
{ {
increateProcessSB.AppendLine(increateProcessData.Replace("[:index:]", $"{i}") increateProcessSB.AppendLine(increateProcessData.Replace("[:index:]", $"{i}")
.Replace("[:ServiceName:]", $"{increateProcessList[i].ItemName}") .Replace("[:ServiceName:]", $" {increateProcessList[i].ItemName} ")
.Replace("[:ServiceCount:]", $"{increateProcessList[i].ItemPrice}*{increateProcessList[i].ItemCount}")); .Replace("[:ServiceCount:]", $"{increateProcessList[i].ItemPrice}*{increateProcessList[i].ItemCount}"));
increateProcesscolumns.AppendLine(columnStr); increateProcesscolumns.AppendLine(columnStr);
} }
@ -445,7 +445,7 @@ namespace BBWY.Client.Views.PackTask
{ {
rowIndex++; rowIndex++;
serviceData.AppendLine(incrementConsumableStr.Replace("[:index:]", $"{rowIndex}") serviceData.AppendLine(incrementConsumableStr.Replace("[:index:]", $"{rowIndex}")
.Replace("[:ServiceName:]", $"{item.ItemName}") .Replace("[:ServiceName:]", $" {item.ItemName} ")
.Replace("[:ServiceCount:]", $"")); .Replace("[:ServiceCount:]", $""));
} }

2
BBWY.Client/Views/PackTask/ServiceWindow.xaml

@ -414,7 +414,7 @@
<Grid Grid.Row="1" Grid.Column="1"> <Grid Grid.Row="1" Grid.Column="1" Visibility="Hidden">

Loading…
Cancel
Save