Compare commits
10
Commits
d77ec5cc2e
...
e12c419ef3
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e12c419ef3 | ||
|
|
11599bc7d3 | ||
|
|
e4e8c34f8d | ||
|
|
39648cd9a9 | ||
|
|
f7082d8a7a | ||
|
|
b7abfb79c6 | ||
|
|
57c8b69252 | ||
|
|
4f1fa75ec8 | ||
|
|
a18191b1a6 | ||
|
|
4e449f31bd |
No files matched your search
@@ -0,0 +1,128 @@
|
|||||||
|
<UserControl
|
||||||
|
x:Class="_29WxOrderWpf.Ctrls.BuyerCtrls.SkuSelectListRowCtrl"
|
||||||
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
|
xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.BuyerCtrls"
|
||||||
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
|
d:DesignHeight="150"
|
||||||
|
d:DesignWidth="800"
|
||||||
|
mc:Ignorable="d">
|
||||||
|
<Grid>
|
||||||
|
<Border
|
||||||
|
Margin="4"
|
||||||
|
BorderBrush="LightSkyBlue"
|
||||||
|
BorderThickness="1"
|
||||||
|
CornerRadius="10">
|
||||||
|
<Grid>
|
||||||
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition Width="auto" />
|
||||||
|
<ColumnDefinition />
|
||||||
|
<ColumnDefinition Width="auto" />
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
<Image
|
||||||
|
x:Name="imgSku"
|
||||||
|
Grid.Row="0"
|
||||||
|
Grid.Column="0"
|
||||||
|
Width="100"
|
||||||
|
Height="100"
|
||||||
|
Margin="8"
|
||||||
|
VerticalAlignment="Top"
|
||||||
|
Cursor="Hand"
|
||||||
|
MouseDown="imgSku_MouseDown"
|
||||||
|
MouseEnter="imgSku_MouseEnter"
|
||||||
|
MouseLeave="imgSku_MouseLeave" />
|
||||||
|
<Grid
|
||||||
|
Grid.Column="1"
|
||||||
|
Margin="0,8"
|
||||||
|
VerticalAlignment="Center">
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="auto" />
|
||||||
|
<RowDefinition Height="auto" />
|
||||||
|
<RowDefinition Height="auto" />
|
||||||
|
<RowDefinition Height="auto" />
|
||||||
|
<RowDefinition Height="auto" />
|
||||||
|
<RowDefinition Height="auto" />
|
||||||
|
<RowDefinition Height="auto" />
|
||||||
|
<RowDefinition Height="auto" />
|
||||||
|
<RowDefinition Height="auto" />
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
|
<WrapPanel Visibility="{Binding SpecNameStr, Converter={StaticResource HasTextVisibility}}">
|
||||||
|
<TextBox
|
||||||
|
VerticalAlignment="Top"
|
||||||
|
d:Opacity="0.5"
|
||||||
|
Background="Transparent"
|
||||||
|
BorderThickness="0"
|
||||||
|
IsReadOnly="True"
|
||||||
|
Text="商品标题:"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
<TextBox
|
||||||
|
VerticalAlignment="Top"
|
||||||
|
d:Opacity="0.5"
|
||||||
|
d:Text="商品标题"
|
||||||
|
Background="Transparent"
|
||||||
|
BorderThickness="0"
|
||||||
|
IsReadOnly="True"
|
||||||
|
Text="{Binding GoodsNameStr}"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
</WrapPanel>
|
||||||
|
<WrapPanel Grid.Row="1" Visibility="{Binding SpecNameStr, Converter={StaticResource HasTextVisibility}}">
|
||||||
|
<TextBox
|
||||||
|
VerticalAlignment="Top"
|
||||||
|
d:Opacity="0.5"
|
||||||
|
Background="Transparent"
|
||||||
|
BorderThickness="0"
|
||||||
|
IsReadOnly="True"
|
||||||
|
Text="商品规格:"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
<TextBox
|
||||||
|
Grid.Row="0"
|
||||||
|
VerticalAlignment="Top"
|
||||||
|
d:Opacity="0.5"
|
||||||
|
d:Text="SKU规格"
|
||||||
|
Background="Transparent"
|
||||||
|
BorderThickness="0"
|
||||||
|
FontWeight="Bold"
|
||||||
|
IsReadOnly="True"
|
||||||
|
Text="{Binding SpecNameStr}"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
</WrapPanel>
|
||||||
|
|
||||||
|
<WrapPanel Grid.Row="2" Visibility="{Binding groupPrice, Converter={StaticResource HasTextVisibility}}">
|
||||||
|
<TextBox
|
||||||
|
VerticalAlignment="Top"
|
||||||
|
d:Opacity="0.5"
|
||||||
|
Background="Transparent"
|
||||||
|
BorderThickness="0"
|
||||||
|
IsReadOnly="True"
|
||||||
|
Text="规格单价:"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
<TextBox
|
||||||
|
Grid.Row="0"
|
||||||
|
VerticalAlignment="Top"
|
||||||
|
d:Opacity="0.5"
|
||||||
|
d:Text="0.00"
|
||||||
|
Background="Transparent"
|
||||||
|
BorderThickness="0"
|
||||||
|
IsReadOnly="True"
|
||||||
|
Text="{Binding groupPrice}"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
</WrapPanel>
|
||||||
|
</Grid>
|
||||||
|
<Button
|
||||||
|
x:Name="btnAdd"
|
||||||
|
Grid.Column="100"
|
||||||
|
MinWidth="48"
|
||||||
|
MinHeight="28"
|
||||||
|
Margin="8"
|
||||||
|
Padding="4"
|
||||||
|
HorizontalAlignment="Left"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
Click="btnAdd_Click"
|
||||||
|
Content="确定关联"
|
||||||
|
Style="{StaticResource BasePageButtonStyle}" />
|
||||||
|
</Grid>
|
||||||
|
</Border>
|
||||||
|
</Grid>
|
||||||
|
</UserControl>
|
||||||
@@ -0,0 +1,81 @@
|
|||||||
|
using _29WxOrderWpf.ViewModels;
|
||||||
|
using AllBase;
|
||||||
|
using AllBase.Model.DBModel;
|
||||||
|
using AllBase.Model.Result;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using System.Windows;
|
||||||
|
using System.Windows.Controls;
|
||||||
|
using System.Windows.Data;
|
||||||
|
using System.Windows.Documents;
|
||||||
|
using System.Windows.Input;
|
||||||
|
using System.Windows.Media;
|
||||||
|
using System.Windows.Media.Imaging;
|
||||||
|
using System.Windows.Navigation;
|
||||||
|
using System.Windows.Shapes;
|
||||||
|
using Work._29Tools.Forms.ToolForms;
|
||||||
|
|
||||||
|
namespace _29WxOrderWpf.Ctrls.BuyerCtrls;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// SkuSelectListRowCtrl.xaml 的交互逻辑
|
||||||
|
/// </summary>
|
||||||
|
public partial class SkuSelectListRowCtrl : UserControl
|
||||||
|
{
|
||||||
|
public SkuSelectListRowCtrl()
|
||||||
|
{
|
||||||
|
InitializeComponent();
|
||||||
|
this.DataContextChanged += SkuSelectListRowCtrl_DataContextChanged;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void SkuSelectListRowCtrl_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
|
||||||
|
{
|
||||||
|
if (this.DataContext is frontSkuInfo3 frontSku)
|
||||||
|
{
|
||||||
|
Task.Run(() =>
|
||||||
|
{
|
||||||
|
// 异步加载图片防止卡顿
|
||||||
|
// 缩略图在有的电脑上无法显示
|
||||||
|
//BitmapImage bImg = ImageUrlToBitmapImageConverter.LoadImageFromUrl(order_item.thumb_img + "?imageView2/1/w/100/format/webp|imageMogr2/auto-orient=");
|
||||||
|
BitmapImage bImg = AllBase.ImageBuild.LoadBitmipImageFromUrl(frontSku.thumbUrl);
|
||||||
|
Thread.Sleep(Randomx.GetId(200));
|
||||||
|
Dispatcher.Invoke(new Action(() =>
|
||||||
|
{
|
||||||
|
imgSku.Source = bImg;
|
||||||
|
}));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void imgSku_MouseDown(object sender, MouseButtonEventArgs e)
|
||||||
|
{
|
||||||
|
if (this.DataContext is frontSkuInfo3 frontSku)
|
||||||
|
{
|
||||||
|
ShowImgForm imgFrom = new ShowImgForm(frontSku.thumbUrl);
|
||||||
|
imgFrom.TopMost = true;
|
||||||
|
imgFrom.Show();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void imgSku_MouseEnter(object sender, MouseEventArgs e)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void imgSku_MouseLeave(object sender, MouseEventArgs e)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private async void btnAdd_Click(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
if (this.DataContext is frontSkuInfo3 frontSku)
|
||||||
|
{
|
||||||
|
await BuyMapSkuViewModel.BuyMapSkuInstance.SetOrderMapSku(frontSku);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -580,24 +580,33 @@
|
|||||||
BorderThickness="0,0,0,1">
|
BorderThickness="0,0,0,1">
|
||||||
<WrapPanel>
|
<WrapPanel>
|
||||||
<CheckBox
|
<CheckBox
|
||||||
x:Name="chkMapProdOnly"
|
x:Name="chkNoMapProd"
|
||||||
Margin="8,0,4,0"
|
Margin="8,0,4,0"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
BorderBrush="{StaticResource mainColorBrush}"
|
BorderBrush="{StaticResource mainColorBrush}"
|
||||||
Click="chkMapProdOnly_Click"
|
Click="chkMapProd_Click"
|
||||||
Content="已关联拍单"
|
|
||||||
FontSize="12" />
|
|
||||||
<CheckBox
|
|
||||||
x:Name="chkNoMapProdOnly"
|
|
||||||
Margin="8,0,4,0"
|
|
||||||
HorizontalAlignment="Left"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
BorderBrush="{StaticResource mainColorBrush}"
|
|
||||||
Click="chkNoMapProdOnly_Click"
|
|
||||||
Content="未关联拍单"
|
Content="未关联拍单"
|
||||||
FontSize="12" />
|
FontSize="12" />
|
||||||
|
|
||||||
|
<CheckBox
|
||||||
|
x:Name="chkMapProd"
|
||||||
|
Margin="8,0,4,0"
|
||||||
|
HorizontalAlignment="Left"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
BorderBrush="{StaticResource mainColorBrush}"
|
||||||
|
Click="chkMapProd_Click"
|
||||||
|
Content="已关联商品"
|
||||||
|
FontSize="12" />
|
||||||
|
<CheckBox
|
||||||
|
x:Name="chkMapSku"
|
||||||
|
Margin="8,0,4,0"
|
||||||
|
HorizontalAlignment="Left"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
BorderBrush="{StaticResource mainColorBrush}"
|
||||||
|
Click="chkMapProd_Click"
|
||||||
|
Content="已关联拍单"
|
||||||
|
FontSize="12" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
Width="Auto"
|
Width="Auto"
|
||||||
|
|||||||
@@ -1512,9 +1512,11 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
{
|
{
|
||||||
if (!order.IsWaitBuy)
|
if (!order.IsWaitBuy)
|
||||||
return true;
|
return true;
|
||||||
if (chkMapProdOnly.IsChecked == true && order.orderItems.All(oi => oi.BuyMap == null))
|
if (chkMapSku.IsChecked == true && order.orderItems.All(oi => oi.BuyMap == null && (oi.BuyMapSkus == null || oi.BuyMapSkus.Count == 0)))
|
||||||
return true;
|
return true;
|
||||||
if (chkNoMapProdOnly.IsChecked == true && order.orderItems.All(oi => oi.BuyMap != null))
|
if (chkMapProd.IsChecked == true && order.orderItems.All(oi => oi.BuyMapSkus == null || oi.BuyMapSkus.Count == 0))
|
||||||
|
return true;
|
||||||
|
if (chkNoMapProd.IsChecked == true && order.orderItems.All(oi => oi.BuyMap != null))
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (filterHeadStr.StartsWith("待发货"))
|
if (filterHeadStr.StartsWith("待发货"))
|
||||||
@@ -1821,16 +1823,14 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
FilterOrders();
|
FilterOrders();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void chkMapProdOnly_Click(object sender, RoutedEventArgs e)
|
private void chkMapProd_Click(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
if (chkMapProdOnly.IsChecked == true)
|
if (sender is CheckBox chk)
|
||||||
chkNoMapProdOnly.IsChecked = false;
|
{
|
||||||
FilterOrders();
|
var isCheck = !chk.IsChecked.ParseToBool();
|
||||||
}
|
chkNoMapProd.IsChecked = chkMapProd.IsChecked = chkMapSku.IsChecked = false;
|
||||||
private void chkNoMapProdOnly_Click(object sender, RoutedEventArgs e)
|
chk.IsChecked = !isCheck;
|
||||||
{
|
}
|
||||||
if (chkNoMapProdOnly.IsChecked == true)
|
|
||||||
chkMapProdOnly.IsChecked = false;
|
|
||||||
FilterOrders();
|
FilterOrders();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,42 +1,52 @@
|
|||||||
<UserControl x:Class="_29WxOrderWpf.Ctrls.OrderCtrls.OrderListRowCtrl"
|
<UserControl
|
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
x:Class="_29WxOrderWpf.Ctrls.OrderCtrls.OrderListRowCtrl"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.OrderCtrls"
|
xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.OrderCtrls"
|
||||||
xmlns:uc="clr-namespace:_29WxOrderWpf.UserControls"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
mc:Ignorable="d"
|
xmlns:uc="clr-namespace:_29WxOrderWpf.UserControls"
|
||||||
d:DesignHeight="230" d:DesignWidth="1200">
|
d:DesignHeight="230"
|
||||||
<Border Margin="0,12,8,0" HorizontalAlignment="Stretch" VerticalAlignment="Center" BorderThickness="1"
|
d:DesignWidth="1200"
|
||||||
BorderBrush="{StaticResource ListRowBorderColorBrush}" CornerRadius="10">
|
mc:Ignorable="d">
|
||||||
<Border.Style>
|
<Border
|
||||||
<!-- 鼠标进入或悬停Border时切换颜色(悬停时Border的填充控件必须有填充Border,所在层级不限,仅填充透明Grid则触发器无效) -->
|
Margin="0,12,8,0"
|
||||||
<Style TargetType="Border">
|
HorizontalAlignment="Stretch"
|
||||||
<Style.Triggers>
|
VerticalAlignment="Center"
|
||||||
<Trigger Property="IsMouseOver" Value="True">
|
BorderBrush="{StaticResource ListRowBorderColorBrush}"
|
||||||
<Setter Property="Background" Value="{StaticResource ListRowHoverBackColorBrush}"/>
|
BorderThickness="1"
|
||||||
</Trigger>
|
CornerRadius="10">
|
||||||
</Style.Triggers>
|
<Border.Style>
|
||||||
</Style>
|
<!-- 鼠标进入或悬停Border时切换颜色(悬停时Border的填充控件必须有填充Border,所在层级不限,仅填充透明Grid则触发器无效) -->
|
||||||
</Border.Style>
|
<Style TargetType="Border">
|
||||||
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Center">
|
<Style.Triggers>
|
||||||
<Grid.RowDefinitions>
|
<Trigger Property="IsMouseOver" Value="True">
|
||||||
<RowDefinition Height="auto"></RowDefinition>
|
<Setter Property="Background" Value="{StaticResource ListRowHoverBackColorBrush}" />
|
||||||
<RowDefinition Height="*"></RowDefinition>
|
</Trigger>
|
||||||
</Grid.RowDefinitions>
|
</Style.Triggers>
|
||||||
|
</Style>
|
||||||
|
</Border.Style>
|
||||||
|
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Center">
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="auto" />
|
||||||
|
<RowDefinition Height="*" />
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
<!--子控件是普通控件而非模板页控件,无需指定DataContext="{Binding}"-->
|
<!-- 子控件是普通控件而非模板页控件,无需指定DataContext="{Binding}" -->
|
||||||
<local:OrderListRowHeaderCtrl></local:OrderListRowHeaderCtrl>
|
<local:OrderListRowHeaderCtrl />
|
||||||
<!--<local:OrderListRowHeaderCtrl DataContext="{Binding}"></local:OrderListRowHeaderCtrl>-->
|
<!--<local:OrderListRowHeaderCtrl DataContext="{Binding}"></local:OrderListRowHeaderCtrl>-->
|
||||||
<Border Grid.Row="1" Background="Transparent" CornerRadius="0,0,12,12" >
|
<Border
|
||||||
<Grid x:Name="gridChildOrder">
|
Grid.Row="1"
|
||||||
<Grid.RowDefinitions>
|
Background="Transparent"
|
||||||
<RowDefinition Height="6"></RowDefinition>
|
CornerRadius="0,0,12,12">
|
||||||
<RowDefinition Height="auto"></RowDefinition>
|
<Grid x:Name="gridChildOrder">
|
||||||
<RowDefinition Height="6"></RowDefinition>
|
<Grid.RowDefinitions>
|
||||||
</Grid.RowDefinitions>
|
<RowDefinition Height="6" />
|
||||||
</Grid>
|
<RowDefinition Height="auto" />
|
||||||
</Border>
|
<RowDefinition Height="6" />
|
||||||
</Grid>
|
</Grid.RowDefinitions>
|
||||||
</Border>
|
</Grid>
|
||||||
|
</Border>
|
||||||
|
</Grid>
|
||||||
|
</Border>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
File diff suppressed because it is too large.
Load diff
@@ -50,12 +50,13 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
public OrderListRowItemCtrl()
|
public OrderListRowItemCtrl()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
txtTransitOrderBuyerStr.AddHandler(TextBox.MouseUpEvent, new MouseButtonEventHandler(txtTransitOrderNumStr_MouseLeftButtonUp), true);
|
txtTransitOrderBuyerStr.AddHandler(TextBox.MouseUpEvent, new MouseButtonEventHandler(TransitOrderBuye_Click), true);
|
||||||
txtTransitOrderNumStr.AddHandler(TextBox.MouseUpEvent, new MouseButtonEventHandler(txtTransitOrderNumStr_MouseLeftButtonUp), true);
|
txtTransitOrderNumStr.AddHandler(TextBox.MouseUpEvent, new MouseButtonEventHandler(TransitOrderBuye_Click), true);
|
||||||
txtDirectBuyer.AddHandler(TextBox.MouseUpEvent, new MouseButtonEventHandler(txtDirectOrderNumStr_MouseLeftButtonUp), true);
|
txtDirectBuyer.AddHandler(TextBox.MouseUpEvent, new MouseButtonEventHandler(txtDirectOrderNumStr_MouseLeftButtonUp), true);
|
||||||
txtDirectBuyerOrderNo.AddHandler(TextBox.MouseUpEvent, new MouseButtonEventHandler(txtDirectOrderNumStr_MouseLeftButtonUp), true);
|
txtDirectBuyerOrderNo.AddHandler(TextBox.MouseUpEvent, new MouseButtonEventHandler(txtDirectOrderNumStr_MouseLeftButtonUp), true);
|
||||||
txtRefundId.AddHandler(TextBox.MouseUpEvent, new MouseButtonEventHandler(txtRefundId_MouseLeftButtonUp), true);
|
txtRefundId.AddHandler(TextBox.MouseUpEvent, new MouseButtonEventHandler(txtRefundId_MouseLeftButtonUp), true);
|
||||||
|
|
||||||
|
|
||||||
txtWarehouseStatus.AddHandler(TextBox.MouseEnterEvent, new MouseEventHandler(txtWarehouseStatus_MouseEnter), true);
|
txtWarehouseStatus.AddHandler(TextBox.MouseEnterEvent, new MouseEventHandler(txtWarehouseStatus_MouseEnter), true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -716,11 +717,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
private void TransitOrderBuye_Click(object sender, MouseButtonEventArgs e)
|
||||||
private void txtTransitOrderNumStr_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
|
|
||||||
{
|
{
|
||||||
var buyerName = txtTransitOrderBuyerStr.Text.Split(':').LastOrDefault();
|
var buyerName = txtTransitOrderBuyerStr.Text;
|
||||||
var outOrderId = txtTransitOrderNumStr.Text.Split(':').LastOrDefault();
|
var outOrderId = txtTransitOrderNumStr.Text;
|
||||||
if (string.IsNullOrEmpty(buyerName) || string.IsNullOrEmpty(outOrderId))
|
if (string.IsNullOrEmpty(buyerName) || string.IsNullOrEmpty(outOrderId))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
@@ -1585,6 +1585,18 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void btnMapSkus_Click(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
|
||||||
|
if (DataContext is oms_wei_order_item_info orderItem)
|
||||||
|
{
|
||||||
|
BuyMapSkuSelectWindow window = new BuyMapSkuSelectWindow(orderItem);
|
||||||
|
window.Show();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using _29WxOrderWpf.Ctrls.Statistics.Models;
|
using _29WxOrderWpf.BaseWindows;
|
||||||
|
using _29WxOrderWpf.Ctrls.Statistics.Models;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
@@ -36,7 +37,16 @@ public partial class ShowOrderDialogView : UserControl
|
|||||||
&& element.DataContext is ShopRevenueStatisticsRow row
|
&& element.DataContext is ShopRevenueStatisticsRow row
|
||||||
&& !string.IsNullOrEmpty(row.OrderId))
|
&& !string.IsNullOrEmpty(row.OrderId))
|
||||||
{
|
{
|
||||||
Clipboard.SetText(row.OrderId);
|
Window window = Window.GetWindow(this);
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Clipboard.SetDataObject(row.OrderId);
|
||||||
|
BaseMsgWindow.ShowAnimateMessage("复制成功");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
BaseMsgWindow.ShowError("复制失败 " + ex.Message,window: window);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,237 @@
|
|||||||
|
using _29WxOrderWpf.BaseWindows;
|
||||||
|
using _29WxOrderWpf.Commands;
|
||||||
|
using AllBase;
|
||||||
|
using AllBase.Helper;
|
||||||
|
using AllBase.Model.DBModel;
|
||||||
|
using AllBase.Model.MvvmBaseClasses;
|
||||||
|
using AllBase.Model.Result;
|
||||||
|
using NaiBa.Util.Extension;
|
||||||
|
using Newtonsoft.Json.Linq;
|
||||||
|
using NPOI.HSSF.Record;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Collections.ObjectModel;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using Work;
|
||||||
|
using Work.BaseForms;
|
||||||
|
using Work.SearchSame;
|
||||||
|
using static System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel;
|
||||||
|
|
||||||
|
namespace _29WxOrderWpf.ViewModels;
|
||||||
|
|
||||||
|
public class BuyMapSkuViewModel : PropertyNotifyObject
|
||||||
|
{
|
||||||
|
public static BuyMapSkuViewModel BuyMapSkuInstance { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 请求关闭窗口
|
||||||
|
/// </summary>
|
||||||
|
public event Action RequestClose;
|
||||||
|
private volatile bool _isWindowLoaded = false;
|
||||||
|
public oms_wei_order_item_info OrderItem
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.OrderItem); }
|
||||||
|
set { this.SetValue(x => x.OrderItem, value); }
|
||||||
|
}
|
||||||
|
public ObservableCollection<WXBuyMapSkusInfo> BuyMapSkus
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.BuyMapSkus); }
|
||||||
|
set { this.SetValue(x => x.BuyMapSkus, value); }
|
||||||
|
}
|
||||||
|
public ObservableCollection<frontSkuInfo3> FrontSkuInfos
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.FrontSkuInfos); }
|
||||||
|
set { this.SetValue(x => x.FrontSkuInfos, value); }
|
||||||
|
}
|
||||||
|
public string ShopGoodsName
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.ShopGoodsName); }
|
||||||
|
set { this.SetValue(x => x.ShopGoodsName, value); }
|
||||||
|
}
|
||||||
|
public string ShopSkuName
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.ShopSkuName); }
|
||||||
|
set { this.SetValue(x => x.ShopSkuName, value); }
|
||||||
|
}
|
||||||
|
public string ShopSkuPrice
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.ShopSkuPrice); }
|
||||||
|
set { this.SetValue(x => x.ShopSkuPrice, value); }
|
||||||
|
}
|
||||||
|
//pddFrontGoods3Lite
|
||||||
|
|
||||||
|
public BuyMapSkuViewModel(oms_wei_order_item_info orderItem)
|
||||||
|
{
|
||||||
|
if (BuyMapSkuInstance != null)
|
||||||
|
BuyMapSkuInstance.RequestClose.Invoke();
|
||||||
|
|
||||||
|
BuyMapSkuInstance = this;
|
||||||
|
|
||||||
|
OrderItem = orderItem;
|
||||||
|
if (orderItem != null)
|
||||||
|
{
|
||||||
|
this.ShopGoodsName = orderItem.title;
|
||||||
|
this.ShopSkuName = orderItem.sku_attr_str;
|
||||||
|
this.ShopSkuPrice = (orderItem.real_price * 0.01m).ParseToString();
|
||||||
|
}
|
||||||
|
if (orderItem?.BuyMapSkus != null && orderItem?.BuyMapSkus.Count > 0)
|
||||||
|
{
|
||||||
|
BuyMapSkus = new ObservableCollection<WXBuyMapSkusInfo>(orderItem.BuyMapSkus);
|
||||||
|
SetCurrentFrontSkuInfo3(BuyMapSkus?.FirstOrDefault());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void SetCurrentFrontSkuInfo3(WXBuyMapSkusInfo skuInfo)
|
||||||
|
{
|
||||||
|
foreach (var info in BuyMapSkus)
|
||||||
|
{
|
||||||
|
info.IsChecked = false;
|
||||||
|
}
|
||||||
|
skuInfo.IsChecked = true;
|
||||||
|
FrontSkuInfos = new ObservableCollection<frontSkuInfo3>(skuInfo?.pdd_front_goods3_Lite.skus);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 窗口加载完成时调用
|
||||||
|
/// </summary>
|
||||||
|
public void Start()
|
||||||
|
{
|
||||||
|
_isWindowLoaded = true;
|
||||||
|
|
||||||
|
Task.Run(() =>
|
||||||
|
{
|
||||||
|
// todo get skus
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 窗口关闭时调用,停止后台任务
|
||||||
|
/// </summary>
|
||||||
|
public void Stop()
|
||||||
|
{
|
||||||
|
_isWindowLoaded = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task SetOrderMapSku(frontSkuInfo3 upSku)
|
||||||
|
{
|
||||||
|
var mapSkuProd = OrderItem.BuyMapSkus.FirstOrDefault(s => s.map_goods_id == upSku.goodsId.ParseToString());
|
||||||
|
if (mapSkuProd == null)
|
||||||
|
return;
|
||||||
|
|
||||||
|
var mapSku = mapSkuProd.pdd_front_goods3_Lite.skus.FirstOrDefault(s => string.Join(",", s.specs.Select(sp => sp.spec_value)) == upSku.SpecNameStr);
|
||||||
|
if (mapSku == null)
|
||||||
|
return;
|
||||||
|
|
||||||
|
var mapGoodsName = mapSkuProd.map_goods_name;
|
||||||
|
var mapSkuName = string.Join(",", mapSku.specs.Select(sp => sp.spec_value));
|
||||||
|
var mapGoodsId = mapSkuProd.map_goods_id;
|
||||||
|
var mapSkuId = mapSku.skuId.ParseToString();
|
||||||
|
var sendProvince = mapSkuProd.map_send_address;
|
||||||
|
|
||||||
|
string cmbTransitWarehouse = "";
|
||||||
|
string txtBuyTransitWarehouse = "";
|
||||||
|
var transitWarehouse = TransitWarehouseData.TransitWarehouseList.FirstOrDefault(t => t.TransId == mapSkuProd.transit_warehouse_id);
|
||||||
|
if (transitWarehouse != null)
|
||||||
|
{
|
||||||
|
cmbTransitWarehouse = transitWarehouse?.TransName + " " + transitWarehouse?.TransDetailAddress;
|
||||||
|
txtBuyTransitWarehouse = transitWarehouse?.TransDetailAddress;
|
||||||
|
}
|
||||||
|
|
||||||
|
var spuCode = OrderItem.out_product_id.IsNullOrEmpty() ? OrderItem.product_id : OrderItem.out_product_id;
|
||||||
|
var skuCode = OrderItem.out_sku_id.IsNullOrEmpty() ? OrderItem.sku_attr_str : OrderItem.out_sku_id;
|
||||||
|
if (spuCode.IsNullOrEmpty())
|
||||||
|
spuCode = OrderItem.product_id;
|
||||||
|
if (await SaveSkuMap(spuCode, skuCode, mapGoodsName, mapSkuName, mapGoodsId, mapSkuId, transitWarehouse, sendProvince))
|
||||||
|
RequestClose?.Invoke();
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<bool> SaveSkuMap(string spuCode, string skuCode, string mapGoodsName,
|
||||||
|
string mapSkuName, string mapGoodsId, string mapSkuId, TransitWarehouseParam transitWarehouse, string sendProvince)
|
||||||
|
{
|
||||||
|
if (transitWarehouse == null)
|
||||||
|
{
|
||||||
|
BaseMsgForm.ShowError("仓库不能为空");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
string url;
|
||||||
|
string upSpuCode = spuCode;
|
||||||
|
string upSkuCode = skuCode;
|
||||||
|
var data = UserLogin.GetSignaturex()
|
||||||
|
+ "&spu_code=" + GetHtml.UrlEncodeUtf8(upSpuCode)
|
||||||
|
+ "&sku_code=" + GetHtml.UrlEncodeUtf8(upSkuCode)
|
||||||
|
+ "&main_user_name=" + BaseClass.MainUserName
|
||||||
|
+ "&map_goods_name=" + mapGoodsName
|
||||||
|
+ "&map_spec_name=" + mapSkuName
|
||||||
|
+ "&map_goods_id=" + mapGoodsId
|
||||||
|
+ "&map_sku_id=" + mapSkuId
|
||||||
|
+ "&map_send_address=" + sendProvince
|
||||||
|
+ "&transit_warehouse_id=" + transitWarehouse?.TransId;
|
||||||
|
|
||||||
|
url = BaseClass.Build29WxObjString("order/wx_add_mdy_buy_prod_map");
|
||||||
|
var result = await GetHtml.PostUtf8Async(url, data);
|
||||||
|
if (!result.Contains("\"code\":200"))
|
||||||
|
result = await GetHtml.PostUtf8Async(url, data);
|
||||||
|
if (!result.Contains("\"code\":200"))
|
||||||
|
{
|
||||||
|
BaseMsgForm.ShowError("保存失败" + BaseRegex.GetStringJson(ref result, "msg") + ",请稍后重试");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
var urlMap = BaseClass.Build29WxObjString("order/wx_get_buy_prod_map");
|
||||||
|
var dataMap = UserLogin.GetSignaturex()
|
||||||
|
+ "&spu_codes=" + upSpuCode;
|
||||||
|
//dataMap += "&sku_codes=" + upSkuCode;
|
||||||
|
dataMap += "&main_user_name=" + BaseClass.MainUserName;
|
||||||
|
var resultMap = await GetHtml.PostUtf8Async(urlMap, dataMap);
|
||||||
|
if (string.IsNullOrEmpty(resultMap) || !resultMap.Contains("\"code\":200"))
|
||||||
|
resultMap = await GetHtml.PostUtf8Async(urlMap, dataMap);
|
||||||
|
if (string.IsNullOrEmpty(resultMap) || !resultMap.Contains("\"code\":200"))
|
||||||
|
{
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
List<WXBuyMapInfo> buyMapList = new List<WXBuyMapInfo>();
|
||||||
|
try
|
||||||
|
{
|
||||||
|
buyMapList = JsonHelper.DeserializeJsonToList<WXBuyMapInfo>(JObject.Parse(resultMap)["data"].ParseToString());
|
||||||
|
|
||||||
|
GlobalConfig.BuyMapList.RemoveAll(b => buyMapList.Any(map => b.spu_code == map.spu_code && b.sku_code == map.sku_code));
|
||||||
|
GlobalConfig.BuyMapList.AddRange(buyMapList);
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
}
|
||||||
|
var map = buyMapList.FirstOrDefault(b => b.spu_code == upSpuCode && b.sku_code == upSkuCode);
|
||||||
|
if (map != null)
|
||||||
|
{
|
||||||
|
foreach (var order in GlobalConfig.lstOrder)
|
||||||
|
{
|
||||||
|
if (order.IsWaitBuy)
|
||||||
|
{
|
||||||
|
foreach (var item in order.orderItems)
|
||||||
|
{
|
||||||
|
if ((item.out_product_id == map.spu_code && item.out_sku_id == map.sku_code) ||
|
||||||
|
(item.out_product_id == map.spu_code && item.sku_attr_str == map.sku_code) ||
|
||||||
|
(item.product_id == map.spu_code && item.out_sku_id == map.sku_code) ||
|
||||||
|
(item.product_id == map.spu_code && item.sku_attr_str == map.sku_code))
|
||||||
|
{
|
||||||
|
item.BuyMap = map;
|
||||||
|
|
||||||
|
item.SetOrderItemTextProperty();
|
||||||
|
// todo 此处刷新一条可能不够
|
||||||
|
MainWindow.Instance.orderListCtrl.FilterOneOrder(order, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
BaseMsgWindow.ShowInfo("保存成功!");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,347 @@
|
|||||||
|
<basewindows:BaseWindow
|
||||||
|
x:Class="_29WxOrderWpf.Windows.OrderWindows.BuyMapSkuSelectWindow"
|
||||||
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
xmlns:basewindows="clr-namespace:_29WxOrderWpf.BaseWindows"
|
||||||
|
xmlns:buyerctrls="clr-namespace:_29WxOrderWpf.Ctrls.BuyerCtrls"
|
||||||
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
|
xmlns:local="clr-namespace:_29WxOrderWpf.Windows.OrderWindows"
|
||||||
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
|
xmlns:skudata="clr-namespace:AllBase.Model.Result;assembly=29WxOrderAllBase"
|
||||||
|
xmlns:userctrls="clr-namespace:_29WxOrderWpf.UserControls"
|
||||||
|
Title="SkuSelectWindow"
|
||||||
|
Width="1360"
|
||||||
|
Height="768"
|
||||||
|
d:Height="700"
|
||||||
|
d:Width="1200"
|
||||||
|
FontSize="15"
|
||||||
|
Loaded="SkuSelectWindow_Loaded"
|
||||||
|
ResizeMode="NoResize"
|
||||||
|
Style="{StaticResource BaseNoneBorderWindowStyle}"
|
||||||
|
mc:Ignorable="d">
|
||||||
|
<Window.Resources>
|
||||||
|
<!--<x:Array x:Key="frontSkuInfo" Type="skudata:frontSkuInfo3">
|
||||||
|
<skudata:frontSkuInfo3 />
|
||||||
|
</x:Array>-->
|
||||||
|
</Window.Resources>
|
||||||
|
<Grid
|
||||||
|
x:Name="mainGrid"
|
||||||
|
Margin="2"
|
||||||
|
Background="Transparent"
|
||||||
|
MouseLeftButtonDown="gridTitle_MouseLeftButtonDown">
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="50" />
|
||||||
|
<RowDefinition Height="*" />
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
<Grid x:Name="gridTitle">
|
||||||
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition Width="auto" />
|
||||||
|
<ColumnDefinition Width="auto" />
|
||||||
|
<ColumnDefinition />
|
||||||
|
<ColumnDefinition />
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
<Image
|
||||||
|
Width="50"
|
||||||
|
Height="50"
|
||||||
|
Margin="4"
|
||||||
|
HorizontalAlignment="Left"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
Source="{StaticResource main29WeixinIcon}" />
|
||||||
|
<Label
|
||||||
|
x:Name="lblAppName"
|
||||||
|
Grid.Column="1"
|
||||||
|
Margin="0,0,0,0"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
|
Content="选择SKU规格"
|
||||||
|
FontSize="20"
|
||||||
|
Foreground="{StaticResource mainColorLightBrush}" />
|
||||||
|
</Grid>
|
||||||
|
<Border
|
||||||
|
Grid.Row="1"
|
||||||
|
Padding="40,20"
|
||||||
|
Background="White">
|
||||||
|
<Grid>
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="Auto" MinHeight="50" />
|
||||||
|
<RowDefinition Height="Auto" MinHeight="50" />
|
||||||
|
<RowDefinition Height="*" MinHeight="50" />
|
||||||
|
<RowDefinition Height="Auto" MinHeight="50" />
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition Width="auto" MinWidth="100" />
|
||||||
|
<ColumnDefinition />
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
<TextBlock
|
||||||
|
Grid.Row="0"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
VerticalAlignment="Top"
|
||||||
|
FontSize="15"
|
||||||
|
Text="订单商品:" />
|
||||||
|
<Grid Grid.Column="1">
|
||||||
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition Width="auto" />
|
||||||
|
<ColumnDefinition />
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
<Image
|
||||||
|
x:Name="imgSku"
|
||||||
|
Grid.Row="0"
|
||||||
|
Grid.Column="0"
|
||||||
|
Width="100"
|
||||||
|
Height="100"
|
||||||
|
Margin="8"
|
||||||
|
VerticalAlignment="Top"
|
||||||
|
Cursor="Hand"
|
||||||
|
MouseDown="imgSku_MouseDown"
|
||||||
|
MouseEnter="imgSku_MouseEnter"
|
||||||
|
MouseLeave="imgSku_MouseLeave" />
|
||||||
|
<Grid
|
||||||
|
Grid.Column="1"
|
||||||
|
Margin="0,8"
|
||||||
|
VerticalAlignment="Center">
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="auto" />
|
||||||
|
<RowDefinition Height="auto" />
|
||||||
|
<RowDefinition Height="auto" />
|
||||||
|
<RowDefinition Height="auto" />
|
||||||
|
<RowDefinition Height="auto" />
|
||||||
|
<RowDefinition Height="auto" />
|
||||||
|
<RowDefinition Height="auto" />
|
||||||
|
<RowDefinition Height="auto" />
|
||||||
|
<RowDefinition Height="auto" />
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
|
<WrapPanel Visibility="{Binding ShopGoodsName, Converter={StaticResource HasTextVisibility}}">
|
||||||
|
<TextBox
|
||||||
|
VerticalAlignment="Top"
|
||||||
|
d:Opacity="0.5"
|
||||||
|
Background="Transparent"
|
||||||
|
BorderThickness="0"
|
||||||
|
IsReadOnly="True"
|
||||||
|
Text="店铺商品标题:"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
<TextBox
|
||||||
|
VerticalAlignment="Top"
|
||||||
|
d:Opacity="0.5"
|
||||||
|
d:Text="店铺商品标题"
|
||||||
|
Background="Transparent"
|
||||||
|
BorderThickness="0"
|
||||||
|
IsReadOnly="True"
|
||||||
|
Text="{Binding ShopGoodsName}"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
</WrapPanel>
|
||||||
|
<WrapPanel Grid.Row="1" Visibility="{Binding ShopSkuName, Converter={StaticResource HasTextVisibility}}">
|
||||||
|
<TextBox
|
||||||
|
VerticalAlignment="Top"
|
||||||
|
d:Opacity="0.5"
|
||||||
|
Background="Transparent"
|
||||||
|
BorderThickness="0"
|
||||||
|
IsReadOnly="True"
|
||||||
|
Text="店铺商品规格:"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
<TextBox
|
||||||
|
Grid.Row="0"
|
||||||
|
VerticalAlignment="Top"
|
||||||
|
d:Opacity="0.5"
|
||||||
|
d:Text="店铺SKU规格"
|
||||||
|
Background="Transparent"
|
||||||
|
BorderThickness="0"
|
||||||
|
FontWeight="Bold"
|
||||||
|
IsReadOnly="True"
|
||||||
|
Text="{Binding ShopSkuName}"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
</WrapPanel>
|
||||||
|
|
||||||
|
<WrapPanel Grid.Row="2" Visibility="{Binding ShopSkuPrice, Converter={StaticResource HasTextVisibility}}">
|
||||||
|
<TextBox
|
||||||
|
VerticalAlignment="Top"
|
||||||
|
d:Opacity="0.5"
|
||||||
|
Background="Transparent"
|
||||||
|
BorderThickness="0"
|
||||||
|
IsReadOnly="True"
|
||||||
|
Text="店铺规格单价:"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
<TextBox
|
||||||
|
Grid.Row="0"
|
||||||
|
VerticalAlignment="Top"
|
||||||
|
d:Opacity="0.5"
|
||||||
|
d:Text="0.00"
|
||||||
|
Background="Transparent"
|
||||||
|
BorderThickness="0"
|
||||||
|
IsReadOnly="True"
|
||||||
|
Text="{Binding ShopSkuPrice}"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
</WrapPanel>
|
||||||
|
</Grid>
|
||||||
|
</Grid>
|
||||||
|
<TextBlock
|
||||||
|
Grid.Row="1"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
VerticalAlignment="Top"
|
||||||
|
FontSize="15"
|
||||||
|
Text="关联商品:" />
|
||||||
|
<Grid Grid.Row="1" Grid.Column="1">
|
||||||
|
<ListBox
|
||||||
|
x:Name="lbxOrderItem"
|
||||||
|
Grid.Row="1"
|
||||||
|
Grid.Column="1"
|
||||||
|
Margin="7,0,7,0"
|
||||||
|
HorizontalContentAlignment="Stretch"
|
||||||
|
BorderThickness="0"
|
||||||
|
ItemsSource="{Binding BuyMapSkus}"
|
||||||
|
ScrollViewer.CanContentScroll="True"
|
||||||
|
VirtualizingPanel.ScrollUnit="Pixel">
|
||||||
|
<!-- 使用自定义属性模板去除ListBox高亮显示框 -->
|
||||||
|
<ListBox.ItemContainerStyle>
|
||||||
|
<Style TargetType="ListBoxItem">
|
||||||
|
<Setter Property="Template">
|
||||||
|
<Setter.Value>
|
||||||
|
<ControlTemplate TargetType="ListBoxItem">
|
||||||
|
<ContentPresenter
|
||||||
|
Content="{TemplateBinding Content}"
|
||||||
|
ContentStringFormat="{TemplateBinding ContentStringFormat}"
|
||||||
|
ContentTemplate="{TemplateBinding ContentTemplate}" />
|
||||||
|
</ControlTemplate>
|
||||||
|
</Setter.Value>
|
||||||
|
</Setter>
|
||||||
|
</Style>
|
||||||
|
</ListBox.ItemContainerStyle>
|
||||||
|
<ListBox.ItemTemplate>
|
||||||
|
<DataTemplate>
|
||||||
|
<!-- 此处绑定将数据源传递给子自定义控件OrderListRowCtrl -->
|
||||||
|
<!--<buyerctrls:SkuSelectListRowCtrl
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
|
DataContext="{Binding}" />-->
|
||||||
|
<RadioButton
|
||||||
|
MaxWidth="250"
|
||||||
|
Margin="0,0,12,0"
|
||||||
|
Click="RadioButton_Click"
|
||||||
|
IsChecked="{Binding IsChecked}">
|
||||||
|
<TextBox
|
||||||
|
VerticalAlignment="Top"
|
||||||
|
d:Opacity="0.5"
|
||||||
|
d:Text="商品标题"
|
||||||
|
Background="Transparent"
|
||||||
|
BorderThickness="0"
|
||||||
|
IsReadOnly="True"
|
||||||
|
Text="{Binding map_goods_name}"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
</RadioButton>
|
||||||
|
</DataTemplate>
|
||||||
|
</ListBox.ItemTemplate>
|
||||||
|
<ListBox.ItemsPanel>
|
||||||
|
<ItemsPanelTemplate>
|
||||||
|
<!-- 单行横向,超出部分隐藏或滚动 -->
|
||||||
|
<StackPanel IsItemsHost="True" Orientation="Horizontal" />
|
||||||
|
|
||||||
|
<!-- 若需自动换行,替换为以下 WrapPanel -->
|
||||||
|
<!-- <WrapPanel Orientation="Horizontal" IsItemsHost="True"/> -->
|
||||||
|
</ItemsPanelTemplate>
|
||||||
|
</ListBox.ItemsPanel>
|
||||||
|
</ListBox>
|
||||||
|
</Grid>
|
||||||
|
|
||||||
|
<TextBlock
|
||||||
|
Grid.Row="2"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
VerticalAlignment="Top"
|
||||||
|
FontSize="15"
|
||||||
|
Text="选择SKU:" />
|
||||||
|
<ListBox
|
||||||
|
x:Name="lbxSku"
|
||||||
|
Grid.Row="2"
|
||||||
|
Grid.Column="1"
|
||||||
|
Margin="7,0,7,0"
|
||||||
|
HorizontalContentAlignment="Stretch"
|
||||||
|
BorderThickness="0"
|
||||||
|
ItemsSource="{Binding FrontSkuInfos}"
|
||||||
|
ScrollViewer.CanContentScroll="True"
|
||||||
|
VirtualizingPanel.ScrollUnit="Pixel">
|
||||||
|
<!-- 使用自定义属性模板去除ListBox高亮显示框 -->
|
||||||
|
<ListBox.ItemContainerStyle>
|
||||||
|
<Style TargetType="ListBoxItem">
|
||||||
|
<Setter Property="Template">
|
||||||
|
<Setter.Value>
|
||||||
|
<ControlTemplate TargetType="ListBoxItem">
|
||||||
|
<ContentPresenter
|
||||||
|
Content="{TemplateBinding Content}"
|
||||||
|
ContentStringFormat="{TemplateBinding ContentStringFormat}"
|
||||||
|
ContentTemplate="{TemplateBinding ContentTemplate}" />
|
||||||
|
</ControlTemplate>
|
||||||
|
</Setter.Value>
|
||||||
|
</Setter>
|
||||||
|
</Style>
|
||||||
|
</ListBox.ItemContainerStyle>
|
||||||
|
<ListBox.ItemTemplate>
|
||||||
|
<DataTemplate>
|
||||||
|
<!-- 此处绑定将数据源传递给子自定义控件OrderListRowCtrl -->
|
||||||
|
<buyerctrls:SkuSelectListRowCtrl
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
|
DataContext="{Binding}" />
|
||||||
|
</DataTemplate>
|
||||||
|
</ListBox.ItemTemplate>
|
||||||
|
</ListBox>
|
||||||
|
<Button
|
||||||
|
x:Name="btnAdd"
|
||||||
|
Grid.Row="3"
|
||||||
|
Grid.Column="1"
|
||||||
|
MinWidth="48"
|
||||||
|
MinHeight="28"
|
||||||
|
Padding="4"
|
||||||
|
HorizontalAlignment="Left"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
d:Visibility="Visible"
|
||||||
|
Click="btnAdd_Click"
|
||||||
|
Content="添 加"
|
||||||
|
Style="{StaticResource BasePageButtonStyle}"
|
||||||
|
Visibility="Collapsed" />
|
||||||
|
<Image
|
||||||
|
x:Name="imgLoading"
|
||||||
|
Grid.Row="9"
|
||||||
|
Grid.Column="1"
|
||||||
|
Width="20"
|
||||||
|
Height="20"
|
||||||
|
Margin="52,0,0,0"
|
||||||
|
HorizontalAlignment="Left"
|
||||||
|
d:Visibility="Visible"
|
||||||
|
IsEnabled="False"
|
||||||
|
Source="{StaticResource imgLoadingPic}"
|
||||||
|
Visibility="Collapsed">
|
||||||
|
<Image.RenderTransform>
|
||||||
|
<RotateTransform Angle="45" CenterX="10" CenterY="10" />
|
||||||
|
</Image.RenderTransform>
|
||||||
|
<Image.Triggers>
|
||||||
|
<EventTrigger RoutedEvent="Image.Loaded">
|
||||||
|
<BeginStoryboard>
|
||||||
|
<Storyboard>
|
||||||
|
<DoubleAnimation
|
||||||
|
RepeatBehavior="Forever"
|
||||||
|
Storyboard.TargetName="imgLoading"
|
||||||
|
Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
|
||||||
|
From="0"
|
||||||
|
To="360"
|
||||||
|
Duration="0:0:3" />
|
||||||
|
</Storyboard>
|
||||||
|
</BeginStoryboard>
|
||||||
|
</EventTrigger>
|
||||||
|
</Image.Triggers>
|
||||||
|
</Image>
|
||||||
|
<Label
|
||||||
|
x:Name="lblMsg"
|
||||||
|
Grid.Row="9"
|
||||||
|
Grid.Column="1"
|
||||||
|
Margin="70,0,0,0"
|
||||||
|
Foreground="{StaticResource PageWarningBrushCC}" />
|
||||||
|
</Grid>
|
||||||
|
</Border>
|
||||||
|
<userctrls:UcWindowBoxes
|
||||||
|
x:Name="ucWindowBox"
|
||||||
|
Margin="4"
|
||||||
|
HorizontalAlignment="Right"
|
||||||
|
VerticalAlignment="Top"
|
||||||
|
MaxBoxVisibility="Visible" />
|
||||||
|
</Grid>
|
||||||
|
</basewindows:BaseWindow>
|
||||||
@@ -0,0 +1,117 @@
|
|||||||
|
using _29WxOrderWpf.BaseWindows;
|
||||||
|
using _29WxOrderWpf.ViewModels;
|
||||||
|
using AllBase;
|
||||||
|
using AllBase.Helper;
|
||||||
|
using AllBase.Model.Config;
|
||||||
|
using AllBase.Model.DBModel;
|
||||||
|
using AllBase.Model.Result;
|
||||||
|
using NaiBa.Util.Extension;
|
||||||
|
using Newtonsoft.Json.Linq;
|
||||||
|
using NPOI.POIFS.NIO;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Text.RegularExpressions;
|
||||||
|
using System.Threading;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using System.Windows;
|
||||||
|
using System.Windows.Controls;
|
||||||
|
using System.Windows.Data;
|
||||||
|
using System.Windows.Documents;
|
||||||
|
using System.Windows.Input;
|
||||||
|
using System.Windows.Interop;
|
||||||
|
using System.Windows.Media;
|
||||||
|
using System.Windows.Media.Imaging;
|
||||||
|
using System.Windows.Shapes;
|
||||||
|
using Work._29Tools.BLL;
|
||||||
|
using Work._29Tools.Forms.ToolForms;
|
||||||
|
|
||||||
|
namespace _29WxOrderWpf.Windows.OrderWindows
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// SkuSelectWindow.xaml 的交互逻辑
|
||||||
|
/// </summary>
|
||||||
|
public partial class BuyMapSkuSelectWindow : BaseWindow
|
||||||
|
{
|
||||||
|
public oms_wei_order_item_info OrderItem { get; set; }
|
||||||
|
public BuyMapSkuViewModel ViewModel { get; set; } = null;
|
||||||
|
|
||||||
|
|
||||||
|
public BuyMapSkuSelectWindow(oms_wei_order_item_info orderItem)
|
||||||
|
{
|
||||||
|
InitializeComponent();
|
||||||
|
|
||||||
|
if (orderItem != null)
|
||||||
|
OrderItem = orderItem;
|
||||||
|
|
||||||
|
ViewModel = new BuyMapSkuViewModel(orderItem);
|
||||||
|
this.DataContext = ViewModel;
|
||||||
|
ViewModel.RequestClose += ViewModel_RequestClose;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ViewModel_RequestClose()
|
||||||
|
{
|
||||||
|
this.Close();
|
||||||
|
}
|
||||||
|
|
||||||
|
private async void SkuSelectWindow_Loaded(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
btnAdd.IsEnabled = true;
|
||||||
|
|
||||||
|
await Task.Run(() =>
|
||||||
|
{
|
||||||
|
// 异步加载图片防止卡顿
|
||||||
|
// 缩略图在有的电脑上无法显示
|
||||||
|
//BitmapImage bImg = ImageUrlToBitmapImageConverter.LoadImageFromUrl(order_item.thumb_img + "?imageView2/1/w/100/format/webp|imageMogr2/auto-orient=");
|
||||||
|
BitmapImage bImg = AllBase.ImageBuild.LoadBitmipImageFromUrl(OrderItem.thumb_img);
|
||||||
|
Thread.Sleep(Randomx.GetId(200));
|
||||||
|
Dispatcher.Invoke(new Action(() =>
|
||||||
|
{
|
||||||
|
imgSku.Source = bImg;
|
||||||
|
}));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private void btnAdd_Click(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
private void gridTitle_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
|
||||||
|
{
|
||||||
|
if (e.LeftButton == MouseButtonState.Pressed)
|
||||||
|
{
|
||||||
|
this.DragMove();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void RadioButton_Click(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
if (this.IsLoaded && sender is RadioButton rb)
|
||||||
|
{
|
||||||
|
if (rb.DataContext is WXBuyMapSkusInfo skuInfo)
|
||||||
|
{
|
||||||
|
this.ViewModel.SetCurrentFrontSkuInfo3(skuInfo);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void imgSku_MouseDown(object sender, MouseButtonEventArgs e)
|
||||||
|
{
|
||||||
|
ShowImgForm imgFrom = new ShowImgForm(this.OrderItem?.thumb_img);
|
||||||
|
imgFrom.TopMost = true;
|
||||||
|
imgFrom.Show();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void imgSku_MouseEnter(object sender, MouseEventArgs e)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void imgSku_MouseLeave(object sender, MouseEventArgs e)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
File diff suppressed because it is too large.
Load diff
@@ -36,7 +36,7 @@ namespace AllBase
|
|||||||
/// 版本ID
|
/// 版本ID
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
||||||
public static int VersionCount = 269;
|
public static int VersionCount = 276;
|
||||||
|
|
||||||
public static string ServerUrl { get; set; } = "http://1.13.195.131:9000";
|
public static string ServerUrl { get; set; } = "http://1.13.195.131:9000";
|
||||||
public static string DebugUrl { get; set; } = "http://localhost:9000";
|
public static string DebugUrl { get; set; } = "http://localhost:9000";
|
||||||
|
|||||||
@@ -45,8 +45,8 @@ XDYGZC ;广州仓 ;何外华 ;13826339849 ;广州市从化区太平镇
|
|||||||
XDYWHC ;武汉2仓 ;杨先生 ;13044121071 ;湖北省武汉市汉阳区洲头街道汉新大道2号3栋17楼 ;13 ;180 ;1548 ;湖北省 ;武汉市
|
XDYWHC ;武汉2仓 ;杨先生 ;13044121071 ;湖北省武汉市汉阳区洲头街道汉新大道2号3栋17楼 ;13 ;180 ;1548 ;湖北省 ;武汉市
|
||||||
XDYSHANDC ;山东2仓 ;鸿鹄小申 ;13044121239 ;山东省临沂市费县南外环东转盘往东200米顺通快递有限公司(仓库二楼) ;22 ;292 ;2415 ;山东省 ;临沂市
|
XDYSHANDC ;山东2仓 ;鸿鹄小申 ;13044121239 ;山东省临沂市费县南外环东转盘往东200米顺通快递有限公司(仓库二楼) ;22 ;292 ;2415 ;山东省 ;临沂市
|
||||||
XDYSHC ;上海新仓 ;纪先生 ;13044121150 ;上海市上海市普陀区真如镇街道真北路2653弄T区 ;25 ;321 ;2709 ;上海市 ;上海市
|
XDYSHC ;上海新仓 ;纪先生 ;13044121150 ;上海市上海市普陀区真如镇街道真北路2653弄T区 ;25 ;321 ;2709 ;上海市 ;上海市
|
||||||
XDYSZC ;深圳仓 ;峰峰 ;15343351331 ;广东省东莞市凤岗镇浸校塘东良巷逸乐轩E栋5号楼 ;6 ;79 ;732 ;广东省 ;东莞市";
|
XDYSZC ;深圳仓 ;峰峰 ;15343351331 ;广东省东莞市凤岗镇浸校塘东良巷逸乐轩E栋5号楼 ;6 ;79 ;732 ;广东省 ;东莞市
|
||||||
//XDYYWC ;义乌仓 ;小田 ;19058117371 ;浙江省金华市义乌市北苑街道西站大道妈妈商贸18号库39号楼誉达 ;31 ;386 ;3409 ;浙江省 ;金华市
|
XDYYWC ;义乌仓 ;小田 ;19058117371 ;浙江省金华市义乌市北苑街道西站大道妈妈商贸18号库39号楼誉达 ;31 ;386 ;3409 ;浙江省 ;金华市";
|
||||||
//XDYJJC ;晋江仓 ;安群 ;19905951984 ;福建省泉州市南安市霞美镇温山村431号鸿鹄大厦 ;4 ;58 ;569 ;福建省 ;泉州市
|
//XDYJJC ;晋江仓 ;安群 ;19905951984 ;福建省泉州市南安市霞美镇温山村431号鸿鹄大厦 ;4 ;58 ;569 ;福建省 ;泉州市
|
||||||
//XDYCDC ;成都仓 ;谢春虹 ;15828201479 ;四川省资阳市乐至县仙鹤大道桑都街15-19号仓库(不要放驿站,送到仓库) ;26 ;340 ;2898 ;四川省 ;资阳市
|
//XDYCDC ;成都仓 ;谢春虹 ;15828201479 ;四川省资阳市乐至县仙鹤大道桑都街15-19号仓库(不要放驿站,送到仓库) ;26 ;340 ;2898 ;四川省 ;资阳市
|
||||||
//XDYCHONGQC ;重庆2仓 ;翁桂柱 ;18923911055 ;重庆市九龙坡区中梁山街道云飞九龙香山(二纵线东50米)重庆九龙坡区渝州公司 ;32 ;394 ;3339
|
//XDYCHONGQC ;重庆2仓 ;翁桂柱 ;18923911055 ;重庆市九龙坡区中梁山街道云飞九龙香山(二纵线东50米)重庆九龙坡区渝州公司 ;32 ;394 ;3339
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using AllBase.Model.Result;
|
using AllBase.Model.MvvmBaseClasses;
|
||||||
|
using AllBase.Model.Result;
|
||||||
using NaiBa.Util;
|
using NaiBa.Util;
|
||||||
using Newtonsoft.Json;
|
using Newtonsoft.Json;
|
||||||
using NPOI.SS.Formula.Functions;
|
using NPOI.SS.Formula.Functions;
|
||||||
@@ -32,14 +33,32 @@ namespace AllBase.Model.DBModel
|
|||||||
public DateTime add_time { get; set; }
|
public DateTime add_time { get; set; }
|
||||||
public DateTime mdy_time { get; set; }
|
public DateTime mdy_time { get; set; }
|
||||||
}
|
}
|
||||||
public class WXBuyMapSkusInfo
|
public class WXBuyMapSkusInfo : PropertyNotifyObject
|
||||||
{
|
{
|
||||||
|
public bool? IsChecked
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.IsChecked); }
|
||||||
|
set { this.SetValue(x => x.IsChecked, value); }
|
||||||
|
}
|
||||||
|
|
||||||
public long id { get; set; }
|
public long id { get; set; }
|
||||||
public string user_name { get; set; }
|
public string user_name { get; set; }
|
||||||
public string spu_code { get; set; }
|
public string spu_code { get; set; }
|
||||||
public string map_url { get; set; }
|
public string map_url
|
||||||
public string map_goods_name { get; set; }
|
{
|
||||||
public string map_goods_id { get; set; }
|
get { return this.GetValue(x => x.map_url); }
|
||||||
|
set { this.SetValue(x => x.map_url, value); }
|
||||||
|
}
|
||||||
|
public string map_goods_name
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.map_goods_name); }
|
||||||
|
set { this.SetValue(x => x.map_goods_name, value); }
|
||||||
|
}
|
||||||
|
public string map_goods_id
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.map_goods_id); }
|
||||||
|
set { this.SetValue(x => x.map_goods_id, value); }
|
||||||
|
}
|
||||||
string _map_skus;
|
string _map_skus;
|
||||||
public string map_skus
|
public string map_skus
|
||||||
{
|
{
|
||||||
@@ -55,7 +74,11 @@ namespace AllBase.Model.DBModel
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
[JsonIgnore]
|
[JsonIgnore]
|
||||||
public pddFrontGoods3Lite pdd_front_goods3_Lite { get; private set; }
|
public pddFrontGoods3Lite pdd_front_goods3_Lite
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.pdd_front_goods3_Lite); }
|
||||||
|
set { this.SetValue(x => x.pdd_front_goods3_Lite, value); }
|
||||||
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 发货地(省,市)
|
/// 发货地(省,市)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -10,12 +10,12 @@ namespace AllBase.Model.DBModel
|
|||||||
{
|
{
|
||||||
public string OutOrderNumStr
|
public string OutOrderNumStr
|
||||||
{
|
{
|
||||||
get { return "采购单号:" + out_order_no; }
|
get { return out_order_no; }
|
||||||
set { }
|
set { }
|
||||||
}
|
}
|
||||||
public string OutOrderBuyerStr
|
public string OutOrderBuyerStr
|
||||||
{
|
{
|
||||||
get { return "采购账户:" + buyer_account; }
|
get { return buyer_account; }
|
||||||
set { }
|
set { }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -38,10 +38,20 @@ namespace AllBase.Model.DBModel
|
|||||||
get { return this.GetValue(x => x.BuyMap); }
|
get { return this.GetValue(x => x.BuyMap); }
|
||||||
set { this.SetValue(x => x.BuyMap, value); }
|
set { this.SetValue(x => x.BuyMap, value); }
|
||||||
}
|
}
|
||||||
|
public Visibility MapSkusBtnVisibility
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.MapSkusBtnVisibility); }
|
||||||
|
set { this.SetValue(x => x.MapSkusBtnVisibility, value); }
|
||||||
|
}
|
||||||
public List<WXBuyMapSkusInfo> BuyMapSkus
|
public List<WXBuyMapSkusInfo> BuyMapSkus
|
||||||
{
|
{
|
||||||
get { return this.GetValue(x => x.BuyMapSkus); }
|
get { return this.GetValue(x => x.BuyMapSkus); }
|
||||||
set { this.SetValue(x => x.BuyMapSkus, value); }
|
set
|
||||||
|
{
|
||||||
|
this.SetValue(x => x.BuyMapSkus, value);
|
||||||
|
if (value != null && value.Count > 0) MapSkusBtnVisibility = Visibility.Visible;
|
||||||
|
else MapSkusBtnVisibility = Visibility.Collapsed;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 采购按钮文字
|
/// 采购按钮文字
|
||||||
@@ -252,19 +262,19 @@ namespace AllBase.Model.DBModel
|
|||||||
if (ItemTransitOrder?.pre_allocated_order_no != 1 && ItemTransitOrder?.pre_allocated_order_no != 3)
|
if (ItemTransitOrder?.pre_allocated_order_no != 1 && ItemTransitOrder?.pre_allocated_order_no != 3)
|
||||||
this.TransitOrderWaybillToWareHouseStr = null;
|
this.TransitOrderWaybillToWareHouseStr = null;
|
||||||
else
|
else
|
||||||
this.TransitOrderWaybillToWareHouseStr = "买手物流:" + ItemTransitOrder.express_1_company + "-" + ItemTransitOrder.express_1_waybill;
|
this.TransitOrderWaybillToWareHouseStr = ItemTransitOrder.express_1_company + "-" + ItemTransitOrder.express_1_waybill;
|
||||||
|
|
||||||
// 提前取号物流
|
// 提前取号物流
|
||||||
if (ItemTransitOrder?.pre_allocated_order_no != 2)
|
if (ItemTransitOrder?.pre_allocated_order_no != 2)
|
||||||
this.TransitOrderWaybillFakeStr = null;
|
this.TransitOrderWaybillFakeStr = null;
|
||||||
else
|
else
|
||||||
this.TransitOrderWaybillFakeStr = "取号物流:" + ItemTransitOrder.express_1_company + "-" + ItemTransitOrder.express_1_waybill;
|
this.TransitOrderWaybillFakeStr = ItemTransitOrder.express_1_company + "-" + ItemTransitOrder.express_1_waybill;
|
||||||
|
|
||||||
// 仓库下游物流
|
// 仓库下游物流
|
||||||
if (ItemTransitOrder == null || ItemTransitOrder.express_2_company.IsNullOrEmpty() || ItemTransitOrder.express_2_waybill.IsNullOrEmpty())
|
if (ItemTransitOrder == null || ItemTransitOrder.express_2_company.IsNullOrEmpty() || ItemTransitOrder.express_2_waybill.IsNullOrEmpty())
|
||||||
TransitOrderWaybillFromWareHouseStr = null;
|
TransitOrderWaybillFromWareHouseStr = null;
|
||||||
else
|
else
|
||||||
TransitOrderWaybillFromWareHouseStr = "仓库物流:" + ItemTransitOrder.express_2_company + "-" + ItemTransitOrder.express_2_waybill;
|
TransitOrderWaybillFromWareHouseStr = ItemTransitOrder.express_2_company + "-" + ItemTransitOrder.express_2_waybill;
|
||||||
|
|
||||||
if (order_id == "3738461463336072960")
|
if (order_id == "3738461463336072960")
|
||||||
{
|
{
|
||||||
@@ -712,7 +722,7 @@ namespace AllBase.Model.DBModel
|
|||||||
if (ItemTransitOrderWithVoid == null)
|
if (ItemTransitOrderWithVoid == null)
|
||||||
return "";
|
return "";
|
||||||
|
|
||||||
string timeStr = "采购时间:" + ItemTransitOrderWithVoid.created_time.ToString("yyyy-MM-dd HH:mm:ss");
|
string timeStr = ItemTransitOrderWithVoid.created_time.ToString("yyyy-MM-dd HH:mm:ss");
|
||||||
if (CreateDateTime.Date != ItemTransitOrderWithVoid.created_time.Date && ItemTransitOrderWithVoid.created_time > ItemTransitOrderWithVoid.created_time.Date.AddHours(1.5))
|
if (CreateDateTime.Date != ItemTransitOrderWithVoid.created_time.Date && ItemTransitOrderWithVoid.created_time > ItemTransitOrderWithVoid.created_time.Date.AddHours(1.5))
|
||||||
return timeStr + " ×";
|
return timeStr + " ×";
|
||||||
return timeStr + " √";
|
return timeStr + " √";
|
||||||
|
|||||||
@@ -83,6 +83,7 @@ namespace AllBase.Model.DBModel
|
|||||||
退货包裹扣费支出 = 26,
|
退货包裹扣费支出 = 26,
|
||||||
支付宝在线充值 = 30,
|
支付宝在线充值 = 30,
|
||||||
云仓退货支出 = 31,
|
云仓退货支出 = 31,
|
||||||
|
礼物单退费 = 34,
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using System;
|
using AllBase.Model.MvvmBaseClasses;
|
||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
@@ -138,13 +139,17 @@ namespace AllBase.Model.Result
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public class pddFrontGoods3Lite
|
public class pddFrontGoods3Lite : PropertyNotifyObject
|
||||||
{
|
{
|
||||||
public long? goodsId { get; set; } // 1661424397,
|
public long? goodsId { get; set; } // 1661424397,
|
||||||
public string goodsName { get; set; } // "红薏仁5斤装 红薏仁米小薏米仁农家自产新红薏米1斤2斤苡仁糙薏米",
|
public string goodsName { get; set; } // "红薏仁5斤装 红薏仁米小薏米仁农家自产新红薏米1斤2斤苡仁糙薏米",
|
||||||
public long? mallId { get; set; } // 525159017
|
public long? mallId { get; set; } // 525159017
|
||||||
public string mallName { get; set; }
|
public string mallName { get; set; }
|
||||||
public List<frontSkuInfo3> skus { get; set; }
|
public List<frontSkuInfo3> skus
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.skus); }
|
||||||
|
set { this.SetValue(x => x.skus, value); }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public class newShareTitleInfo
|
public class newShareTitleInfo
|
||||||
@@ -164,11 +169,20 @@ namespace AllBase.Model.Result
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public class frontSkuInfo3
|
public class frontSkuInfo3 : PropertyNotifyObject
|
||||||
{
|
{
|
||||||
public long? skuId { get; set; } // 28790184768,
|
public long? skuId { get; set; } // 28790184768,
|
||||||
public long? goodsId { get; set; } // 1661424397,
|
public long? goodsId { get; set; } // 1661424397,
|
||||||
public string thumbUrl { get; set; } // "https://t00img.yangkeduo.com/t10img/images/2018-06-09/5c7746a3608e75a2b65926f4ed0f34cb.jpeg",
|
public string GoodsNameStr
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.GoodsNameStr); }
|
||||||
|
set { this.SetValue(x => x.GoodsNameStr, value); }
|
||||||
|
}
|
||||||
|
public string thumbUrl
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.thumbUrl); }
|
||||||
|
set { this.SetValue(x => x.thumbUrl, value); }
|
||||||
|
} // "https://t00img.yangkeduo.com/t10img/images/2018-06-09/5c7746a3608e75a2b65926f4ed0f34cb.jpeg",
|
||||||
public int? initQuantity { get; set; } // 0,
|
public int? initQuantity { get; set; } // 0,
|
||||||
public int? quantity { get; set; } // 1000,
|
public int? quantity { get; set; } // 1000,
|
||||||
public int? limitQuantity { get; set; } // 999999,
|
public int? limitQuantity { get; set; } // 999999,
|
||||||
@@ -177,7 +191,21 @@ namespace AllBase.Model.Result
|
|||||||
public int? defaultQuantity { get; set; } // 100,
|
public int? defaultQuantity { get; set; } // 100,
|
||||||
public int? isOnsale { get; set; } // 1,
|
public int? isOnsale { get; set; } // 1,
|
||||||
public string spec { get; set; } // "677094835",
|
public string spec { get; set; } // "677094835",
|
||||||
public List<frontSpecInfo3> specs { get; set; }
|
public string SpecNameStr
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.SpecNameStr) == null ? string.Join(",", specs?.Select(s => s.spec_value)) : this.GetValue(x => x.SpecNameStr); }
|
||||||
|
set { this.SetValue(x => x.SpecNameStr, value); }
|
||||||
|
}
|
||||||
|
List<frontSpecInfo3> _specs = new List<frontSpecInfo3>();
|
||||||
|
public List<frontSpecInfo3> specs
|
||||||
|
{
|
||||||
|
get => _specs;
|
||||||
|
set
|
||||||
|
{
|
||||||
|
_specs = value;
|
||||||
|
SpecNameStr = string.Join(",", value.Select(s => s.spec_value));
|
||||||
|
}
|
||||||
|
}
|
||||||
public int? price { get; set; } // 0,
|
public int? price { get; set; } // 0,
|
||||||
public string normalPrice { get; set; } // "14.5",
|
public string normalPrice { get; set; } // "14.5",
|
||||||
public string groupPrice { get; set; } // "13.5",
|
public string groupPrice { get; set; } // "13.5",
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using System.Windows.Controls;
|
||||||
|
|
||||||
|
namespace Main.Test;
|
||||||
|
|
||||||
|
public class DataGridEx : DataGrid
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
+132
-1
@@ -1,9 +1,14 @@
|
|||||||
using System;
|
using HandyControl.Controls;
|
||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using System.Windows;
|
using System.Windows;
|
||||||
|
using System.Windows.Controls;
|
||||||
|
using System.Windows.Controls.Primitives;
|
||||||
|
using System.Windows.Documents;
|
||||||
|
using System.Windows.Media;
|
||||||
|
|
||||||
namespace Main.Test;
|
namespace Main.Test;
|
||||||
|
|
||||||
@@ -55,4 +60,130 @@ public class DataGridHelper
|
|||||||
public static readonly DependencyProperty IsActiveProperty =
|
public static readonly DependencyProperty IsActiveProperty =
|
||||||
DependencyProperty.RegisterAttached("IsActive", typeof(bool), typeof(DataGridHelper));
|
DependencyProperty.RegisterAttached("IsActive", typeof(bool), typeof(DataGridHelper));
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
public static DependencyProperty ShowRowNumberProperty = DependencyProperty.RegisterAttached("ShowRowNumber",
|
||||||
|
typeof(bool), typeof(DataGridAttach),
|
||||||
|
new FrameworkPropertyMetadata(false, FrameworkPropertyMetadataOptions.Inherits, OnShowRowNumberChanged));
|
||||||
|
|
||||||
|
public static bool GetShowRowNumber(DependencyObject target) => (bool)target.GetValue(ShowRowNumberProperty);
|
||||||
|
|
||||||
|
public static void SetShowRowNumber(DependencyObject target, bool value) => target.SetValue(ShowRowNumberProperty, value);
|
||||||
|
|
||||||
|
private static void OnShowRowNumberChanged(DependencyObject target, DependencyPropertyChangedEventArgs e)
|
||||||
|
{
|
||||||
|
if (target is not DataGrid dataGrid) return;
|
||||||
|
var show = (bool)e.NewValue;
|
||||||
|
|
||||||
|
if (show)
|
||||||
|
{
|
||||||
|
dataGrid.LoadingRow += DataGrid_LoadingRow;
|
||||||
|
dataGrid.ItemContainerGenerator.ItemsChanged += ItemContainerGeneratorItemsChanged;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
dataGrid.LoadingRow -= DataGrid_LoadingRow;
|
||||||
|
dataGrid.ItemContainerGenerator.ItemsChanged -= ItemContainerGeneratorItemsChanged;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
void ItemContainerGeneratorItemsChanged(object sender, ItemsChangedEventArgs e)
|
||||||
|
{
|
||||||
|
var generator = dataGrid.ItemContainerGenerator;
|
||||||
|
var itemsCount = dataGrid.Items.Count;
|
||||||
|
|
||||||
|
if (show)
|
||||||
|
{
|
||||||
|
for (var i = 0; i < itemsCount; i++)
|
||||||
|
{
|
||||||
|
var row = (DataGridRow)generator.ContainerFromIndex(i);
|
||||||
|
if (row != null)
|
||||||
|
{
|
||||||
|
row.Header = (i + 1).ToString();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
for (var i = 0; i < itemsCount; i++)
|
||||||
|
{
|
||||||
|
var row = (DataGridRow)generator.ContainerFromIndex(i);
|
||||||
|
if (row != null)
|
||||||
|
{
|
||||||
|
row.Header = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void DataGrid_LoadingRow(object sender, DataGridRowEventArgs e) => e.Row.Header = (e.Row.GetIndex() + 1).ToString();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
public static readonly DependencyProperty ShowBorderProperty =
|
||||||
|
DependencyProperty.RegisterAttached("ShowBorder", typeof(bool),
|
||||||
|
typeof(DataGridHelper), new PropertyMetadata(false, OnShowBorderChanged));
|
||||||
|
|
||||||
|
public static void SetShowBorder(DependencyObject element, bool value)
|
||||||
|
=> element.SetValue(ShowBorderProperty, value);
|
||||||
|
|
||||||
|
public static bool GetShowBorder(DependencyObject element)
|
||||||
|
=> (bool)element.GetValue(ShowBorderProperty);
|
||||||
|
|
||||||
|
private static void OnShowBorderChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
|
||||||
|
{
|
||||||
|
if (d is DataGridColumnHeader header && (bool)e.NewValue)
|
||||||
|
{
|
||||||
|
header.Loaded += (s, args) =>
|
||||||
|
{
|
||||||
|
var layer = AdornerLayer.GetAdornerLayer(header);
|
||||||
|
if (layer != null)
|
||||||
|
{
|
||||||
|
layer.Add(new BorderAdorner(header));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
public class BorderAdorner : Adorner
|
||||||
|
{
|
||||||
|
public BorderAdorner(UIElement adornedElement) : base(adornedElement) { }
|
||||||
|
|
||||||
|
protected override void OnRender(DrawingContext drawingContext)
|
||||||
|
{
|
||||||
|
var header = AdornedElement as DataGridColumnHeader;
|
||||||
|
if (header == null) return;
|
||||||
|
|
||||||
|
var pen = new Pen(header.BorderBrush ?? new SolidColorBrush(Colors.LightGray), 1);
|
||||||
|
|
||||||
|
// 绘制右侧竖线(永远不消失)
|
||||||
|
drawingContext.DrawLine(pen,
|
||||||
|
new Point(header.ActualWidth - 0.5, 0),
|
||||||
|
new Point(header.ActualWidth - 0.5, header.ActualHeight));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// 先创建自定义类(如果还没创建)
|
||||||
|
public class CustomDataGridColumnHeader : DataGridColumnHeader
|
||||||
|
{
|
||||||
|
protected override void OnRender(DrawingContext drawingContext)
|
||||||
|
{
|
||||||
|
base.OnRender(drawingContext);
|
||||||
|
|
||||||
|
// 在这里绘制边框,永远不消失
|
||||||
|
var pen = new Pen(new SolidColorBrush(Colors.LightGray), 1);
|
||||||
|
|
||||||
|
// 绘制右侧竖线
|
||||||
|
drawingContext.DrawLine(pen,
|
||||||
|
new Point(ActualWidth - 0.5, 0),
|
||||||
|
new Point(ActualWidth - 0.5, ActualHeight));
|
||||||
|
|
||||||
|
// 绘制底部横线(如果需要)
|
||||||
|
// drawingContext.DrawLine(pen,
|
||||||
|
// new Point(0, ActualHeight - 0.5),
|
||||||
|
// new Point(ActualWidth, ActualHeight - 0.5));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+80
-11
@@ -11,10 +11,13 @@
|
|||||||
|
|
||||||
|
|
||||||
<Style x:Key="DefaultCellHeaderStyle" TargetType="DataGridColumnHeader">
|
<Style x:Key="DefaultCellHeaderStyle" TargetType="DataGridColumnHeader">
|
||||||
|
<Setter Property="UseLayoutRounding" Value="True" />
|
||||||
|
<Setter Property="ext:DataGridHelper.ShowBorder" Value="True" />
|
||||||
|
|
||||||
<Setter Property="Height" Value="{Binding ColumnHeaderHeight, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" />
|
<Setter Property="Height" Value="{Binding ColumnHeaderHeight, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" />
|
||||||
<Setter Property="Background" Value="#eeeeee" />
|
<Setter Property="Background" Value="#eeeeee" />
|
||||||
<Setter Property="BorderThickness" Value="1,0,1,1" />
|
<Setter Property="BorderThickness" Value="0,0,0,1" />
|
||||||
<Setter Property="Margin" Value="-1,0,0,0" />
|
<!-- 只保留底边框,竖线不再用 Border 画 -->
|
||||||
<Setter Property="HorizontalContentAlignment" Value="{Binding RelativeSource={RelativeSource AncestorType=DataGrid}, Path=HorizontalContentAlignment}" />
|
<Setter Property="HorizontalContentAlignment" Value="{Binding RelativeSource={RelativeSource AncestorType=DataGrid}, Path=HorizontalContentAlignment}" />
|
||||||
<Setter Property="Padding" Value="8,0" />
|
<Setter Property="Padding" Value="8,0" />
|
||||||
<Setter Property="FontSize" Value="{DynamicResource DefaultFontSize}" />
|
<Setter Property="FontSize" Value="{DynamicResource DefaultFontSize}" />
|
||||||
@@ -28,7 +31,8 @@
|
|||||||
Padding="{TemplateBinding Padding}"
|
Padding="{TemplateBinding Padding}"
|
||||||
Background="{TemplateBinding Background}"
|
Background="{TemplateBinding Background}"
|
||||||
BorderBrush="{TemplateBinding BorderBrush}"
|
BorderBrush="{TemplateBinding BorderBrush}"
|
||||||
BorderThickness="{TemplateBinding BorderThickness}">
|
BorderThickness="{TemplateBinding BorderThickness}"
|
||||||
|
UseLayoutRounding="True">
|
||||||
<Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
|
<Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
|
||||||
<ContentPresenter
|
<ContentPresenter
|
||||||
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
|
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
|
||||||
@@ -63,18 +67,52 @@
|
|||||||
</Grid>
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Border>
|
</Border>
|
||||||
|
|
||||||
|
<!-- 关键改动:用固定宽度的 Rectangle 画右侧竖线,永不消失 -->
|
||||||
|
<Rectangle
|
||||||
|
Width="1"
|
||||||
|
HorizontalAlignment="Right"
|
||||||
|
Fill="{TemplateBinding BorderBrush}"
|
||||||
|
SnapsToDevicePixels="False" />
|
||||||
|
|
||||||
<Thumb
|
<Thumb
|
||||||
x:Name="PART_LeftHeaderGripper"
|
x:Name="PART_LeftHeaderGripper"
|
||||||
|
Width="6"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
|
Background="Transparent"
|
||||||
Cursor="SizeWE"
|
Cursor="SizeWE"
|
||||||
FocusVisualStyle="{x:Null}"
|
FocusVisualStyle="{x:Null}">
|
||||||
Opacity="0" />
|
<Thumb.Style>
|
||||||
|
<Style TargetType="Thumb">
|
||||||
|
<Setter Property="Template">
|
||||||
|
<Setter.Value>
|
||||||
|
<ControlTemplate TargetType="Thumb">
|
||||||
|
<Border Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" />
|
||||||
|
</ControlTemplate>
|
||||||
|
</Setter.Value>
|
||||||
|
</Setter>
|
||||||
|
</Style>
|
||||||
|
</Thumb.Style>
|
||||||
|
</Thumb>
|
||||||
<Thumb
|
<Thumb
|
||||||
x:Name="PART_RightHeaderGripper"
|
x:Name="PART_RightHeaderGripper"
|
||||||
|
Width="6"
|
||||||
HorizontalAlignment="Right"
|
HorizontalAlignment="Right"
|
||||||
|
Background="Transparent"
|
||||||
Cursor="SizeWE"
|
Cursor="SizeWE"
|
||||||
FocusVisualStyle="{x:Null}"
|
FocusVisualStyle="{x:Null}">
|
||||||
Opacity="0" />
|
<Thumb.Style>
|
||||||
|
<Style TargetType="Thumb">
|
||||||
|
<Setter Property="Template">
|
||||||
|
<Setter.Value>
|
||||||
|
<ControlTemplate TargetType="Thumb">
|
||||||
|
<Border Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" />
|
||||||
|
</ControlTemplate>
|
||||||
|
</Setter.Value>
|
||||||
|
</Setter>
|
||||||
|
</Style>
|
||||||
|
</Thumb.Style>
|
||||||
|
</Thumb>
|
||||||
</Grid>
|
</Grid>
|
||||||
<ControlTemplate.Triggers>
|
<ControlTemplate.Triggers>
|
||||||
<Trigger Property="SortDirection" Value="Ascending">
|
<Trigger Property="SortDirection" Value="Ascending">
|
||||||
@@ -137,9 +175,25 @@
|
|||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style x:Key="DefaultRowHeaderStyle" TargetType="{x:Type DataGridRowHeader}">
|
<Style x:Key="DefaultRowHeaderStyle" TargetType="{x:Type DataGridRowHeader}">
|
||||||
<Setter Property="BorderThickness" Value="0" />
|
<Setter Property="BorderBrush" Value="{Binding BorderBrush, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" />
|
||||||
|
<Setter Property="BorderThickness" Value="0,0,1,1" />
|
||||||
<Setter Property="FontSize" Value="{DynamicResource DefaultFontSize}" />
|
<Setter Property="FontSize" Value="{DynamicResource DefaultFontSize}" />
|
||||||
<Setter Property="FontFamily" Value="{DynamicResource FontFamily}" />
|
<Setter Property="FontFamily" Value="{DynamicResource FontFamily}" />
|
||||||
|
<Setter Property="Template">
|
||||||
|
<Setter.Value>
|
||||||
|
<ControlTemplate TargetType="{x:Type DataGridRowHeader}">
|
||||||
|
<Border
|
||||||
|
Background="Transparent"
|
||||||
|
BorderBrush="{TemplateBinding BorderBrush}"
|
||||||
|
BorderThickness="{TemplateBinding BorderThickness}">
|
||||||
|
<ContentPresenter
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
TextElement.FontSize="10" />
|
||||||
|
</Border>
|
||||||
|
</ControlTemplate>
|
||||||
|
</Setter.Value>
|
||||||
|
</Setter>
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style x:Key="DefaultRowStyle" TargetType="{x:Type DataGridRow}">
|
<Style x:Key="DefaultRowStyle" TargetType="{x:Type DataGridRow}">
|
||||||
@@ -184,7 +238,8 @@
|
|||||||
<Grid
|
<Grid
|
||||||
x:Name="fousIcon"
|
x:Name="fousIcon"
|
||||||
IsHitTestVisible="False"
|
IsHitTestVisible="False"
|
||||||
Opacity="0">
|
Opacity="0"
|
||||||
|
Visibility="Collapsed">
|
||||||
<Path
|
<Path
|
||||||
Width="10"
|
Width="10"
|
||||||
Height="10"
|
Height="10"
|
||||||
@@ -290,6 +345,8 @@
|
|||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style x:Key="DefaultDataGridStyle" TargetType="DataGrid">
|
<Style x:Key="DefaultDataGridStyle" TargetType="DataGrid">
|
||||||
|
<Setter Property="UseLayoutRounding" Value="True" />
|
||||||
|
<Setter Property="SnapsToDevicePixels" Value="True" />
|
||||||
<Setter Property="Background" Value="White" />
|
<Setter Property="Background" Value="White" />
|
||||||
<Setter Property="FocusVisualStyle" Value="{x:Null}" />
|
<Setter Property="FocusVisualStyle" Value="{x:Null}" />
|
||||||
<Setter Property="ColumnHeaderHeight" Value="36" />
|
<Setter Property="ColumnHeaderHeight" Value="36" />
|
||||||
@@ -325,7 +382,8 @@
|
|||||||
Background="{TemplateBinding Background}"
|
Background="{TemplateBinding Background}"
|
||||||
BorderBrush="{TemplateBinding BorderBrush}"
|
BorderBrush="{TemplateBinding BorderBrush}"
|
||||||
BorderThickness="{TemplateBinding BorderThickness}"
|
BorderThickness="{TemplateBinding BorderThickness}"
|
||||||
SnapsToDevicePixels="True">
|
SnapsToDevicePixels="True"
|
||||||
|
UseLayoutRounding="True">
|
||||||
<ScrollViewer x:Name="DG_ScrollViewer" Focusable="false">
|
<ScrollViewer x:Name="DG_ScrollViewer" Focusable="false">
|
||||||
<ScrollViewer.Template>
|
<ScrollViewer.Template>
|
||||||
<ControlTemplate TargetType="{x:Type ScrollViewer}">
|
<ControlTemplate TargetType="{x:Type ScrollViewer}">
|
||||||
@@ -340,13 +398,24 @@
|
|||||||
<RowDefinition Height="*" />
|
<RowDefinition Height="*" />
|
||||||
<RowDefinition Height="Auto" />
|
<RowDefinition Height="Auto" />
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
|
<Border
|
||||||
|
Grid.Row="0"
|
||||||
|
Grid.Column="0"
|
||||||
|
Width="{Binding CellsPanelHorizontalOffset, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
|
||||||
|
Background="#eeeeee"
|
||||||
|
BorderBrush="{Binding BorderBrush, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
|
||||||
|
BorderThickness="1,0,1,1" />
|
||||||
|
|
||||||
<DataGridColumnHeadersPresenter
|
<DataGridColumnHeadersPresenter
|
||||||
x:Name="PART_ColumnHeadersPresenter"
|
x:Name="PART_ColumnHeadersPresenter"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Grid.ColumnSpan="2"
|
Grid.ColumnSpan="2"
|
||||||
Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Column}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" />
|
Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Column}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" />
|
||||||
|
|
||||||
<Grid Grid.Row="1" Grid.Column="1">
|
<Grid
|
||||||
|
Grid.Row="1"
|
||||||
|
Grid.Column="0"
|
||||||
|
Grid.ColumnSpan="2">
|
||||||
<ScrollContentPresenter x:Name="PART_ScrollContentPresenter" CanContentScroll="{TemplateBinding CanContentScroll}" />
|
<ScrollContentPresenter x:Name="PART_ScrollContentPresenter" CanContentScroll="{TemplateBinding CanContentScroll}" />
|
||||||
<Grid
|
<Grid
|
||||||
x:Name="NoDataTipsGrid"
|
x:Name="NoDataTipsGrid"
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
|
xmlns:hc="https://handyorg.github.io/handycontrol"
|
||||||
xmlns:local="clr-namespace:Main.Test"
|
xmlns:local="clr-namespace:Main.Test"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:tf="Trade.Framework"
|
xmlns:tf="Trade.Framework"
|
||||||
@@ -12,8 +13,6 @@
|
|||||||
Width="800"
|
Width="800"
|
||||||
Height="450"
|
Height="450"
|
||||||
DataContext="{tf:DISource Type=vm:MainViewModel}"
|
DataContext="{tf:DISource Type=vm:MainViewModel}"
|
||||||
NonClientAreaContent=""
|
|
||||||
NonClientAreaHeight="200"
|
|
||||||
ResizeMode="CanResizeWithGrip"
|
ResizeMode="CanResizeWithGrip"
|
||||||
WindowStartupLocation="CenterScreen"
|
WindowStartupLocation="CenterScreen"
|
||||||
mc:Ignorable="d">
|
mc:Ignorable="d">
|
||||||
@@ -22,7 +21,9 @@
|
|||||||
<DataGrid
|
<DataGrid
|
||||||
Height="Auto"
|
Height="Auto"
|
||||||
d:ItemsSource="{d:SampleData ItemCount=10}"
|
d:ItemsSource="{d:SampleData ItemCount=10}"
|
||||||
|
hc:DataGridAttach.ShowRowNumber="True"
|
||||||
ItemsSource="{Binding Data}"
|
ItemsSource="{Binding Data}"
|
||||||
|
RowHeaderWidth="30"
|
||||||
Style="{StaticResource DefaultDataGridStyle}">
|
Style="{StaticResource DefaultDataGridStyle}">
|
||||||
<DataGrid.Columns>
|
<DataGrid.Columns>
|
||||||
<DataGridTextColumn
|
<DataGridTextColumn
|
||||||
|
|||||||
@@ -21,8 +21,8 @@ public partial class MainWindow : WindowBase
|
|||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
var mainHeaderImageContent = new MainHeaderImageContent();
|
var mainHeaderImageContent = new MainHeaderImageContent();
|
||||||
NonClientAreaHeight = mainHeaderImageContent.Height;
|
//NonClientAreaHeight = mainHeaderImageContent.Height;
|
||||||
NonClientAreaContent = mainHeaderImageContent;
|
//NonClientAreaContent = mainHeaderImageContent;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -186,8 +186,8 @@ namespace TemuKJD.ToolForms
|
|||||||
this.pictureBox1.Image = ImageBuild.LoadBitmapLoadBitmipImageFromUrl(orderItem.thumb_img);
|
this.pictureBox1.Image = ImageBuild.LoadBitmapLoadBitmipImageFromUrl(orderItem.thumb_img);
|
||||||
this.txtShopSkuId.Text = orderItem.sku_id;
|
this.txtShopSkuId.Text = orderItem.sku_id;
|
||||||
this.txtShopGoodsId.Text = orderItem.product_id;
|
this.txtShopGoodsId.Text = orderItem.product_id;
|
||||||
this.txtUpSpuCode.Text = orderItem.out_product_id.IsNullOrEmpty() ? orderItem.product_id : orderItem.out_product_id;
|
this.txtSpuCode.Text = orderItem.out_product_id.IsNullOrEmpty() ? orderItem.product_id : orderItem.out_product_id;
|
||||||
this.txtUpSkuCode.Text = orderItem.out_sku_id.IsNullOrEmpty() ? orderItem.sku_attr_str : orderItem.out_sku_id;
|
this.txtSkuCode.Text = orderItem.out_sku_id.IsNullOrEmpty() ? orderItem.sku_attr_str : orderItem.out_sku_id;
|
||||||
this.txtShopGoodsName.Text = orderItem.title;
|
this.txtShopGoodsName.Text = orderItem.title;
|
||||||
this.txtShopSpecName.Text = orderItem.sku_attr_str;
|
this.txtShopSpecName.Text = orderItem.sku_attr_str;
|
||||||
this.txtShopOrderItemCnt.Text = orderItem.sku_cnt.ParseToString();
|
this.txtShopOrderItemCnt.Text = orderItem.sku_cnt.ParseToString();
|
||||||
@@ -944,8 +944,8 @@ namespace TemuKJD.ToolForms
|
|||||||
}
|
}
|
||||||
|
|
||||||
string url;
|
string url;
|
||||||
string upSpuCode = txtUpSpuCode.Text.Trim();
|
string upSpuCode = txtSpuCode.Text.Trim();
|
||||||
string upSkuCode = txtUpSkuCode.Text.Trim();
|
string upSkuCode = txtSkuCode.Text.Trim();
|
||||||
// 保存sku及商品关联信息
|
// 保存sku及商品关联信息
|
||||||
var data = UserLogin.GetSignaturex()
|
var data = UserLogin.GetSignaturex()
|
||||||
+ "&spu_code=" + GetHtml.UrlEncodeUtf8(upSpuCode)
|
+ "&spu_code=" + GetHtml.UrlEncodeUtf8(upSpuCode)
|
||||||
|
|||||||
+17
-17
@@ -57,9 +57,9 @@
|
|||||||
this.txtShopSpecName = new System.Windows.Forms.TextBox();
|
this.txtShopSpecName = new System.Windows.Forms.TextBox();
|
||||||
this.label14 = new System.Windows.Forms.Label();
|
this.label14 = new System.Windows.Forms.Label();
|
||||||
this.label13 = new System.Windows.Forms.Label();
|
this.label13 = new System.Windows.Forms.Label();
|
||||||
this.txtUpSpuCode = new System.Windows.Forms.TextBox();
|
this.txtSpuCode = new System.Windows.Forms.TextBox();
|
||||||
this.label12 = new System.Windows.Forms.Label();
|
this.label12 = new System.Windows.Forms.Label();
|
||||||
this.txtUpSkuCode = new System.Windows.Forms.TextBox();
|
this.txtSkuCode = new System.Windows.Forms.TextBox();
|
||||||
this.label11 = new System.Windows.Forms.Label();
|
this.label11 = new System.Windows.Forms.Label();
|
||||||
this.txtShopSkuId = new System.Windows.Forms.TextBox();
|
this.txtShopSkuId = new System.Windows.Forms.TextBox();
|
||||||
this.label10 = new System.Windows.Forms.Label();
|
this.label10 = new System.Windows.Forms.Label();
|
||||||
@@ -470,11 +470,11 @@
|
|||||||
//
|
//
|
||||||
// txtUpSpuCode
|
// txtUpSpuCode
|
||||||
//
|
//
|
||||||
this.txtUpSpuCode.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
this.txtSpuCode.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||||
this.txtUpSpuCode.Location = new System.Drawing.Point(85, 228);
|
this.txtSpuCode.Location = new System.Drawing.Point(85, 228);
|
||||||
this.txtUpSpuCode.Name = "txtUpSpuCode";
|
this.txtSpuCode.Name = "txtUpSpuCode";
|
||||||
this.txtUpSpuCode.Size = new System.Drawing.Size(152, 23);
|
this.txtSpuCode.Size = new System.Drawing.Size(152, 23);
|
||||||
this.txtUpSpuCode.TabIndex = 814;
|
this.txtSpuCode.TabIndex = 814;
|
||||||
//
|
//
|
||||||
// label12
|
// label12
|
||||||
//
|
//
|
||||||
@@ -487,13 +487,13 @@
|
|||||||
//
|
//
|
||||||
// txtUpSkuCode
|
// txtUpSkuCode
|
||||||
//
|
//
|
||||||
this.txtUpSkuCode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
this.txtSkuCode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||||
| System.Windows.Forms.AnchorStyles.Right)));
|
| System.Windows.Forms.AnchorStyles.Right)));
|
||||||
this.txtUpSkuCode.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
this.txtSkuCode.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||||
this.txtUpSkuCode.Location = new System.Drawing.Point(321, 228);
|
this.txtSkuCode.Location = new System.Drawing.Point(321, 228);
|
||||||
this.txtUpSkuCode.Name = "txtUpSkuCode";
|
this.txtSkuCode.Name = "txtUpSkuCode";
|
||||||
this.txtUpSkuCode.Size = new System.Drawing.Size(152, 23);
|
this.txtSkuCode.Size = new System.Drawing.Size(152, 23);
|
||||||
this.txtUpSkuCode.TabIndex = 812;
|
this.txtSkuCode.TabIndex = 812;
|
||||||
//
|
//
|
||||||
// label11
|
// label11
|
||||||
//
|
//
|
||||||
@@ -779,8 +779,8 @@
|
|||||||
this.panel1.Controls.Add(this.label10);
|
this.panel1.Controls.Add(this.label10);
|
||||||
this.panel1.Controls.Add(this.txtShopSkuId);
|
this.panel1.Controls.Add(this.txtShopSkuId);
|
||||||
this.panel1.Controls.Add(this.label11);
|
this.panel1.Controls.Add(this.label11);
|
||||||
this.panel1.Controls.Add(this.txtUpSpuCode);
|
this.panel1.Controls.Add(this.txtSpuCode);
|
||||||
this.panel1.Controls.Add(this.txtUpSkuCode);
|
this.panel1.Controls.Add(this.txtSkuCode);
|
||||||
this.panel1.Controls.Add(this.label12);
|
this.panel1.Controls.Add(this.label12);
|
||||||
this.panel1.Controls.Add(this.pnlMap);
|
this.panel1.Controls.Add(this.pnlMap);
|
||||||
this.panel1.Location = new System.Drawing.Point(867, 3);
|
this.panel1.Location = new System.Drawing.Point(867, 3);
|
||||||
@@ -1201,9 +1201,9 @@
|
|||||||
private System.Windows.Forms.Label label8;
|
private System.Windows.Forms.Label label8;
|
||||||
private System.Windows.Forms.TextBox txtShopGoodsName;
|
private System.Windows.Forms.TextBox txtShopGoodsName;
|
||||||
private System.Windows.Forms.Label label7;
|
private System.Windows.Forms.Label label7;
|
||||||
private System.Windows.Forms.TextBox txtUpSpuCode;
|
private System.Windows.Forms.TextBox txtSpuCode;
|
||||||
private System.Windows.Forms.Label label12;
|
private System.Windows.Forms.Label label12;
|
||||||
private System.Windows.Forms.TextBox txtUpSkuCode;
|
private System.Windows.Forms.TextBox txtSkuCode;
|
||||||
private System.Windows.Forms.Label label11;
|
private System.Windows.Forms.Label label11;
|
||||||
private System.Windows.Forms.Label label13;
|
private System.Windows.Forms.Label label13;
|
||||||
private System.Windows.Forms.TextBox txtShopSpecName;
|
private System.Windows.Forms.TextBox txtShopSpecName;
|
||||||
|
|||||||
@@ -474,11 +474,14 @@ namespace Work._29Tools.Forms.UserForms
|
|||||||
this.cmbType.FormattingEnabled = true;
|
this.cmbType.FormattingEnabled = true;
|
||||||
this.cmbType.Items.AddRange(new object[] {
|
this.cmbType.Items.AddRange(new object[] {
|
||||||
"",
|
"",
|
||||||
"充值",
|
"充值",
|
||||||
"管理员充值",
|
"管理员充值",
|
||||||
"支付宝充值",
|
"支付宝充值",
|
||||||
"拍单扣除/作废返还",
|
"礼物单支出/礼物单退费",
|
||||||
"超重扣费"});
|
"拍单扣除/作废返还",
|
||||||
|
"超重扣费支出",
|
||||||
|
"退货包裹扣费支出",
|
||||||
|
"云仓退货扣费支出"});
|
||||||
this.cmbType.Location = new System.Drawing.Point(42, 33);
|
this.cmbType.Location = new System.Drawing.Point(42, 33);
|
||||||
this.cmbType.Name = "cmbType";
|
this.cmbType.Name = "cmbType";
|
||||||
this.cmbType.Size = new System.Drawing.Size(121, 25);
|
this.cmbType.Size = new System.Drawing.Size(121, 25);
|
||||||
|
|||||||
@@ -152,14 +152,20 @@ namespace Work._29Tools.Forms.UserForms
|
|||||||
data3 += "&create_time_end=" + dtpTimeEnd.Value.ToString("yyyy-MM-dd HH:mm:ss");
|
data3 += "&create_time_end=" + dtpTimeEnd.Value.ToString("yyyy-MM-dd HH:mm:ss");
|
||||||
if (cmbType.Text == "充值")
|
if (cmbType.Text == "充值")
|
||||||
data3 += "&type_in=1,30";
|
data3 += "&type_in=1,30";
|
||||||
if (cmbType.Text == "管理员充值")
|
else if (cmbType.Text == "管理员充值")
|
||||||
data3 += "&type_in=1";
|
data3 += "&type_in=1";
|
||||||
if (cmbType.Text == "支付宝充值")
|
else if (cmbType.Text == "支付宝充值")
|
||||||
data3 += "&type_in=30";
|
data3 += "&type_in=30";
|
||||||
if (cmbType.Text == "拍单扣除/作废返还")
|
else if (cmbType.Text == "礼物单支出/礼物单退费")
|
||||||
|
data3 += "&type_in=16,34";
|
||||||
|
else if (cmbType.Text == "拍单扣除/作废返还")
|
||||||
data3 += "&type_in=20,23";
|
data3 += "&type_in=20,23";
|
||||||
if (cmbType.Text == "超重扣费")
|
else if (cmbType.Text == "超重扣费支出")
|
||||||
data3 += "&type_in=24";
|
data3 += "&type_in=24";
|
||||||
|
else if (cmbType.Text == "退货包裹扣费支出")
|
||||||
|
data3 += "&type_in=26";
|
||||||
|
else if (cmbType.Text == "云仓退货扣费支出")
|
||||||
|
data3 += "&type_in=31";
|
||||||
if (!string.IsNullOrEmpty(txtOutOrderId.Text.Trim()))
|
if (!string.IsNullOrEmpty(txtOutOrderId.Text.Trim()))
|
||||||
data3 += "&order_id_in=" + txtOutOrderId.Text.Trim();
|
data3 += "&order_id_in=" + txtOutOrderId.Text.Trim();
|
||||||
if (!string.IsNullOrEmpty(txtShopOrderNo.Text.Trim()))
|
if (!string.IsNullOrEmpty(txtShopOrderNo.Text.Trim()))
|
||||||
|
|||||||
Reference in new issue
Block a user