pengcong001
/
bbwy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

10226

pjzs_starttask_update
shanji 2 years ago
parent
79933ba04d
commit
26e9c031fa
2 changed files with 22 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      BBWY.Client/GlobalContext.cs
  2. 30
      BBWY.Client/Views/Ware/WareStock.xaml

2
BBWY.Client/GlobalContext.cs
View File

@ -13,7 +13,7 @@ namespace BBWY.Client
{ {
ShopServiceGroupList = new List<string>(); ShopServiceGroupList = new List<string>();
ShopServiceGroupLowerList = new List<string>(); ShopServiceGroupLowerList = new List<string>();
ClientVersion = "10225"; ClientVersion = "10226";
} }

30
BBWY.Client/Views/Ware/WareStock.xaml
View File

@ -43,7 +43,7 @@
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="50"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<!--<ColumnDefinition Width="60"/>--> <!--<ColumnDefinition Width="60"/>-->
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
@ -111,7 +111,7 @@
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="50"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<!--<ColumnDefinition Width="60"/>--> <!--<ColumnDefinition Width="60"/>-->
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
@ -212,7 +212,7 @@
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="50"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
@ -244,7 +244,7 @@
<TextBlock Style="{StaticResource middleTextBlock}" TextAlignment="Center"> <TextBlock Style="{StaticResource middleTextBlock}" TextAlignment="Center">
<Run Text="采购运"/> <Run Text="采购运"/>
<LineBreak/> <LineBreak/>
<Run Text="单价"/> <Run Text="费单价"/>
</TextBlock> </TextBlock>
<Path Style="{StaticResource path_question}" <Path Style="{StaticResource path_question}"
Width="14" Fill="{StaticResource Text.Pink}" ToolTipService.InitialShowDelay="0"> Width="14" Fill="{StaticResource Text.Pink}" ToolTipService.InitialShowDelay="0">
@ -363,11 +363,23 @@
</Path.ToolTip> </Path.ToolTip>
</Path> </Path>
</StackPanel> </StackPanel>
<TextBlock Grid.Column="12" Style="{StaticResource middleTextBlock}" TextAlignment="Center"> <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center"
<Run Text="单件"/> Grid.Column="12">
<LineBreak/> <TextBlock Style="{StaticResource middleTextBlock}" TextAlignment="Center">
<Run Text="总成本"/> <Run Text="单件"/>
</TextBlock> <LineBreak/>
<Run Text="总成本"/>
</TextBlock>
<Path Style="{StaticResource path_question}"
Width="14" Fill="{StaticResource Text.Pink}" ToolTipService.InitialShowDelay="0">
<Path.ToolTip>
<ToolTip Style="{StaticResource OrderCouponToolipStyle}">
<TextBlock Text="合计前列各项成本"/>
</ToolTip>
</Path.ToolTip>
</Path>
</StackPanel>
<TextBlock Text="库存" Grid.Column="13" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="库存" Grid.Column="13" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="剩余库存" Grid.Column="14" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="剩余库存" Grid.Column="14" Style="{StaticResource middleTextBlock}"/>

Write Preview
Loading…
Cancel
Save