Merge branch 'master' of http://10.10.28.13:8080/r/PDM/PdmSwPlugin2

chr

2024-08-21 9ee7d3bd9c58a204b1efe38e6be61155bbb15c16

 PdmSwPlugin.DrawApprove/DrawApprove.xaml

@@ -17,59 +17,6 @@
                <Setter Property="TextBlock.TextTrimming" Value="CharacterEllipsis"/>
            </Style>

            <Style x:Key ="jgjSlot" TargetType="TextBlock">
                <Setter Property="Text" Value="-"/>
                <Style.Triggers>
                    <DataTrigger Binding="{Binding jgj}" Value="True">
                        <Setter Property="Text" Value="是"/>
                    </DataTrigger>
                    <DataTrigger Binding="{Binding jgj}" Value="False">
                        <Setter Property="Text" Value="否"/>
                    </DataTrigger>
                </Style.Triggers>
            </Style>

            <Style x:Key ="inDbSlot" TargetType="TextBlock">
                <Setter Property="Foreground" Value="White"/>
                <Style.Triggers>
                    <MultiDataTrigger>
                        <MultiDataTrigger.Conditions>
                            <Condition Binding="{Binding needOrdered}" Value="True"/>
                            <Condition Binding="{Binding inDb}" Value="True"/>
                        </MultiDataTrigger.Conditions>
                        <Setter Property="Text" Value="已建料"/>
                        <Setter Property="Background" Value="Green"/>
                    </MultiDataTrigger>
                    <MultiDataTrigger>
                        <MultiDataTrigger.Conditions>
                            <Condition Binding="{Binding needOrdered}" Value="True"/>
                            <Condition Binding="{Binding inDb}" Value="False"/>
                        </MultiDataTrigger.Conditions>
                        <Setter Property="Text" Value="未建料"/>
                        <Setter Property="Background" Value="red"/>
                    </MultiDataTrigger>

                    <MultiDataTrigger>
                        <MultiDataTrigger.Conditions>
                            <Condition Binding="{Binding produceWay}" Value="自制"/>
                            <Condition Binding="{Binding xcChild}" Value="False"/>
                            <Condition Binding="{Binding inDb}" Value="True"/>
                        </MultiDataTrigger.Conditions>
                        <Setter Property="Text" Value="已建料"/>
                        <Setter Property="Background" Value="Green"/>
                    </MultiDataTrigger>
                    <MultiDataTrigger>
                        <MultiDataTrigger.Conditions>
                            <Condition Binding="{Binding produceWay}" Value="自制"/>
                            <Condition Binding="{Binding xcChild}" Value="False"/>
                            <Condition Binding="{Binding inDb}" Value="False"/>
                        </MultiDataTrigger.Conditions>
                        <Setter Property="Text" Value="未建料"/>
                        <Setter Property="Background" Value="Orange"/>
                    </MultiDataTrigger>
                </Style.Triggers>
            </Style>

            <Style x:Key ="statusSlot" TargetType="TextBlock">
                <Setter Property="Foreground" Value="White"/>
                <Style.Triggers>
@@ -137,7 +84,7 @@
                            <DataGridTemplateColumn.CellTemplate>
                                <DataTemplate>
                                    <CheckBox DataContext="{Binding Data}"
                      IsChecked="{Binding selected}"/>
                      IsChecked="{Binding selected}" Checked="SingleCheckBox_Event" Unchecked="SingleCheckBox_Event"/>
                                </DataTemplate>
                            </DataGridTemplateColumn.CellTemplate>
                        </DataGridTemplateColumn>
@@ -152,13 +99,16 @@
                            </DataGridTemplateColumn.CellTemplate>
                        </DataGridTemplateColumn>

                        <DataGridTextColumn Header="申请人" Width="80" IsReadOnly="True"  Binding="{Binding Data.requestUser}"/>
                        <DataGridTextColumn Header="前一审核人" Width="80" IsReadOnly="True"  Binding="{Binding Data.auditUser}"/>
                        <DataGridTextColumn Header="申请人" Width="80" IsReadOnly="True" Binding="{Binding Data.requestUser}"/>
                        <DataGridTextColumn Header="流水单号" Width="80" IsReadOnly="True" Binding="{Binding Data.orderCode}"/>
                        <DataGridTextColumn Header="前一审核人" Width="80" IsReadOnly="True" Binding="{Binding Data.auditUser}"/>
                        <DataGridTextColumn Header="提交时间" Width="130" IsReadOnly="True" Binding="{Binding Data.updateTime}"/>

                        <DataGridTemplateColumn Header="状态" Width="60" IsReadOnly="True">
                            <DataGridTemplateColumn.CellTemplate>
                                <DataTemplate>
                                    <TextBlock Style="{StaticResource statusSlot}" DataContext="{Binding Data}"/>
                                    <TextBlock Style="{StaticResource statusSlot}" DataContext="{Binding Data}"
                                               MouseLeftButtonDown="TextBlock_MouseLeftButtonDown"/>
                                </DataTemplate>
                            </DataGridTemplateColumn.CellTemplate>
                        </DataGridTemplateColumn>
@@ -182,7 +132,7 @@

                <StatusBar DockPanel.Dock="Bottom" Height="20">
                    <StatusBarItem >
                        <TextBox x:Name="activeDocPath" IsReadOnly="True" Style="{StaticResource StatusBarTextBox}" Text="{Binding ActiveDocPath}"/>
                        <TextBox x:Name="activeDocPath" IsReadOnly="True" Style="{StaticResource StatusBarTextBox}" Text="{Binding SelectBomText}"/>
                    </StatusBarItem>
                    <Separator/>
                    <StatusBarItem>