diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 0e381a2..31076a5 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 0e381a2..31076a5 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj
index ce01527..2432672 100644
--- a/SubCabinetSolution/SubCabinetSolution.csproj
+++ b/SubCabinetSolution/SubCabinetSolution.csproj
@@ -244,6 +244,9 @@
TotalQueryPage.xaml
+
+ PlaceHolderTextBox.xaml
+
MSBuild:Compile
Designer
@@ -279,6 +282,10 @@
+
+ Designer
+ MSBuild:Compile
+
@@ -384,5 +391,6 @@
+
\ No newline at end of file
diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 0e381a2..31076a5 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj
index ce01527..2432672 100644
--- a/SubCabinetSolution/SubCabinetSolution.csproj
+++ b/SubCabinetSolution/SubCabinetSolution.csproj
@@ -244,6 +244,9 @@
TotalQueryPage.xaml
+
+ PlaceHolderTextBox.xaml
+
MSBuild:Compile
Designer
@@ -279,6 +282,10 @@
+
+ Designer
+ MSBuild:Compile
+
@@ -384,5 +391,6 @@
+
\ No newline at end of file
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml
index 18e4a3a..3bab960 100644
--- a/SubCabinetSolution/Views/CabinetWindow.xaml
+++ b/SubCabinetSolution/Views/CabinetWindow.xaml
@@ -5,6 +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"
Title="高值耗材柜(科室)"
Width="1366"
Height="768"
@@ -298,51 +299,21 @@
Grid.Column="1"
HorizontalAlignment="Center"
Orientation="Horizontal">
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Foreground="#333333"
+ HintText="请输入要查询的关键字"
+ PlaceHolderPadding="5"
+ Text="{Binding UserInputKeywords}" />
+
diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index 0e381a2..31076a5 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj
index ce01527..2432672 100644
--- a/SubCabinetSolution/SubCabinetSolution.csproj
+++ b/SubCabinetSolution/SubCabinetSolution.csproj
@@ -244,6 +244,9 @@
TotalQueryPage.xaml
+
+ PlaceHolderTextBox.xaml
+
MSBuild:Compile
Designer
@@ -279,6 +282,10 @@
+
+ Designer
+ MSBuild:Compile
+
@@ -384,5 +391,6 @@
+
\ No newline at end of file
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml
index 18e4a3a..3bab960 100644
--- a/SubCabinetSolution/Views/CabinetWindow.xaml
+++ b/SubCabinetSolution/Views/CabinetWindow.xaml
@@ -5,6 +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"
Title="高值耗材柜(科室)"
Width="1366"
Height="768"
@@ -298,51 +299,21 @@
Grid.Column="1"
HorizontalAlignment="Center"
Orientation="Horizontal">
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Foreground="#333333"
+ HintText="请输入要查询的关键字"
+ PlaceHolderPadding="5"
+ Text="{Binding UserInputKeywords}" />
+
diff --git a/SubCabinetSolution/Views/RecentUsePage.xaml b/SubCabinetSolution/Views/RecentUsePage.xaml
index 951ca30..2424b41 100644
--- a/SubCabinetSolution/Views/RecentUsePage.xaml
+++ b/SubCabinetSolution/Views/RecentUsePage.xaml
@@ -4,6 +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"
Title="RecentUsePage"
d:DesignHeight="450"
d:DesignWidth="800"
@@ -161,7 +162,7 @@
Background="{x:Null}"
BorderThickness="0"
FontSize="16"
- Foreground="#4381DF"
+ Foreground="Blue"
ItemsSource="{Binding TimeSelections}"
SelectedItem="{Binding TimeSelections[0]}" />
@@ -175,14 +176,16 @@
BorderBrush="#4381DF"
CornerRadius="3">
-
+ Foreground="#333333"
+ HintText="请输入助记码查询"
+ PlaceHolderPadding="5" />
@@ -384,5 +391,6 @@
+
\ No newline at end of file
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml
index 18e4a3a..3bab960 100644
--- a/SubCabinetSolution/Views/CabinetWindow.xaml
+++ b/SubCabinetSolution/Views/CabinetWindow.xaml
@@ -5,6 +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"
Title="高值耗材柜(科室)"
Width="1366"
Height="768"
@@ -298,51 +299,21 @@
Grid.Column="1"
HorizontalAlignment="Center"
Orientation="Horizontal">
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Foreground="#333333"
+ HintText="请输入要查询的关键字"
+ PlaceHolderPadding="5"
+ Text="{Binding UserInputKeywords}" />
+
diff --git a/SubCabinetSolution/Views/RecentUsePage.xaml b/SubCabinetSolution/Views/RecentUsePage.xaml
index 951ca30..2424b41 100644
--- a/SubCabinetSolution/Views/RecentUsePage.xaml
+++ b/SubCabinetSolution/Views/RecentUsePage.xaml
@@ -4,6 +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"
Title="RecentUsePage"
d:DesignHeight="450"
d:DesignWidth="800"
@@ -161,7 +162,7 @@
Background="{x:Null}"
BorderThickness="0"
FontSize="16"
- Foreground="#4381DF"
+ Foreground="Blue"
ItemsSource="{Binding TimeSelections}"
SelectedItem="{Binding TimeSelections[0]}" />
@@ -175,14 +176,16 @@
BorderBrush="#4381DF"
CornerRadius="3">
-
+ Foreground="#333333"
+ HintText="请输入助记码查询"
+ PlaceHolderPadding="5" />
@@ -384,5 +391,6 @@
+
\ No newline at end of file
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml
index 18e4a3a..3bab960 100644
--- a/SubCabinetSolution/Views/CabinetWindow.xaml
+++ b/SubCabinetSolution/Views/CabinetWindow.xaml
@@ -5,6 +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"
Title="高值耗材柜(科室)"
Width="1366"
Height="768"
@@ -298,51 +299,21 @@
Grid.Column="1"
HorizontalAlignment="Center"
Orientation="Horizontal">
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Foreground="#333333"
+ HintText="请输入要查询的关键字"
+ PlaceHolderPadding="5"
+ Text="{Binding UserInputKeywords}" />
+
diff --git a/SubCabinetSolution/Views/RecentUsePage.xaml b/SubCabinetSolution/Views/RecentUsePage.xaml
index 951ca30..2424b41 100644
--- a/SubCabinetSolution/Views/RecentUsePage.xaml
+++ b/SubCabinetSolution/Views/RecentUsePage.xaml
@@ -4,6 +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"
Title="RecentUsePage"
d:DesignHeight="450"
d:DesignWidth="800"
@@ -161,7 +162,7 @@
Background="{x:Null}"
BorderThickness="0"
FontSize="16"
- Foreground="#4381DF"
+ Foreground="Blue"
ItemsSource="{Binding TimeSelections}"
SelectedItem="{Binding TimeSelections[0]}" />
@@ -175,14 +176,16 @@
BorderBrush="#4381DF"
CornerRadius="3">
-
+ Foreground="#333333"
+ HintText="请输入助记码查询"
+ PlaceHolderPadding="5" />