Browse Source

修复财务审计匹配店铺问题

qianyi
shanji 2 years ago
parent
commit
db20d96214
  1. 2
      BBWY.Client/Views/FinancialTerminal/ProcurementAudit.xaml
  2. 2
      BBWY.Client/Views/MainWindow.xaml

2
BBWY.Client/Views/FinancialTerminal/ProcurementAudit.xaml

@ -273,7 +273,7 @@
<DataGridTemplateColumn Header="归属店铺" Width="100"> <DataGridTemplateColumn Header="归属店铺" Width="100">
<DataGridTemplateColumn.CellTemplate> <DataGridTemplateColumn.CellTemplate>
<DataTemplate> <DataTemplate>
<ComboBox ItemsSource="{Binding DataContext.SelectedDepartment.ShopList,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGrid}}}" <ComboBox ItemsSource="{Binding DataContext.ShopList,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGrid}}}"
SelectedItem="{Binding BelongShopModel,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" SelectedItem="{Binding BelongShopModel,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
VerticalContentAlignment="Center"/> VerticalContentAlignment="Center"/>
</DataTemplate> </DataTemplate>

2
BBWY.Client/Views/MainWindow.xaml

@ -26,7 +26,7 @@
<!--<TextBlock Text="{Binding GlobalContext.User.TeamName}" Margin="5,0,0,0"/> <!--<TextBlock Text="{Binding GlobalContext.User.TeamName}" Margin="5,0,0,0"/>
<TextBlock Text="{Binding GlobalContext.User.Shop.Platform}" Margin="5,0,0,0"/>--> <TextBlock Text="{Binding GlobalContext.User.Shop.Platform}" Margin="5,0,0,0"/>-->
<TextBlock Text="{Binding GlobalContext.User.Shop.ShopName}" Margin="5,0,0,0"/> <TextBlock Text="{Binding GlobalContext.User.Shop.ShopName}" Margin="5,0,0,0"/>
<TextBlock Text="v10071" Margin="5,0,0,0"/> <TextBlock Text="v10072" Margin="5,0,0,0"/>
</StackPanel> </StackPanel>
</Border> </Border>
<Grid Grid.Row="1"> <Grid Grid.Row="1">

Loading…
Cancel
Save