Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder
This commit is contained in:
commit
1803a4e5e9
12 files changed
+1118
-1027
No files matched your search
@@ -108,7 +108,7 @@ namespace _29WxOrderWpf
|
|||||||
string str = GetExceptionMsg(ex, string.Empty);
|
string str = GetExceptionMsg(ex, string.Empty);
|
||||||
NaiBa.Util.Helper.LogHelper.WriteWithTime("SystemError:" + str);
|
NaiBa.Util.Helper.LogHelper.WriteWithTime("SystemError:" + str);
|
||||||
//BaseMsgForm.ShowError(str, "系统错误");
|
//BaseMsgForm.ShowError(str, "系统错误");
|
||||||
BaseMsgWindow.ShowError(str, "系统错误");
|
BaseMsgWindow.ShowError(str, "系统错误", null, MsgWindowLevel.LARGE);
|
||||||
}
|
}
|
||||||
|
|
||||||
#region 初始化cef
|
#region 初始化cef
|
||||||
@@ -157,15 +157,15 @@ namespace _29WxOrderWpf
|
|||||||
{
|
{
|
||||||
string str = GetExceptionMsg(e.Exception, e.ToString());
|
string str = GetExceptionMsg(e.Exception, e.ToString());
|
||||||
NaiBa.Util.Helper.LogHelper.WriteWithTime("SystemError:" + str);
|
NaiBa.Util.Helper.LogHelper.WriteWithTime("SystemError:" + str);
|
||||||
BaseMsgWindow.ShowError(str, "系统错误");
|
BaseMsgWindow.ShowError(str, "系统错误", null, MsgWindowLevel.LARGE);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
|
static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
|
||||||
{
|
{
|
||||||
string str = GetExceptionMsg(e.ExceptionObject as Exception, e.ToString());
|
string str = GetExceptionMsg(e.ExceptionObject as Exception, e.ToString());
|
||||||
NaiBa.Util.Helper.LogHelper.WriteWithTime("SystemError:" + str);
|
NaiBa.Util.Helper.LogHelper.WriteWithTime("SystemError:" + str);
|
||||||
BaseMsgWindow.ShowError(str, "系统错误");
|
BaseMsgWindow.ShowError(str, "系统错误", null, MsgWindowLevel.LARGE);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 生成自定义异常消息
|
/// 生成自定义异常消息
|
||||||
@@ -190,8 +190,8 @@ namespace _29WxOrderWpf
|
|||||||
}
|
}
|
||||||
sb.AppendLine("***************************************************************");
|
sb.AppendLine("***************************************************************");
|
||||||
NaiBa.Util.Helper.LogHelper.WriteWithTime("Error:" + sb);
|
NaiBa.Util.Helper.LogHelper.WriteWithTime("Error:" + sb);
|
||||||
BaseMsgWindow.ShowError(sb.ToString(), "系统错误");
|
BaseMsgWindow.ShowError(sb.ToString(), "系统错误", null, MsgWindowLevel.LARGE);
|
||||||
return sb.ToString();
|
return sb.ToString();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
using _29WxOrderWpf.BaseWindows;
|
using _29WxOrderWpf.BaseWindows;
|
||||||
using WxOrder.Framework.Commons;
|
using WxOrder.Framework.Commons;
|
||||||
using WxOrder.Framework.Commons;
|
|
||||||
using _29WxOrderWpf.Ctrls.PDDInvoice;
|
using _29WxOrderWpf.Ctrls.PDDInvoice;
|
||||||
using _29WxOrderWpf.Ctrls.Statistics;
|
using _29WxOrderWpf.Ctrls.Statistics;
|
||||||
using _29WxOrderWpf.Services;
|
using _29WxOrderWpf.Services;
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
using _29WxOrderWpf.BaseWindows;
|
using _29WxOrderWpf.BaseWindows;
|
||||||
using WxOrder.Framework.Commons;
|
using WxOrder.Framework.Commons;
|
||||||
using WxOrder.Framework.Commons;
|
|
||||||
using _29WxOrderWpf.Ctrls.BuyerCtrls;
|
using _29WxOrderWpf.Ctrls.BuyerCtrls;
|
||||||
using _29WxOrderWpf.Ctrls.Statistics;
|
using _29WxOrderWpf.Ctrls.Statistics;
|
||||||
using _29WxOrderWpf.Services;
|
using _29WxOrderWpf.Services;
|
||||||
|
|||||||
@@ -167,6 +167,7 @@
|
|||||||
Grid.Column="6"
|
Grid.Column="6"
|
||||||
Margin="4,8,4,8"
|
Margin="4,8,4,8"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
|
d:Text="店铺名称"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
BorderThickness="0"
|
BorderThickness="0"
|
||||||
Cursor="Hand"
|
Cursor="Hand"
|
||||||
|
|||||||
@@ -95,7 +95,15 @@
|
|||||||
Cursor="Hand"
|
Cursor="Hand"
|
||||||
MouseDown="imgOrderItem_MouseDown"
|
MouseDown="imgOrderItem_MouseDown"
|
||||||
MouseEnter="imgOrderItem_MouseEnter"
|
MouseEnter="imgOrderItem_MouseEnter"
|
||||||
MouseLeave="imgOrderItem_MouseLeave" />
|
MouseLeave="imgOrderItem_MouseLeave">
|
||||||
|
<Image.Source>
|
||||||
|
<MultiBinding Converter="{StaticResource ImageUrlToBitmapImage}" Mode="OneWay">
|
||||||
|
<Binding IsAsync="True" Path="ThumbImgStr" />
|
||||||
|
<Binding IsAsync="True" Path="IsLoadThumbImg" />
|
||||||
|
<!--<Binding Path="DataContext.IsLoadImage" RelativeSource="{RelativeSource AncestorType=UserControl}" />-->
|
||||||
|
</MultiBinding>
|
||||||
|
</Image.Source>
|
||||||
|
</Image>
|
||||||
|
|
||||||
<wpf:SpacingStackPanel
|
<wpf:SpacingStackPanel
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
|
|||||||
@@ -672,9 +672,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
if (isAbnormalOrder)
|
if (isAbnormalOrder)
|
||||||
buyOrderForm.AbnormalTransitWarehouseOrderInfo = orderItem.ItemTransitOrder;
|
buyOrderForm.AbnormalTransitWarehouseOrderInfo = orderItem.ItemTransitOrder;
|
||||||
buyOrderForm.ShowDialog();
|
buyOrderForm.ShowDialog();
|
||||||
OrderListCtrl.IsAutoBuy = buyOrderForm.IsAutoBuy;
|
OrderListCtrl.IsAutoBuy = (buyOrderForm?.IsAutoBuy).ParseToBool();
|
||||||
|
|
||||||
if (buyOrderForm.IsBuySuccess)
|
if (buyOrderForm?.IsBuySuccess == true)
|
||||||
{
|
{
|
||||||
Task.Run(async () =>
|
Task.Run(async () =>
|
||||||
{
|
{
|
||||||
@@ -799,11 +799,18 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
// }));
|
// }));
|
||||||
//});
|
//});
|
||||||
|
|
||||||
//var bImg = await AllBase.ImageBuild.LoadBitmipImageFromUrlAsync(order_item.thumb_img + "?imageView2/1/w/100/format/webp|imageMogr2/auto-orient=");
|
//var imgItem = imgOrderItem;
|
||||||
//var bImg = await AllBase.ImageBuild.LoadBitmipImageFromUrlAsync(order_item.thumb_img + "?imageView2/1/w/100/h/100/format/jpg/q/85|imageMogr2/auto-orient=");
|
//Task.Run(() =>
|
||||||
var bImg = await AllBase.ImageBuild.LoadBitmipImageFromUrlAsync(order_item.thumb_img + "?imageView2/1/w/100/h/100/format/jpg/q/80");
|
//{
|
||||||
imgOrderItem.Source = bImg;
|
// BitmapImage bImg = AllBase.ImageBuild.LoadBitmipImageFromUrl(order_item.thumb_img + "?imageView2/1/w/100/h/100/format/jpg/q/80");
|
||||||
|
// Thread.Sleep(Randomx.GetId(1000));
|
||||||
|
// Dispatcher.Invoke(new Action(() =>
|
||||||
|
// {
|
||||||
|
// imgItem.Source = bImg;
|
||||||
|
// }));
|
||||||
|
//});
|
||||||
|
|
||||||
|
//await UpdateImg(order_item, imgOrderItem);
|
||||||
|
|
||||||
// 待采购不显示所有采购信息状态(否则会显示作废订单状态)
|
// 待采购不显示所有采购信息状态(否则会显示作废订单状态)
|
||||||
if (GlobalConfig.OrderTabHeaderStr.StartsWith("待采购"))
|
if (GlobalConfig.OrderTabHeaderStr.StartsWith("待采购"))
|
||||||
@@ -821,6 +828,14 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async Task UpdateImg(oms_wei_order_item_info order_item, Image imageItem)
|
||||||
|
{
|
||||||
|
//var bImg = await AllBase.ImageBuild.LoadBitmipImageFromUrlAsync(order_item.thumb_img + "?imageView2/1/w/100/format/webp|imageMogr2/auto-orient=");
|
||||||
|
//var bImg = await AllBase.ImageBuild.LoadBitmipImageFromUrlAsync(order_item.thumb_img + "?imageView2/1/w/100/h/100/format/jpg/q/85|imageMogr2/auto-orient=");
|
||||||
|
var bImg = await AllBase.ImageBuild.LoadBitmipImageFromUrlAsync(order_item.thumb_img + "?imageView2/1/w/100/h/100/format/jpg/q/80");
|
||||||
|
Dispatcher.Invoke(new Action(() => { imageItem.Source = bImg; }));
|
||||||
|
}
|
||||||
|
|
||||||
private void TransitOrderBuy_Click(object sender, MouseButtonEventArgs e)
|
private void TransitOrderBuy_Click(object sender, MouseButtonEventArgs e)
|
||||||
{
|
{
|
||||||
var orderItem = this.DataContext as oms_wei_order_item_info;
|
var orderItem = this.DataContext as oms_wei_order_item_info;
|
||||||
@@ -1590,7 +1605,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
buyOrderForm.pnlMap.Visible = false;
|
buyOrderForm.pnlMap.Visible = false;
|
||||||
}
|
}
|
||||||
buyOrderForm.ShowDialog();
|
buyOrderForm.ShowDialog();
|
||||||
IsBuySuccess = buyOrderForm.IsBuySuccess;
|
IsBuySuccess = (buyOrderForm?.IsBuySuccess).ParseToBool();
|
||||||
}
|
}
|
||||||
else if (GlobalConfig.CurrentBuyPlatform == "tb")
|
else if (GlobalConfig.CurrentBuyPlatform == "tb")
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,327 +1,356 @@
|
|||||||
<UserControl
|
<UserControl
|
||||||
x:Class="_29WxOrderWpf.Ctrls.ShopCtrls.ShopListCtrl"
|
x:Class="_29WxOrderWpf.Ctrls.ShopCtrls.ShopListCtrl"
|
||||||
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:local="clr-namespace:_29WxOrderWpf.Ctrls.ShopCtrls"
|
xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.ShopCtrls"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
x:Name="shopListCtrl"
|
x:Name="shopListCtrl"
|
||||||
d:DesignHeight="450"
|
d:DesignHeight="450"
|
||||||
d:DesignWidth="800"
|
d:DesignWidth="800"
|
||||||
Loaded="shopListCtrl_Loaded"
|
Loaded="shopListCtrl_Loaded"
|
||||||
mc:Ignorable="d">
|
mc:Ignorable="d">
|
||||||
<Grid Background="{StaticResource ListCtrlBackColorBrush}">
|
<Grid Background="{StaticResource ListCtrlBackColorBrush}">
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="40" />
|
<RowDefinition Height="40" />
|
||||||
<RowDefinition Height="40" />
|
<RowDefinition Height="40" />
|
||||||
<RowDefinition Height="*" />
|
<RowDefinition Height="*" />
|
||||||
<RowDefinition Height="40" />
|
<RowDefinition Height="40" />
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
<Grid x:Name="gridSearch">
|
<Grid x:Name="gridSearch">
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition Width="Auto" />
|
<ColumnDefinition Width="Auto" />
|
||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
<ColumnDefinition Width="Auto" />
|
<ColumnDefinition Width="Auto" />
|
||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
<ColumnDefinition Width="Auto" />
|
<ColumnDefinition Width="Auto" />
|
||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
<ColumnDefinition Width="Auto" />
|
<ColumnDefinition Width="Auto" />
|
||||||
<ColumnDefinition Width="Auto" />
|
<ColumnDefinition Width="Auto" />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
Margin="6,0,0,0"
|
Margin="6,0,0,0"
|
||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Text="店名" />
|
Text="店名" />
|
||||||
<Border
|
<Border
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Height="26"
|
Height="26"
|
||||||
Margin="4"
|
Margin="4"
|
||||||
BorderBrush="{StaticResource mainColorBrush}"
|
BorderBrush="{StaticResource mainColorBrush}"
|
||||||
BorderThickness="1"
|
BorderThickness="1"
|
||||||
CornerRadius="4">
|
CornerRadius="4">
|
||||||
<TextBox
|
<TextBox
|
||||||
x:Name="txtShopName"
|
x:Name="txtShopName"
|
||||||
Margin="3,0"
|
Margin="3,0"
|
||||||
VerticalContentAlignment="Center"
|
VerticalContentAlignment="Center"
|
||||||
Style="{StaticResource BaseTextBoxStyle}" />
|
Style="{StaticResource BaseTextBoxStyle}" />
|
||||||
</Border>
|
</Border>
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Column="2"
|
Grid.Column="2"
|
||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Text="分组" />
|
Text="分组" />
|
||||||
<Border
|
<Border
|
||||||
Grid.Column="3"
|
Grid.Column="3"
|
||||||
Height="26"
|
Height="26"
|
||||||
Margin="4"
|
Margin="4"
|
||||||
BorderBrush="{StaticResource mainColorBrush}"
|
BorderBrush="{StaticResource mainColorBrush}"
|
||||||
BorderThickness="1"
|
BorderThickness="1"
|
||||||
CornerRadius="4">
|
CornerRadius="4">
|
||||||
<ComboBox
|
<ComboBox
|
||||||
x:Name="cmbGroup"
|
x:Name="cmbGroup"
|
||||||
Margin="3,0"
|
Margin="3,0"
|
||||||
VerticalContentAlignment="Center"
|
VerticalContentAlignment="Center"
|
||||||
SelectionChanged="cmbGroup_SelectionChanged"
|
SelectionChanged="cmbGroup_SelectionChanged"
|
||||||
Style="{StaticResource BaseComboBoxStyle}" />
|
Style="{StaticResource BaseComboBoxStyle}" />
|
||||||
</Border>
|
</Border>
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Column="4"
|
Grid.Column="4"
|
||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Text="备注" />
|
Text="备注" />
|
||||||
<Border
|
<Border
|
||||||
Grid.Column="5"
|
Grid.Column="5"
|
||||||
Height="26"
|
Height="26"
|
||||||
Margin="4"
|
Margin="4"
|
||||||
BorderBrush="{StaticResource mainColorBrush}"
|
BorderBrush="{StaticResource mainColorBrush}"
|
||||||
BorderThickness="1"
|
BorderThickness="1"
|
||||||
CornerRadius="4">
|
CornerRadius="4">
|
||||||
<ComboBox
|
<ComboBox
|
||||||
x:Name="cmbNotes"
|
x:Name="cmbNotes"
|
||||||
Margin="3,0"
|
Margin="3,0"
|
||||||
VerticalContentAlignment="Center"
|
VerticalContentAlignment="Center"
|
||||||
SelectionChanged="cmbNotes_SelectionChanged"
|
SelectionChanged="cmbNotes_SelectionChanged"
|
||||||
Style="{StaticResource BaseComboBoxStyle}" />
|
Style="{StaticResource BaseComboBoxStyle}" />
|
||||||
</Border>
|
</Border>
|
||||||
<Button
|
<Button
|
||||||
x:Name="btnSearch"
|
x:Name="btnSearch"
|
||||||
Grid.Row="4"
|
Grid.Row="4"
|
||||||
Grid.Column="6"
|
Grid.Column="6"
|
||||||
Height="26"
|
Height="26"
|
||||||
Click="btnSearch_Click"
|
Click="btnSearch_Click"
|
||||||
Content=" 搜索 "
|
Content=" 搜索 "
|
||||||
Style="{StaticResource BasePageButtonStyle}" />
|
Style="{StaticResource BasePageButtonStyle}" />
|
||||||
<Button
|
<Button
|
||||||
x:Name="btnRestore"
|
x:Name="btnRestore"
|
||||||
Grid.Row="4"
|
Grid.Row="4"
|
||||||
Grid.Column="7"
|
Grid.Column="7"
|
||||||
Height="26"
|
Height="26"
|
||||||
Margin="4,0,6,0"
|
Margin="4,0,6,0"
|
||||||
Click="btnRestore_Click"
|
Click="btnRestore_Click"
|
||||||
Content=" 还原 "
|
Content=" 还原 "
|
||||||
Style="{StaticResource BasePageButtonLightStyle}" />
|
Style="{StaticResource BasePageButtonLightStyle}" />
|
||||||
</Grid>
|
</Grid>
|
||||||
<Grid
|
<Grid
|
||||||
x:Name="lstTitle"
|
x:Name="lstTitle"
|
||||||
Grid.Row="1"
|
Grid.Row="1"
|
||||||
Margin="4,0"
|
Margin="4,0"
|
||||||
Background="{StaticResource ListHeadBackColorBrush}">
|
Background="{StaticResource ListHeadBackColorBrush}">
|
||||||
<Border BorderBrush="{StaticResource ListHeadBorderColorBrush}" BorderThickness="0,0,1,0">
|
<Border BorderBrush="{StaticResource ListHeadBorderColorBrush}" BorderThickness="0,0,1,0">
|
||||||
<DataGrid
|
<DataGrid
|
||||||
x:Name="dgShopHeader"
|
x:Name="dgShopHeader"
|
||||||
Grid.ColumnSpan="100"
|
Grid.ColumnSpan="100"
|
||||||
Margin="0,0,18,0"
|
Margin="0,0,18,0"
|
||||||
AutoGenerateColumns="False"
|
AutoGenerateColumns="False"
|
||||||
BorderThickness="0"
|
BorderThickness="0"
|
||||||
CanUserReorderColumns="False"
|
CanUserReorderColumns="False"
|
||||||
ColumnDisplayIndexChanged="dgShopHeader_ColumnDisplayIndexChanged"
|
ColumnDisplayIndexChanged="dgShopHeader_ColumnDisplayIndexChanged"
|
||||||
ColumnHeaderHeight="{Binding ElementName=lstTitle, Path=ActualHeight}"
|
ColumnHeaderHeight="{Binding ElementName=lstTitle, Path=ActualHeight}"
|
||||||
LayoutUpdated="dgShopHeader_LayoutUpdated">
|
LayoutUpdated="dgShopHeader_LayoutUpdated">
|
||||||
<DataGrid.Columns>
|
<DataGrid.Columns>
|
||||||
<DataGridTemplateColumn
|
<DataGridTemplateColumn
|
||||||
x:Name="colSelectAll"
|
x:Name="colSelectAll"
|
||||||
Width="50"
|
Width="50"
|
||||||
Header="选择"
|
Header="选择"
|
||||||
HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}">
|
HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}">
|
||||||
<DataGridTemplateColumn.HeaderTemplate>
|
<DataGridTemplateColumn.HeaderTemplate>
|
||||||
<DataTemplate>
|
<DataTemplate>
|
||||||
<Grid Width="14" Height="14">
|
<Grid Width="14" Height="14">
|
||||||
<!--<CheckBox x:Name="headerCheckBox" BorderThickness="0" IsChecked="{Binding DataContext.AreAllSelected, RelativeSource={RelativeSource AncestorType=DataGrid}, UpdateSourceTrigger=PropertyChanged}" Checked="HeaderCheckBox_Checked" Unchecked="HeaderCheckBox_Unchecked"/>-->
|
<!--<CheckBox x:Name="headerCheckBox" BorderThickness="0" IsChecked="{Binding DataContext.AreAllSelected, RelativeSource={RelativeSource AncestorType=DataGrid}, UpdateSourceTrigger=PropertyChanged}" Checked="HeaderCheckBox_Checked" Unchecked="HeaderCheckBox_Unchecked"/>-->
|
||||||
<CheckBox
|
<CheckBox
|
||||||
x:Name="chkSelectAll"
|
x:Name="chkSelectAll"
|
||||||
BorderThickness="0"
|
BorderThickness="0"
|
||||||
Checked="ChkSelectAll_Checked"
|
Checked="ChkSelectAll_Checked"
|
||||||
IsChecked="False"
|
IsChecked="False"
|
||||||
IsThreeState="True"
|
IsThreeState="True"
|
||||||
Loaded="ChkSelectAll_Loaded"
|
Loaded="ChkSelectAll_Loaded"
|
||||||
Unchecked="ChkSelectAll_Unchecked" />
|
Unchecked="ChkSelectAll_Unchecked" />
|
||||||
<Border
|
<Border
|
||||||
Width="14"
|
Width="14"
|
||||||
Height="14"
|
Height="14"
|
||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
BorderBrush="{StaticResource mainColorBrush}"
|
BorderBrush="{StaticResource mainColorBrush}"
|
||||||
BorderThickness="1"
|
BorderThickness="1"
|
||||||
IsHitTestVisible="False" />
|
IsHitTestVisible="False" />
|
||||||
</Grid>
|
</Grid>
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
</DataGridTemplateColumn.HeaderTemplate>
|
</DataGridTemplateColumn.HeaderTemplate>
|
||||||
<DataGridTemplateColumn.CellTemplate>
|
<DataGridTemplateColumn.CellTemplate>
|
||||||
<DataTemplate>
|
<DataTemplate>
|
||||||
<!--<CheckBox IsChecked="{Binding IsSelected, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Center" VerticalAlignment="Center"/>-->
|
<!--<CheckBox IsChecked="{Binding IsSelected, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Center" VerticalAlignment="Center"/>-->
|
||||||
<CheckBox HorizontalAlignment="Center" VerticalAlignment="Center" />
|
<CheckBox HorizontalAlignment="Center" VerticalAlignment="Center" />
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
</DataGridTemplateColumn.CellTemplate>
|
</DataGridTemplateColumn.CellTemplate>
|
||||||
</DataGridTemplateColumn>
|
</DataGridTemplateColumn>
|
||||||
<DataGridTextColumn
|
<DataGridTextColumn
|
||||||
Width="100*"
|
Width="50*"
|
||||||
Header="AppId"
|
Header="序号"
|
||||||
HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
|
HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
|
||||||
<DataGridTextColumn
|
<DataGridTextColumn
|
||||||
Width="100*"
|
Width="100*"
|
||||||
Header="店铺名称"
|
Header="AppId"
|
||||||
HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
|
HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
|
||||||
<DataGridTextColumn
|
<DataGridTextColumn
|
||||||
Width="100*"
|
Width="100*"
|
||||||
Header="分组"
|
Header="店铺编号"
|
||||||
HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
|
HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
|
||||||
<DataGridTextColumn
|
<DataGridTextColumn
|
||||||
Width="82*"
|
Width="100*"
|
||||||
Header=" 备注"
|
Header="店铺名称"
|
||||||
HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
|
HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
|
||||||
</DataGrid.Columns>
|
<DataGridTextColumn
|
||||||
</DataGrid>
|
Width="100*"
|
||||||
</Border>
|
Header="分组"
|
||||||
</Grid>
|
HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
|
||||||
<!--<ListBox Grid.Row="2" x:Name="lbxShop" ItemsSource="{Binding GlobalConfig.ShopLoginList}" BorderThickness="0" Margin="4,0,4,4">-->
|
<DataGridTextColumn
|
||||||
<ListBox
|
Width="82*"
|
||||||
x:Name="lbxShop"
|
Header=" 备注"
|
||||||
Grid.Row="2"
|
HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
|
||||||
Margin="4,0,4,4"
|
</DataGrid.Columns>
|
||||||
BorderThickness="0"
|
</DataGrid>
|
||||||
SelectionMode="Extended">
|
</Border>
|
||||||
<!-- 使用自定义属性模板去除ListBox高亮显示框 -->
|
</Grid>
|
||||||
<ListBox.ItemContainerStyle>
|
<!--<ListBox Grid.Row="2" x:Name="lbxShop" ItemsSource="{Binding GlobalConfig.ShopLoginList}" BorderThickness="0" Margin="4,0,4,4">-->
|
||||||
<Style TargetType="ListBoxItem">
|
<ListBox
|
||||||
<Setter Property="Template">
|
x:Name="lbxShop"
|
||||||
<Setter.Value>
|
Grid.Row="2"
|
||||||
<ControlTemplate TargetType="ListBoxItem">
|
Margin="4,0,4,4"
|
||||||
<ContentPresenter
|
BorderThickness="0"
|
||||||
Content="{TemplateBinding Content}"
|
SelectionMode="Extended">
|
||||||
ContentStringFormat="{TemplateBinding ContentStringFormat}"
|
<!-- 使用自定义属性模板去除ListBox高亮显示框 -->
|
||||||
ContentTemplate="{TemplateBinding ContentTemplate}" />
|
<ListBox.ItemContainerStyle>
|
||||||
</ControlTemplate>
|
<Style TargetType="ListBoxItem">
|
||||||
</Setter.Value>
|
<Setter Property="Template">
|
||||||
</Setter>
|
<Setter.Value>
|
||||||
</Style>
|
<ControlTemplate TargetType="ListBoxItem">
|
||||||
</ListBox.ItemContainerStyle>
|
<ContentPresenter
|
||||||
<ListBox.ItemTemplate>
|
Content="{TemplateBinding Content}"
|
||||||
<DataTemplate>
|
ContentStringFormat="{TemplateBinding ContentStringFormat}"
|
||||||
<!--<local:ShopListRowCtrl></local:ShopListRowCtrl>-->
|
ContentTemplate="{TemplateBinding ContentTemplate}" />
|
||||||
<Border
|
</ControlTemplate>
|
||||||
MinHeight="50"
|
</Setter.Value>
|
||||||
Margin="0,0,0,0"
|
</Setter>
|
||||||
HorizontalAlignment="Stretch"
|
</Style>
|
||||||
VerticalAlignment="Stretch"
|
</ListBox.ItemContainerStyle>
|
||||||
BorderBrush="{StaticResource ListRowBorderColorBrush}"
|
<ListBox.ItemTemplate>
|
||||||
BorderThickness="0,0,0,1"
|
<DataTemplate>
|
||||||
CornerRadius="0">
|
<!--<local:ShopListRowCtrl></local:ShopListRowCtrl>-->
|
||||||
<Border.Style>
|
<Border
|
||||||
<!-- 鼠标进入或悬停Border时切换颜色(悬停时Border的填充控件必须有填充Border,所在层级不限,仅填充透明Grid则触发器无效) -->
|
MinHeight="50"
|
||||||
<Style TargetType="Border">
|
Margin="0,0,0,0"
|
||||||
<Style.Triggers>
|
HorizontalAlignment="Stretch"
|
||||||
<Trigger Property="IsMouseOver" Value="True">
|
VerticalAlignment="Stretch"
|
||||||
<Setter Property="Background" Value="{StaticResource ListRowHoverBackColorBrush}" />
|
BorderBrush="{StaticResource ListRowBorderColorBrush}"
|
||||||
</Trigger>
|
BorderThickness="0,0,0,1"
|
||||||
</Style.Triggers>
|
CornerRadius="0">
|
||||||
</Style>
|
<Border.Style>
|
||||||
</Border.Style>
|
<!-- 鼠标进入或悬停Border时切换颜色(悬停时Border的填充控件必须有填充Border,所在层级不限,仅填充透明Grid则触发器无效) -->
|
||||||
|
<Style TargetType="Border">
|
||||||
|
<Style.Triggers>
|
||||||
|
<Trigger Property="IsMouseOver" Value="True">
|
||||||
|
<Setter Property="Background" Value="{StaticResource ListRowHoverBackColorBrush}" />
|
||||||
|
</Trigger>
|
||||||
|
</Style.Triggers>
|
||||||
|
</Style>
|
||||||
|
</Border.Style>
|
||||||
|
|
||||||
<Grid x:Name="gridListItem">
|
<Grid x:Name="gridListItem">
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<!--<ColumnDefinition Width="{Binding colShopIdWidth,RelativeSource={RelativeSource AncestorType={x:Type local:ShopListCtrl}}}" ></ColumnDefinition>-->
|
<!--<ColumnDefinition Width="{Binding colShopIdWidth,RelativeSource={RelativeSource AncestorType={x:Type local:ShopListCtrl}}}" ></ColumnDefinition>-->
|
||||||
<ColumnDefinition x:Name="colCheck" Width="100*" />
|
<ColumnDefinition x:Name="colCheck" Width="50*" />
|
||||||
<ColumnDefinition x:Name="colShopId" Width="100*" />
|
<ColumnDefinition x:Name="colIndex" Width="50*" />
|
||||||
<ColumnDefinition x:Name="colShopName" Width="100*" />
|
<ColumnDefinition x:Name="colAppId" Width="100*" />
|
||||||
<ColumnDefinition x:Name="colGroupName" Width="100*" />
|
<ColumnDefinition x:Name="colShopId" Width="100*" />
|
||||||
<ColumnDefinition x:Name="colNotes" Width="100*" />
|
<ColumnDefinition x:Name="colShopName" Width="100*" />
|
||||||
</Grid.ColumnDefinitions>
|
<ColumnDefinition x:Name="colGroupName" Width="100*" />
|
||||||
<CheckBox
|
<ColumnDefinition x:Name="colNotes" Width="100*" />
|
||||||
Grid.Column="0"
|
</Grid.ColumnDefinitions>
|
||||||
HorizontalAlignment="Center"
|
<CheckBox
|
||||||
VerticalAlignment="Center"
|
Grid.Column="0"
|
||||||
Background="Transparent"
|
HorizontalAlignment="Center"
|
||||||
Click="CheckBox_Click"
|
VerticalAlignment="Center"
|
||||||
IsChecked="{Binding IsSelect, Mode=TwoWay}"
|
Background="Transparent"
|
||||||
Tag="{Binding ShopId}" />
|
Click="CheckBox_Click"
|
||||||
<TextBox
|
IsChecked="{Binding IsSelect, Mode=TwoWay}"
|
||||||
Grid.Column="1"
|
Tag="{Binding ShopId}" />
|
||||||
HorizontalContentAlignment="Center"
|
<TextBox
|
||||||
VerticalContentAlignment="Center"
|
Grid.Column="1"
|
||||||
Background="Transparent"
|
HorizontalContentAlignment="Center"
|
||||||
BorderThickness="0"
|
VerticalContentAlignment="Center"
|
||||||
IsReadOnly="True"
|
Background="Transparent"
|
||||||
Tag="{Binding ShopId}"
|
BorderThickness="0"
|
||||||
Text="{Binding ShopId}"
|
IsReadOnly="True"
|
||||||
TextWrapping="Wrap" />
|
Text="{Binding Mode=OneWay, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}, Converter={StaticResource listBoxIndexConverter}}"
|
||||||
<TextBox
|
TextWrapping="Wrap" />
|
||||||
Grid.Column="2"
|
<TextBox
|
||||||
HorizontalContentAlignment="Center"
|
Grid.Column="2"
|
||||||
VerticalContentAlignment="Center"
|
HorizontalContentAlignment="Center"
|
||||||
Background="Transparent"
|
VerticalContentAlignment="Center"
|
||||||
BorderThickness="0"
|
Background="Transparent"
|
||||||
IsReadOnly="True"
|
BorderThickness="0"
|
||||||
Tag="{Binding ShopId}"
|
IsReadOnly="True"
|
||||||
Text="{Binding ShopAccount}"
|
Tag="{Binding ShopId}"
|
||||||
TextWrapping="Wrap" />
|
Text="{Binding ShopId}"
|
||||||
<TextBox
|
TextWrapping="Wrap" />
|
||||||
Grid.Column="3"
|
<TextBox
|
||||||
HorizontalContentAlignment="Center"
|
Grid.Column="3"
|
||||||
VerticalContentAlignment="Center"
|
HorizontalContentAlignment="Center"
|
||||||
Background="Transparent"
|
VerticalContentAlignment="Center"
|
||||||
BorderThickness="0"
|
Background="Transparent"
|
||||||
IsReadOnly="True"
|
BorderThickness="0"
|
||||||
Tag="{Binding ShopId}"
|
IsReadOnly="True"
|
||||||
Text="{Binding GroupName}"
|
Tag="{Binding ErpShopId}"
|
||||||
TextWrapping="Wrap" />
|
Text="{Binding ErpShopId}"
|
||||||
<TextBox
|
TextWrapping="Wrap" />
|
||||||
Grid.Column="4"
|
<TextBox
|
||||||
HorizontalContentAlignment="Center"
|
Grid.Column="4"
|
||||||
VerticalContentAlignment="Center"
|
HorizontalContentAlignment="Center"
|
||||||
Background="Transparent"
|
VerticalContentAlignment="Center"
|
||||||
BorderThickness="0"
|
Background="Transparent"
|
||||||
IsReadOnly="True"
|
BorderThickness="0"
|
||||||
Tag="{Binding ShopId}"
|
IsReadOnly="True"
|
||||||
Text="{Binding Notes}"
|
Tag="{Binding ShopId}"
|
||||||
TextWrapping="Wrap" />
|
Text="{Binding ShopAccount}"
|
||||||
</Grid>
|
TextWrapping="Wrap" />
|
||||||
</Border>
|
<TextBox
|
||||||
</DataTemplate>
|
Grid.Column="5"
|
||||||
</ListBox.ItemTemplate>
|
HorizontalContentAlignment="Center"
|
||||||
</ListBox>
|
VerticalContentAlignment="Center"
|
||||||
|
Background="Transparent"
|
||||||
|
BorderThickness="0"
|
||||||
|
IsReadOnly="True"
|
||||||
|
Tag="{Binding ShopId}"
|
||||||
|
Text="{Binding GroupName}"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
<TextBox
|
||||||
|
Grid.Column="6"
|
||||||
|
HorizontalContentAlignment="Center"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
|
Background="Transparent"
|
||||||
|
BorderThickness="0"
|
||||||
|
IsReadOnly="True"
|
||||||
|
Tag="{Binding ShopId}"
|
||||||
|
Text="{Binding Notes}"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
</Grid>
|
||||||
|
</Border>
|
||||||
|
</DataTemplate>
|
||||||
|
</ListBox.ItemTemplate>
|
||||||
|
</ListBox>
|
||||||
|
|
||||||
<Grid x:Name="gridRefreshOrSelect" Grid.Row="3">
|
<Grid x:Name="gridRefreshOrSelect" Grid.Row="3">
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition Width="Auto" />
|
<ColumnDefinition Width="Auto" />
|
||||||
<ColumnDefinition Width="Auto" />
|
<ColumnDefinition Width="Auto" />
|
||||||
<ColumnDefinition Width="Auto" />
|
<ColumnDefinition Width="Auto" />
|
||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
<ColumnDefinition Width="Auto" />
|
<ColumnDefinition Width="Auto" />
|
||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
<ColumnDefinition Width="Auto" />
|
<ColumnDefinition Width="Auto" />
|
||||||
<ColumnDefinition Width="Auto" />
|
<ColumnDefinition Width="Auto" />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<Button
|
<Button
|
||||||
x:Name="btnRefreshShop"
|
x:Name="btnRefreshShop"
|
||||||
Grid.Row="4"
|
Grid.Row="4"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
Height="26"
|
Height="26"
|
||||||
Margin="6,0,0,0"
|
Margin="6,0,0,0"
|
||||||
Click="btnRefreshShop_Click"
|
Click="btnRefreshShop_Click"
|
||||||
Content=" 刷新店铺 "
|
Content=" 刷新店铺 "
|
||||||
Style="{StaticResource BasePageButtonStyle}" />
|
Style="{StaticResource BasePageButtonStyle}" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
x:Name="btnApplySelectShop"
|
x:Name="btnApplySelectShop"
|
||||||
Grid.Row="4"
|
Grid.Row="4"
|
||||||
Grid.Column="6"
|
Grid.Column="6"
|
||||||
Height="26"
|
Height="26"
|
||||||
Click="btnApplySelectShop_Click"
|
Click="btnApplySelectShop_Click"
|
||||||
Content=" 确定 "
|
Content=" 确定 "
|
||||||
Style="{StaticResource BasePageButtonStyle}" />
|
Style="{StaticResource BasePageButtonStyle}" />
|
||||||
<Button
|
<Button
|
||||||
x:Name="btnCancelSelectShop"
|
x:Name="btnCancelSelectShop"
|
||||||
Grid.Row="4"
|
Grid.Row="4"
|
||||||
Grid.Column="7"
|
Grid.Column="7"
|
||||||
Height="26"
|
Height="26"
|
||||||
Margin="4,0,6,0"
|
Margin="4,0,6,0"
|
||||||
Click="btnCancelSelectShop_Click"
|
Click="btnCancelSelectShop_Click"
|
||||||
Content=" 取消 "
|
Content=" 取消 "
|
||||||
Style="{StaticResource BasePageButtonLightStyle}" />
|
Style="{StaticResource BasePageButtonLightStyle}" />
|
||||||
</Grid>
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
@@ -222,8 +222,8 @@
|
|||||||
Background="#7F000000"
|
Background="#7F000000"
|
||||||
Visibility="Hidden">
|
Visibility="Hidden">
|
||||||
<Border
|
<Border
|
||||||
Width="500"
|
Width="850"
|
||||||
Height="600"
|
Height="650"
|
||||||
Background="White"
|
Background="White"
|
||||||
CornerRadius="4">
|
CornerRadius="4">
|
||||||
<shopctrls:ShopListCtrl
|
<shopctrls:ShopListCtrl
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ namespace AllBase
|
|||||||
/// 版本ID
|
/// 版本ID
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
||||||
public static int VersionCount = 351;
|
public static int VersionCount = 353;
|
||||||
|
|
||||||
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";
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ namespace AllBase.Model.DBModel
|
|||||||
public ShopLoginInfo Shop
|
public ShopLoginInfo Shop
|
||||||
{
|
{
|
||||||
get { return this.GetValue(x => x.Shop); }
|
get { return this.GetValue(x => x.Shop); }
|
||||||
set { this.SetValue(x => x.Shop, value); }
|
set { this.SetValue(x => x.Shop, value); if (!Shop.ShopAccount.IsNullOrEmpty()) shop_name = Shop.ShopAccount; }
|
||||||
}
|
}
|
||||||
public int Index
|
public int Index
|
||||||
{
|
{
|
||||||
@@ -425,10 +425,17 @@ namespace AllBase.Model.DBModel
|
|||||||
}
|
}
|
||||||
//public bool is_visible { get; set; } = true;
|
//public bool is_visible { get; set; } = true;
|
||||||
|
|
||||||
|
|
||||||
public long id { get; set; }
|
public long id { get; set; }
|
||||||
public long shop_id { get; set; }
|
public long shop_id
|
||||||
public string shop_name { get; set; }
|
{
|
||||||
|
get { return this.GetValue(x => x.shop_id); }
|
||||||
|
set { this.SetValue(x => x.shop_id, value); }
|
||||||
|
}
|
||||||
|
public string shop_name
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.shop_name); }
|
||||||
|
set { this.SetValue(x => x.shop_name, value); }
|
||||||
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 商户ID
|
/// 商户ID
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -1194,6 +1194,17 @@ namespace AllBase.Model.DBModel
|
|||||||
DirectOrderBuyTimeStr = DirectPddBuyerOrder != null ? DirectPddBuyerOrder.add_time.ToString("yyyy-MM-dd HH:mm:ss") : "";
|
DirectOrderBuyTimeStr = DirectPddBuyerOrder != null ? DirectPddBuyerOrder.add_time.ToString("yyyy-MM-dd HH:mm:ss") : "";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public string ThumbImgStr
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.ThumbImgStr); }
|
||||||
|
set { this.SetValue(x => x.ThumbImgStr, value); }
|
||||||
|
}
|
||||||
|
public bool IsLoadThumbImg
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.IsLoadThumbImg); }
|
||||||
|
set { this.SetValue(x => x.IsLoadThumbImg, value); }
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary> 直发最后一条物流信息 </summary>
|
/// <summary> 直发最后一条物流信息 </summary>
|
||||||
public oms_wei_ewaybill_path LatestDirectEWaybill
|
public oms_wei_ewaybill_path LatestDirectEWaybill
|
||||||
{
|
{
|
||||||
@@ -1521,7 +1532,11 @@ namespace AllBase.Model.DBModel
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// sku小图
|
/// sku小图
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string thumb_img { get; set; }
|
public string thumb_img
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.thumb_img); }
|
||||||
|
set { this.SetValue(x => x.thumb_img, value); IsLoadThumbImg = !string.IsNullOrEmpty(value); ThumbImgStr = thumb_img + "?imageView2/1/w/100/h/100/format/jpg/q/80"; }
|
||||||
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// sku数量
|
/// sku数量
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
File diff suppressed because it is too large.
Load diff
Reference in new issue
Block a user