Compare commits
	
		
			2 Commits
		
	
	
		
			36ca926b87
			...
			134d3119aa
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
							
							
								
								 | 
						134d3119aa | 
							 | 
					|
| 
							
							
								
								 | 
						464b8bc147 | 
							 | 
					
| 
						 | 
				
			
			@ -72,7 +72,7 @@ namespace DM_Weight.ViewModels
 | 
			
		|||
                GetChannelsByDrawerNo();
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
          
 | 
			
		||||
        private DrugInfo? _drugInfo;
 | 
			
		||||
 | 
			
		||||
        public DrugInfo? DrugInfo
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -65,20 +65,21 @@
 | 
			
		|||
                    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="3" Orientation="Horizontal">
 | 
			
		||||
                <Button
 | 
			
		||||
            <StackPanel HorizontalAlignment="Right"  Grid.Column="2" Grid.ColumnSpan="2" Orientation="Horizontal">
 | 
			
		||||
                <Button Margin="6 0 6 0" 
 | 
			
		||||
                        Style="{StaticResource MaterialDesignOutlinedLightButton}"
 | 
			
		||||
                        ToolTip="渲染标签"
 | 
			
		||||
                        Content="渲染标签"
 | 
			
		||||
                        Command="{Binding ResetLabelCommand}"/>
 | 
			
		||||
                    <Button
 | 
			
		||||
                        Margin="6 0 6 0"
 | 
			
		||||
                        Style="{StaticResource MaterialDesignOutlinedLightButton}"
 | 
			
		||||
                        ToolTip="绑定库位"
 | 
			
		||||
                        Content="绑定"
 | 
			
		||||
| 
						 | 
				
			
			@ -90,7 +91,7 @@
 | 
			
		|||
                        Content="解绑"
 | 
			
		||||
                        Command="{Binding RemoveBinding}" />
 | 
			
		||||
                    <Button
 | 
			
		||||
                        Margin="0 0 6 0"
 | 
			
		||||
                        Margin="6 0 6 0"
 | 
			
		||||
                        Style="{StaticResource MaterialDesignOutlinedLightButton}"
 | 
			
		||||
                        ToolTip="刷新"
 | 
			
		||||
                        Command="{Binding Query}"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue