Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage
This commit is contained in:
commit
e628bc2575
1 file changed
+1
-1
+1
-1
@@ -154,7 +154,7 @@
|
|||||||
</DataGridTemplateColumn.CellTemplate>
|
</DataGridTemplateColumn.CellTemplate>
|
||||||
</DataGridTemplateColumn>
|
</DataGridTemplateColumn>
|
||||||
<DataGridTemplateColumn Header="计算单位" Width="80" MaxWidth="80" MinWidth="80" CanUserReorder="False" CellStyle="{StaticResource CellStyle}">
|
<DataGridTemplateColumn Header="计算单位" Width="80" MaxWidth="80" MinWidth="80" CanUserReorder="False" CellStyle="{StaticResource CellStyle}">
|
||||||
<DataGridTemplateColumn.CellTemplate >
|
<DataGridTemplateColumn.CellTemplate>
|
||||||
<DataTemplate>
|
<DataTemplate>
|
||||||
<ComboBox x:Name="CP_SHIFT" BorderThickness="0,0,0,0" Text="{Binding SHIFT}" BorderBrush="{x:Null}" Background="{x:Null}" IsEditable="True" IsReadOnly="True" Focusable="True" IsTabStop="False">
|
<ComboBox x:Name="CP_SHIFT" BorderThickness="0,0,0,0" Text="{Binding SHIFT}" BorderBrush="{x:Null}" Background="{x:Null}" IsEditable="True" IsReadOnly="True" Focusable="True" IsTabStop="False">
|
||||||
<ComboBoxItem Content="%"></ComboBoxItem>
|
<ComboBoxItem Content="%"></ComboBoxItem>
|
||||||
|
|||||||
Reference in new issue
Block a user