pengcong001
/
bbwy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修复业务端金额显示问题

AddValidOverTime
506583276@qq.com 2 years ago
parent
77defe1ec3
commit
c076e24dff
8 changed files with 46 additions and 35 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      BBWY.Client/BBWYAppSettings.json
  2. 2
      BBWY.Client/GlobalContext.cs
  3. 4
      BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs
  4. 2
      BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
  5. 2
      BBWY.Client/Views/PackTask/PackDetailWindow.xaml
  6. 2
      BBWY.Client/Views/PackTask/ServiceWindow.xaml
  7. 19
      BBWY.Client/Views/PackTask/ShopWaitPackageControl.xaml
  8. 32
      BBWY.Client/Views/PackTask/TaskListControl.xaml

4
BBWY.Client/BBWYAppSettings.json
View File

@ -4,6 +4,6 @@
"MDSApiHost": "http://mdsapi.qiyue666.com", "MDSApiHost": "http://mdsapi.qiyue666.com",
"JOSApiHost": "", "JOSApiHost": "",
"1688ApiHost": "", "1688ApiHost": "",
"QKApiHost": "http://localhost:8080" // "QKApiHost": "http://localhost:8080"
//"QKApiHost": "http://qiku.qiyue666.com" "QKApiHost": "http://qiku.qiyue666.com"
} }

2
BBWY.Client/GlobalContext.cs
View File

@ -13,7 +13,7 @@ namespace BBWY.Client
{ {
ShopServiceGroupList = new List<string>(); ShopServiceGroupList = new List<string>();
ShopServiceGroupLowerList = new List<string>(); ShopServiceGroupLowerList = new List<string>();
ClientVersion = "10153"; ClientVersion = "10154";
} }
private User user; private User user;

4
BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs
View File

