Compare commits

..

No commits in common. "134d3119aa1cbe959490102ca342c04a6c9e474f" and "36ca926b870b435656ae428ccbca2b92399f35a1" have entirely different histories.

2 changed files with 5 additions and 6 deletions

View File

@ -72,7 +72,7 @@ namespace DM_Weight.ViewModels
GetChannelsByDrawerNo();
}
}
private DrugInfo? _drugInfo;
public DrugInfo? DrugInfo

View File

@ -65,21 +65,20 @@
DisplayMemberPath="DrugName"
/>-->
<ComboBox
Margin="6 0 6 0"
Margin="6 0 6 0"
Grid.Column="0"
materialDesign:HintAssist.Hint="药品名称/拼音码/药品编码"
ItemsSource="{Binding DrugInfos}"
SelectedItem="{Binding DrugInfo}"
DisplayMemberPath="drug_name_spec" IsEditable="True" IsTextSearchEnabled="False" KeyUp="ComboBox_KeyUp"
/>
<StackPanel HorizontalAlignment="Right" Grid.Column="2" Grid.ColumnSpan="2" Orientation="Horizontal">
<Button Margin="6 0 6 0"
<StackPanel HorizontalAlignment="Right" Grid.Column="3" Orientation="Horizontal">
<Button
Style="{StaticResource MaterialDesignOutlinedLightButton}"
ToolTip="渲染标签"
Content="渲染标签"
Command="{Binding ResetLabelCommand}"/>
<Button
Margin="6 0 6 0"
Style="{StaticResource MaterialDesignOutlinedLightButton}"
ToolTip="绑定库位"
Content="绑定"
@ -91,7 +90,7 @@
Content="解绑"
Command="{Binding RemoveBinding}" />
<Button
Margin="6 0 6 0"
Margin="0 0 6 0"
Style="{StaticResource MaterialDesignOutlinedLightButton}"
ToolTip="刷新"
Command="{Binding Query}"