maqiao
/
HuNan_DM
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: maqiao:134d3119aa1cbe959490102ca342c04a6c9e474f
Branches Tags
maqiao:master
maqiao:SanYa_ZhuYuan
maqiao:SanYa
maqiao:secondMaster
..
compare: maqiao:36ca926b870b435656ae428ccbca2b92399f35a1
Branches Tags
maqiao:SanYa_ZhuYuan
maqiao:SanYa
maqiao:secondMaster
maqiao:master

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

2 changed files with 5 additions and 6 deletions
Show Stats Expand all files Collapse all files

2
DM_Weight/ViewModels/BindingChannelNewDialogViewModel .cs
View File

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

9
DM_Weight/Views/Dialog/BindingChannelNewDialog.xaml
View File

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