@ -613,8 +613,8 @@ namespace BBWY.Client.ViewModels.PackTask
if (item.FeesItemResponse != null) if (item.FeesItemResponse != null)
{ {
data.FeesItemResponse = item.FeesItemResponse; data.FeesItemResponse = item.FeesItemResponse;
data.FeesMoney = item.FeesItemResponse.SingleFees; data.FeesMoney = item.FeesItemResponse.AllFees;
data.IsShowFees = data.FeesMoney > 0 ? true : false; data.IsShowFees = item.FeesItemResponse.AllFees > 0 ? true : false;
data.FeesItemResponse.DiscountSingleFees = item.FeesItemResponse.SingleFees * item.FeesItemResponse.disCount; data.FeesItemResponse.DiscountSingleFees = item.FeesItemResponse.SingleFees * item.FeesItemResponse.disCount;
data.FeesItemResponse.DiscountAllFees = item.FeesItemResponse.AllFees * item.FeesItemResponse.disCount; data.FeesItemResponse.DiscountAllFees = item.FeesItemResponse.AllFees * item.FeesItemResponse.disCount;

2
BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
View File

@ -777,7 +777,7 @@ namespace BBWY.Client.ViewModels.PackTask
{ {
var model = (PackTaskModel)obj; var model = (PackTaskModel)obj;
if (model == null || model.FeesItemResponse == null || model.FeesItemResponse.DiscountAllFees == 0) if (model == null || model.FeesItemResponse == null || model.FeesItemResponse.AllFees == 0)
{ {
System.Windows.MessageBox.Show("请先设置打包费用!"); System.Windows.MessageBox.Show("请先设置打包费用!");
return; return;

2
BBWY.Client/Views/PackTask/PackDetailWindow.xaml
View File

@ -538,7 +538,7 @@
<Grid Grid.Row="1" Grid.Column="1" Visibility="Visible"> <Grid Grid.Row="1" Grid.Column="1" Visibility="Hidden">
<StackPanel Orientation="Vertical" Name="printArea" Width="1065" Height="800"> <StackPanel Orientation="Vertical" Name="printArea" Width="1065" Height="800">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">

2
BBWY.Client/Views/PackTask/ServiceWindow.xaml
View File

@ -421,7 +421,7 @@
<Grid Grid.Row="1" Grid.Column="1" Visibility="Visible"> <Grid Grid.Row="1" Grid.Column="1" Visibility="Hidden">
<StackPanel Orientation="Vertical" Name="printArea" Width="1065" Height="800"> <StackPanel Orientation="Vertical" Name="printArea" Width="1065" Height="800">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">

19
BBWY.Client/Views/PackTask/ShopWaitPackageControl.xaml
View File

@ -399,7 +399,9 @@
<Grid Grid.Column="7"> <Grid Grid.Column="7">
<StackPanel Margin="20,0,0,0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" > <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding FeesItemResponse,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible }"
>
<TextBlock Text="收费: "/> <TextBlock Text="收费: "/>
<TextBlock <TextBlock
Text="{Binding FeesItemResponse.AllFees, StringFormat={}{0:F2}}" Text="{Binding FeesItemResponse.AllFees, StringFormat={}{0:F2}}"
@ -408,19 +410,22 @@
/> />
<Path x:Name="path_fees_name" <Path x:Name="path_fees_name"
Style="{StaticResource path_question}" Style="{StaticResource path_question}"
Width="14" Margin="0,0,0,0" Fill="{StaticResource Text.Pink}" Width="14" Fill="{StaticResource Text.Pink}"
ToolTipService.InitialShowDelay="0" ToolTipService.ShowDuration="20000" ToolTipService.InitialShowDelay="0" ToolTipService.ShowDuration="30000"
Visibility="{Binding FeesItemResponse,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible }"
> >
<Path.ToolTip> <Path.ToolTip>
<ToolTip Style="{StaticResource OrderCouponToolipStyle}"> <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
<local:FeesExcelControl IsWareHouse="True" FeesItem="{Binding FeesItemResponse,Mode=TwoWay,NotifyOnSourceUpdated=True,UpdateSourceTrigger=PropertyChanged}" <Grid>
<local:FeesExcelControl FeesItem="{Binding FeesItemResponse,Mode=TwoWay,NotifyOnSourceUpdated=True,UpdateSourceTrigger=PropertyChanged}"
Visibility="{Binding PackProcessType,Converter={StaticResource objConverter},ConverterParameter=#null:Visible:Collapsed}"
/>
<local:FeesExcelV2Control FeesItem="{Binding FeesItemResponse,Mode=TwoWay,NotifyOnSourceUpdated=True,UpdateSourceTrigger=PropertyChanged}"
Visibility="{Binding PackProcessType,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
/> />
</Grid>
</ToolTip> </ToolTip>
</Path.ToolTip> </Path.ToolTip>
</Path> </Path>
</StackPanel> </StackPanel>
</Grid> </Grid>
<!--<Grid Grid.Column="8" > <!--<Grid Grid.Column="8" >

32
BBWY.Client/Views/PackTask/TaskListControl.xaml
View File

@ -369,30 +369,36 @@
</Grid>--> </Grid>-->
<Grid Grid.Column="8" > <Grid Grid.Column="8" >
<Grid > <Grid >
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding IsShowFees,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}" Visibility="{Binding FeesItemResponse,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible }"
> >
<TextBlock TextWrapping="Wrap" <TextBlock Text="收费: "/>
TextAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center" > <TextBlock
<Run Text="收费:"/> Text="{Binding FeesItemResponse.AllFees, StringFormat={}{0:F2}}"
<Run Text="{Binding FeesItemResponse.DiscountAllFees,StringFormat=0.00}" TextWrapping="Wrap"
HorizontalAlignment="Center"
/> />
</TextBlock> <Path x:Name="path_fees_name"
<Path x:Name="path_purchaseAmount_question"
Style="{StaticResource path_question}" Style="{StaticResource path_question}"
Width="14" Margin="5,0,0,0" Fill="{StaticResource Text.Pink}" Width="14" Fill="{StaticResource Text.Pink}"
ToolTipService.InitialShowDelay="0" ToolTipService.InitialShowDelay="0" ToolTipService.ShowDuration="30000"
>
ToolTipService.ShowDuration="20000">
<Path.ToolTip> <Path.ToolTip>
<ToolTip Style="{StaticResource OrderCouponToolipStyle}"> <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
<local:FeesExcelControl FeesItem="{Binding FeesItemResponse,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" <Grid>
<local:FeesExcelControl FeesItem="{Binding FeesItemResponse,Mode=TwoWay,NotifyOnSourceUpdated=True,UpdateSourceTrigger=PropertyChanged}"
Visibility="{Binding PackProcessType,Converter={StaticResource objConverter},ConverterParameter=#null:Visible:Collapsed}"
/>
<local:FeesExcelV2Control FeesItem="{Binding FeesItemResponse,Mode=TwoWay,NotifyOnSourceUpdated=True,UpdateSourceTrigger=PropertyChanged}"
Visibility="{Binding PackProcessType,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
/> />
</Grid>
</ToolTip> </ToolTip>
</Path.ToolTip> </Path.ToolTip>
</Path> </Path>
</StackPanel> </StackPanel>
</Grid> </Grid>
</Grid> </Grid>
<Grid Grid.Column="9" > <Grid Grid.Column="9" >

Write Preview
Loading…
Cancel
Save