diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 31076a5..9d45698 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 31076a5..9d45698 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/IconFont/iconfont.ttf b/SubCabinetSolution/IconFont/iconfont.ttf
new file mode 100644
index 0000000..2275aec
--- /dev/null
+++ b/SubCabinetSolution/IconFont/iconfont.ttf
Binary files differ

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 31076a5..9d45698 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/IconFont/iconfont.ttf b/SubCabinetSolution/IconFont/iconfont.ttf
new file mode 100644
index 0000000..2275aec
--- /dev/null
+++ b/SubCabinetSolution/IconFont/iconfont.ttf
Binary files differ
diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj
index 2432672..8a78b13 100644
--- a/SubCabinetSolution/SubCabinetSolution.csproj
+++ b/SubCabinetSolution/SubCabinetSolution.csproj
@@ -42,6 +42,9 @@
       <HintPath>..\packages\CommonServiceLocator.2.0.2\lib\net47\CommonServiceLocator.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="CSharpToolkit">
+      <HintPath>..\..\..\..\DLL\CSharpToolkit.dll</HintPath>
+    </Reference>
     <Reference Include="GalaSoft.MvvmLight, Version=5.4.1.0, Culture=neutral, PublicKeyToken=e7570ab207bcb616">
       <HintPath>..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.dll</HintPath>
       <Private>True</Private>
@@ -244,9 +247,6 @@
     <Compile Include="Views\TotalQueryPage.xaml.cs">
       <DependentUpon>TotalQueryPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Widgets\PlaceHolderTextBox.xaml.cs">
-      <DependentUpon>PlaceHolderTextBox.xaml</DependentUpon>
-    </Compile>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -282,10 +282,6 @@
     <Page Include="Views\SettingsPage.xaml" />
     <Page Include="Views\SpdQueryPage.xaml" />
     <Page Include="Views\TotalQueryPage.xaml" />
-    <Page Include="Widgets\PlaceHolderTextBox.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs">
@@ -303,6 +299,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
+    <Resource Include="IconFont\iconfont.ttf" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 31076a5..9d45698 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/IconFont/iconfont.ttf b/SubCabinetSolution/IconFont/iconfont.ttf
new file mode 100644
index 0000000..2275aec
--- /dev/null
+++ b/SubCabinetSolution/IconFont/iconfont.ttf
Binary files differ
diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj
index 2432672..8a78b13 100644
--- a/SubCabinetSolution/SubCabinetSolution.csproj
+++ b/SubCabinetSolution/SubCabinetSolution.csproj
@@ -42,6 +42,9 @@
       <HintPath>..\packages\CommonServiceLocator.2.0.2\lib\net47\CommonServiceLocator.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="CSharpToolkit">
+      <HintPath>..\..\..\..\DLL\CSharpToolkit.dll</HintPath>
+    </Reference>
     <Reference Include="GalaSoft.MvvmLight, Version=5.4.1.0, Culture=neutral, PublicKeyToken=e7570ab207bcb616">
       <HintPath>..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.dll</HintPath>
       <Private>True</Private>
@@ -244,9 +247,6 @@
     <Compile Include="Views\TotalQueryPage.xaml.cs">
       <DependentUpon>TotalQueryPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Widgets\PlaceHolderTextBox.xaml.cs">
-      <DependentUpon>PlaceHolderTextBox.xaml</DependentUpon>
-    </Compile>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -282,10 +282,6 @@
     <Page Include="Views\SettingsPage.xaml" />
     <Page Include="Views\SpdQueryPage.xaml" />
     <Page Include="Views\TotalQueryPage.xaml" />
-    <Page Include="Widgets\PlaceHolderTextBox.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs">
@@ -303,6 +299,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
+    <Resource Include="IconFont\iconfont.ttf" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml
index 3bab960..6451a40 100644
--- a/SubCabinetSolution/Views/CabinetWindow.xaml
+++ b/SubCabinetSolution/Views/CabinetWindow.xaml
@@ -5,7 +5,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:interactivity="http://schemas.microsoft.com/expression/2010/interactivity"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:widgets="clr-namespace:SubCabinetSolution.Widgets"
+    xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit"
     Title="高值耗材柜（科室）"
     Width="1366"
     Height="768"
@@ -302,9 +302,11 @@
                         <widgets:PlaceHolderTextBox
                             Width="300"
                             Height="30"
-                            Padding="5"
+                            Padding="3,0"
+                            BorderCornerRadius="3"
                             VerticalContentAlignment="Center"
                             Foreground="#333333"
