Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage
This commit is contained in:
commit
5af7997dc9
4 files changed
+44
-13
No files matched your search
@@ -12,10 +12,10 @@
|
|||||||
<ImageBrush ImageSource="/sunlight_sc.png"/>
|
<ImageBrush ImageSource="/sunlight_sc.png"/>
|
||||||
</Rectangle.Fill>
|
</Rectangle.Fill>
|
||||||
</Rectangle>
|
</Rectangle>
|
||||||
<Label Content="化学品审计管理客户端" HorizontalAlignment="Left" Height="35" Margin="55,210,0,0" VerticalAlignment="Top" Width="175" FontSize="16"/>
|
<Label Content="化学品单据管理客户端" HorizontalAlignment="Left" Height="35" Margin="55,210,0,0" VerticalAlignment="Top" Width="175" FontSize="16"/>
|
||||||
<Label Content="TEL:0575-88202605" HorizontalAlignment="Left" Height="35" Margin="55,245,0,0" VerticalAlignment="Top" Width="175" FontSize="16"/>
|
<Label Content="TEL:0575-88202605" HorizontalAlignment="Left" Height="35" Margin="55,245,0,0" VerticalAlignment="Top" Width="175" FontSize="16"/>
|
||||||
<Label Content="VER:BETA 0.0.0.5" HorizontalAlignment="Left" Height="35" Margin="65,365,0,0" VerticalAlignment="Top" Width="175" FontSize="16"/>
|
<Label Content="VER:BETA 1.0.50" HorizontalAlignment="Left" Height="35" Margin="65,365,0,0" VerticalAlignment="Top" Width="175" FontSize="16"/>
|
||||||
<Label Content="SUNLIGHT © 2022" HorizontalAlignment="Left" Height="35" Margin="65,395,0,0" VerticalAlignment="Top" Width="175" FontSize="16"/>
|
<Label Content="SUNLIGHT © 2023" HorizontalAlignment="Left" Height="35" Margin="65,395,0,0" VerticalAlignment="Top" Width="175" FontSize="16"/>
|
||||||
<Label Content="FAX:0575-88029740" HorizontalAlignment="Left" Height="35" Margin="55,285,0,0" VerticalAlignment="Top" Width="175" FontSize="16"/>
|
<Label Content="FAX:0575-88029740" HorizontalAlignment="Left" Height="35" Margin="55,285,0,0" VerticalAlignment="Top" Width="175" FontSize="16"/>
|
||||||
<Label Content="WEB:www.secolor.cn" HorizontalAlignment="Left" Height="35" Margin="55,325,0,0" VerticalAlignment="Top" Width="185" FontSize="16"/>
|
<Label Content="WEB:www.secolor.cn" HorizontalAlignment="Left" Height="35" Margin="55,325,0,0" VerticalAlignment="Top" Width="185" FontSize="16"/>
|
||||||
|
|
||||||
|
|||||||
+12
-10
@@ -11,15 +11,17 @@
|
|||||||
<MenuItem Header="_设置" FontSize="16">
|
<MenuItem Header="_设置" FontSize="16">
|
||||||
<MenuItem Header="_数据库设置" FontSize="16"/>
|
<MenuItem Header="_数据库设置" FontSize="16"/>
|
||||||
<MenuItem Header="_备份/还原" FontSize="16"/>
|
<MenuItem Header="_备份/还原" FontSize="16"/>
|
||||||
|
<Separator/>
|
||||||
<MenuItem Header="_料单设置" FontSize="16"/>
|
<MenuItem Header="_料单设置" FontSize="16"/>
|
||||||
<MenuItem Header="_用户设置" FontSize="16"/>
|
<MenuItem Header="_用户设置" FontSize="16"/>
|
||||||
<MenuItem Header="_帮助" FontSize="16"/>
|
<Separator/>
|
||||||
|
<MenuItem Header="_帮助" FontSize="16" Click="HELP"/>
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
<MenuItem Header="_数据" FontSize="16">
|
<MenuItem Header="_管理" FontSize="16">
|
||||||
<MenuItem Header="_染机..." FontSize="16"/>
|
<MenuItem Header="_染机管理" FontSize="16"/>
|
||||||
<MenuItem Header="_原料..." FontSize="16"/>
|
<MenuItem Header="_原料管理" FontSize="16"/>
|
||||||
<MenuItem Header="_配方..." FontSize="16"/>
|
<MenuItem Header="_配方管理" FontSize="16"/>
|
||||||
<MenuItem Header="_工艺..." FontSize="16"/>
|
<MenuItem Header="_工艺管理" FontSize="16"/>
|
||||||
<Separator />
|
<Separator />
|
||||||
<MenuItem Header="其它...">
|
<MenuItem Header="其它...">
|
||||||
<MenuItem Header="_品名" FontSize="16"/>
|
<MenuItem Header="_品名" FontSize="16"/>
|
||||||
@@ -72,9 +74,9 @@
|
|||||||
<DataGridTextColumn Header="备注" Width="400" FontSize="15" MinWidth="100" CanUserReorder="False"/>
|
<DataGridTextColumn Header="备注" Width="400" FontSize="15" MinWidth="100" CanUserReorder="False"/>
|
||||||
</DataGrid.Columns>
|
</DataGrid.Columns>
|
||||||
</DataGrid>
|
</DataGrid>
|
||||||
<Button Content="保存" HorizontalAlignment="Left" Height="40" Width="80" Margin="15,0,0,20" VerticalAlignment="Bottom" FontSize="20" Background="#FFEFEFEF" BorderBrush="White"/>
|
<Button Content="保存" HorizontalAlignment="Left" Height="40" Width="80" Margin="15,0,0,20" VerticalAlignment="Bottom" FontSize="20" Background="#FFEFEFEF" BorderBrush="White" Click="save"/>
|
||||||
<Button Content="删除" HorizontalAlignment="Left" Height="40" Width="80" Margin="100,0,0,20" VerticalAlignment="Bottom" FontSize="20" Background="#FFEFEFEF" BorderBrush="White"/>
|
<Button Content="删除" HorizontalAlignment="Left" Height="40" Width="80" Margin="100,0,0,20" VerticalAlignment="Bottom" FontSize="20" Background="#FFEFEFEF" BorderBrush="White" Click="delete"/>
|
||||||
<Button Content="打印" HorizontalAlignment="Right" Height="40" Width="80" Margin="0,0,55,20" VerticalAlignment="Bottom" FontSize="20" Background="#FFEFEFEF" BorderBrush="White"/>
|
<Button Content="打印" HorizontalAlignment="Right" Height="40" Width="80" Margin="0,0,55,20" VerticalAlignment="Bottom" FontSize="20" Background="#FFEFEFEF" BorderBrush="White" Click="print"/>
|
||||||
<Button Content="确认" HorizontalAlignment="Right" Height="40" Width="80" Margin="0,0,140,20" VerticalAlignment="Bottom" FontSize="20" Background="#FFEFEFEF" BorderBrush="White"/>
|
<Button Content="确认" HorizontalAlignment="Right" Height="40" Width="80" Margin="0,0,140,20" VerticalAlignment="Bottom" FontSize="20" Background="#FFEFEFEF" BorderBrush="White" Click="confirm"/>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Window>
|
</Window>
|
||||||
@@ -12,6 +12,7 @@ using System.Windows.Media;
|
|||||||
using System.Windows.Media.Imaging;
|
using System.Windows.Media.Imaging;
|
||||||
using System.Windows.Navigation;
|
using System.Windows.Navigation;
|
||||||
using System.Windows.Shapes;
|
using System.Windows.Shapes;
|
||||||
|
using System.Windows.Threading;
|
||||||
|
|
||||||
namespace formula_manage
|
namespace formula_manage
|
||||||
{
|
{
|
||||||
@@ -24,5 +25,30 @@ namespace formula_manage
|
|||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
}
|
}
|
||||||
|
private void HELP(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
Help help_page = new Help();
|
||||||
|
help_page.ShowDialog();//实例化并置顶打开信息窗口
|
||||||
|
}
|
||||||
|
|
||||||
|
private void print(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void confirm(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void delete(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void save(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -104,5 +104,8 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Resource Include="sunlight_sc.png" />
|
<Resource Include="sunlight_sc.png" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Folder Include="Windows\" />
|
||||||
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
</Project>
|
</Project>
|
||||||
Reference in new issue
Block a user