@@ -127,6 +127,25 @@ | |||||
<None Remove="Image\工艺流程.jpg" /> | <None Remove="Image\工艺流程.jpg" /> | ||||
<None Remove="Image\工艺流程.png" /> | <None Remove="Image\工艺流程.png" /> | ||||
<None Remove="Image\底部背景.png" /> | <None Remove="Image\底部背景.png" /> | ||||
<None Remove="Image\弹框\BG.png" /> | |||||
<None Remove="Image\弹框\bh.png" /> | |||||
<None Remove="Image\弹框\biankuang_.png" /> | |||||
<None Remove="Image\弹框\bz.png" /> | |||||
<None Remove="Image\弹框\c.png" /> | |||||
<None Remove="Image\弹框\ch.png" /> | |||||
<None Remove="Image\弹框\j1.png" /> | |||||
<None Remove="Image\弹框\j2.png" /> | |||||
<None Remove="Image\弹框\j3.png" /> | |||||
<None Remove="Image\弹框\j4.png" /> | |||||
<None Remove="Image\弹框\j5.png" /> | |||||
<None Remove="Image\弹框\j6.png" /> | |||||
<None Remove="Image\弹框\sbj.png" /> | |||||
<None Remove="Image\弹框\wbjx.png" /> | |||||
<None Remove="Image\弹框\xsbj.png" /> | |||||
<None Remove="Image\弹框\ybjx.png" /> | |||||
<None Remove="Image\弹框\z22.png" /> | |||||
<None Remove="Image\弹框\z4.png" /> | |||||
<None Remove="Image\弹框\弹窗.png" /> | |||||
<None Remove="Image\弹窗2.png" /> | <None Remove="Image\弹窗2.png" /> | ||||
<None Remove="Image\按钮\AddGreen.png" /> | <None Remove="Image\按钮\AddGreen.png" /> | ||||
<None Remove="Image\按钮\Delete.png" /> | <None Remove="Image\按钮\Delete.png" /> | ||||
@@ -344,6 +363,25 @@ | |||||
<Resource Include="Image\容器边框2.png" /> | <Resource Include="Image\容器边框2.png" /> | ||||
<Resource Include="Image\工艺流程.jpg" /> | <Resource Include="Image\工艺流程.jpg" /> | ||||
<Resource Include="Image\工艺流程.png" /> | <Resource Include="Image\工艺流程.png" /> | ||||
<Resource Include="Image\弹框\BG.png" /> | |||||
<Resource Include="Image\弹框\bh.png" /> | |||||
<Resource Include="Image\弹框\biankuang_.png" /> | |||||
<Resource Include="Image\弹框\bz.png" /> | |||||
<Resource Include="Image\弹框\c.png" /> | |||||
<Resource Include="Image\弹框\ch.png" /> | |||||
<Resource Include="Image\弹框\j1.png" /> | |||||
<Resource Include="Image\弹框\j2.png" /> | |||||
<Resource Include="Image\弹框\j3.png" /> | |||||
<Resource Include="Image\弹框\j4.png" /> | |||||
<Resource Include="Image\弹框\j5.png" /> | |||||
<Resource Include="Image\弹框\j6.png" /> | |||||
<Resource Include="Image\弹框\sbj.png" /> | |||||
<Resource Include="Image\弹框\wbjx.png" /> | |||||
<Resource Include="Image\弹框\xsbj.png" /> | |||||
<Resource Include="Image\弹框\ybjx.png" /> | |||||
<Resource Include="Image\弹框\z22.png" /> | |||||
<Resource Include="Image\弹框\z4.png" /> | |||||
<Resource Include="Image\弹框\弹窗.png" /> | |||||
<Resource Include="Image\弹窗2.png" /> | <Resource Include="Image\弹窗2.png" /> | ||||
<Resource Include="Image\按钮\AddGreen.png" /> | <Resource Include="Image\按钮\AddGreen.png" /> | ||||
<Resource Include="Image\按钮\Delete.png" /> | <Resource Include="Image\按钮\Delete.png" /> | ||||
@@ -68,9 +68,10 @@ | |||||
<Border | <Border | ||||
Name="br" | Name="br" | ||||
BorderBrush="#0CADF5" | BorderBrush="#0CADF5" | ||||
BorderThickness="2"> | |||||
BorderThickness="0"> | |||||
<Border.Background> | <Border.Background> | ||||
<ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/bg.png" /> | |||||
<!--<ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/bg.png" />--> | |||||
<ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/弹框/z4.png" /> | |||||
<!--<ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/弹窗2.png" />--> | <!--<ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/弹窗2.png" />--> | ||||
</Border.Background> | </Border.Background> | ||||
<Grid Margin="10"> | <Grid Margin="10"> | ||||
@@ -78,9 +79,17 @@ | |||||
<RowDefinition Height="40" /> | <RowDefinition Height="40" /> | ||||
<RowDefinition Height="40" /> | <RowDefinition Height="40" /> | ||||
<RowDefinition Height="40" /> | <RowDefinition Height="40" /> | ||||
<RowDefinition Height="40" /> | |||||
<RowDefinition /> | <RowDefinition /> | ||||
</Grid.RowDefinitions> | </Grid.RowDefinitions> | ||||
<Grid Grid.Row="0"> | |||||
<TextBlock | |||||
HorizontalAlignment="Center" | |||||
VerticalAlignment="Center" | |||||
Foreground="DeepSkyBlue" | |||||
Text="配方编辑" /> | |||||
<Grid Grid.Row="1"> | |||||
<Grid.ColumnDefinitions> | <Grid.ColumnDefinitions> | ||||
<ColumnDefinition /> | <ColumnDefinition /> | ||||
<ColumnDefinition /> | <ColumnDefinition /> | ||||
@@ -120,7 +129,7 @@ | |||||
Text="{Binding RecipeCode}" /> | Text="{Binding RecipeCode}" /> | ||||
</WrapPanel> | </WrapPanel> | ||||
</Grid> | </Grid> | ||||
<Grid Grid.Row="1"> | |||||
<Grid Grid.Row="2"> | |||||
<Grid.ColumnDefinitions> | <Grid.ColumnDefinitions> | ||||
<ColumnDefinition Width="1*" /> | <ColumnDefinition Width="1*" /> | ||||
<ColumnDefinition Width="1*" /> | <ColumnDefinition Width="1*" /> | ||||
@@ -181,7 +190,7 @@ | |||||
<!--#region 表格标题栏设置--> | <!--#region 表格标题栏设置--> | ||||
<Grid | <Grid | ||||
Grid.Row="2" | |||||
Grid.Row="3" | |||||
Margin="0,10,0,0" | Margin="0,10,0,0" | ||||
Background="#ff0C255F"> | Background="#ff0C255F"> | ||||
@@ -287,7 +296,7 @@ | |||||
</Grid> | </Grid> | ||||
<Border Grid.ColumnSpan="10" BorderThickness="1,0,1,0" />--> | <Border Grid.ColumnSpan="10" BorderThickness="1,0,1,0" />--> | ||||
</Grid> | </Grid> | ||||
<Grid Grid.Row="3"> | |||||
<Grid Grid.Row="4"> | |||||
<ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"> | <ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"> | ||||
<ItemsControl ItemsSource="{Binding AllRawMaterial}"> | <ItemsControl ItemsSource="{Binding AllRawMaterial}"> | ||||
<ItemsControl.ItemTemplate> | <ItemsControl.ItemTemplate> | ||||