+                            MouseOverBorderColor="Blue"
                             HintText="请输入要查询的关键字"
                             PlaceHolderPadding="5"
                             Text="{Binding UserInputKeywords}" />

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 31076a5..9d45698 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/IconFont/iconfont.ttf b/SubCabinetSolution/IconFont/iconfont.ttf
new file mode 100644
index 0000000..2275aec
--- /dev/null
+++ b/SubCabinetSolution/IconFont/iconfont.ttf
Binary files differ
diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj
index 2432672..8a78b13 100644
--- a/SubCabinetSolution/SubCabinetSolution.csproj
+++ b/SubCabinetSolution/SubCabinetSolution.csproj
@@ -42,6 +42,9 @@
       <HintPath>..\packages\CommonServiceLocator.2.0.2\lib\net47\CommonServiceLocator.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="CSharpToolkit">
+      <HintPath>..\..\..\..\DLL\CSharpToolkit.dll</HintPath>
+    </Reference>
     <Reference Include="GalaSoft.MvvmLight, Version=5.4.1.0, Culture=neutral, PublicKeyToken=e7570ab207bcb616">
       <HintPath>..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.dll</HintPath>
       <Private>True</Private>
@@ -244,9 +247,6 @@
     <Compile Include="Views\TotalQueryPage.xaml.cs">
       <DependentUpon>TotalQueryPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Widgets\PlaceHolderTextBox.xaml.cs">
-      <DependentUpon>PlaceHolderTextBox.xaml</DependentUpon>
-    </Compile>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -282,10 +282,6 @@
     <Page Include="Views\SettingsPage.xaml" />
     <Page Include="Views\SpdQueryPage.xaml" />
     <Page Include="Views\TotalQueryPage.xaml" />
-    <Page Include="Widgets\PlaceHolderTextBox.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs">
@@ -303,6 +299,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
+    <Resource Include="IconFont\iconfont.ttf" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml
index 3bab960..6451a40 100644
--- a/SubCabinetSolution/Views/CabinetWindow.xaml
+++ b/SubCabinetSolution/Views/CabinetWindow.xaml
@@ -5,7 +5,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:interactivity="http://schemas.microsoft.com/expression/2010/interactivity"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:widgets="clr-namespace:SubCabinetSolution.Widgets"
+    xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit"
     Title="高值耗材柜（科室）"
     Width="1366"
     Height="768"
@@ -302,9 +302,11 @@
                         <widgets:PlaceHolderTextBox
                             Width="300"
                             Height="30"
-                            Padding="5"
+                            Padding="3,0"
+                            BorderCornerRadius="3"
                             VerticalContentAlignment="Center"
                             Foreground="#333333"
+                            MouseOverBorderColor="Blue"
                             HintText="请输入要查询的关键字"
                             PlaceHolderPadding="5"
                             Text="{Binding UserInputKeywords}" />
diff --git a/SubCabinetSolution/Views/RecentUsePage.xaml b/SubCabinetSolution/Views/RecentUsePage.xaml
index 2424b41..d063373 100644
--- a/SubCabinetSolution/Views/RecentUsePage.xaml
+++ b/SubCabinetSolution/Views/RecentUsePage.xaml
@@ -4,7 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:widgets="clr-namespace:SubCabinetSolution.Widgets"
+    xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit"
     Title="RecentUsePage"
     d:DesignHeight="450"
     d:DesignWidth="800"

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 31076a5..9d45698 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/IconFont/iconfont.ttf b/SubCabinetSolution/IconFont/iconfont.ttf
new file mode 100644
index 0000000..2275aec
--- /dev/null
+++ b/SubCabinetSolution/IconFont/iconfont.ttf
Binary files differ
diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj
index 2432672..8a78b13 100644
--- a/SubCabinetSolution/SubCabinetSolution.csproj
+++ b/SubCabinetSolution/SubCabinetSolution.csproj
@@ -42,6 +42,9 @@
       <HintPath>..\packages\CommonServiceLocator.2.0.2\lib\net47\CommonServiceLocator.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="CSharpToolkit">
+      <HintPath>..\..\..\..\DLL\CSharpToolkit.dll</HintPath>
+    </Reference>
     <Reference Include="GalaSoft.MvvmLight, Version=5.4.1.0, Culture=neutral, PublicKeyToken=e7570ab207bcb616">
       <HintPath>..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.dll</HintPath>
       <Private>True</Private>
