diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 9d45698..31a7016 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 9d45698..31a7016 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 index 2275aec..2544133 100644 --- a/SubCabinetSolution/IconFont/iconfont.ttf +++ b/SubCabinetSolution/IconFont/iconfont.ttf Binary files differ diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 9d45698..31a7016 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 index 2275aec..2544133 100644 --- a/SubCabinetSolution/IconFont/iconfont.ttf +++ b/SubCabinetSolution/IconFont/iconfont.ttf Binary files differ diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml index cde23f1..b0776ca 100644 --- a/SubCabinetSolution/MainWindow.xaml +++ b/SubCabinetSolution/MainWindow.xaml @@ -5,6 +5,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:utils="clr-namespace:SubCabinetSolution.Utils" + xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit" Title="高值耗材柜（科室）" Width="1366" Height="768" @@ -19,37 +20,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -208,29 +153,31 @@ - - - + + + - + \ No newline at end of file diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 9d45698..31a7016 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 index 2275aec..2544133 100644 --- a/SubCabinetSolution/IconFont/iconfont.ttf +++ b/SubCabinetSolution/IconFont/iconfont.ttf Binary files differ diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml index cde23f1..b0776ca 100644 --- a/SubCabinetSolution/MainWindow.xaml +++ b/SubCabinetSolution/MainWindow.xaml @@ -5,6 +5,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:utils="clr-namespace:SubCabinetSolution.Utils" + xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit" Title="高值耗材柜（科室）" Width="1366" Height="768" @@ -19,37 +20,6 @@ - - - - - - - - - - @@ -208,29 +153,31 @@ - - - + + + - + \ No newline at end of file diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml index b93e19c..c411208 100644 --- a/SubCabinetSolution/Views/EmergencyPage.xaml +++ b/SubCabinetSolution/Views/EmergencyPage.xaml @@ -3,8 +3,8 @@ 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:local="clr-namespace:SubCabinetSolution.Views" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit" Title="EmergencyPage" d:DesignHeight="450" d:DesignWidth="800" @@ -52,35 +52,6 @@ - - - - - - - - - - - @@ -208,29 +153,31 @@ - - - + + + - + \ No newline at end of file diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml index b93e19c..c411208 100644 --- a/SubCabinetSolution/Views/EmergencyPage.xaml +++ b/SubCabinetSolution/Views/EmergencyPage.xaml @@ -3,8 +3,8 @@ 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:local="clr-namespace:SubCabinetSolution.Views" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit" Title="EmergencyPage" d:DesignHeight="450" d:DesignWidth="800" @@ -52,35 +52,6 @@ - - - - - - - - - - - - - - @@ -208,29 +153,31 @@ - - - + + + - + \ No newline at end of file diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml index b93e19c..c411208 100644 --- a/SubCabinetSolution/Views/EmergencyPage.xaml +++ b/SubCabinetSolution/Views/EmergencyPage.xaml @@ -3,8 +3,8 @@ 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:local="clr-namespace:SubCabinetSolution.Views" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit" Title="EmergencyPage" d:DesignHeight="450" d:DesignWidth="800" @@ -52,35 +52,6 @@ - - - - - - - - - - - - - - - - @@ -208,29 +153,31 @@ - - - + + + - + \ No newline at end of file diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml index b93e19c..c411208 100644 --- a/SubCabinetSolution/Views/EmergencyPage.xaml +++ b/SubCabinetSolution/Views/EmergencyPage.xaml @@ -3,8 +3,8 @@ 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:local="clr-namespace:SubCabinetSolution.Views" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit" Title="EmergencyPage" d:DesignHeight="450" d:DesignWidth="800" @@ -52,35 +52,6 @@ - - - - - - - - - - - + @@ -187,14 +130,17 @@ HintText="请输入助记码查询" PlaceHolderPadding="5" /> - + @@ -266,19 +212,24 @@ Foreground="#4381DF" Text="27" /> - + \ No newline at end of file diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 9d45698..31a7016 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 index 2275aec..2544133 100644 --- a/SubCabinetSolution/IconFont/iconfont.ttf +++ b/SubCabinetSolution/IconFont/iconfont.ttf Binary files differ diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml index cde23f1..b0776ca 100644 --- a/SubCabinetSolution/MainWindow.xaml +++ b/SubCabinetSolution/MainWindow.xaml @@ -5,6 +5,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:utils="clr-namespace:SubCabinetSolution.Utils" + xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit" Title="高值耗材柜（科室）" Width="1366" Height="768" @@ -19,37 +20,6 @@ - - - - - - - - - - @@ -208,29 +153,31 @@ - - - + + + - + \ No newline at end of file diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml index b93e19c..c411208 100644 --- a/SubCabinetSolution/Views/EmergencyPage.xaml +++ b/SubCabinetSolution/Views/EmergencyPage.xaml @@ -3,8 +3,8 @@ 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:local="clr-namespace:SubCabinetSolution.Views" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit" Title="EmergencyPage" d:DesignHeight="450" d:DesignWidth="800" @@ -52,35 +52,6 @@ - - - - - - - - - - - + @@ -187,14 +130,17 @@ HintText="请输入助记码查询" PlaceHolderPadding="5" /> - + @@ -266,19 +212,24 @@ Foreground="#4381DF" Text="27" /> - + \ No newline at end of file diff --git a/SubCabinetSolution/Views/RefundSpdPage.xaml b/SubCabinetSolution/Views/RefundSpdPage.xaml index 3584013..f3f749f 100644 --- a/SubCabinetSolution/Views/RefundSpdPage.xaml +++ b/SubCabinetSolution/Views/RefundSpdPage.xaml @@ -3,8 +3,8 @@ 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:local="clr-namespace:SubCabinetSolution.Views" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit" Title="RefundSpdPage" d:DesignHeight="450" d:DesignWidth="800" @@ -52,35 +52,6 @@ - - - - - - - - - - - @@ -208,29 +153,31 @@ - - - + + + - + \ No newline at end of file diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml index b93e19c..c411208 100644 --- a/SubCabinetSolution/Views/EmergencyPage.xaml +++ b/SubCabinetSolution/Views/EmergencyPage.xaml @@ -3,8 +3,8 @@ 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:local="clr-namespace:SubCabinetSolution.Views" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit" Title="EmergencyPage" d:DesignHeight="450" d:DesignWidth="800" @@ -52,35 +52,6 @@ - - - - - - - - - - - + @@ -187,14 +130,17 @@ HintText="请输入助记码查询" PlaceHolderPadding="5" /> - + @@ -266,19 +212,24 @@ Foreground="#4381DF" Text="27" /> - + \ No newline at end of file diff --git a/SubCabinetSolution/Views/RefundSpdPage.xaml b/SubCabinetSolution/Views/RefundSpdPage.xaml index 3584013..f3f749f 100644 --- a/SubCabinetSolution/Views/RefundSpdPage.xaml +++ b/SubCabinetSolution/Views/RefundSpdPage.xaml @@ -3,8 +3,8 @@ 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:local="clr-namespace:SubCabinetSolution.Views" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit" Title="RefundSpdPage" d:DesignHeight="450" d:DesignWidth="800" @@ -52,35 +52,6 @@ - - - - - - - - - - - - - @@ -208,29 +153,31 @@ - - - + + + - + \ No newline at end of file diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml index b93e19c..c411208 100644 --- a/SubCabinetSolution/Views/EmergencyPage.xaml +++ b/SubCabinetSolution/Views/EmergencyPage.xaml @@ -3,8 +3,8 @@ 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:local="clr-namespace:SubCabinetSolution.Views" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit" Title="EmergencyPage" d:DesignHeight="450" d:DesignWidth="800" @@ -52,35 +52,6 @@ - - - - - - - - - - - + @@ -187,14 +130,17 @@ HintText="请输入助记码查询" PlaceHolderPadding="5" /> - + @@ -266,19 +212,24 @@ Foreground="#4381DF" Text="27" /> - + \ No newline at end of file diff --git a/SubCabinetSolution/Views/RefundSpdPage.xaml b/SubCabinetSolution/Views/RefundSpdPage.xaml index 3584013..f3f749f 100644 --- a/SubCabinetSolution/Views/RefundSpdPage.xaml +++ b/SubCabinetSolution/Views/RefundSpdPage.xaml @@ -3,8 +3,8 @@ 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:local="clr-namespace:SubCabinetSolution.Views" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit" Title="RefundSpdPage" d:DesignHeight="450" d:DesignWidth="800" @@ -52,35 +52,6 @@ - - - - - - - - - - - - - - - @@ -208,29 +153,31 @@ - - - + + + - + \ No newline at end of file diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml index b93e19c..c411208 100644 --- a/SubCabinetSolution/Views/EmergencyPage.xaml +++ b/SubCabinetSolution/Views/EmergencyPage.xaml @@ -3,8 +3,8 @@ 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:local="clr-namespace:SubCabinetSolution.Views" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit" Title="EmergencyPage" d:DesignHeight="450" d:DesignWidth="800" @@ -52,35 +52,6 @@ - - - - - - - - - - - + @@ -187,14 +130,17 @@ HintText="请输入助记码查询" PlaceHolderPadding="5" /> - + @@ -266,19 +212,24 @@ Foreground="#4381DF" Text="27" /> - + \ No newline at end of file diff --git a/SubCabinetSolution/Views/RefundSpdPage.xaml b/SubCabinetSolution/Views/RefundSpdPage.xaml index 3584013..f3f749f 100644 --- a/SubCabinetSolution/Views/RefundSpdPage.xaml +++ b/SubCabinetSolution/Views/RefundSpdPage.xaml @@ -3,8 +3,8 @@ 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:local="clr-namespace:SubCabinetSolution.Views" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit" Title="RefundSpdPage" d:DesignHeight="450" d:DesignWidth="800" @@ -52,35 +52,6 @@ - - - - - - - - @@ -98,7 +70,7 @@ - + - + diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 9d45698..31a7016 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 index 2275aec..2544133 100644 --- a/SubCabinetSolution/IconFont/iconfont.ttf +++ b/SubCabinetSolution/IconFont/iconfont.ttf Binary files differ diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml index cde23f1..b0776ca 100644 --- a/SubCabinetSolution/MainWindow.xaml +++ b/SubCabinetSolution/MainWindow.xaml @@ -5,6 +5,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:utils="clr-namespace:SubCabinetSolution.Utils" + xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit" Title="高值耗材柜（科室）" Width="1366" Height="768" @@ -19,37 +20,6 @@ - - - - - - - - - - @@ -208,29 +153,31 @@ - - - + + + - + \ No newline at end of file diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml index b93e19c..c411208 100644 --- a/SubCabinetSolution/Views/EmergencyPage.xaml +++ b/SubCabinetSolution/Views/EmergencyPage.xaml @@ -3,8 +3,8 @@ 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:local="clr-namespace:SubCabinetSolution.Views" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit" Title="EmergencyPage" d:DesignHeight="450" d:DesignWidth="800" @@ -52,35 +52,6 @@ - - - - - - - - - - - + @@ -187,14 +130,17 @@ HintText="请输入助记码查询" PlaceHolderPadding="5" /> - + @@ -266,19 +212,24 @@ Foreground="#4381DF" Text="27" /> - + \ No newline at end of file diff --git a/SubCabinetSolution/Views/RefundSpdPage.xaml b/SubCabinetSolution/Views/RefundSpdPage.xaml index 3584013..f3f749f 100644 --- a/SubCabinetSolution/Views/RefundSpdPage.xaml +++ b/SubCabinetSolution/Views/RefundSpdPage.xaml @@ -3,8 +3,8 @@ 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:local="clr-namespace:SubCabinetSolution.Views" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit" Title="RefundSpdPage" d:DesignHeight="450" d:DesignWidth="800" @@ -52,35 +52,6 @@ - - - - - - - - @@ -98,7 +70,7 @@ - + - + diff --git a/SubCabinetSolution/obj/Debug/MainWindow.g.i.cs b/SubCabinetSolution/obj/Debug/MainWindow.g.i.cs index 3c4912b..dad4cf0 100644 --- a/SubCabinetSolution/obj/Debug/MainWindow.g.i.cs +++ b/SubCabinetSolution/obj/Debug/MainWindow.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "B3E70D585034396A3E80FF035B6863B6DD2E8144F26AFEBE49933BC583482556" +#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "4BBA1068D6F9EBCA47A6C57E5A35F562A98DF3A590CA7B234432CF51DC7127D6" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -9,6 +9,7 @@ // //------------------------------------------------------------------------------ +using CSharpToolkit.Widgets; using SubCabinetSolution.Utils; using System; using System.Diagnostics;