From 45c004d4bb5a6f73843a8e8020523f4df14a14e4 Mon Sep 17 00:00:00 2001
From: Chr <haoran.cheng@skonda.com.cn>
Date: 星期二, 20 八月 2024 19:17:07 +0800
Subject: [PATCH] 完善消息通知程序；
---
PdmSwPlugin.DrawApprove/DrawApprove.xaml | 66 ++++-----------------------------
1 files changed, 8 insertions(+), 58 deletions(-)
diff --git a/PdmSwPlugin.DrawApprove/DrawApprove.xaml b/PdmSwPlugin.DrawApprove/DrawApprove.xaml
index 5506ce2..fd35c23 100644
--- a/PdmSwPlugin.DrawApprove/DrawApprove.xaml
+++ b/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>
--
Gitblit v1.9.1