@@ -244,9 +247,6 @@
     <Compile Include="Views\TotalQueryPage.xaml.cs">
       <DependentUpon>TotalQueryPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Widgets\PlaceHolderTextBox.xaml.cs">
-      <DependentUpon>PlaceHolderTextBox.xaml</DependentUpon>
-    </Compile>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -282,10 +282,6 @@
     <Page Include="Views\SettingsPage.xaml" />
     <Page Include="Views\SpdQueryPage.xaml" />
     <Page Include="Views\TotalQueryPage.xaml" />
-    <Page Include="Widgets\PlaceHolderTextBox.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs">
@@ -303,6 +299,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
+    <Resource Include="IconFont\iconfont.ttf" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml
index 3bab960..6451a40 100644
--- a/SubCabinetSolution/Views/CabinetWindow.xaml
+++ b/SubCabinetSolution/Views/CabinetWindow.xaml
@@ -5,7 +5,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:interactivity="http://schemas.microsoft.com/expression/2010/interactivity"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:widgets="clr-namespace:SubCabinetSolution.Widgets"
+    xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit"
     Title="高值耗材柜（科室）"
     Width="1366"
     Height="768"
@@ -302,9 +302,11 @@
                         <widgets:PlaceHolderTextBox
                             Width="300"
                             Height="30"
-                            Padding="5"
+                            Padding="3,0"
+                            BorderCornerRadius="3"
                             VerticalContentAlignment="Center"
                             Foreground="#333333"
+                            MouseOverBorderColor="Blue"
                             HintText="请输入要查询的关键字"
                             PlaceHolderPadding="5"
                             Text="{Binding UserInputKeywords}" />
diff --git a/SubCabinetSolution/Views/RecentUsePage.xaml b/SubCabinetSolution/Views/RecentUsePage.xaml
index 2424b41..d063373 100644
--- a/SubCabinetSolution/Views/RecentUsePage.xaml
+++ b/SubCabinetSolution/Views/RecentUsePage.xaml
@@ -4,7 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:widgets="clr-namespace:SubCabinetSolution.Widgets"
+    xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit"
     Title="RecentUsePage"
     d:DesignHeight="450"
     d:DesignWidth="800"
diff --git a/SubCabinetSolution/Widgets/PlaceHolderTextBox.xaml b/SubCabinetSolution/Widgets/PlaceHolderTextBox.xaml
deleted file mode 100644
index 0884bb8..0000000
--- a/SubCabinetSolution/Widgets/PlaceHolderTextBox.xaml
+++ /dev/null
@@ -1,96 +0,0 @@
-<TextBox x:Class="SubCabinetSolution.Widgets.PlaceHolderTextBox"
-         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-         d:DesignHeight="300"
-         d:DesignWidth="300"
-         Loaded="PlaceHolderTextBox_OnLoaded"
-         Style="{DynamicResource DefaultTextBox}"
-         mc:Ignorable="d">
-    <TextBox.Resources>
-        <SolidColorBrush x:Key="TextBox.Static.Border" Color="#FFABADB3" />
-        <SolidColorBrush x:Key="TextBox.MouseOver.Border" Color="#FF7EB4EA" />
-        <SolidColorBrush x:Key="TextBox.Focus.Border" Color="#FF569DE5" />
-        <Style x:Key="DefaultTextBox" TargetType="{x:Type TextBox}">
-            <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-            <Setter Property="BorderBrush" Value="{StaticResource TextBox.Static.Border}" />
-            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" />
-            <Setter Property="BorderThickness" Value="1" />
-            <Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
-            <Setter Property="HorizontalContentAlignment" Value="Left" />
-            <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-            <Setter Property="AllowDrop" Value="True" />
-            <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
-            <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate x:Name="DefaultTextBoxTemplate" TargetType="{x:Type TextBox}">
-                        <Border
-                            x:Name="TextBoxBorder"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{Binding BorderCornerRadius, RelativeSource={RelativeSource Mode=TemplatedParent}}"
-                            SnapsToDevicePixels="True">
-                            <Grid>
-                                <ScrollViewer
-                                    x:Name="PART_ContentHost"
-                                    HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                                    VerticalAlignment="Center"
-                                    Focusable="False"
-                                    HorizontalScrollBarVisibility="Hidden"
-                                    VerticalScrollBarVisibility="Hidden" />
-
-                                <TextBlock
-                                    x:Name="PlaceHolderTextBlock"
-                                    Margin="0"
-                                    Padding="{Binding PlaceHolderPadding, RelativeSource={RelativeSource AncestorType=TextBox, Mode=FindAncestor}}"
-                                    HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                                    VerticalAlignment="Center"
-                                    FocusVisualStyle="{x:Null}"
-                                    FontSize="{TemplateBinding FontSize}"
-                                    Foreground="LightGray"
-                                    Text="{Binding HintText, RelativeSource={RelativeSource Mode=TemplatedParent}}"
-                                    Visibility="Hidden" />
-                            </Grid>
-                        </Border>
-
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="Text" Value="">
-                                <Setter TargetName="PlaceHolderTextBlock" Property="Visibility" Value="Visible" />
-                            </Trigger>
-
-                            <Trigger Property="Text" Value="{x:Null}">
-                                <Setter TargetName="PlaceHolderTextBlock" Property="Visibility" Value="Visible" />
-                            </Trigger>
-
-                            <Trigger Property="IsEnabled" Value="False">
-                                <Setter TargetName="TextBoxBorder" Property="Opacity" Value="0.5" />
-                            </Trigger>
-
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="TextBoxBorder" Property="BorderBrush" Value="{StaticResource TextBox.MouseOver.Border}" />
-                            </Trigger>
-
-                            <Trigger Property="IsKeyboardFocused" Value="True">
-                                <Setter TargetName="TextBoxBorder" Property="BorderBrush" Value="{StaticResource TextBox.Focus.Border}" />
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-
-            <Style.Triggers>
-                <MultiTrigger>
-                    <MultiTrigger.Conditions>
-                        <Condition Property="IsInactiveSelectionHighlightEnabled" Value="True" />
-                        <Condition Property="IsSelectionActive" Value="False" />
-                    </MultiTrigger.Conditions>
-
-                    <Setter Property="SelectionBrush" Value="{DynamicResource {x:Static SystemColors.InactiveSelectionHighlightBrushKey}}" />
-                </MultiTrigger>
-            </Style.Triggers>
-        </Style>
-    </TextBox.Resources>
-</TextBox>

diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 31076a5..9d45698 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/IconFont/iconfont.ttf b/SubCabinetSolution/IconFont/iconfont.ttf
new file mode 100644
index 0000000..2275aec
--- /dev/null
+++ b/SubCabinetSolution/IconFont/iconfont.ttf
Binary files differ
diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj
index 2432672..8a78b13 100644
--- a/SubCabinetSolution/SubCabinetSolution.csproj
+++ b/SubCabinetSolution/SubCabinetSolution.csproj
@@ -42,6 +42,9 @@
       <HintPath>..\packages\CommonServiceLocator.2.0.2\lib\net47\CommonServiceLocator.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="CSharpToolkit">
+      <HintPath>..\..\..\..\DLL\CSharpToolkit.dll</HintPath>
+    </Reference>
     <Reference Include="GalaSoft.MvvmLight, Version=5.4.1.0, Culture=neutral, PublicKeyToken=e7570ab207bcb616">
       <HintPath>..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.dll</HintPath>
       <Private>True</Private>
@@ -244,9 +247,6 @@
     <Compile Include="Views\TotalQueryPage.xaml.cs">
       <DependentUpon>TotalQueryPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Widgets\PlaceHolderTextBox.xaml.cs">
-      <DependentUpon>PlaceHolderTextBox.xaml</DependentUpon>
-    </Compile>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -282,10 +282,6 @@
     <Page Include="Views\SettingsPage.xaml" />
     <Page Include="Views\SpdQueryPage.xaml" />
     <Page Include="Views\TotalQueryPage.xaml" />
-    <Page Include="Widgets\PlaceHolderTextBox.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs">
@@ -303,6 +299,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
+    <Resource Include="IconFont\iconfont.ttf" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml
index 3bab960..6451a40 100644
--- a/SubCabinetSolution/Views/CabinetWindow.xaml
+++ b/SubCabinetSolution/Views/CabinetWindow.xaml
@@ -5,7 +5,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:interactivity="http://schemas.microsoft.com/expression/2010/interactivity"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:widgets="clr-namespace:SubCabinetSolution.Widgets"
+    xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit"
     Title="高值耗材柜（科室）"
     Width="1366"
     Height="768"
@@ -302,9 +302,11 @@
                         <widgets:PlaceHolderTextBox
                             Width="300"
                             Height="30"
