|
@@ -48,7 +48,7 @@
|
|
|
Command="{x:Static bllCommon:EditCommands.SingleUpdate}" CommandParameter="{Binding RelativeSource={RelativeSource Self}}">
|
|
|
</fw:TextBoxEditor>
|
|
|
<!--<Button Style="{StaticResource ResourceKey={x:Static uc:CommonStyles.ButtonKey}}" Height="23" Margin="10" fw:ButtonOptions.Icon="../Images/修改.jpg" Padding="0"/>-->
|
|
|
-
|
|
|
+
|
|
|
</StackPanel>
|
|
|
<StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Right">
|
|
|
<Button Command="{Binding Commands.AddBranchCommand}" Style="{StaticResource ResourceKey={x:Static uc:CommonStyles.ButtonKey}}" Height="23" Margin="10" Content="添加品牌"/>
|
|
@@ -62,9 +62,9 @@
|
|
|
</ItemsPanelTemplate>
|
|
|
</ListBox.ItemsPanel>
|
|
|
<ListBox.ItemContainerStyle>
|
|
|
-
|
|
|
+
|
|
|
<Style TargetType="{x:Type ListBoxItem}">
|
|
|
-
|
|
|
+
|
|
|
<Setter Property="Template">
|
|
|
<Setter.Value>
|
|
|
<ControlTemplate TargetType="{x:Type ListBoxItem}">
|
|
@@ -113,7 +113,7 @@
|
|
|
<MenuItem Header="删除" Command="{Binding Data.Commands.DeleteCommand,Source={StaticResource ResourceKey=DATA}}" CommandParameter="{Binding }"></MenuItem>
|
|
|
</ContextMenu>
|
|
|
</Setter.Value>
|
|
|
-
|
|
|
+
|
|
|
</Setter>
|
|
|
<Setter Property="Height" Value="30"></Setter>
|
|
|
<Style.Triggers>
|
|
@@ -136,7 +136,7 @@
|
|
|
<Button IsEnabled="False" Command="{Binding Data.Commands.ManageTypeCommand,Source={StaticResource ResourceKey=DATA} }" CommandParameter="{Binding}" Style="{StaticResource ResourceKey={x:Static uc:CommonStyles.LinkButtonKey}}" Content="管理常见问题" HorizontalAlignment="Left" Padding="5,0,5,0"/>
|
|
|
<Button Command="{Binding Data.Commands.ManageTypeCommand,Source={StaticResource ResourceKey=DATA} }" CommandParameter="{Binding}" Style="{StaticResource ResourceKey={x:Static uc:CommonStyles.LinkButtonKey}}" Content="管理型号" HorizontalAlignment="Left" Padding="5,0,5,0"/>
|
|
|
</StackPanel>
|
|
|
-
|
|
|
+
|
|
|
</DataTemplate>
|
|
|
</DataGridTemplateColumn.CellTemplate>
|
|
|
|
|
@@ -166,14 +166,27 @@
|
|
|
<Setter Property="Template">
|
|
|
<Setter.Value>
|
|
|
<ControlTemplate TargetType="{x:Type ListBoxItem}">
|
|
|
- <Border BorderThickness="1" BorderBrush="Black" Margin="5" Padding="5">
|
|
|
+ <Border BorderThickness="1" BorderBrush="Black" Margin="5" Padding="5" fw:MaskOptions.IsManualHide="true" fw:MaskOptions.IsShow="{Binding IsLoading}">
|
|
|
+ <fw:MaskOptions.MaskTemplate>
|
|
|
+ <ControlTemplate>
|
|
|
+ <Border Background="Gray" Opacity="0.5">
|
|
|
+ <ProgressBar VerticalAlignment="Center" Margin="5" IsIndeterminate="True"></ProgressBar>
|
|
|
+ </Border>
|
|
|
+ </ControlTemplate>
|
|
|
+ </fw:MaskOptions.MaskTemplate>
|
|
|
+
|
|
|
<Grid Width="150" Height="80" >
|
|
|
<Grid.RowDefinitions>
|
|
|
<RowDefinition></RowDefinition>
|
|
|
<RowDefinition Height="Auto"></RowDefinition>
|
|
|
</Grid.RowDefinitions>
|
|
|
<StackPanel Orientation="Vertical" Grid.Row="0">
|
|
|
- <TextBlock Margin="5,0,5,0" Name="TxtName" FontSize="20" Text="{Binding ProjectLocalName}"></TextBlock>
|
|
|
+ <Grid>
|
|
|
+
|
|
|
+ <TextBlock Margin="5,0,5,0" Name="TxtName" FontSize="20" Text="{Binding ProjectLocalName}"></TextBlock>
|
|
|
+ <Button HorizontalAlignment="Right" VerticalAlignment="Center" Content="刷新" Style="{StaticResource ResourceKey={x:Static uc:CommonStyles.LinkButtonKey}}" Command="{Binding Data.Commands.RefreshCommand,Source={StaticResource ResourceKey=DATA}}" CommandParameter="{Binding}" ></Button>
|
|
|
+ </Grid>
|
|
|
+
|
|
|
<StackPanel Orientation="Horizontal">
|
|
|
<TextBlock Margin="5,0,5,0" Text="涉及资产:" />
|
|
|
<TextBlock Margin="5,0,5,0" x:Name="TXTN" Text="{Binding AssetCount}" TextDecorations="Underline"/>
|
|
@@ -183,7 +196,7 @@
|
|
|
<Button Grid.Row="1" Grid.Column="0" x:Name="BTNU" HorizontalAlignment="Right" Content="资产清单" Style="{StaticResource ResourceKey={x:Static uc:CommonStyles.LinkButtonKey}}" Command="{Binding Data.Commands.GoAssetCommand,Source={StaticResource ResourceKey=DATA}}" CommandParameter="{Binding}" ></Button>
|
|
|
</Grid>
|
|
|
</Border>
|
|
|
-
|
|
|
+
|
|
|
</ControlTemplate>
|
|
|
</Setter.Value>
|
|
|
</Setter>
|
|
@@ -193,7 +206,7 @@
|
|
|
</GroupBox>
|
|
|
|
|
|
<GroupBox MaxHeight="170" Grid.Row="4" Grid.Column="0" Margin="0,10,0,0" Header="供应该厂家产品的所有供应商" Style="{StaticResource ResourceKey={x:Static uc:CommonStyles.GroupBoxKey}}">
|
|
|
- <ListBox ItemsSource="{Binding SellerItems}" BorderThickness="0" ScrollViewer.HorizontalScrollBarVisibility="Auto" Margin="-5,0,-5,0">
|
|
|
+ <ListBox ItemsSource="{Binding SellerItems}" BorderThickness="0" ScrollViewer.HorizontalScrollBarVisibility="Auto" Margin="-5,0,-5,0">
|
|
|
<ListBox.ItemsPanel >
|
|
|
<ItemsPanelTemplate>
|
|
|
<WrapPanel Orientation="Horizontal" Width="{Binding Path=Width,RelativeSource={RelativeSource AncestorType=ListBox}}"/>
|
|
@@ -212,13 +225,13 @@
|
|
|
</Grid.RowDefinitions>
|
|
|
<StackPanel Orientation="Vertical" Grid.Row="0">
|
|
|
<TextBlock Margin="5,0,5,0" FontSize="20" Text="{Binding VenderName}"></TextBlock>
|
|
|
- <TextBlock Margin="5,0,5,0" Text="{Binding WebSite}"></TextBlock>
|
|
|
+ <TextBlock Margin="5,0,5,0" Text="{Binding WebSite}"></TextBlock>
|
|
|
<StackPanel Orientation="Horizontal">
|
|
|
<TextBlock Margin="5,0,5,0" Text="供应名录中涉及我的品牌:" />
|
|
|
<TextBlock Margin="2,0,2,0" Text="{Binding BrandCount}" TextDecorations="Underline"/>
|
|
|
<TextBlock Margin="2,0,2,0" Text="个" />
|
|
|
</StackPanel>
|
|
|
- <StackPanel Orientation="Horizontal">
|
|
|
+ <StackPanel Orientation="Horizontal">
|
|
|
<TextBlock Margin="5,0,5,0" Text="涉及产品:" />
|
|
|
<TextBlock Margin="2,0,2,0" Text="{Binding ProductCount}" TextDecorations="Underline"/>
|
|
|
<TextBlock Margin="2,0,2,0" Text="个" />
|
|
@@ -227,7 +240,7 @@
|
|
|
<Button Grid.Row="1" Grid.Column="0" x:Name="BTNU" HorizontalAlignment="Right" Content="查看供应名录" Style="{StaticResource ResourceKey={x:Static uc:CommonStyles.LinkButtonKey}}" Command="{Binding Data.Commands.ScanRefTypesCommand,Source={StaticResource ResourceKey=DATA}}" CommandParameter="{Binding}" ></Button>
|
|
|
</Grid>
|
|
|
</Border>
|
|
|
-
|
|
|
+
|
|
|
</ControlTemplate>
|
|
|
</Setter.Value>
|
|
|
</Setter>
|
|
@@ -237,7 +250,7 @@
|
|
|
</GroupBox>
|
|
|
|
|
|
<GroupBox MaxHeight="170" Grid.Row="5" Grid.Column="0" Margin="0,10,0,0" Header="维修该厂家产品的所有维修商" Style="{StaticResource ResourceKey={x:Static uc:CommonStyles.GroupBoxKey}}">
|
|
|
- <ListBox ItemsSource="{Binding MaintainerItems}" BorderThickness="0" ScrollViewer.HorizontalScrollBarVisibility="Auto" Margin="-5,0,-5,0">
|
|
|
+ <ListBox ItemsSource="{Binding MaintainerItems}" BorderThickness="0" ScrollViewer.HorizontalScrollBarVisibility="Auto" Margin="-5,0,-5,0">
|
|
|
<ListBox.ItemsPanel >
|
|
|
<ItemsPanelTemplate>
|
|
|
<WrapPanel Orientation="Horizontal" Width="{Binding Path=Width,RelativeSource={RelativeSource AncestorType=ListBox}}"/>
|
|
@@ -248,7 +261,7 @@
|
|
|
<Setter Property="Template">
|
|
|
<Setter.Value>
|
|
|
<ControlTemplate TargetType="{x:Type ListBoxItem}">
|
|
|
- <Border BorderThickness="1" BorderBrush="Black" Margin="5" Padding="5">
|
|
|
+ <Border BorderThickness="1" BorderBrush="Black" Margin="5" Padding="5">
|
|
|
<Grid Width="180" Height="110" >
|
|
|
<Grid.RowDefinitions>
|
|
|
<RowDefinition></RowDefinition>
|
|
@@ -256,13 +269,13 @@
|
|
|
</Grid.RowDefinitions>
|
|
|
<StackPanel Orientation="Vertical" Grid.Row="0">
|
|
|
<TextBlock Margin="5,0,5,0" FontSize="20" Text="{Binding VenderName}"></TextBlock>
|
|
|
- <TextBlock Margin="5,0,5,0" Text="{Binding WebSite}"></TextBlock>
|
|
|
+ <TextBlock Margin="5,0,5,0" Text="{Binding WebSite}"></TextBlock>
|
|
|
<StackPanel Orientation="Horizontal">
|
|
|
<TextBlock Margin="5,0,5,0" Text="维修名录中涉及我的品牌:" />
|
|
|
<TextBlock Margin="2,0,2,0" Text="{Binding BrandCount}" TextDecorations="Underline"/>
|
|
|
<TextBlock Margin="2,0,2,0" Text="个" />
|
|
|
</StackPanel>
|
|
|
- <StackPanel Orientation="Horizontal">
|
|
|
+ <StackPanel Orientation="Horizontal">
|
|
|
<TextBlock Margin="5,0,5,0" Text="涉及产品:" />
|
|
|
<TextBlock Margin="2,0,2,0" Text="{Binding ProductCount}" TextDecorations="Underline"/>
|
|
|
<TextBlock Margin="2,0,2,0" Text="个" />
|