-                            Padding="5"
+                            Padding="3,0"
+                            BorderCornerRadius="3"
                             VerticalContentAlignment="Center"
                             Foreground="#333333"
+                            MouseOverBorderColor="Blue"
                             HintText="请输入要查询的关键字"
                             PlaceHolderPadding="5"
                             Text="{Binding UserInputKeywords}" />
diff --git a/SubCabinetSolution/Views/RecentUsePage.xaml b/SubCabinetSolution/Views/RecentUsePage.xaml
index 2424b41..d063373 100644
--- a/SubCabinetSolution/Views/RecentUsePage.xaml
+++ b/SubCabinetSolution/Views/RecentUsePage.xaml
@@ -4,7 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:widgets="clr-namespace:SubCabinetSolution.Widgets"
+    xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit"
     Title="RecentUsePage"
     d:DesignHeight="450"
     d:DesignWidth="800"
diff --git a/SubCabinetSolution/Widgets/PlaceHolderTextBox.xaml b/SubCabinetSolution/Widgets/PlaceHolderTextBox.xaml
deleted file mode 100644
index 0884bb8..0000000
--- a/SubCabinetSolution/Widgets/PlaceHolderTextBox.xaml
+++ /dev/null
@@ -1,96 +0,0 @@
-<TextBox x:Class="SubCabinetSolution.Widgets.PlaceHolderTextBox"
-         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-         d:DesignHeight="300"
-         d:DesignWidth="300"
-         Loaded="PlaceHolderTextBox_OnLoaded"
-         Style="{DynamicResource DefaultTextBox}"
-         mc:Ignorable="d">
-    <TextBox.Resources>
-        <SolidColorBrush x:Key="TextBox.Static.Border" Color="#FFABADB3" />
-        <SolidColorBrush x:Key="TextBox.MouseOver.Border" Color="#FF7EB4EA" />
-        <SolidColorBrush x:Key="TextBox.Focus.Border" Color="#FF569DE5" />
-        <Style x:Key="DefaultTextBox" TargetType="{x:Type TextBox}">
-            <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-            <Setter Property="BorderBrush" Value="{StaticResource TextBox.Static.Border}" />
-            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" />
-            <Setter Property="BorderThickness" Value="1" />
-            <Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
-            <Setter Property="HorizontalContentAlignment" Value="Left" />
-            <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-            <Setter Property="AllowDrop" Value="True" />
-            <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
-            <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate x:Name="DefaultTextBoxTemplate" TargetType="{x:Type TextBox}">
-                        <Border
-                            x:Name="TextBoxBorder"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{Binding BorderCornerRadius, RelativeSource={RelativeSource Mode=TemplatedParent}}"
-                            SnapsToDevicePixels="True">
-                            <Grid>
-                                <ScrollViewer
-                                    x:Name="PART_ContentHost"
-                                    HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                                    VerticalAlignment="Center"
-                                    Focusable="False"
-                                    HorizontalScrollBarVisibility="Hidden"
-                                    VerticalScrollBarVisibility="Hidden" />
-
-                                <TextBlock
-                                    x:Name="PlaceHolderTextBlock"
-                                    Margin="0"
-                                    Padding="{Binding PlaceHolderPadding, RelativeSource={RelativeSource AncestorType=TextBox, Mode=FindAncestor}}"
-                                    HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                                    VerticalAlignment="Center"
-                                    FocusVisualStyle="{x:Null}"
-                                    FontSize="{TemplateBinding FontSize}"
-                                    Foreground="LightGray"
-                                    Text="{Binding HintText, RelativeSource={RelativeSource Mode=TemplatedParent}}"
-                                    Visibility="Hidden" />
-                            </Grid>
-                        </Border>
-
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="Text" Value="">
-                                <Setter TargetName="PlaceHolderTextBlock" Property="Visibility" Value="Visible" />
-                            </Trigger>
-
-                            <Trigger Property="Text" Value="{x:Null}">
-                                <Setter TargetName="PlaceHolderTextBlock" Property="Visibility" Value="Visible" />
-                            </Trigger>
-
-                            <Trigger Property="IsEnabled" Value="False">
-                                <Setter TargetName="TextBoxBorder" Property="Opacity" Value="0.5" />
-                            </Trigger>
-
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="TextBoxBorder" Property="BorderBrush" Value="{StaticResource TextBox.MouseOver.Border}" />
-                            </Trigger>
-
-                            <Trigger Property="IsKeyboardFocused" Value="True">
-                                <Setter TargetName="TextBoxBorder" Property="BorderBrush" Value="{StaticResource TextBox.Focus.Border}" />
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-
-            <Style.Triggers>
-                <MultiTrigger>
-                    <MultiTrigger.Conditions>
-                        <Condition Property="IsInactiveSelectionHighlightEnabled" Value="True" />
-                        <Condition Property="IsSelectionActive" Value="False" />
-                    </MultiTrigger.Conditions>
-
-                    <Setter Property="SelectionBrush" Value="{DynamicResource {x:Static SystemColors.InactiveSelectionHighlightBrushKey}}" />
-                </MultiTrigger>
-            </Style.Triggers>
-        </Style>
-    </TextBox.Resources>
-</TextBox>
diff --git a/SubCabinetSolution/Widgets/PlaceHolderTextBox.xaml.cs b/SubCabinetSolution/Widgets/PlaceHolderTextBox.xaml.cs
deleted file mode 100644
index 5ebcaae..0000000
--- a/SubCabinetSolution/Widgets/PlaceHolderTextBox.xaml.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-using System.ComponentModel;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace SubCabinetSolution.Widgets
-{
-    /// <summary>
-    /// PlaceHolderTextBox.xaml 的交互逻辑
-    /// </summary>
-    public partial class PlaceHolderTextBox : TextBox
-    {
-        public PlaceHolderTextBox()
-        {
-            InitializeComponent();
-        }
-        
-        private void PlaceHolderTextBox_OnLoaded(object sender, RoutedEventArgs e)
-        {
-            Padding = new Thickness(5, 0, 5, 0);
-            PlaceHolderPadding = new Thickness(10, 0, 10, 0);
-        }
-
-        #region 依赖属性
-
-        [Category("自定义"), Description("该属性用于调整内部文字的Padding值")]
-        public Thickness PlaceHolderPadding
-        {
-            get => (Thickness)GetValue(PlaceHolderPaddingProperty);
-            set => SetValue(PlaceHolderPaddingProperty, value);
-        }
-
-        /// <summary>
-        /// nameof(PlaceHolderPadding) 对应xaml里面的属性
-        /// </summary>
-        public static readonly DependencyProperty PlaceHolderPaddingProperty =
-            DependencyProperty.Register(nameof(PlaceHolderPadding), typeof(Thickness), typeof(PlaceHolderTextBox),
-                new PropertyMetadata(new Thickness(0, 0, 0, 0)));
-
-        [Category("自定义"), Description("该属性用于控制TextBox边框圆角")]
-        public int BorderCornerRadius
-        {
-            get => (int)GetValue(BorderCornerRadiusProperty);
-            set => SetValue(BorderCornerRadiusProperty, value);
-        }
-
-        public static readonly DependencyProperty BorderCornerRadiusProperty =
-            DependencyProperty.Register(nameof(BorderCornerRadius), typeof(int), typeof(PlaceHolderTextBox),
-                new PropertyMetadata(0, OnBorderCornerRadiusChanged));
-
-        [Category("自定义"), Description("该属性用于显示TextBox的Hint值")]
-        public string HintText
-        {
-            get => (string)GetValue(HintTextProperty);
-            set => SetValue(HintTextProperty, value);
-        }
-
-        public static readonly DependencyProperty HintTextProperty =
-            DependencyProperty.Register(
-                nameof(HintText), typeof(string), typeof(PlaceHolderTextBox), new PropertyMetadata(null)
-            );
-
-        #endregion
-
-        #region 命令绑定
-
-        #endregion
-
-        #region 委托的方法
-
-        /// <summary>
-        /// 边框角度改变时
-        /// </summary>
-        private static void OnBorderCornerRadiusChanged(DependencyObject dpo, DependencyPropertyChangedEventArgs dpe)
-        {
-            var textBox = (PlaceHolderTextBox)dpo;
-            var radius = int.Parse(dpe.NewValue.ToString());
-            if (radius != 0)
-            {
-                textBox.Padding = new Thickness(radius - 5, 0, radius - 5, 0);
-                textBox.PlaceHolderPadding = new Thickness(radius, 0, radius, 0);
-            }
-            else
-            {
-                textBox.Padding = new Thickness(radius + 5, 0, radius + 5, 0);
-                textBox.PlaceHolderPadding = new Thickness(radius + 10, 0, radius + 10, 0);
-            }
-        }
-
-        #endregion
-    }
-}