抖音小店准备阶段
This commit is contained in:
1 parent
9e0a3fc10c
commit
17e4dc4a3c
61 files changed
+5154
-1505
No files matched your search
@@ -15,6 +15,7 @@ using TemuKJD.KJDForms.ProductSelectForms;
|
||||
using TemuKJD.KJDForms.ProductThirdSelectForms;
|
||||
using TemuKJD.KJDForms.ProductForms;
|
||||
using TemuKJD.KJDForms.JITForms;
|
||||
using TemuKJD.BLL;
|
||||
|
||||
namespace TemuKJD.KJDForms.AdminForms
|
||||
{
|
||||
@@ -109,14 +110,14 @@ namespace TemuKJD.KJDForms.AdminForms
|
||||
SetForm(dbPriceMarkUpForm.Value);
|
||||
break;
|
||||
case "认领待上传":
|
||||
dbProductSelectListManageForm.Value.ClientMode = DbProductSelectListManageForm.EnumClientMode.Admin;
|
||||
dbProductSelectListManageForm.Value.ClientMode = EnumClientMode.Admin;
|
||||
SetForm(dbProductSelectListManageForm.Value);
|
||||
break;
|
||||
case "库存上传":
|
||||
SetForm(productThirdSelectListManageForm.Value);
|
||||
break;
|
||||
case "商品核价":
|
||||
adminProductPriceCheckForm.Value.ClientMode = AdminProductPriceCheckForm.EnumClientMode.Admin;
|
||||
adminProductPriceCheckForm.Value.ClientMode = EnumClientMode.Admin;
|
||||
SetForm(adminProductPriceCheckForm.Value);
|
||||
break;
|
||||
case "加入发货台":
|
||||
|
||||
@@ -27,13 +27,6 @@ namespace TemuKJD.KJDForms.AdminForms
|
||||
{
|
||||
public partial class AdminProductPriceCheckForm : BaseForm
|
||||
{
|
||||
public enum EnumClientMode
|
||||
{
|
||||
Admin,
|
||||
Client,
|
||||
ClientJit,
|
||||
}
|
||||
|
||||
public EnumClientMode ClientMode { get; set; } = EnumClientMode.Admin;
|
||||
CheckBox chkSelectAll;
|
||||
PriceCheckConfig priceCheckConfig = null;
|
||||
@@ -1355,7 +1348,8 @@ namespace TemuKJD.KJDForms.AdminForms
|
||||
foreach (var row in rows)
|
||||
row.Cells["colMsg"].Value = "已提交过修改任务或商品有其他修改任务,请在后店铺台终止任务并稍候重试";
|
||||
}));
|
||||
return; //continue;
|
||||
continue;
|
||||
//return; //
|
||||
}
|
||||
|
||||
//Invoke(new Action(() =>
|
||||
|
||||
@@ -639,7 +639,7 @@ namespace TemuKJD.KJDForms.AdminForms
|
||||
TemuDetailProductInfo prodInfo = JsonHelper.DeserializeJsonToObject<TemuDetailProductInfo>(text);
|
||||
TemuProductParam prodParam = new TemuProductParam();
|
||||
prodParam.carouselImageI18nReqs = prodInfo.carouselImageI18nVOList;
|
||||
prodParam.carouselImageUrls = prodInfo.carouselImageUrls;
|
||||
prodParam.carouselImageUrls = prodInfo.carouselImageUrls.Take(10).ToList();
|
||||
prodParam.cat1Id = prodInfo.categories.cat1.catId;
|
||||
prodParam.cat2Id = prodInfo.categories.cat2.catId;
|
||||
prodParam.cat3Id = prodInfo.categories.cat3.catId;
|
||||
|
||||
@@ -8,6 +8,7 @@ using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
using TemuKJD.BaseForms;
|
||||
using TemuKJD.BLL;
|
||||
using TemuKJD.KJDForms.AdminForms;
|
||||
using TemuKJD.KJDForms.ProductForms;
|
||||
using TemuKJD.KJDForms.ProductSelectForms;
|
||||
@@ -62,11 +63,11 @@ namespace TemuKJD.KJDForms.JITForms
|
||||
SetForm(dbProductListForm.Value);
|
||||
break;
|
||||
case "JIT商品上传":
|
||||
dDbProductSelectListManageForm.Value.ClientMode = DbProductSelectListManageForm.EnumClientMode.ClientJit;
|
||||
dDbProductSelectListManageForm.Value.ClientMode = EnumClientMode.ClientJit;
|
||||
SetForm(dDbProductSelectListManageForm.Value);
|
||||
break;
|
||||
case "JIT商品核价":
|
||||
productPriceCheckForm.Value.ClientMode = AdminProductPriceCheckForm.EnumClientMode.ClientJit;
|
||||
productPriceCheckForm.Value.ClientMode = EnumClientMode.ClientJit;
|
||||
SetForm(productPriceCheckForm.Value);
|
||||
break;
|
||||
case "开通JIT":
|
||||
|
||||
+62
-36
@@ -30,12 +30,12 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
private void InitializeComponent()
|
||||
{
|
||||
this.components = new System.ComponentModel.Container();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
|
||||
this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.btnStart = new DevComponents.DotNetBar.PanelEx();
|
||||
@@ -89,6 +89,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.txtRetryInterval = new System.Windows.Forms.TextBox();
|
||||
this.btnStop = new DevComponents.DotNetBar.PanelEx();
|
||||
this.label1 = new System.Windows.Forms.Label();
|
||||
this.btnSearchShop = new DevComponents.DotNetBar.PanelEx();
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
|
||||
this.splitContainer1.Panel1.SuspendLayout();
|
||||
this.splitContainer1.Panel2.SuspendLayout();
|
||||
@@ -205,6 +206,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
| System.Windows.Forms.AnchorStyles.Left)));
|
||||
this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
|
||||
this.ucGroupBoxEx1.Controls.Add(this.btnSearchShop);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.btnEmpty);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.txtNotes);
|
||||
@@ -225,9 +227,9 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.btnEmpty.CanvasColor = System.Drawing.SystemColors.Control;
|
||||
this.btnEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnEmpty.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnEmpty.Location = new System.Drawing.Point(173, 90);
|
||||
this.btnEmpty.Location = new System.Drawing.Point(201, 90);
|
||||
this.btnEmpty.Name = "btnEmpty";
|
||||
this.btnEmpty.Size = new System.Drawing.Size(88, 23);
|
||||
this.btnEmpty.Size = new System.Drawing.Size(60, 23);
|
||||
this.btnEmpty.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
|
||||
this.btnEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
|
||||
@@ -241,19 +243,18 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.btnEmpty.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnEmpty.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
|
||||
this.btnEmpty.TabIndex = 701;
|
||||
this.btnEmpty.Text = "重置查询条件";
|
||||
this.btnEmpty.Text = "重置查询";
|
||||
this.btnEmpty.Click += new System.EventHandler(this.btnEmpty_Click);
|
||||
//
|
||||
// btnRefreshShop
|
||||
//
|
||||
this.btnRefreshShop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.btnRefreshShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnRefreshShop.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnRefreshShop.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnRefreshShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnRefreshShop.Location = new System.Drawing.Point(75, 90);
|
||||
this.btnRefreshShop.Name = "btnRefreshShop";
|
||||
this.btnRefreshShop.Size = new System.Drawing.Size(96, 23);
|
||||
this.btnRefreshShop.Size = new System.Drawing.Size(61, 23);
|
||||
this.btnRefreshShop.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnRefreshShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnRefreshShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
@@ -266,7 +267,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.btnRefreshShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnRefreshShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnRefreshShop.TabIndex = 431;
|
||||
this.btnRefreshShop.Text = "查询/刷新店铺";
|
||||
this.btnRefreshShop.Text = "刷新店铺";
|
||||
this.btnRefreshShop.Click += new System.EventHandler(this.btnRefreshShop_Click);
|
||||
//
|
||||
// txtNotes
|
||||
@@ -389,19 +390,19 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
//
|
||||
this.dgvShop.AllowUserToAddRows = false;
|
||||
this.dgvShop.AllowUserToDeleteRows = false;
|
||||
dataGridViewCellStyle19.BackColor = System.Drawing.Color.WhiteSmoke;
|
||||
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle19;
|
||||
dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
|
||||
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
|
||||
this.dgvShop.AutoRowNumber = true;
|
||||
this.dgvShop.BackgroundColor = System.Drawing.Color.White;
|
||||
this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
||||
dataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Control;
|
||||
dataGridViewCellStyle20.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
dataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.WindowText;
|
||||
dataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
||||
dataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
||||
dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
|
||||
this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle20;
|
||||
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
||||
dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
|
||||
dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
|
||||
dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
||||
dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
||||
dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
|
||||
this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
|
||||
this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
||||
this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
|
||||
this.colSelect,
|
||||
@@ -539,19 +540,19 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
//
|
||||
this.dgvStock.AllowUserToAddRows = false;
|
||||
this.dgvStock.AllowUserToDeleteRows = false;
|
||||
dataGridViewCellStyle21.BackColor = System.Drawing.Color.WhiteSmoke;
|
||||
this.dgvStock.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle21;
|
||||
dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke;
|
||||
this.dgvStock.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3;
|
||||
this.dgvStock.AutoRowNumber = true;
|
||||
this.dgvStock.BackgroundColor = System.Drawing.Color.White;
|
||||
this.dgvStock.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
||||
dataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control;
|
||||
dataGridViewCellStyle22.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
dataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText;
|
||||
dataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
||||
dataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
||||
dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
|
||||
this.dgvStock.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle22;
|
||||
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
||||
dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;
|
||||
dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
|
||||
dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
||||
dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
||||
dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
|
||||
this.dgvStock.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
|
||||
this.dgvStock.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
||||
this.dgvStock.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
|
||||
this.colUpId,
|
||||
@@ -663,8 +664,8 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
//
|
||||
// colProdName
|
||||
//
|
||||
dataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colProdName.DefaultCellStyle = dataGridViewCellStyle23;
|
||||
dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colProdName.DefaultCellStyle = dataGridViewCellStyle5;
|
||||
this.colProdName.HeaderText = "标题";
|
||||
this.colProdName.Name = "colProdName";
|
||||
this.colProdName.ReadOnly = true;
|
||||
@@ -686,8 +687,8 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
//
|
||||
// colCreateTime
|
||||
//
|
||||
dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colCreateTime.DefaultCellStyle = dataGridViewCellStyle24;
|
||||
dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colCreateTime.DefaultCellStyle = dataGridViewCellStyle6;
|
||||
this.colCreateTime.HeaderText = "备货单创建时间";
|
||||
this.colCreateTime.Name = "colCreateTime";
|
||||
this.colCreateTime.ReadOnly = true;
|
||||
@@ -816,6 +817,30 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.label1.TabIndex = 432;
|
||||
this.label1.Text = "重试间隔(秒)";
|
||||
//
|
||||
// btnSearchShop
|
||||
//
|
||||
this.btnSearchShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnSearchShop.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnSearchShop.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnSearchShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnSearchShop.Location = new System.Drawing.Point(138, 90);
|
||||
this.btnSearchShop.Name = "btnSearchShop";
|
||||
this.btnSearchShop.Size = new System.Drawing.Size(61, 23);
|
||||
this.btnSearchShop.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnSearchShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnSearchShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnSearchShop.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
|
||||
this.btnSearchShop.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
|
||||
this.btnSearchShop.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
|
||||
this.btnSearchShop.Style.ForeColor.Color = System.Drawing.Color.White;
|
||||
this.btnSearchShop.Style.GradientAngle = 90;
|
||||
this.btnSearchShop.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnSearchShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnSearchShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnSearchShop.TabIndex = 711;
|
||||
this.btnSearchShop.Text = "查询店铺";
|
||||
this.btnSearchShop.Click += new System.EventHandler(this.btnSearchShop_Click);
|
||||
//
|
||||
// JoinDeliveryForm
|
||||
//
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
|
||||
@@ -912,5 +937,6 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colMsg;
|
||||
private DevComponents.DotNetBar.PanelEx pnlMsg;
|
||||
private System.Windows.Forms.Label lblMsg;
|
||||
private DevComponents.DotNetBar.PanelEx btnSearchShop;
|
||||
}
|
||||
}
|
||||
@@ -43,6 +43,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
private void JoinDeliveryFrom_Load(object sender, EventArgs e)
|
||||
{
|
||||
ucSplitPage1.Visible = IsAdmin;
|
||||
btnRefreshShop.Visible = IsAdmin;
|
||||
dgvShop.AddSelectorColumn("colSelect");
|
||||
dgvStock.AddSelectorColumn("colCheck");
|
||||
dgvStock.AddImgColumn("colProductSkcPic", "colImgUrl");
|
||||
@@ -90,7 +91,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
}
|
||||
else
|
||||
{
|
||||
RefreshShop();
|
||||
FiltShop();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -200,6 +201,20 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
}
|
||||
|
||||
private void btnRefreshShop_Click(object sender, EventArgs e)
|
||||
{
|
||||
pbShopLoading.Visible = true;
|
||||
Task.Run(() =>
|
||||
{
|
||||
ShopListForm.UpdateShop();
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
FiltShop();
|
||||
pbShopLoading.Visible = false;
|
||||
}));
|
||||
});
|
||||
}
|
||||
|
||||
private void btnSearchShop_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (IsAdmin)
|
||||
{
|
||||
@@ -210,11 +225,11 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
}
|
||||
else
|
||||
{
|
||||
RefreshShop();
|
||||
FiltShop();
|
||||
}
|
||||
}
|
||||
|
||||
private void RefreshShop()
|
||||
private void FiltShop()
|
||||
{
|
||||
// 店铺Id
|
||||
var selectIds = dgvShop.Rows.Cast<DataGridViewRow>().Where(row
|
||||
@@ -594,7 +609,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
ShopLoginForm shopLoginForm = new ShopLoginForm(shop);
|
||||
shopLoginForm.openType = EnumOpenType.login;
|
||||
shopLoginForm.ShowDialog();
|
||||
RefreshShop();
|
||||
FiltShop();
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
+125
-82
@@ -43,9 +43,18 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.chkHasSuccess = new System.Windows.Forms.CheckBox();
|
||||
this.btnSearchPrice = new DevComponents.DotNetBar.PanelEx();
|
||||
this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.btnSearchShop = new DevComponents.DotNetBar.PanelEx();
|
||||
this.btnRefreshShop = new DevComponents.DotNetBar.PanelEx();
|
||||
this.btnEmpty = new DevComponents.DotNetBar.PanelEx();
|
||||
this.txtNotes = new System.Windows.Forms.TextBox();
|
||||
this.label14 = new System.Windows.Forms.Label();
|
||||
this.txtShopName = new System.Windows.Forms.TextBox();
|
||||
this.label21 = new System.Windows.Forms.Label();
|
||||
this.txtShopId = new System.Windows.Forms.TextBox();
|
||||
this.label22 = new System.Windows.Forms.Label();
|
||||
this.splitContainer3 = new System.Windows.Forms.SplitContainer();
|
||||
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
|
||||
this.pbShopLoading = new System.Windows.Forms.PictureBox();
|
||||
this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx();
|
||||
this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
|
||||
this.colShopLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
@@ -78,13 +87,6 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
|
||||
this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
|
||||
this.btnClear = new DevComponents.DotNetBar.PanelEx();
|
||||
this.btnEmpty = new DevComponents.DotNetBar.PanelEx();
|
||||
this.txtNotes = new System.Windows.Forms.TextBox();
|
||||
this.label14 = new System.Windows.Forms.Label();
|
||||
this.txtShopName = new System.Windows.Forms.TextBox();
|
||||
this.label21 = new System.Windows.Forms.Label();
|
||||
this.txtShopId = new System.Windows.Forms.TextBox();
|
||||
this.label22 = new System.Windows.Forms.Label();
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
|
||||
this.splitContainer1.Panel1.SuspendLayout();
|
||||
this.splitContainer1.Panel2.SuspendLayout();
|
||||
@@ -100,6 +102,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.splitContainer2.Panel1.SuspendLayout();
|
||||
this.splitContainer2.Panel2.SuspendLayout();
|
||||
this.splitContainer2.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pbShopLoading)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.dgvShop)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pbLoading)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.dgvAdjust)).BeginInit();
|
||||
@@ -244,6 +247,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
| System.Windows.Forms.AnchorStyles.Left)));
|
||||
this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
|
||||
this.ucGroupBoxEx1.Controls.Add(this.btnSearchShop);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.btnEmpty);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.txtNotes);
|
||||
@@ -259,16 +263,39 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.ucGroupBoxEx1.TabStop = false;
|
||||
this.ucGroupBoxEx1.Text = "基础";
|
||||
//
|
||||
// btnSearchShop
|
||||
//
|
||||
this.btnSearchShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnSearchShop.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnSearchShop.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnSearchShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnSearchShop.Location = new System.Drawing.Point(138, 90);
|
||||
this.btnSearchShop.Name = "btnSearchShop";
|
||||
this.btnSearchShop.Size = new System.Drawing.Size(61, 23);
|
||||
this.btnSearchShop.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnSearchShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnSearchShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnSearchShop.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
|
||||
this.btnSearchShop.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
|
||||
this.btnSearchShop.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
|
||||
this.btnSearchShop.Style.ForeColor.Color = System.Drawing.Color.White;
|
||||
this.btnSearchShop.Style.GradientAngle = 90;
|
||||
this.btnSearchShop.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnSearchShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnSearchShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnSearchShop.TabIndex = 722;
|
||||
this.btnSearchShop.Text = "查询店铺";
|
||||
this.btnSearchShop.Click += new System.EventHandler(this.btnSearchShop_Click);
|
||||
//
|
||||
// btnRefreshShop
|
||||
//
|
||||
this.btnRefreshShop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.btnRefreshShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnRefreshShop.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnRefreshShop.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnRefreshShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnRefreshShop.Location = new System.Drawing.Point(75, 90);
|
||||
this.btnRefreshShop.Name = "btnRefreshShop";
|
||||
this.btnRefreshShop.Size = new System.Drawing.Size(96, 23);
|
||||
this.btnRefreshShop.Size = new System.Drawing.Size(61, 23);
|
||||
this.btnRefreshShop.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnRefreshShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnRefreshShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
@@ -281,9 +308,81 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.btnRefreshShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnRefreshShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnRefreshShop.TabIndex = 431;
|
||||
this.btnRefreshShop.Text = "查询/刷新店铺";
|
||||
this.btnRefreshShop.Text = "刷新店铺";
|
||||
this.btnRefreshShop.Click += new System.EventHandler(this.btnRefreshShop_Click);
|
||||
//
|
||||
// btnEmpty
|
||||
//
|
||||
this.btnEmpty.CanvasColor = System.Drawing.SystemColors.Control;
|
||||
this.btnEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnEmpty.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnEmpty.Location = new System.Drawing.Point(201, 90);
|
||||
this.btnEmpty.Name = "btnEmpty";
|
||||
this.btnEmpty.Size = new System.Drawing.Size(60, 23);
|
||||
this.btnEmpty.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
|
||||
this.btnEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
|
||||
this.btnEmpty.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
|
||||
this.btnEmpty.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnEmpty.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
|
||||
this.btnEmpty.Style.GradientAngle = 90;
|
||||
this.btnEmpty.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnEmpty.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnEmpty.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnEmpty.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnEmpty.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
|
||||
this.btnEmpty.TabIndex = 715;
|
||||
this.btnEmpty.Text = "重置查询";
|
||||
this.btnEmpty.Click += new System.EventHandler(this.btnEmpty_Click);
|
||||
//
|
||||
// txtNotes
|
||||
//
|
||||
this.txtNotes.Location = new System.Drawing.Point(75, 65);
|
||||
this.txtNotes.Name = "txtNotes";
|
||||
this.txtNotes.Size = new System.Drawing.Size(186, 23);
|
||||
this.txtNotes.TabIndex = 713;
|
||||
//
|
||||
// label14
|
||||
//
|
||||
this.label14.AutoSize = true;
|
||||
this.label14.Location = new System.Drawing.Point(18, 68);
|
||||
this.label14.Name = "label14";
|
||||
this.label14.Size = new System.Drawing.Size(68, 17);
|
||||
this.label14.TabIndex = 714;
|
||||
this.label14.Text = "店铺分组:";
|
||||
//
|
||||
// txtShopName
|
||||
//
|
||||
this.txtShopName.Location = new System.Drawing.Point(75, 40);
|
||||
this.txtShopName.Name = "txtShopName";
|
||||
this.txtShopName.Size = new System.Drawing.Size(186, 23);
|
||||
this.txtShopName.TabIndex = 711;
|
||||
//
|
||||
// label21
|
||||
//
|
||||
this.label21.AutoSize = true;
|
||||
this.label21.Location = new System.Drawing.Point(18, 43);
|
||||
this.label21.Name = "label21";
|
||||
this.label21.Size = new System.Drawing.Size(68, 17);
|
||||
this.label21.TabIndex = 712;
|
||||
this.label21.Text = "店铺名称:";
|
||||
//
|
||||
// txtShopId
|
||||
//
|
||||
this.txtShopId.Location = new System.Drawing.Point(75, 15);
|
||||
this.txtShopId.Name = "txtShopId";
|
||||
this.txtShopId.Size = new System.Drawing.Size(186, 23);
|
||||
this.txtShopId.TabIndex = 709;
|
||||
//
|
||||
// label22
|
||||
//
|
||||
this.label22.AutoSize = true;
|
||||
this.label22.Location = new System.Drawing.Point(29, 18);
|
||||
this.label22.Name = "label22";
|
||||
this.label22.Size = new System.Drawing.Size(57, 17);
|
||||
this.label22.TabIndex = 710;
|
||||
this.label22.Text = "店铺ID:";
|
||||
//
|
||||
// splitContainer3
|
||||
//
|
||||
this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
@@ -312,6 +411,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
//
|
||||
// splitContainer2.Panel1
|
||||
//
|
||||
this.splitContainer2.Panel1.Controls.Add(this.pbShopLoading);
|
||||
this.splitContainer2.Panel1.Controls.Add(this.dgvShop);
|
||||
this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0);
|
||||
//
|
||||
@@ -324,6 +424,18 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.splitContainer2.SplitterDistance = 280;
|
||||
this.splitContainer2.TabIndex = 0;
|
||||
//
|
||||
// pbShopLoading
|
||||
//
|
||||
this.pbShopLoading.Anchor = System.Windows.Forms.AnchorStyles.None;
|
||||
this.pbShopLoading.Image = global::TemuKJD.Properties.Resources.loading_blue;
|
||||
this.pbShopLoading.Location = new System.Drawing.Point(117, 196);
|
||||
this.pbShopLoading.Name = "pbShopLoading";
|
||||
this.pbShopLoading.Size = new System.Drawing.Size(50, 50);
|
||||
this.pbShopLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
|
||||
this.pbShopLoading.TabIndex = 189;
|
||||
this.pbShopLoading.TabStop = false;
|
||||
this.pbShopLoading.Visible = false;
|
||||
//
|
||||
// dgvShop
|
||||
//
|
||||
this.dgvShop.AllowUserToAddRows = false;
|
||||
@@ -692,78 +804,6 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.btnClear.Text = "清空结果";
|
||||
this.btnClear.Visible = false;
|
||||
//
|
||||
// btnEmpty
|
||||
//
|
||||
this.btnEmpty.CanvasColor = System.Drawing.SystemColors.Control;
|
||||
this.btnEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnEmpty.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnEmpty.Location = new System.Drawing.Point(173, 90);
|
||||
this.btnEmpty.Name = "btnEmpty";
|
||||
this.btnEmpty.Size = new System.Drawing.Size(88, 23);
|
||||
this.btnEmpty.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
|
||||
this.btnEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
|
||||
this.btnEmpty.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
|
||||
this.btnEmpty.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnEmpty.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
|
||||
this.btnEmpty.Style.GradientAngle = 90;
|
||||
this.btnEmpty.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnEmpty.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnEmpty.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnEmpty.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnEmpty.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
|
||||
this.btnEmpty.TabIndex = 715;
|
||||
this.btnEmpty.Text = "重置查询条件";
|
||||
this.btnEmpty.Click += new System.EventHandler(this.btnEmpty_Click);
|
||||
//
|
||||
// txtNotes
|
||||
//
|
||||
this.txtNotes.Location = new System.Drawing.Point(75, 65);
|
||||
this.txtNotes.Name = "txtNotes";
|
||||
this.txtNotes.Size = new System.Drawing.Size(186, 23);
|
||||
this.txtNotes.TabIndex = 713;
|
||||
//
|
||||
// label14
|
||||
//
|
||||
this.label14.AutoSize = true;
|
||||
this.label14.Location = new System.Drawing.Point(18, 68);
|
||||
this.label14.Name = "label14";
|
||||
this.label14.Size = new System.Drawing.Size(68, 17);
|
||||
this.label14.TabIndex = 714;
|
||||
this.label14.Text = "店铺分组:";
|
||||
//
|
||||
// txtShopName
|
||||
//
|
||||
this.txtShopName.Location = new System.Drawing.Point(75, 40);
|
||||
this.txtShopName.Name = "txtShopName";
|
||||
this.txtShopName.Size = new System.Drawing.Size(186, 23);
|
||||
this.txtShopName.TabIndex = 711;
|
||||
//
|
||||
// label21
|
||||
//
|
||||
this.label21.AutoSize = true;
|
||||
this.label21.Location = new System.Drawing.Point(18, 43);
|
||||
this.label21.Name = "label21";
|
||||
this.label21.Size = new System.Drawing.Size(68, 17);
|
||||
this.label21.TabIndex = 712;
|
||||
this.label21.Text = "店铺名称:";
|
||||
//
|
||||
// txtShopId
|
||||
//
|
||||
this.txtShopId.Location = new System.Drawing.Point(75, 15);
|
||||
this.txtShopId.Name = "txtShopId";
|
||||
this.txtShopId.Size = new System.Drawing.Size(186, 23);
|
||||
this.txtShopId.TabIndex = 709;
|
||||
//
|
||||
// label22
|
||||
//
|
||||
this.label22.AutoSize = true;
|
||||
this.label22.Location = new System.Drawing.Point(29, 18);
|
||||
this.label22.Name = "label22";
|
||||
this.label22.Size = new System.Drawing.Size(57, 17);
|
||||
this.label22.TabIndex = 710;
|
||||
this.label22.Text = "店铺ID:";
|
||||
//
|
||||
// PriceManageForm
|
||||
//
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
|
||||
@@ -793,6 +833,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.splitContainer2.Panel2.ResumeLayout(false);
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
|
||||
this.splitContainer2.ResumeLayout(false);
|
||||
((System.ComponentModel.ISupportInitialize)(this.pbShopLoading)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.dgvShop)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pbLoading)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.dgvAdjust)).EndInit();
|
||||
@@ -857,5 +898,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
private System.Windows.Forms.Label label21;
|
||||
private System.Windows.Forms.TextBox txtShopId;
|
||||
private System.Windows.Forms.Label label22;
|
||||
private DevComponents.DotNetBar.PanelEx btnSearchShop;
|
||||
private System.Windows.Forms.PictureBox pbShopLoading;
|
||||
}
|
||||
}
|
||||
@@ -65,14 +65,28 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
private void PriceManageForm_VisibleChanged(object sender, EventArgs e)
|
||||
{
|
||||
if (Visible == true)
|
||||
RefreshShop();
|
||||
FiltShop();
|
||||
}
|
||||
|
||||
private void btnRefreshShop_Click(object sender, EventArgs e)
|
||||
{
|
||||
RefreshShop();
|
||||
pbShopLoading.Visible = true;
|
||||
Task.Run(() =>
|
||||
{
|
||||
ShopListForm.UpdateShop();
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
FiltShop();
|
||||
pbShopLoading.Visible = false;
|
||||
}));
|
||||
});
|
||||
}
|
||||
private void RefreshShop()
|
||||
|
||||
private void btnSearchShop_Click(object sender, EventArgs e)
|
||||
{
|
||||
FiltShop();
|
||||
}
|
||||
private void FiltShop()
|
||||
{
|
||||
// 店铺Id
|
||||
var selectIds = dgvShop.Rows.Cast<DataGridViewRow>().Where(row
|
||||
@@ -213,7 +227,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
ShopLoginForm shopLoginForm = new ShopLoginForm(shop);
|
||||
shopLoginForm.openType = EnumOpenType.login;
|
||||
shopLoginForm.ShowDialog();
|
||||
RefreshShop();
|
||||
FiltShop();
|
||||
}
|
||||
}
|
||||
break;
|
||||
@@ -719,6 +733,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
private void btnEmpty_Click(object sender, EventArgs e)
|
||||
{
|
||||
txtNotes.Text = txtShopId.Text = txtShopName.Text = "";
|
||||
FiltShop();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -15,6 +15,7 @@ using TemuKJD.BaseForms;
|
||||
using TemuKJD.KJDForms.ProductThirdSelectForms;
|
||||
using AllBase;
|
||||
using TemuKJD.KJDForms.AdminForms;
|
||||
using TemuKJD.BLL;
|
||||
|
||||
namespace TemuKJD.KJDForms.ProductForms
|
||||
{
|
||||
@@ -113,15 +114,15 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
break;
|
||||
|
||||
case "商品上传":
|
||||
productSelectListManageForm.Value.ClientMode = DbProductSelectListManageForm.EnumClientMode.Client;
|
||||
productSelectListManageForm.Value.ClientMode = EnumClientMode.Client;
|
||||
SetForm(productSelectListManageForm.Value);
|
||||
break;
|
||||
case "库存上传":
|
||||
productThirdSelectListManageForm.Value.ClientMode = ProductThirdSelectListManageForm.EnumClientMode.Client;
|
||||
productThirdSelectListManageForm.Value.ClientMode = EnumClientMode.Client;
|
||||
SetForm(productThirdSelectListManageForm.Value);
|
||||
break;
|
||||
case "商品核价":
|
||||
productPriceCheckForm.Value.ClientMode = AdminProductPriceCheckForm.EnumClientMode.Client;
|
||||
productPriceCheckForm.Value.ClientMode = EnumClientMode.Client;
|
||||
SetForm(productPriceCheckForm.Value);
|
||||
break;
|
||||
}
|
||||
|
||||
+93
-626
@@ -30,11 +30,11 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
private void InitializeComponent()
|
||||
{
|
||||
this.components = new System.ComponentModel.Container();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
|
||||
this.ucGroupBoxEx4 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.txtMaxQualityRate = new System.Windows.Forms.TextBox();
|
||||
@@ -68,6 +68,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.btnSearch = new DevComponents.DotNetBar.PanelEx();
|
||||
this.panelEx2 = new DevComponents.DotNetBar.PanelEx();
|
||||
this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.pnlSearchShop = new DevComponents.DotNetBar.PanelEx();
|
||||
this.btnEmpty = new DevComponents.DotNetBar.PanelEx();
|
||||
this.btnRefreshShop = new DevComponents.DotNetBar.PanelEx();
|
||||
this.txtNotes = new System.Windows.Forms.TextBox();
|
||||
@@ -78,6 +79,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.label22 = new System.Windows.Forms.Label();
|
||||
this.splitContainer3 = new System.Windows.Forms.SplitContainer();
|
||||
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
|
||||
this.pbShopLoading = new System.Windows.Forms.PictureBox();
|
||||
this.txtPid = new System.Windows.Forms.TextBox();
|
||||
this.txtStockid = new System.Windows.Forms.TextBox();
|
||||
this.label9 = new System.Windows.Forms.Label();
|
||||
@@ -95,44 +97,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.colLoginStatus = new System.Windows.Forms.DataGridViewLinkColumn();
|
||||
this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn();
|
||||
this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.ucGroupBoxEx99 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.cmbCity = new DevComponents.DotNetBar.Controls.ComboBoxEx();
|
||||
this.cmbProvince = new DevComponents.DotNetBar.Controls.ComboBoxEx();
|
||||
this.label3 = new System.Windows.Forms.Label();
|
||||
this.pnlSamePostage = new System.Windows.Forms.FlowLayoutPanel();
|
||||
this.label12 = new System.Windows.Forms.Label();
|
||||
this.txtSamePostagePrice = new System.Windows.Forms.TextBox();
|
||||
this.label13 = new System.Windows.Forms.Label();
|
||||
this.panel3 = new System.Windows.Forms.Panel();
|
||||
this.rbSamePostage = new System.Windows.Forms.RadioButton();
|
||||
this.rbStepPostage = new System.Windows.Forms.RadioButton();
|
||||
this.rbNoPostage = new System.Windows.Forms.RadioButton();
|
||||
this.pnlStepPostage = new System.Windows.Forms.FlowLayoutPanel();
|
||||
this.rbWithCount = new System.Windows.Forms.RadioButton();
|
||||
this.rbWithWeight = new System.Windows.Forms.RadioButton();
|
||||
this.label2 = new System.Windows.Forms.Label();
|
||||
this.txtWeightOrCountStep1 = new System.Windows.Forms.TextBox();
|
||||
this.lblWeightOrCountStep1 = new System.Windows.Forms.Label();
|
||||
this.txtWeightOrCountPrice1 = new System.Windows.Forms.TextBox();
|
||||
this.label5 = new System.Windows.Forms.Label();
|
||||
this.label6 = new System.Windows.Forms.Label();
|
||||
this.txtWeightOrCountStep2 = new System.Windows.Forms.TextBox();
|
||||
this.lblWeightOrCountStep2 = new System.Windows.Forms.Label();
|
||||
this.txtWeightOrCountPrice2 = new System.Windows.Forms.TextBox();
|
||||
this.label8 = new System.Windows.Forms.Label();
|
||||
this.panel2 = new System.Windows.Forms.Panel();
|
||||
this.textBox2 = new System.Windows.Forms.TextBox();
|
||||
this.btnSetNotArea = new DevComponents.DotNetBar.PanelEx();
|
||||
this.nudGroupCount = new System.Windows.Forms.NumericUpDown();
|
||||
this.label11 = new System.Windows.Forms.Label();
|
||||
this.panel1 = new System.Windows.Forms.Panel();
|
||||
this.btnSetName = new DevComponents.DotNetBar.PanelEx();
|
||||
this.rbCustomName = new System.Windows.Forms.RadioButton();
|
||||
this.rbAutoName = new System.Windows.Forms.RadioButton();
|
||||
this.label7 = new System.Windows.Forms.Label();
|
||||
this.btnAdd = new DevComponents.DotNetBar.PanelEx();
|
||||
this.btnStopAdd = new DevComponents.DotNetBar.PanelEx();
|
||||
this.chkLimited = new System.Windows.Forms.CheckBox();
|
||||
this.pbLoading = new System.Windows.Forms.PictureBox();
|
||||
this.dgvStock = new TemuKJD.UserComponent.DataGridViewEx();
|
||||
this.colUpId = new System.Windows.Forms.DataGridViewLinkColumn();
|
||||
this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn();
|
||||
@@ -179,14 +144,9 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.splitContainer2.Panel1.SuspendLayout();
|
||||
this.splitContainer2.Panel2.SuspendLayout();
|
||||
this.splitContainer2.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pbShopLoading)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.dgvShop)).BeginInit();
|
||||
this.ucGroupBoxEx99.SuspendLayout();
|
||||
this.pnlSamePostage.SuspendLayout();
|
||||
this.panel3.SuspendLayout();
|
||||
this.pnlStepPostage.SuspendLayout();
|
||||
this.panel2.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.nudGroupCount)).BeginInit();
|
||||
this.panel1.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pbLoading)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.dgvStock)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).BeginInit();
|
||||
this.splitContainer4.Panel1.SuspendLayout();
|
||||
@@ -676,6 +636,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
| System.Windows.Forms.AnchorStyles.Left)));
|
||||
this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
|
||||
this.ucGroupBoxEx1.Controls.Add(this.pnlSearchShop);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.btnEmpty);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.txtNotes);
|
||||
@@ -691,14 +652,38 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.ucGroupBoxEx1.TabStop = false;
|
||||
this.ucGroupBoxEx1.Text = "基础";
|
||||
//
|
||||
// pnlSearchShop
|
||||
//
|
||||
this.pnlSearchShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.pnlSearchShop.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.pnlSearchShop.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.pnlSearchShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.pnlSearchShop.Location = new System.Drawing.Point(138, 90);
|
||||
this.pnlSearchShop.Name = "pnlSearchShop";
|
||||
this.pnlSearchShop.Size = new System.Drawing.Size(61, 23);
|
||||
this.pnlSearchShop.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.pnlSearchShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.pnlSearchShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.pnlSearchShop.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
|
||||
this.pnlSearchShop.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
|
||||
this.pnlSearchShop.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
|
||||
this.pnlSearchShop.Style.ForeColor.Color = System.Drawing.Color.White;
|
||||
this.pnlSearchShop.Style.GradientAngle = 90;
|
||||
this.pnlSearchShop.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.pnlSearchShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.pnlSearchShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.pnlSearchShop.TabIndex = 715;
|
||||
this.pnlSearchShop.Text = "查询店铺";
|
||||
this.pnlSearchShop.Click += new System.EventHandler(this.btnSearchShop_Click);
|
||||
//
|
||||
// btnEmpty
|
||||
//
|
||||
this.btnEmpty.CanvasColor = System.Drawing.SystemColors.Control;
|
||||
this.btnEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnEmpty.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnEmpty.Location = new System.Drawing.Point(173, 90);
|
||||
this.btnEmpty.Location = new System.Drawing.Point(201, 90);
|
||||
this.btnEmpty.Name = "btnEmpty";
|
||||
this.btnEmpty.Size = new System.Drawing.Size(88, 23);
|
||||
this.btnEmpty.Size = new System.Drawing.Size(60, 23);
|
||||
this.btnEmpty.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
|
||||
this.btnEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
|
||||
@@ -712,19 +697,18 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.btnEmpty.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnEmpty.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
|
||||
this.btnEmpty.TabIndex = 705;
|
||||
this.btnEmpty.Text = "重置查询条件";
|
||||
this.btnEmpty.Text = "重置查询";
|
||||
this.btnEmpty.Click += new System.EventHandler(this.btnEmpty_Click);
|
||||
//
|
||||
// btnRefreshShop
|
||||
//
|
||||
this.btnRefreshShop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.btnRefreshShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnRefreshShop.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnRefreshShop.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnRefreshShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnRefreshShop.Location = new System.Drawing.Point(75, 90);
|
||||
this.btnRefreshShop.Name = "btnRefreshShop";
|
||||
this.btnRefreshShop.Size = new System.Drawing.Size(96, 23);
|
||||
this.btnRefreshShop.Size = new System.Drawing.Size(61, 23);
|
||||
this.btnRefreshShop.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnRefreshShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnRefreshShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
@@ -737,7 +721,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.btnRefreshShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnRefreshShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnRefreshShop.TabIndex = 431;
|
||||
this.btnRefreshShop.Text = "查询/刷新店铺";
|
||||
this.btnRefreshShop.Text = "刷新店铺";
|
||||
this.btnRefreshShop.Click += new System.EventHandler(this.btnRefreshShop_Click);
|
||||
//
|
||||
// txtNotes
|
||||
@@ -816,6 +800,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
//
|
||||
// splitContainer2.Panel1
|
||||
//
|
||||
this.splitContainer2.Panel1.Controls.Add(this.pbShopLoading);
|
||||
this.splitContainer2.Panel1.Controls.Add(this.txtPid);
|
||||
this.splitContainer2.Panel1.Controls.Add(this.txtStockid);
|
||||
this.splitContainer2.Panel1.Controls.Add(this.label9);
|
||||
@@ -829,13 +814,25 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
//
|
||||
// splitContainer2.Panel2
|
||||
//
|
||||
this.splitContainer2.Panel2.Controls.Add(this.ucGroupBoxEx99);
|
||||
this.splitContainer2.Panel2.Controls.Add(this.pbLoading);
|
||||
this.splitContainer2.Panel2.Controls.Add(this.dgvStock);
|
||||
this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0);
|
||||
this.splitContainer2.Size = new System.Drawing.Size(1350, 435);
|
||||
this.splitContainer2.SplitterDistance = 280;
|
||||
this.splitContainer2.TabIndex = 0;
|
||||
//
|
||||
// pbShopLoading
|
||||
//
|
||||
this.pbShopLoading.Anchor = System.Windows.Forms.AnchorStyles.None;
|
||||
this.pbShopLoading.Image = global::TemuKJD.Properties.Resources.loading_blue;
|
||||
this.pbShopLoading.Location = new System.Drawing.Point(117, 192);
|
||||
this.pbShopLoading.Name = "pbShopLoading";
|
||||
this.pbShopLoading.Size = new System.Drawing.Size(50, 50);
|
||||
this.pbShopLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
|
||||
this.pbShopLoading.TabIndex = 659;
|
||||
this.pbShopLoading.TabStop = false;
|
||||
this.pbShopLoading.Visible = false;
|
||||
//
|
||||
// txtPid
|
||||
//
|
||||
this.txtPid.Location = new System.Drawing.Point(85, 94);
|
||||
@@ -908,7 +905,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
// chkHasCreate
|
||||
//
|
||||
this.chkHasCreate.AutoSize = true;
|
||||
this.chkHasCreate.Location = new System.Drawing.Point(31, 165);
|
||||
this.chkHasCreate.Location = new System.Drawing.Point(120, 136);
|
||||
this.chkHasCreate.Name = "chkHasCreate";
|
||||
this.chkHasCreate.Size = new System.Drawing.Size(111, 21);
|
||||
this.chkHasCreate.TabIndex = 658;
|
||||
@@ -930,19 +927,19 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
//
|
||||
this.dgvShop.AllowUserToAddRows = false;
|
||||
this.dgvShop.AllowUserToDeleteRows = false;
|
||||
dataGridViewCellStyle6.BackColor = System.Drawing.Color.WhiteSmoke;
|
||||
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6;
|
||||
dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
|
||||
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
|
||||
this.dgvShop.AutoRowNumber = true;
|
||||
this.dgvShop.BackgroundColor = System.Drawing.Color.White;
|
||||
this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
||||
dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control;
|
||||
dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText;
|
||||
dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
||||
dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
||||
dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
|
||||
this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
|
||||
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
||||
dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
|
||||
dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
|
||||
dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
||||
dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
||||
dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
|
||||
this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
|
||||
this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
||||
this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
|
||||
this.colSelect,
|
||||
@@ -1029,519 +1026,35 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.colMessage.ReadOnly = true;
|
||||
this.colMessage.Width = 120;
|
||||
//
|
||||
// ucGroupBoxEx99
|
||||
//
|
||||
this.ucGroupBoxEx99.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
|
||||
| System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.ucGroupBoxEx99.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.ucGroupBoxEx99.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
|
||||
this.ucGroupBoxEx99.Controls.Add(this.cmbCity);
|
||||
this.ucGroupBoxEx99.Controls.Add(this.cmbProvince);
|
||||
this.ucGroupBoxEx99.Controls.Add(this.label3);
|
||||
this.ucGroupBoxEx99.Controls.Add(this.pnlSamePostage);
|
||||
this.ucGroupBoxEx99.Controls.Add(this.panel3);
|
||||
this.ucGroupBoxEx99.Controls.Add(this.pnlStepPostage);
|
||||
this.ucGroupBoxEx99.Controls.Add(this.panel2);
|
||||
this.ucGroupBoxEx99.Controls.Add(this.nudGroupCount);
|
||||
this.ucGroupBoxEx99.Controls.Add(this.label11);
|
||||
this.ucGroupBoxEx99.Controls.Add(this.panel1);
|
||||
this.ucGroupBoxEx99.Controls.Add(this.btnAdd);
|
||||
this.ucGroupBoxEx99.Controls.Add(this.btnStopAdd);
|
||||
this.ucGroupBoxEx99.Controls.Add(this.chkLimited);
|
||||
this.ucGroupBoxEx99.Location = new System.Drawing.Point(296, 46);
|
||||
this.ucGroupBoxEx99.Name = "ucGroupBoxEx99";
|
||||
this.ucGroupBoxEx99.Size = new System.Drawing.Size(742, 180);
|
||||
this.ucGroupBoxEx99.TabIndex = 470;
|
||||
this.ucGroupBoxEx99.TabStop = false;
|
||||
this.ucGroupBoxEx99.Text = "创建备货单";
|
||||
this.ucGroupBoxEx99.Visible = false;
|
||||
//
|
||||
// cmbCity
|
||||
//
|
||||
this.cmbCity.DisplayMember = "Text";
|
||||
this.cmbCity.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
|
||||
this.cmbCity.FormattingEnabled = true;
|
||||
this.cmbCity.ItemHeight = 18;
|
||||
this.cmbCity.Location = new System.Drawing.Point(283, 28);
|
||||
this.cmbCity.Name = "cmbCity";
|
||||
this.cmbCity.Size = new System.Drawing.Size(90, 24);
|
||||
this.cmbCity.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.cmbCity.TabIndex = 650;
|
||||
this.cmbCity.Text = "请选择";
|
||||
//
|
||||
// cmbProvince
|
||||
//
|
||||
this.cmbProvince.DisplayMember = "Text";
|
||||
this.cmbProvince.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
|
||||
this.cmbProvince.FormattingEnabled = true;
|
||||
this.cmbProvince.ItemHeight = 18;
|
||||
this.cmbProvince.Location = new System.Drawing.Point(189, 29);
|
||||
this.cmbProvince.Name = "cmbProvince";
|
||||
this.cmbProvince.Size = new System.Drawing.Size(90, 24);
|
||||
this.cmbProvince.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.cmbProvince.TabIndex = 649;
|
||||
this.cmbProvince.Text = "请选择";
|
||||
//
|
||||
// label3
|
||||
//
|
||||
this.label3.AutoSize = true;
|
||||
this.label3.Location = new System.Drawing.Point(130, 32);
|
||||
this.label3.Name = "label3";
|
||||
this.label3.Size = new System.Drawing.Size(68, 17);
|
||||
this.label3.TabIndex = 648;
|
||||
this.label3.Text = "发货地区:";
|
||||
//
|
||||
// pnlSamePostage
|
||||
//
|
||||
this.pnlSamePostage.Controls.Add(this.label12);
|
||||
this.pnlSamePostage.Controls.Add(this.txtSamePostagePrice);
|
||||
this.pnlSamePostage.Controls.Add(this.label13);
|
||||
this.pnlSamePostage.Location = new System.Drawing.Point(277, 88);
|
||||
this.pnlSamePostage.Name = "pnlSamePostage";
|
||||
this.pnlSamePostage.Size = new System.Drawing.Size(194, 23);
|
||||
this.pnlSamePostage.TabIndex = 641;
|
||||
this.pnlSamePostage.Visible = false;
|
||||
//
|
||||
// label12
|
||||
//
|
||||
this.label12.Anchor = System.Windows.Forms.AnchorStyles.Left;
|
||||
this.label12.AutoSize = true;
|
||||
this.label12.Location = new System.Drawing.Point(3, 3);
|
||||
this.label12.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
|
||||
this.label12.Name = "label12";
|
||||
this.label12.Size = new System.Drawing.Size(56, 17);
|
||||
this.label12.TabIndex = 612;
|
||||
this.label12.Text = "固定运费";
|
||||
//
|
||||
// txtSamePostagePrice
|
||||
//
|
||||
this.txtSamePostagePrice.Anchor = System.Windows.Forms.AnchorStyles.Left;
|
||||
this.txtSamePostagePrice.Location = new System.Drawing.Point(59, 0);
|
||||
this.txtSamePostagePrice.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.txtSamePostagePrice.Name = "txtSamePostagePrice";
|
||||
this.txtSamePostagePrice.Size = new System.Drawing.Size(45, 23);
|
||||
this.txtSamePostagePrice.TabIndex = 613;
|
||||
//
|
||||
// label13
|
||||
//
|
||||
this.label13.Anchor = System.Windows.Forms.AnchorStyles.Left;
|
||||
this.label13.AutoSize = true;
|
||||
this.label13.Location = new System.Drawing.Point(104, 3);
|
||||
this.label13.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.label13.Name = "label13";
|
||||
this.label13.Size = new System.Drawing.Size(20, 17);
|
||||
this.label13.TabIndex = 614;
|
||||
this.label13.Text = "元";
|
||||
//
|
||||
// panel3
|
||||
//
|
||||
this.panel3.Controls.Add(this.rbSamePostage);
|
||||
this.panel3.Controls.Add(this.rbStepPostage);
|
||||
this.panel3.Controls.Add(this.rbNoPostage);
|
||||
this.panel3.Location = new System.Drawing.Point(21, 88);
|
||||
this.panel3.Name = "panel3";
|
||||
this.panel3.Size = new System.Drawing.Size(250, 23);
|
||||
this.panel3.TabIndex = 640;
|
||||
//
|
||||
// rbSamePostage
|
||||
//
|
||||
this.rbSamePostage.AutoSize = true;
|
||||
this.rbSamePostage.Location = new System.Drawing.Point(83, 1);
|
||||
this.rbSamePostage.Name = "rbSamePostage";
|
||||
this.rbSamePostage.Size = new System.Drawing.Size(74, 21);
|
||||
this.rbSamePostage.TabIndex = 466;
|
||||
this.rbSamePostage.Text = "固定运费";
|
||||
this.rbSamePostage.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// rbStepPostage
|
||||
//
|
||||
this.rbStepPostage.AutoSize = true;
|
||||
this.rbStepPostage.Location = new System.Drawing.Point(3, 1);
|
||||
this.rbStepPostage.Name = "rbStepPostage";
|
||||
this.rbStepPostage.Size = new System.Drawing.Size(74, 21);
|
||||
this.rbStepPostage.TabIndex = 465;
|
||||
this.rbStepPostage.Text = "阶梯计价";
|
||||
this.rbStepPostage.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// rbNoPostage
|
||||
//
|
||||
this.rbNoPostage.AutoSize = true;
|
||||
this.rbNoPostage.Checked = true;
|
||||
this.rbNoPostage.Location = new System.Drawing.Point(163, 1);
|
||||
this.rbNoPostage.Name = "rbNoPostage";
|
||||
this.rbNoPostage.Size = new System.Drawing.Size(74, 21);
|
||||
this.rbNoPostage.TabIndex = 467;
|
||||
this.rbNoPostage.TabStop = true;
|
||||
this.rbNoPostage.Text = "卖家包邮";
|
||||
this.rbNoPostage.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// pnlStepPostage
|
||||
//
|
||||
this.pnlStepPostage.Controls.Add(this.rbWithCount);
|
||||
this.pnlStepPostage.Controls.Add(this.rbWithWeight);
|
||||
this.pnlStepPostage.Controls.Add(this.label2);
|
||||
this.pnlStepPostage.Controls.Add(this.txtWeightOrCountStep1);
|
||||
this.pnlStepPostage.Controls.Add(this.lblWeightOrCountStep1);
|
||||
this.pnlStepPostage.Controls.Add(this.txtWeightOrCountPrice1);
|
||||
this.pnlStepPostage.Controls.Add(this.label5);
|
||||
this.pnlStepPostage.Controls.Add(this.label6);
|
||||
this.pnlStepPostage.Controls.Add(this.txtWeightOrCountStep2);
|
||||
this.pnlStepPostage.Controls.Add(this.lblWeightOrCountStep2);
|
||||
this.pnlStepPostage.Controls.Add(this.txtWeightOrCountPrice2);
|
||||
this.pnlStepPostage.Controls.Add(this.label8);
|
||||
this.pnlStepPostage.Location = new System.Drawing.Point(21, 116);
|
||||
this.pnlStepPostage.Name = "pnlStepPostage";
|
||||
this.pnlStepPostage.Size = new System.Drawing.Size(575, 23);
|
||||
this.pnlStepPostage.TabIndex = 639;
|
||||
this.pnlStepPostage.Visible = false;
|
||||
//
|
||||
// rbWithCount
|
||||
//
|
||||
this.rbWithCount.Anchor = System.Windows.Forms.AnchorStyles.Left;
|
||||
this.rbWithCount.AutoSize = true;
|
||||
this.rbWithCount.Checked = true;
|
||||
this.rbWithCount.Location = new System.Drawing.Point(3, 1);
|
||||
this.rbWithCount.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
|
||||
this.rbWithCount.Name = "rbWithCount";
|
||||
this.rbWithCount.Size = new System.Drawing.Size(62, 21);
|
||||
this.rbWithCount.TabIndex = 615;
|
||||
this.rbWithCount.TabStop = true;
|
||||
this.rbWithCount.Text = "按件数";
|
||||
this.rbWithCount.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// rbWithWeight
|
||||
//
|
||||
this.rbWithWeight.Anchor = System.Windows.Forms.AnchorStyles.Left;
|
||||
this.rbWithWeight.AutoSize = true;
|
||||
this.rbWithWeight.Location = new System.Drawing.Point(65, 1);
|
||||
this.rbWithWeight.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
|
||||
this.rbWithWeight.Name = "rbWithWeight";
|
||||
this.rbWithWeight.Size = new System.Drawing.Size(62, 21);
|
||||
this.rbWithWeight.TabIndex = 616;
|
||||
this.rbWithWeight.Text = "按重量";
|
||||
this.rbWithWeight.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// label2
|
||||
//
|
||||
this.label2.Anchor = System.Windows.Forms.AnchorStyles.Left;
|
||||
this.label2.AutoSize = true;
|
||||
this.label2.Location = new System.Drawing.Point(130, 3);
|
||||
this.label2.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.label2.Name = "label2";
|
||||
this.label2.Size = new System.Drawing.Size(56, 17);
|
||||
this.label2.TabIndex = 605;
|
||||
this.label2.Text = "默认运费";
|
||||
//
|
||||
// txtWeightOrCountStep1
|
||||
//
|
||||
this.txtWeightOrCountStep1.Anchor = System.Windows.Forms.AnchorStyles.Left;
|
||||
this.txtWeightOrCountStep1.Location = new System.Drawing.Point(186, 0);
|
||||
this.txtWeightOrCountStep1.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.txtWeightOrCountStep1.Name = "txtWeightOrCountStep1";
|
||||
this.txtWeightOrCountStep1.Size = new System.Drawing.Size(45, 23);
|
||||
this.txtWeightOrCountStep1.TabIndex = 606;
|
||||
//
|
||||
// lblWeightOrCountStep1
|
||||
//
|
||||
this.lblWeightOrCountStep1.Anchor = System.Windows.Forms.AnchorStyles.Left;
|
||||
this.lblWeightOrCountStep1.AutoSize = true;
|
||||
this.lblWeightOrCountStep1.Location = new System.Drawing.Point(231, 3);
|
||||
this.lblWeightOrCountStep1.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.lblWeightOrCountStep1.Name = "lblWeightOrCountStep1";
|
||||
this.lblWeightOrCountStep1.Size = new System.Drawing.Size(56, 17);
|
||||
this.lblWeightOrCountStep1.TabIndex = 607;
|
||||
this.lblWeightOrCountStep1.Text = "件以内,";
|
||||
//
|
||||
// txtWeightOrCountPrice1
|
||||
//
|
||||
this.txtWeightOrCountPrice1.Anchor = System.Windows.Forms.AnchorStyles.Left;
|
||||
this.txtWeightOrCountPrice1.Location = new System.Drawing.Point(287, 0);
|
||||
this.txtWeightOrCountPrice1.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.txtWeightOrCountPrice1.Name = "txtWeightOrCountPrice1";
|
||||
this.txtWeightOrCountPrice1.Size = new System.Drawing.Size(45, 23);
|
||||
this.txtWeightOrCountPrice1.TabIndex = 608;
|
||||
//
|
||||
// label5
|
||||
//
|
||||
this.label5.Anchor = System.Windows.Forms.AnchorStyles.Left;
|
||||
this.label5.AutoSize = true;
|
||||
this.label5.Location = new System.Drawing.Point(332, 3);
|
||||
this.label5.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.label5.Name = "label5";
|
||||
this.label5.Size = new System.Drawing.Size(32, 17);
|
||||
this.label5.TabIndex = 609;
|
||||
this.label5.Text = "元,";
|
||||
//
|
||||
// label6
|
||||
//
|
||||
this.label6.Anchor = System.Windows.Forms.AnchorStyles.Left;
|
||||
this.label6.AutoSize = true;
|
||||
this.label6.Location = new System.Drawing.Point(364, 3);
|
||||
this.label6.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.label6.Name = "label6";
|
||||
this.label6.Size = new System.Drawing.Size(44, 17);
|
||||
this.label6.TabIndex = 610;
|
||||
this.label6.Text = "每增加";
|
||||
//
|
||||
// txtWeightOrCountStep2
|
||||
//
|
||||
this.txtWeightOrCountStep2.Anchor = System.Windows.Forms.AnchorStyles.Left;
|
||||
this.txtWeightOrCountStep2.Location = new System.Drawing.Point(408, 0);
|
||||
this.txtWeightOrCountStep2.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.txtWeightOrCountStep2.Name = "txtWeightOrCountStep2";
|
||||
this.txtWeightOrCountStep2.Size = new System.Drawing.Size(45, 23);
|
||||
this.txtWeightOrCountStep2.TabIndex = 611;
|
||||
//
|
||||
// lblWeightOrCountStep2
|
||||
//
|
||||
this.lblWeightOrCountStep2.Anchor = System.Windows.Forms.AnchorStyles.Left;
|
||||
this.lblWeightOrCountStep2.AutoSize = true;
|
||||
this.lblWeightOrCountStep2.Location = new System.Drawing.Point(453, 3);
|
||||
this.lblWeightOrCountStep2.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.lblWeightOrCountStep2.Name = "lblWeightOrCountStep2";
|
||||
this.lblWeightOrCountStep2.Size = new System.Drawing.Size(80, 17);
|
||||
this.lblWeightOrCountStep2.TabIndex = 612;
|
||||
this.lblWeightOrCountStep2.Text = "件,增加运费";
|
||||
//
|
||||
// txtWeightOrCountPrice2
|
||||
//
|
||||
this.txtWeightOrCountPrice2.Anchor = System.Windows.Forms.AnchorStyles.Left;
|
||||
this.txtWeightOrCountPrice2.Location = new System.Drawing.Point(0, 23);
|
||||
this.txtWeightOrCountPrice2.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.txtWeightOrCountPrice2.Name = "txtWeightOrCountPrice2";
|
||||
this.txtWeightOrCountPrice2.Size = new System.Drawing.Size(45, 23);
|
||||
this.txtWeightOrCountPrice2.TabIndex = 613;
|
||||
//
|
||||
// label8
|
||||
//
|
||||
this.label8.Anchor = System.Windows.Forms.AnchorStyles.Left;
|
||||
this.label8.AutoSize = true;
|
||||
this.label8.Location = new System.Drawing.Point(45, 26);
|
||||
this.label8.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.label8.Name = "label8";
|
||||
this.label8.Size = new System.Drawing.Size(20, 17);
|
||||
this.label8.TabIndex = 614;
|
||||
this.label8.Text = "元";
|
||||
//
|
||||
// panel2
|
||||
//
|
||||
this.panel2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.panel2.Controls.Add(this.textBox2);
|
||||
this.panel2.Controls.Add(this.btnSetNotArea);
|
||||
this.panel2.Location = new System.Drawing.Point(151, 59);
|
||||
this.panel2.Name = "panel2";
|
||||
this.panel2.Size = new System.Drawing.Size(487, 23);
|
||||
this.panel2.TabIndex = 638;
|
||||
//
|
||||
// textBox2
|
||||
//
|
||||
this.textBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.textBox2.Location = new System.Drawing.Point(0, 0);
|
||||
this.textBox2.Name = "textBox2";
|
||||
this.textBox2.ReadOnly = true;
|
||||
this.textBox2.Size = new System.Drawing.Size(421, 23);
|
||||
this.textBox2.TabIndex = 638;
|
||||
//
|
||||
// btnSetNotArea
|
||||
//
|
||||
this.btnSetNotArea.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.btnSetNotArea.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnSetNotArea.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnSetNotArea.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnSetNotArea.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnSetNotArea.Location = new System.Drawing.Point(427, 2);
|
||||
this.btnSetNotArea.Name = "btnSetNotArea";
|
||||
this.btnSetNotArea.Size = new System.Drawing.Size(56, 19);
|
||||
this.btnSetNotArea.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnSetNotArea.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnSetNotArea.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnSetNotArea.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
|
||||
this.btnSetNotArea.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
|
||||
this.btnSetNotArea.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
|
||||
this.btnSetNotArea.Style.ForeColor.Color = System.Drawing.Color.White;
|
||||
this.btnSetNotArea.Style.GradientAngle = 90;
|
||||
this.btnSetNotArea.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnSetNotArea.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnSetNotArea.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnSetNotArea.TabIndex = 634;
|
||||
this.btnSetNotArea.Text = "设置地区";
|
||||
//
|
||||
// nudGroupCount
|
||||
//
|
||||
this.nudGroupCount.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
this.nudGroupCount.Location = new System.Drawing.Point(75, 29);
|
||||
this.nudGroupCount.Maximum = new decimal(new int[] {
|
||||
10000,
|
||||
0,
|
||||
0,
|
||||
0});
|
||||
this.nudGroupCount.Minimum = new decimal(new int[] {
|
||||
1,
|
||||
0,
|
||||
0,
|
||||
0});
|
||||
this.nudGroupCount.Name = "nudGroupCount";
|
||||
this.nudGroupCount.Size = new System.Drawing.Size(49, 23);
|
||||
this.nudGroupCount.TabIndex = 603;
|
||||
this.nudGroupCount.Value = new decimal(new int[] {
|
||||
10,
|
||||
0,
|
||||
0,
|
||||
0});
|
||||
//
|
||||
// label11
|
||||
//
|
||||
this.label11.AutoSize = true;
|
||||
this.label11.Location = new System.Drawing.Point(18, 32);
|
||||
this.label11.Name = "label11";
|
||||
this.label11.Size = new System.Drawing.Size(68, 17);
|
||||
this.label11.TabIndex = 602;
|
||||
this.label11.Text = "新建数量:";
|
||||
//
|
||||
// panel1
|
||||
//
|
||||
this.panel1.Controls.Add(this.btnSetName);
|
||||
this.panel1.Controls.Add(this.rbCustomName);
|
||||
this.panel1.Controls.Add(this.rbAutoName);
|
||||
this.panel1.Controls.Add(this.label7);
|
||||
this.panel1.Location = new System.Drawing.Point(245, 29);
|
||||
this.panel1.Name = "panel1";
|
||||
this.panel1.Size = new System.Drawing.Size(254, 23);
|
||||
this.panel1.TabIndex = 601;
|
||||
//
|
||||
// btnSetName
|
||||
//
|
||||
this.btnSetName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.btnSetName.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnSetName.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnSetName.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnSetName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnSetName.Location = new System.Drawing.Point(194, 2);
|
||||
this.btnSetName.Name = "btnSetName";
|
||||
this.btnSetName.Size = new System.Drawing.Size(56, 19);
|
||||
this.btnSetName.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnSetName.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnSetName.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnSetName.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
|
||||
this.btnSetName.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
|
||||
this.btnSetName.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
|
||||
this.btnSetName.Style.ForeColor.Color = System.Drawing.Color.White;
|
||||
this.btnSetName.Style.GradientAngle = 90;
|
||||
this.btnSetName.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnSetName.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnSetName.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnSetName.TabIndex = 634;
|
||||
this.btnSetName.Text = "设置名称";
|
||||
//
|
||||
// rbCustomName
|
||||
//
|
||||
this.rbCustomName.AutoSize = true;
|
||||
this.rbCustomName.Location = new System.Drawing.Point(133, 1);
|
||||
this.rbCustomName.Name = "rbCustomName";
|
||||
this.rbCustomName.Size = new System.Drawing.Size(62, 21);
|
||||
this.rbCustomName.TabIndex = 465;
|
||||
this.rbCustomName.Text = "自定义";
|
||||
this.rbCustomName.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// rbAutoName
|
||||
//
|
||||
this.rbAutoName.AutoSize = true;
|
||||
this.rbAutoName.Checked = true;
|
||||
this.rbAutoName.Location = new System.Drawing.Point(60, 1);
|
||||
this.rbAutoName.Name = "rbAutoName";
|
||||
this.rbAutoName.Size = new System.Drawing.Size(74, 21);
|
||||
this.rbAutoName.TabIndex = 464;
|
||||
this.rbAutoName.TabStop = true;
|
||||
this.rbAutoName.Text = "自动设置";
|
||||
this.rbAutoName.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// label7
|
||||
//
|
||||
this.label7.AutoSize = true;
|
||||
this.label7.Location = new System.Drawing.Point(1, 3);
|
||||
this.label7.Name = "label7";
|
||||
this.label7.Size = new System.Drawing.Size(68, 17);
|
||||
this.label7.TabIndex = 638;
|
||||
this.label7.Text = "模板名称:";
|
||||
//
|
||||
// btnAdd
|
||||
//
|
||||
this.btnAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.btnAdd.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnAdd.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnAdd.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnAdd.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnAdd.Location = new System.Drawing.Point(646, 29);
|
||||
this.btnAdd.Name = "btnAdd";
|
||||
this.btnAdd.Size = new System.Drawing.Size(80, 23);
|
||||
this.btnAdd.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnAdd.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnAdd.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnAdd.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
|
||||
this.btnAdd.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
|
||||
this.btnAdd.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
|
||||
this.btnAdd.Style.ForeColor.Color = System.Drawing.Color.White;
|
||||
this.btnAdd.Style.GradientAngle = 90;
|
||||
this.btnAdd.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnAdd.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnAdd.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnAdd.TabIndex = 427;
|
||||
this.btnAdd.Text = "开始创建";
|
||||
//
|
||||
// btnStopAdd
|
||||
//
|
||||
this.btnStopAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.btnStopAdd.CanvasColor = System.Drawing.SystemColors.Control;
|
||||
this.btnStopAdd.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnStopAdd.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnStopAdd.Location = new System.Drawing.Point(646, 59);
|
||||
this.btnStopAdd.Name = "btnStopAdd";
|
||||
this.btnStopAdd.Size = new System.Drawing.Size(80, 23);
|
||||
this.btnStopAdd.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnStopAdd.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
|
||||
this.btnStopAdd.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
|
||||
this.btnStopAdd.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
|
||||
this.btnStopAdd.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnStopAdd.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
|
||||
this.btnStopAdd.Style.GradientAngle = 90;
|
||||
this.btnStopAdd.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnStopAdd.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnStopAdd.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnStopAdd.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnStopAdd.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
|
||||
this.btnStopAdd.TabIndex = 405;
|
||||
this.btnStopAdd.Text = "停止创建";
|
||||
//
|
||||
// chkLimited
|
||||
//
|
||||
this.chkLimited.AutoSize = true;
|
||||
this.chkLimited.Location = new System.Drawing.Point(22, 61);
|
||||
this.chkLimited.Name = "chkLimited";
|
||||
this.chkLimited.Size = new System.Drawing.Size(131, 21);
|
||||
this.chkLimited.TabIndex = 657;
|
||||
this.chkLimited.Text = "限制下单区域(可选)";
|
||||
this.chkLimited.UseVisualStyleBackColor = true;
|
||||
// pbLoading
|
||||
//
|
||||
this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None;
|
||||
this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue;
|
||||
this.pbLoading.Location = new System.Drawing.Point(506, 192);
|
||||
this.pbLoading.Name = "pbLoading";
|
||||
this.pbLoading.Size = new System.Drawing.Size(50, 50);
|
||||
this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
|
||||
this.pbLoading.TabIndex = 471;
|
||||
this.pbLoading.TabStop = false;
|
||||
this.pbLoading.Visible = false;
|
||||
//
|
||||
// dgvStock
|
||||
//
|
||||
this.dgvStock.AllowUserToAddRows = false;
|
||||
this.dgvStock.AllowUserToDeleteRows = false;
|
||||
dataGridViewCellStyle8.BackColor = System.Drawing.Color.WhiteSmoke;
|
||||
this.dgvStock.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle8;
|
||||
dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke;
|
||||
this.dgvStock.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3;
|
||||
this.dgvStock.AutoRowNumber = true;
|
||||
this.dgvStock.BackgroundColor = System.Drawing.Color.White;
|
||||
this.dgvStock.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
||||
dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control;
|
||||
dataGridViewCellStyle9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText;
|
||||
dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
||||
dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
||||
dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
|
||||
this.dgvStock.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9;
|
||||
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
||||
dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;
|
||||
dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
|
||||
dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
||||
dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
||||
dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
|
||||
this.dgvStock.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
|
||||
this.dgvStock.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
||||
this.dgvStock.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
|
||||
this.colUpId,
|
||||
@@ -1663,8 +1176,8 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
//
|
||||
// colProdName
|
||||
//
|
||||
dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colProdName.DefaultCellStyle = dataGridViewCellStyle10;
|
||||
dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colProdName.DefaultCellStyle = dataGridViewCellStyle5;
|
||||
this.colProdName.HeaderText = "标题";
|
||||
this.colProdName.Name = "colProdName";
|
||||
this.colProdName.ReadOnly = true;
|
||||
@@ -1880,20 +1393,9 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.splitContainer2.Panel2.ResumeLayout(false);
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
|
||||
this.splitContainer2.ResumeLayout(false);
|
||||
((System.ComponentModel.ISupportInitialize)(this.pbShopLoading)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.dgvShop)).EndInit();
|
||||
this.ucGroupBoxEx99.ResumeLayout(false);
|
||||
this.ucGroupBoxEx99.PerformLayout();
|
||||
this.pnlSamePostage.ResumeLayout(false);
|
||||
this.pnlSamePostage.PerformLayout();
|
||||
this.panel3.ResumeLayout(false);
|
||||
this.panel3.PerformLayout();
|
||||
this.pnlStepPostage.ResumeLayout(false);
|
||||
this.pnlStepPostage.PerformLayout();
|
||||
this.panel2.ResumeLayout(false);
|
||||
this.panel2.PerformLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.nudGroupCount)).EndInit();
|
||||
this.panel1.ResumeLayout(false);
|
||||
this.panel1.PerformLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pbLoading)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.dgvStock)).EndInit();
|
||||
this.splitContainer4.Panel1.ResumeLayout(false);
|
||||
this.splitContainer4.Panel2.ResumeLayout(false);
|
||||
@@ -1906,44 +1408,6 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
#endregion
|
||||
|
||||
private System.Windows.Forms.SplitContainer splitContainer1;
|
||||
private UserComponent.UcGroupBoxEx ucGroupBoxEx99;
|
||||
private DevComponents.DotNetBar.Controls.ComboBoxEx cmbCity;
|
||||
private DevComponents.DotNetBar.Controls.ComboBoxEx cmbProvince;
|
||||
private System.Windows.Forms.Label label3;
|
||||
private System.Windows.Forms.FlowLayoutPanel pnlSamePostage;
|
||||
private System.Windows.Forms.Label label12;
|
||||
private System.Windows.Forms.TextBox txtSamePostagePrice;
|
||||
private System.Windows.Forms.Label label13;
|
||||
private System.Windows.Forms.Panel panel3;
|
||||
private System.Windows.Forms.RadioButton rbSamePostage;
|
||||
private System.Windows.Forms.RadioButton rbStepPostage;
|
||||
private System.Windows.Forms.RadioButton rbNoPostage;
|
||||
private System.Windows.Forms.FlowLayoutPanel pnlStepPostage;
|
||||
private System.Windows.Forms.RadioButton rbWithCount;
|
||||
private System.Windows.Forms.RadioButton rbWithWeight;
|
||||
private System.Windows.Forms.Label label2;
|
||||
private System.Windows.Forms.TextBox txtWeightOrCountStep1;
|
||||
private System.Windows.Forms.Label lblWeightOrCountStep1;
|
||||
private System.Windows.Forms.TextBox txtWeightOrCountPrice1;
|
||||
private System.Windows.Forms.Label label5;
|
||||
private System.Windows.Forms.Label label6;
|
||||
private System.Windows.Forms.TextBox txtWeightOrCountStep2;
|
||||
private System.Windows.Forms.Label lblWeightOrCountStep2;
|
||||
private System.Windows.Forms.TextBox txtWeightOrCountPrice2;
|
||||
private System.Windows.Forms.Label label8;
|
||||
private System.Windows.Forms.Panel panel2;
|
||||
private System.Windows.Forms.TextBox textBox2;
|
||||
private DevComponents.DotNetBar.PanelEx btnSetNotArea;
|
||||
private System.Windows.Forms.NumericUpDown nudGroupCount;
|
||||
private System.Windows.Forms.Label label11;
|
||||
private System.Windows.Forms.Panel panel1;
|
||||
private DevComponents.DotNetBar.PanelEx btnSetName;
|
||||
private System.Windows.Forms.RadioButton rbCustomName;
|
||||
private System.Windows.Forms.RadioButton rbAutoName;
|
||||
private System.Windows.Forms.Label label7;
|
||||
private DevComponents.DotNetBar.PanelEx btnAdd;
|
||||
private DevComponents.DotNetBar.PanelEx btnStopAdd;
|
||||
private System.Windows.Forms.CheckBox chkLimited;
|
||||
private System.Windows.Forms.TextBox txtStockid;
|
||||
private System.Windows.Forms.Label label4;
|
||||
private DevComponents.DotNetBar.PanelEx btnSearch;
|
||||
@@ -2032,5 +1496,8 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
private System.Windows.Forms.TextBox txtShopId;
|
||||
private System.Windows.Forms.Label label22;
|
||||
private DevComponents.DotNetBar.PanelEx btnEmpty;
|
||||
private DevComponents.DotNetBar.PanelEx pnlSearchShop;
|
||||
private System.Windows.Forms.PictureBox pbShopLoading;
|
||||
private System.Windows.Forms.PictureBox pbLoading;
|
||||
}
|
||||
}
|
||||
@@ -50,8 +50,6 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
|
||||
private void StockUpForm_Load(object sender, EventArgs e)
|
||||
{
|
||||
pnlSamePostage.Location = pnlStepPostage.Location;
|
||||
|
||||
chkSelectAll = dgvShop.Columns["colSelect"].AddHeaderCheckBox(HorizontalAlignment.Center, 0, 0, null, null, false);
|
||||
dgvShop.Columns["colSelect"].HeaderText = "";
|
||||
//chkSelectAll.Width = chkSelectAll.Height = 13;
|
||||
@@ -83,15 +81,29 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
private void StockUpForm_VisibleChanged(object sender, EventArgs e)
|
||||
{
|
||||
if (Visible == true)
|
||||
RefreshShop();
|
||||
FiltShop();
|
||||
}
|
||||
|
||||
private void btnRefreshShop_Click(object sender, EventArgs e)
|
||||
{
|
||||
RefreshShop();
|
||||
pbShopLoading.Visible = true;
|
||||
Task.Run(() =>
|
||||
{
|
||||
ShopListForm.UpdateShop();
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
FiltShop();
|
||||
pbShopLoading.Visible = false;
|
||||
}));
|
||||
});
|
||||
}
|
||||
|
||||
private void RefreshShop()
|
||||
private void btnSearchShop_Click(object sender, EventArgs e)
|
||||
{
|
||||
FiltShop();
|
||||
}
|
||||
|
||||
private void FiltShop()
|
||||
{
|
||||
// 店铺Id
|
||||
var selectIds = dgvShop.Rows.Cast<DataGridViewRow>().Where(row
|
||||
@@ -608,7 +620,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
ShopLoginForm shopLoginForm = new ShopLoginForm(shop);
|
||||
shopLoginForm.openType = EnumOpenType.login;
|
||||
shopLoginForm.ShowDialog();
|
||||
RefreshShop();
|
||||
FiltShop();
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -1364,6 +1376,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
private void btnEmpty_Click(object sender, EventArgs e)
|
||||
{
|
||||
txtNotes.Text = txtShopId.Text = txtShopName.Text = "";
|
||||
FiltShop();
|
||||
}
|
||||
}
|
||||
}
|
||||
+92
-67
@@ -30,15 +30,15 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
private void InitializeComponent()
|
||||
{
|
||||
this.components = new System.ComponentModel.Container();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
|
||||
this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.txtSelectFilter = new System.Windows.Forms.TextBox();
|
||||
@@ -70,6 +70,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.chkToday = new TemuKJD.UserComponent.UcCheckBox(this.components);
|
||||
this.btnSearchAds = new DevComponents.DotNetBar.PanelEx();
|
||||
this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.btnSearchShop = new DevComponents.DotNetBar.PanelEx();
|
||||
this.btnEmpty = new DevComponents.DotNetBar.PanelEx();
|
||||
this.txtNotes = new System.Windows.Forms.TextBox();
|
||||
this.btnCheckAdsLogin = new DevComponents.DotNetBar.PanelEx();
|
||||
@@ -81,7 +82,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.label7 = new System.Windows.Forms.Label();
|
||||
this.splitContainer3 = new System.Windows.Forms.SplitContainer();
|
||||
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
|
||||
this.pbLoading2 = new System.Windows.Forms.PictureBox();
|
||||
this.pbShopLoading = new System.Windows.Forms.PictureBox();
|
||||
this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx();
|
||||
this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
|
||||
this.colShopLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
@@ -158,7 +159,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.splitContainer2.Panel1.SuspendLayout();
|
||||
this.splitContainer2.Panel2.SuspendLayout();
|
||||
this.splitContainer2.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pbLoading2)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pbShopLoading)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.dgvShop)).BeginInit();
|
||||
this.gbxSoloChangeRoas.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pbLoading)).BeginInit();
|
||||
@@ -552,7 +553,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
//
|
||||
// chk30Days
|
||||
//
|
||||
this.chk30Days.Location = new System.Drawing.Point(70, 85);
|
||||
this.chk30Days.Location = new System.Drawing.Point(70, 84);
|
||||
this.chk30Days.Name = "chk30Days";
|
||||
this.chk30Days.Size = new System.Drawing.Size(59, 21);
|
||||
this.chk30Days.TabIndex = 443;
|
||||
@@ -563,7 +564,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
// chk7Days
|
||||
//
|
||||
this.chk7Days.AutoSize = true;
|
||||
this.chk7Days.Location = new System.Drawing.Point(13, 85);
|
||||
this.chk7Days.Location = new System.Drawing.Point(13, 84);
|
||||
this.chk7Days.Name = "chk7Days";
|
||||
this.chk7Days.Size = new System.Drawing.Size(58, 21);
|
||||
this.chk7Days.TabIndex = 442;
|
||||
@@ -574,7 +575,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
// chkYesterday
|
||||
//
|
||||
this.chkYesterday.AutoSize = true;
|
||||
this.chkYesterday.Location = new System.Drawing.Point(70, 61);
|
||||
this.chkYesterday.Location = new System.Drawing.Point(70, 60);
|
||||
this.chkYesterday.Name = "chkYesterday";
|
||||
this.chkYesterday.Size = new System.Drawing.Size(51, 21);
|
||||
this.chkYesterday.TabIndex = 441;
|
||||
@@ -588,7 +589,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.chkToday.Checked = true;
|
||||
this.chkToday.CheckState = System.Windows.Forms.CheckState.Checked;
|
||||
this.chkToday.Enabled = false;
|
||||
this.chkToday.Location = new System.Drawing.Point(13, 61);
|
||||
this.chkToday.Location = new System.Drawing.Point(13, 60);
|
||||
this.chkToday.Name = "chkToday";
|
||||
this.chkToday.Size = new System.Drawing.Size(51, 21);
|
||||
this.chkToday.TabIndex = 440;
|
||||
@@ -602,7 +603,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.btnSearchAds.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnSearchAds.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnSearchAds.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnSearchAds.Location = new System.Drawing.Point(13, 32);
|
||||
this.btnSearchAds.Location = new System.Drawing.Point(13, 31);
|
||||
this.btnSearchAds.Name = "btnSearchAds";
|
||||
this.btnSearchAds.Size = new System.Drawing.Size(110, 23);
|
||||
this.btnSearchAds.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
@@ -626,6 +627,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
| System.Windows.Forms.AnchorStyles.Left)));
|
||||
this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
|
||||
this.ucGroupBoxEx1.Controls.Add(this.btnSearchShop);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.btnEmpty);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.txtNotes);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.btnCheckAdsLogin);
|
||||
@@ -642,14 +644,38 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.ucGroupBoxEx1.TabStop = false;
|
||||
this.ucGroupBoxEx1.Text = "基础";
|
||||
//
|
||||
// btnSearchShop
|
||||
//
|
||||
this.btnSearchShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnSearchShop.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnSearchShop.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnSearchShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnSearchShop.Location = new System.Drawing.Point(172, 90);
|
||||
this.btnSearchShop.Name = "btnSearchShop";
|
||||
this.btnSearchShop.Size = new System.Drawing.Size(56, 23);
|
||||
this.btnSearchShop.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnSearchShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnSearchShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnSearchShop.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
|
||||
this.btnSearchShop.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
|
||||
this.btnSearchShop.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
|
||||
this.btnSearchShop.Style.ForeColor.Color = System.Drawing.Color.White;
|
||||
this.btnSearchShop.Style.GradientAngle = 90;
|
||||
this.btnSearchShop.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnSearchShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnSearchShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnSearchShop.TabIndex = 435;
|
||||
this.btnSearchShop.Text = "查询店铺";
|
||||
this.btnSearchShop.Click += new System.EventHandler(this.btnSearchShop_Click);
|
||||
//
|
||||
// btnEmpty
|
||||
//
|
||||
this.btnEmpty.CanvasColor = System.Drawing.SystemColors.Control;
|
||||
this.btnEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnEmpty.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnEmpty.Location = new System.Drawing.Point(223, 90);
|
||||
this.btnEmpty.Location = new System.Drawing.Point(230, 90);
|
||||
this.btnEmpty.Name = "btnEmpty";
|
||||
this.btnEmpty.Size = new System.Drawing.Size(38, 23);
|
||||
this.btnEmpty.Size = new System.Drawing.Size(31, 23);
|
||||
this.btnEmpty.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
|
||||
this.btnEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
|
||||
@@ -675,14 +701,13 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
//
|
||||
// btnCheckAdsLogin
|
||||
//
|
||||
this.btnCheckAdsLogin.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.btnCheckAdsLogin.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnCheckAdsLogin.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnCheckAdsLogin.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnCheckAdsLogin.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnCheckAdsLogin.Location = new System.Drawing.Point(19, 90);
|
||||
this.btnCheckAdsLogin.Name = "btnCheckAdsLogin";
|
||||
this.btnCheckAdsLogin.Size = new System.Drawing.Size(102, 23);
|
||||
this.btnCheckAdsLogin.Size = new System.Drawing.Size(93, 23);
|
||||
this.btnCheckAdsLogin.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnCheckAdsLogin.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnCheckAdsLogin.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
@@ -709,14 +734,13 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
//
|
||||
// btnRefreshShop
|
||||
//
|
||||
this.btnRefreshShop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.btnRefreshShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnRefreshShop.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnRefreshShop.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnRefreshShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnRefreshShop.Location = new System.Drawing.Point(123, 90);
|
||||
this.btnRefreshShop.Location = new System.Drawing.Point(114, 90);
|
||||
this.btnRefreshShop.Name = "btnRefreshShop";
|
||||
this.btnRefreshShop.Size = new System.Drawing.Size(98, 23);
|
||||
this.btnRefreshShop.Size = new System.Drawing.Size(56, 23);
|
||||
this.btnRefreshShop.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnRefreshShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnRefreshShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
@@ -729,7 +753,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.btnRefreshShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnRefreshShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnRefreshShop.TabIndex = 431;
|
||||
this.btnRefreshShop.Text = "查询/刷新店铺";
|
||||
this.btnRefreshShop.Text = "刷新店铺";
|
||||
this.btnRefreshShop.Click += new System.EventHandler(this.btnRefreshShop_Click);
|
||||
//
|
||||
// txtShopName
|
||||
@@ -792,7 +816,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
//
|
||||
// splitContainer2.Panel1
|
||||
//
|
||||
this.splitContainer2.Panel1.Controls.Add(this.pbLoading2);
|
||||
this.splitContainer2.Panel1.Controls.Add(this.pbShopLoading);
|
||||
this.splitContainer2.Panel1.Controls.Add(this.dgvShop);
|
||||
this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0);
|
||||
//
|
||||
@@ -807,35 +831,35 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.splitContainer2.SplitterDistance = 280;
|
||||
this.splitContainer2.TabIndex = 0;
|
||||
//
|
||||
// pbLoading2
|
||||
// pbShopLoading
|
||||
//
|
||||
this.pbLoading2.Anchor = System.Windows.Forms.AnchorStyles.None;
|
||||
this.pbLoading2.Image = global::TemuKJD.Properties.Resources.loading_blue;
|
||||
this.pbLoading2.Location = new System.Drawing.Point(115, 188);
|
||||
this.pbLoading2.Name = "pbLoading2";
|
||||
this.pbLoading2.Size = new System.Drawing.Size(50, 50);
|
||||
this.pbLoading2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
|
||||
this.pbLoading2.TabIndex = 9;
|
||||
this.pbLoading2.TabStop = false;
|
||||
this.pbLoading2.Visible = false;
|
||||
this.pbShopLoading.Anchor = System.Windows.Forms.AnchorStyles.None;
|
||||
this.pbShopLoading.Image = global::TemuKJD.Properties.Resources.loading_blue;
|
||||
this.pbShopLoading.Location = new System.Drawing.Point(115, 188);
|
||||
this.pbShopLoading.Name = "pbShopLoading";
|
||||
this.pbShopLoading.Size = new System.Drawing.Size(50, 50);
|
||||
this.pbShopLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
|
||||
this.pbShopLoading.TabIndex = 9;
|
||||
this.pbShopLoading.TabStop = false;
|
||||
this.pbShopLoading.Visible = false;
|
||||
//
|
||||
// dgvShop
|
||||
//
|
||||
this.dgvShop.AllowUserToAddRows = false;
|
||||
this.dgvShop.AllowUserToDeleteRows = false;
|
||||
dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
|
||||
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
|
||||
dataGridViewCellStyle10.BackColor = System.Drawing.Color.WhiteSmoke;
|
||||
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10;
|
||||
this.dgvShop.AutoRowNumber = true;
|
||||
this.dgvShop.BackgroundColor = System.Drawing.Color.White;
|
||||
this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
||||
dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
|
||||
dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
|
||||
dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
||||
dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
||||
dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
|
||||
this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
|
||||
dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
||||
dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control;
|
||||
dataGridViewCellStyle11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText;
|
||||
dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
||||
dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
||||
dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
|
||||
this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11;
|
||||
this.dgvShop.ColumnHeadersHeight = 45;
|
||||
this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
|
||||
this.colSelect,
|
||||
@@ -1117,19 +1141,19 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
//
|
||||
this.dgvAds.AllowUserToAddRows = false;
|
||||
this.dgvAds.AllowUserToDeleteRows = false;
|
||||
dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke;
|
||||
this.dgvAds.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3;
|
||||
dataGridViewCellStyle12.BackColor = System.Drawing.Color.WhiteSmoke;
|
||||
this.dgvAds.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle12;
|
||||
this.dgvAds.AutoRowNumber = true;
|
||||
this.dgvAds.BackgroundColor = System.Drawing.Color.White;
|
||||
this.dgvAds.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
||||
dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;
|
||||
dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
|
||||
dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
||||
dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
||||
dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.dgvAds.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
|
||||
dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
||||
dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control;
|
||||
dataGridViewCellStyle13.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText;
|
||||
dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
||||
dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
||||
dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.dgvAds.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle13;
|
||||
this.dgvAds.ColumnHeadersHeight = 45;
|
||||
this.dgvAds.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
|
||||
this.colCheck,
|
||||
@@ -1193,8 +1217,8 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
//
|
||||
// colSupplierName
|
||||
//
|
||||
dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle5;
|
||||
dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle14;
|
||||
this.colSupplierName.HeaderText = "店铺名称";
|
||||
this.colSupplierName.Name = "colSupplierName";
|
||||
this.colSupplierName.ReadOnly = true;
|
||||
@@ -1251,8 +1275,8 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
//
|
||||
// colPrcie
|
||||
//
|
||||
dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colPrcie.DefaultCellStyle = dataGridViewCellStyle6;
|
||||
dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colPrcie.DefaultCellStyle = dataGridViewCellStyle15;
|
||||
this.colPrcie.HeaderText = "申报价";
|
||||
this.colPrcie.Name = "colPrcie";
|
||||
this.colPrcie.ReadOnly = true;
|
||||
@@ -1282,8 +1306,8 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
//
|
||||
// colSetCost
|
||||
//
|
||||
dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colSetCost.DefaultCellStyle = dataGridViewCellStyle7;
|
||||
dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colSetCost.DefaultCellStyle = dataGridViewCellStyle16;
|
||||
this.colSetCost.HeaderText = "成本";
|
||||
this.colSetCost.Name = "colSetCost";
|
||||
this.colSetCost.ReadOnly = true;
|
||||
@@ -1292,8 +1316,8 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
//
|
||||
// colSetDiscount
|
||||
//
|
||||
dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colSetDiscount.DefaultCellStyle = dataGridViewCellStyle8;
|
||||
dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colSetDiscount.DefaultCellStyle = dataGridViewCellStyle17;
|
||||
this.colSetDiscount.HeaderText = "折扣";
|
||||
this.colSetDiscount.Name = "colSetDiscount";
|
||||
this.colSetDiscount.ReadOnly = true;
|
||||
@@ -1301,8 +1325,8 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
//
|
||||
// colAdStatus
|
||||
//
|
||||
dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colAdStatus.DefaultCellStyle = dataGridViewCellStyle9;
|
||||
dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colAdStatus.DefaultCellStyle = dataGridViewCellStyle18;
|
||||
this.colAdStatus.HeaderText = "推广状态";
|
||||
this.colAdStatus.Name = "colAdStatus";
|
||||
this.colAdStatus.ReadOnly = true;
|
||||
@@ -1531,7 +1555,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.splitContainer2.Panel2.PerformLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
|
||||
this.splitContainer2.ResumeLayout(false);
|
||||
((System.ComponentModel.ISupportInitialize)(this.pbLoading2)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pbShopLoading)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.dgvShop)).EndInit();
|
||||
this.gbxSoloChangeRoas.ResumeLayout(false);
|
||||
this.gbxSoloChangeRoas.PerformLayout();
|
||||
@@ -1563,7 +1587,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
private DevComponents.DotNetBar.PanelEx panelEx1;
|
||||
private DevComponents.DotNetBar.PanelEx btnClear;
|
||||
private DevComponents.DotNetBar.PanelEx btnCheckAdsLogin;
|
||||
private System.Windows.Forms.PictureBox pbLoading2;
|
||||
private System.Windows.Forms.PictureBox pbShopLoading;
|
||||
private System.Windows.Forms.PictureBox pbLoading;
|
||||
private DevComponents.DotNetBar.PanelEx btnAddAds;
|
||||
private DevComponents.DotNetBar.PanelEx btnDelAds;
|
||||
@@ -1651,5 +1675,6 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
private System.Windows.Forms.Label label8;
|
||||
private System.Windows.Forms.TextBox txtShopId;
|
||||
private DevComponents.DotNetBar.PanelEx btnEmpty;
|
||||
private DevComponents.DotNetBar.PanelEx btnSearchShop;
|
||||
}
|
||||
}
|
||||
@@ -85,15 +85,29 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
private void TemuAdsForm_VisibleChanged(object sender, EventArgs e)
|
||||
{
|
||||
if (Visible == true)
|
||||
RefreshShop();
|
||||
FiltShop();
|
||||
}
|
||||
|
||||
private void btnRefreshShop_Click(object sender, EventArgs e)
|
||||
{
|
||||
RefreshShop();
|
||||
pbShopLoading.Visible = true;
|
||||
Task.Run(() =>
|
||||
{
|
||||
ShopListForm.UpdateShop();
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
FiltShop();
|
||||
pbShopLoading.Visible = false;
|
||||
}));
|
||||
});
|
||||
}
|
||||
|
||||
private void RefreshShop()
|
||||
private void btnSearchShop_Click(object sender, EventArgs e)
|
||||
{
|
||||
FiltShop();
|
||||
}
|
||||
|
||||
private void FiltShop()
|
||||
{
|
||||
// 店铺Id
|
||||
var selectIds = dgvShop.Rows.Cast<DataGridViewRow>().Where(row
|
||||
@@ -228,7 +242,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
ShopLoginForm shopLoginForm = new ShopLoginForm(shop);
|
||||
shopLoginForm.openType = EnumOpenType.login;
|
||||
shopLoginForm.ShowDialog();
|
||||
RefreshShop();
|
||||
FiltShop();
|
||||
}
|
||||
}
|
||||
break;
|
||||
@@ -247,7 +261,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
shopLoginForm.openType = EnumOpenType.login;
|
||||
shopLoginForm.IsAdsLogin = true;
|
||||
shopLoginForm.ShowDialog();
|
||||
RefreshShop();
|
||||
FiltShop();
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -262,8 +276,8 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
BaseMsgForm.ShowError("请选中店铺!");
|
||||
return;
|
||||
}
|
||||
ShopListForm.Instance.CheckShopAdsLogin(shopIds, pbLoading2, statusBar);
|
||||
this.RefreshShop();
|
||||
ShopListForm.Instance.CheckShopAdsLogin(shopIds, pbShopLoading, statusBar);
|
||||
this.FiltShop();
|
||||
}
|
||||
|
||||
public static string getAdsGoodsList(ShopLoginInfo shop, int page = 1, int pageSize = 20)
|
||||
@@ -740,7 +754,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
if(!string.IsNullOrEmpty(error))
|
||||
{
|
||||
BaseMsgForm.ShowError(error);
|
||||
this.RefreshShop();
|
||||
this.FiltShop();
|
||||
}
|
||||
lstWareHouse.AddRange(wareHouses);
|
||||
|
||||
@@ -1067,7 +1081,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
if (!string.IsNullOrEmpty(error))
|
||||
{
|
||||
BaseMsgForm.ShowError(error);
|
||||
this.RefreshShop();
|
||||
this.FiltShop();
|
||||
}
|
||||
lstWareHouse.AddRange(wareHouses);
|
||||
|
||||
@@ -2388,6 +2402,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
private void btnEmpty_Click(object sender, EventArgs e)
|
||||
{
|
||||
txtNotes.Text = txtShopId.Text = txtShopName.Text = "";
|
||||
FiltShop();
|
||||
}
|
||||
|
||||
private void panelEx1_Click(object sender, EventArgs e)
|
||||
|
||||
@@ -21,11 +21,11 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
{
|
||||
ShopLoginInfo Shop;
|
||||
TemuDBProductSelect ProdSelect;
|
||||
SetProductSelectNotesType SelectType;
|
||||
SetProductSelectType SelectType;
|
||||
//string ChangeCatId = "";
|
||||
//string ChangeCatName = "";
|
||||
Dictionary<string, string> cateIdNameMap = new Dictionary<string, string>();
|
||||
public DbProductCategorySearch(ShopLoginInfo shop, TemuDBProductSelect prodSelect, SetProductSelectNotesType selectType = SetProductSelectNotesType.DbProduct)
|
||||
public DbProductCategorySearch(ShopLoginInfo shop, TemuDBProductSelect prodSelect, SetProductSelectType selectType = SetProductSelectType.DbProduct)
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
@@ -46,7 +46,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
private void btnSave_Click(object sender, EventArgs e)
|
||||
{
|
||||
var url = BaseClass.BuildObjString("product/mdy_product_category");
|
||||
if (this.SelectType == SetProductSelectNotesType.ThirdProduct)
|
||||
if (this.SelectType == SetProductSelectType.ThirdProduct)
|
||||
url = BaseClass.BuildObjString("product_third/mdy_product_category");
|
||||
|
||||
var data = UserLogin.GetSignaturex() +
|
||||
|
||||
+125
-30
@@ -33,13 +33,24 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
|
||||
this.ucSkuImgListItem1 = new TemuKJD.ToolForms.UcSkuImgListItem();
|
||||
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
|
||||
this.btnSave = new DevComponents.DotNetBar.PanelEx();
|
||||
this.tabProduct = new PinBaoBao.UserControls.UcTabControlMetro();
|
||||
this.tabPage1 = new System.Windows.Forms.TabPage();
|
||||
this.tabPage2 = new System.Windows.Forms.TabPage();
|
||||
this.flowLayoutPanel2 = new System.Windows.Forms.FlowLayoutPanel();
|
||||
this.ucPropEdit1 = new TemuKJD.KJDForms.ProductSelectForms.UcPropEdit();
|
||||
this.btnCancel = new DevComponents.DotNetBar.PanelEx();
|
||||
this.btnSave = new DevComponents.DotNetBar.PanelEx();
|
||||
this.pbLoading = new System.Windows.Forms.PictureBox();
|
||||
this.flowLayoutPanel1.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
|
||||
this.splitContainer1.Panel1.SuspendLayout();
|
||||
this.splitContainer1.Panel2.SuspendLayout();
|
||||
this.splitContainer1.SuspendLayout();
|
||||
this.tabProduct.SuspendLayout();
|
||||
this.tabPage1.SuspendLayout();
|
||||
this.tabPage2.SuspendLayout();
|
||||
this.flowLayoutPanel2.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pbLoading)).BeginInit();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// flowLayoutPanel1
|
||||
@@ -48,10 +59,10 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
this.flowLayoutPanel1.BackColor = System.Drawing.Color.White;
|
||||
this.flowLayoutPanel1.Controls.Add(this.ucSkuImgListItem1);
|
||||
this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 0);
|
||||
this.flowLayoutPanel1.Location = new System.Drawing.Point(3, 3);
|
||||
this.flowLayoutPanel1.Name = "flowLayoutPanel1";
|
||||
this.flowLayoutPanel1.Padding = new System.Windows.Forms.Padding(4);
|
||||
this.flowLayoutPanel1.Size = new System.Drawing.Size(1198, 555);
|
||||
this.flowLayoutPanel1.Size = new System.Drawing.Size(431, 292);
|
||||
this.flowLayoutPanel1.TabIndex = 2;
|
||||
//
|
||||
// ucSkuImgListItem1
|
||||
@@ -74,46 +85,82 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
//
|
||||
// splitContainer1.Panel1
|
||||
//
|
||||
this.splitContainer1.Panel1.Controls.Add(this.flowLayoutPanel1);
|
||||
this.splitContainer1.Panel1.Controls.Add(this.pbLoading);
|
||||
this.splitContainer1.Panel1.Controls.Add(this.tabProduct);
|
||||
//
|
||||
// splitContainer1.Panel2
|
||||
//
|
||||
this.splitContainer1.Panel2.Controls.Add(this.btnCancel);
|
||||
this.splitContainer1.Panel2.Controls.Add(this.btnSave);
|
||||
this.splitContainer1.Size = new System.Drawing.Size(1198, 606);
|
||||
this.splitContainer1.SplitterDistance = 555;
|
||||
this.splitContainer1.SplitterDistance = 561;
|
||||
this.splitContainer1.TabIndex = 3;
|
||||
//
|
||||
// btnSave
|
||||
// tabProduct
|
||||
//
|
||||
this.btnSave.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnSave.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnSave.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnSave.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnSave.Location = new System.Drawing.Point(1108, 11);
|
||||
this.btnSave.Name = "btnSave";
|
||||
this.btnSave.Size = new System.Drawing.Size(73, 23);
|
||||
this.btnSave.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnSave.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnSave.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnSave.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
|
||||
this.btnSave.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
|
||||
this.btnSave.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
|
||||
this.btnSave.Style.ForeColor.Color = System.Drawing.Color.White;
|
||||
this.btnSave.Style.GradientAngle = 90;
|
||||
this.btnSave.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnSave.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnSave.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnSave.TabIndex = 435;
|
||||
this.btnSave.Text = "保存";
|
||||
this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
|
||||
this.tabProduct.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(251)))), ((int)(((byte)(251)))), ((int)(((byte)(251)))));
|
||||
this.tabProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.tabProduct.Controls.Add(this.tabPage1);
|
||||
this.tabProduct.Controls.Add(this.tabPage2);
|
||||
this.tabProduct.Location = new System.Drawing.Point(0, 0);
|
||||
this.tabProduct.Name = "tabProduct";
|
||||
this.tabProduct.SelectedIndex = 0;
|
||||
this.tabProduct.ShowCloseButton = false;
|
||||
this.tabProduct.Size = new System.Drawing.Size(445, 328);
|
||||
this.tabProduct.TabIndex = 3;
|
||||
this.tabProduct.TabSelectColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.tabProduct.TabSelectTextColor = System.Drawing.Color.Gray;
|
||||
this.tabProduct.TabUnSelectTextColor = System.Drawing.Color.White;
|
||||
//
|
||||
// tabPage1
|
||||
//
|
||||
this.tabPage1.Controls.Add(this.flowLayoutPanel1);
|
||||
this.tabPage1.Location = new System.Drawing.Point(4, 26);
|
||||
this.tabPage1.Name = "tabPage1";
|
||||
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
|
||||
this.tabPage1.Size = new System.Drawing.Size(437, 298);
|
||||
this.tabPage1.TabIndex = 0;
|
||||
this.tabPage1.Text = "商品主图";
|
||||
this.tabPage1.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// tabPage2
|
||||
//
|
||||
this.tabPage2.Controls.Add(this.flowLayoutPanel2);
|
||||
this.tabPage2.Location = new System.Drawing.Point(4, 26);
|
||||
this.tabPage2.Name = "tabPage2";
|
||||
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
|
||||
this.tabPage2.Size = new System.Drawing.Size(437, 298);
|
||||
this.tabPage2.TabIndex = 1;
|
||||
this.tabPage2.Text = "商品属性";
|
||||
this.tabPage2.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// flowLayoutPanel2
|
||||
//
|
||||
this.flowLayoutPanel2.AutoScroll = true;
|
||||
this.flowLayoutPanel2.BackColor = System.Drawing.Color.White;
|
||||
this.flowLayoutPanel2.Controls.Add(this.ucPropEdit1);
|
||||
this.flowLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.flowLayoutPanel2.Location = new System.Drawing.Point(3, 3);
|
||||
this.flowLayoutPanel2.Name = "flowLayoutPanel2";
|
||||
this.flowLayoutPanel2.Padding = new System.Windows.Forms.Padding(4);
|
||||
this.flowLayoutPanel2.Size = new System.Drawing.Size(431, 292);
|
||||
this.flowLayoutPanel2.TabIndex = 3;
|
||||
//
|
||||
// ucPropEdit1
|
||||
//
|
||||
this.ucPropEdit1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.ucPropEdit1.Location = new System.Drawing.Point(7, 7);
|
||||
this.ucPropEdit1.Name = "ucPropEdit1";
|
||||
this.ucPropEdit1.Size = new System.Drawing.Size(300, 71);
|
||||
this.ucPropEdit1.TabIndex = 0;
|
||||
//
|
||||
// btnCancel
|
||||
//
|
||||
this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.btnCancel.CanvasColor = System.Drawing.SystemColors.Control;
|
||||
this.btnCancel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnCancel.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnCancel.Location = new System.Drawing.Point(1031, 11);
|
||||
this.btnCancel.Location = new System.Drawing.Point(1031, 5);
|
||||
this.btnCancel.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2);
|
||||
this.btnCancel.Name = "btnCancel";
|
||||
this.btnCancel.Size = new System.Drawing.Size(73, 23);
|
||||
@@ -133,12 +180,49 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
this.btnCancel.Text = "取消";
|
||||
this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
|
||||
//
|
||||
// btnSave
|
||||
//
|
||||
this.btnSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.btnSave.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnSave.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnSave.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnSave.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnSave.Location = new System.Drawing.Point(1108, 5);
|
||||
this.btnSave.Name = "btnSave";
|
||||
this.btnSave.Size = new System.Drawing.Size(73, 23);
|
||||
this.btnSave.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnSave.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnSave.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnSave.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
|
||||
this.btnSave.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
|
||||
this.btnSave.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
|
||||
this.btnSave.Style.ForeColor.Color = System.Drawing.Color.White;
|
||||
this.btnSave.Style.GradientAngle = 90;
|
||||
this.btnSave.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnSave.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnSave.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnSave.TabIndex = 435;
|
||||
this.btnSave.Text = "保存";
|
||||
this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
|
||||
//
|
||||
// pbLoading
|
||||
//
|
||||
this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None;
|
||||
this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue;
|
||||
this.pbLoading.Location = new System.Drawing.Point(574, 255);
|
||||
this.pbLoading.Name = "pbLoading";
|
||||
this.pbLoading.Size = new System.Drawing.Size(50, 50);
|
||||
this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
|
||||
this.pbLoading.TabIndex = 189;
|
||||
this.pbLoading.TabStop = false;
|
||||
this.pbLoading.Visible = false;
|
||||
//
|
||||
// DbProductEditDetailForm
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
|
||||
this.ClientSize = new System.Drawing.Size(1200, 640);
|
||||
this.Controls.Add(this.splitContainer1);
|
||||
this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
|
||||
this.Name = "DbProductEditDetailForm";
|
||||
this.Text = "DbProductEditDetailForm";
|
||||
@@ -150,6 +234,11 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
this.splitContainer1.Panel2.ResumeLayout(false);
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
|
||||
this.splitContainer1.ResumeLayout(false);
|
||||
this.tabProduct.ResumeLayout(false);
|
||||
this.tabPage1.ResumeLayout(false);
|
||||
this.tabPage2.ResumeLayout(false);
|
||||
this.flowLayoutPanel2.ResumeLayout(false);
|
||||
((System.ComponentModel.ISupportInitialize)(this.pbLoading)).EndInit();
|
||||
this.ResumeLayout(false);
|
||||
|
||||
}
|
||||
@@ -161,5 +250,11 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
private System.Windows.Forms.SplitContainer splitContainer1;
|
||||
private DevComponents.DotNetBar.PanelEx btnSave;
|
||||
private DevComponents.DotNetBar.PanelEx btnCancel;
|
||||
private PinBaoBao.UserControls.UcTabControlMetro tabProduct;
|
||||
private System.Windows.Forms.TabPage tabPage1;
|
||||
private System.Windows.Forms.TabPage tabPage2;
|
||||
private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel2;
|
||||
private UcPropEdit ucPropEdit1;
|
||||
private System.Windows.Forms.PictureBox pbLoading;
|
||||
}
|
||||
}
|
||||
@@ -2,6 +2,7 @@
|
||||
using AllBase.Model.Result;
|
||||
using DevComponents.DotNetBar;
|
||||
using NaiBa.Util.Extension;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel;
|
||||
@@ -12,6 +13,8 @@ using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
using TemuKJD.BaseForms;
|
||||
using TemuKJD.BLL;
|
||||
using TemuKJD.KJDForms.ProductThirdSelectForms;
|
||||
using TemuKJD.ToolForms;
|
||||
using Work;
|
||||
|
||||
@@ -19,17 +22,26 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
{
|
||||
public partial class DbProductEditDetailForm : LRBaseForm
|
||||
{
|
||||
public ShopLoginInfo shop { get; set; }
|
||||
public string productDraftId { get; set; }
|
||||
KJDDBProduct dbProd = null;
|
||||
TemuDBProductSelect dbProdSelect = null;
|
||||
List<UcSkuImgListItem> lstUcSkuImgListItem = new List<UcSkuImgListItem>();
|
||||
int maxIndex = 1;
|
||||
int minIndex = 1;
|
||||
List<TemuCategoryTemplateInfo> lstCategoryTemplate = new List<TemuCategoryTemplateInfo>();
|
||||
|
||||
public DbProductEditDetailForm(KJDDBProduct _dbProd)
|
||||
SetProductSelectType selectType;
|
||||
|
||||
public DbProductEditDetailForm(KJDDBProduct _dbProd, TemuDBProductSelect _dbProdSelect = null, SetProductSelectType _selectType = SetProductSelectType.DbProduct)
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
if (_dbProd != null)
|
||||
dbProd = _dbProd;
|
||||
if (_dbProdSelect != null)
|
||||
dbProdSelect = _dbProdSelect;
|
||||
this.selectType = _selectType;
|
||||
|
||||
this.Width = Math.Min(1600, Screen.PrimaryScreen.Bounds.Width);
|
||||
this.Height = Math.Min(900, Screen.PrimaryScreen.Bounds.Height);
|
||||
@@ -40,7 +52,11 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(dbProd.product_json))
|
||||
{
|
||||
var temuDBProd = DbProductSelectListManageForm.GetProductDetail(dbProd.id.ToString());
|
||||
KJDDBProduct temuDBProd = null;
|
||||
if (selectType == SetProductSelectType.DbProduct)
|
||||
temuDBProd = DbProductSelectListManageForm.GetProductDetail(dbProd.id.ToString());
|
||||
else if (selectType == SetProductSelectType.ThirdProduct)
|
||||
temuDBProd = ProductThirdSelectListManageForm.GetProductDetail(dbProd.id.ToString());
|
||||
if (temuDBProd == null || temuDBProd.id == 0)
|
||||
{
|
||||
BaseMsgForm.ShowError("商品已清除!");
|
||||
@@ -49,7 +65,59 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
dbProd = temuDBProd;
|
||||
}
|
||||
|
||||
var prodInfo = JsonHelper.DeserializeJsonToObject<TemuDetailProductInfo>(dbProd.product_json);
|
||||
pbLoading.BringToFront();
|
||||
pbLoading.Visible = true;
|
||||
this.tabProduct.Dock = DockStyle.Fill;
|
||||
var t = Task.Run(() =>
|
||||
{
|
||||
var prodInfo = JsonHelper.DeserializeJsonToObject<TemuDetailProductInfo>(dbProd.product_json);
|
||||
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
// 取商品主图并展示
|
||||
DisplayMainImg(prodInfo);
|
||||
pbLoading.Visible = false;
|
||||
}));
|
||||
|
||||
//后面功能没写完暂时return掉
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
this.tabProduct.TabPages.Remove(tabPage2);
|
||||
}));
|
||||
return;
|
||||
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
pbLoading.Visible = true;
|
||||
}));
|
||||
if (shop == null)
|
||||
{
|
||||
while (shop == null || shop.LoginStatus2 != "国际版在线")
|
||||
{
|
||||
var shopList = AdminForms.AdminShopListForm.lstAdminShopInfo.Where(s => s.LoginStatus2 == "国际版在线").ToList();
|
||||
if (shopList.Count == 0)
|
||||
{
|
||||
BaseMsgForm.ShowError("店铺全部掉线,无法上传图片!");
|
||||
return;
|
||||
}
|
||||
shop = shopList[Randomx.GetId(shopList.Count)];
|
||||
AdminForms.AdminShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false);
|
||||
}
|
||||
}
|
||||
GetPropTemplate(prodInfo);
|
||||
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
// 根据类目获取商品属性模板
|
||||
DisplayPropTemplate(prodInfo);
|
||||
pbLoading.Visible = false;
|
||||
}));
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
private void DisplayMainImg(TemuDetailProductInfo prodInfo)
|
||||
{
|
||||
var mainImgUrls = prodInfo.carouselImageUrls;
|
||||
flowLayoutPanel1.Controls.Clear();
|
||||
lstUcSkuImgListItem.Clear();
|
||||
@@ -65,14 +133,187 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
imgListItem.txtUseCount.Text = index.ToString();
|
||||
imgListItem.txtUseCount.Tag = index;
|
||||
imgListItem.txtUseCount.ReadOnly = false;
|
||||
imgListItem.btnDel.Text = "交换";
|
||||
imgListItem.txtUseCount.Width -= imgListItem.btnEdit.Width + 2;
|
||||
imgListItem.btnEdit.Visible = true;
|
||||
imgListItem.btnEdit.Text = "交换";
|
||||
imgListItem.btnEdit.Tag = imgListItem;
|
||||
imgListItem.btnEdit.Click += BtnEdit_Click;
|
||||
imgListItem.btnDel.Tag = imgListItem;
|
||||
imgListItem.btnDel.Click += BtnDel_Click;
|
||||
|
||||
this.flowLayoutPanel1.Controls.Add(imgListItem);
|
||||
lstUcSkuImgListItem.Add(imgListItem);
|
||||
}
|
||||
}
|
||||
|
||||
private void GetPropTemplate(TemuDetailProductInfo prodInfo)
|
||||
{
|
||||
long catId = (this.dbProdSelect?.change_cat_id).ParseToLong();
|
||||
if (catId == 0) catId = (prodInfo?.categories?.cat10?.catId).ParseToLong();
|
||||
if (catId == 0) catId = (prodInfo?.categories?.cat9?.catId).ParseToLong();
|
||||
if (catId == 0) catId = (prodInfo?.categories?.cat8?.catId).ParseToLong();
|
||||
if (catId == 0) catId = (prodInfo?.categories?.cat7?.catId).ParseToLong();
|
||||
if (catId == 0) catId = (prodInfo?.categories?.cat6?.catId).ParseToLong();
|
||||
if (catId == 0) catId = (prodInfo?.categories?.cat5?.catId).ParseToLong();
|
||||
if (catId == 0) catId = (prodInfo?.categories?.cat4?.catId).ParseToLong();
|
||||
if (catId == 0) catId = (prodInfo?.categories?.cat3?.catId).ParseToLong();
|
||||
if (catId == 0) catId = (prodInfo?.categories?.cat2?.catId).ParseToLong();
|
||||
if (catId == 0) catId = (prodInfo?.categories?.cat1?.catId).ParseToLong();
|
||||
var propTemplateRst = DbProductSelectListManageForm.QueryCategoryTemplate(shop, productDraftId, catId.ParseToString());
|
||||
if (propTemplateRst.Contains("\"success\":true"))
|
||||
{
|
||||
try
|
||||
{
|
||||
JObject jObj = JObject.Parse(propTemplateRst);
|
||||
var PropLstStr = JsonHelper.SerializeObject(jObj["result"]["properties"]);
|
||||
lstCategoryTemplate.Clear();
|
||||
lstCategoryTemplate.AddRange(JsonHelper.DeserializeJsonToList<TemuCategoryTemplateInfo>(PropLstStr).OrderBy(p => p.templatePid));
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
var error = BaseRegex.GetStringJson(ref propTemplateRst, "errorMsg");
|
||||
if (string.IsNullOrEmpty(error))
|
||||
error = BaseRegex.GetStringJson(ref propTemplateRst, "error_msg");
|
||||
|
||||
AdminForms.AdminShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false);
|
||||
|
||||
if (shop.LoginStatus2 != "国际版在线")
|
||||
{
|
||||
BaseMsgForm.ShowError("因掉线导致商品属性模板获取失败,请登录后再试。");
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
BaseMsgForm.ShowError("商品属性模板获取失败,请重试:" + error);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void DisplayPropTemplate(TemuDetailProductInfo prodInfo)
|
||||
{
|
||||
this.flowLayoutPanel2.Controls.Clear();
|
||||
foreach (var propCatTempInfo in this.lstCategoryTemplate)
|
||||
{
|
||||
if (propCatTempInfo.controlType != 1 && propCatTempInfo.controlType != 3 && propCatTempInfo.controlType != 1)
|
||||
{
|
||||
// 3 多选
|
||||
// 1 单选
|
||||
// 0 填写
|
||||
}
|
||||
if (propCatTempInfo.name == "品牌名")
|
||||
{
|
||||
}
|
||||
|
||||
var propEditItem = new UcPropEdit();
|
||||
propEditItem.Tag = propCatTempInfo;
|
||||
propEditItem.Anchor = AnchorStyles.None;
|
||||
propEditItem.lblRequired.Visible = propCatTempInfo.required.ParseToBool()|| propCatTempInfo.isImportant.ParseToBool(); //propCatTempInfo.required.ParseToBool();
|
||||
propEditItem.lblPropName.Text = propCatTempInfo.name + " " + propCatTempInfo.lang2Name["en"];
|
||||
propEditItem.cmbPropValues.TextChanged += CmbPropValues_TextChanged;
|
||||
propEditItem.cmbPropValues.Tag = propCatTempInfo;
|
||||
if (propCatTempInfo.values != null)
|
||||
{
|
||||
foreach (var v in propCatTempInfo.values)
|
||||
{
|
||||
propEditItem.cmbPropValues.Items.Add(v.value);
|
||||
}
|
||||
}
|
||||
this.flowLayoutPanel2.Controls.Add(propEditItem);
|
||||
|
||||
// 0为主属性 1为附庸属性,当主属性选择了某个值以后,附庸属性才显示
|
||||
if (propCatTempInfo.showType != 0)
|
||||
propEditItem.Visible = false;
|
||||
}
|
||||
|
||||
foreach (var propCatTempInfo in this.lstCategoryTemplate)
|
||||
{
|
||||
var propEditItem = flowLayoutPanel2.Controls.Cast<Control>().FirstOrDefault(c => c.Tag == propCatTempInfo) as UcPropEdit;
|
||||
if (propEditItem == null)
|
||||
continue;
|
||||
|
||||
var currentValue = prodInfo.productPropertyList.FirstOrDefault(p => p.refPid == propCatTempInfo.refPid);
|
||||
if (currentValue != null)
|
||||
{
|
||||
propEditItem.cmbPropValues.Text = currentValue.propValue;
|
||||
if (string.IsNullOrEmpty(propEditItem.cmbPropValues.Text))
|
||||
propEditItem.cmbPropValues.Text = currentValue.numberInputValue;
|
||||
}
|
||||
}
|
||||
|
||||
SetSubPropEditVisible();
|
||||
}
|
||||
|
||||
private void SetSubPropEditVisible()
|
||||
{
|
||||
foreach (var propCatTempInfo in this.lstCategoryTemplate)
|
||||
{
|
||||
var propEditItem = flowLayoutPanel2.Controls.Cast<Control>().FirstOrDefault(c => c.Tag == propCatTempInfo) as UcPropEdit;
|
||||
if (propEditItem == null)
|
||||
continue;
|
||||
|
||||
if (propCatTempInfo.showType == 1)
|
||||
{
|
||||
propEditItem.Visible = false;
|
||||
|
||||
var parentPropCatTempInfo = this.lstCategoryTemplate.FirstOrDefault(p => p.templatePid == propCatTempInfo.parentTemplatePid);
|
||||
var parentPropEditItem = flowLayoutPanel2.Controls.Cast<Control>().FirstOrDefault(c => c.Tag == parentPropCatTempInfo) as UcPropEdit;
|
||||
if (parentPropCatTempInfo == null || parentPropEditItem == null)
|
||||
continue;
|
||||
|
||||
var parentValue = parentPropEditItem.cmbPropValues.Text;
|
||||
var parentId = parentPropCatTempInfo.values.FirstOrDefault(v => v.value == parentValue)?.vid;
|
||||
if (string.IsNullOrEmpty(parentValue) || parentId == 0)
|
||||
continue;
|
||||
|
||||
var templatePropertyValueParent =
|
||||
propCatTempInfo.templatePropertyValueParentList.FirstOrDefault(p => p.parentVidList.Contains(parentId.ParseToLong()));
|
||||
if (templatePropertyValueParent != null)
|
||||
{
|
||||
propEditItem.Visible = true;
|
||||
propEditItem.cmbPropValues.Items.Clear();
|
||||
foreach (var vid in templatePropertyValueParent.vidList)
|
||||
{
|
||||
var valueItem = propCatTempInfo.values.FirstOrDefault(v => v.vid == vid);
|
||||
if (valueItem != null)
|
||||
{
|
||||
propEditItem.cmbPropValues.Items.Add(valueItem.value);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void CmbPropValues_TextChanged(object sender, EventArgs e)
|
||||
{
|
||||
var cmbPropValues = sender as ComboBox;
|
||||
if (cmbPropValues == null)
|
||||
return;
|
||||
var propCatTempInfo = cmbPropValues.Tag as TemuCategoryTemplateInfo;
|
||||
if (propCatTempInfo == null)
|
||||
return;
|
||||
|
||||
SetSubPropEditVisible();
|
||||
|
||||
cmbPropValues.ForeColor = Color.Red;
|
||||
if (cmbPropValues.Items.Count == 0)
|
||||
{
|
||||
cmbPropValues.ForeColor = Color.Black;
|
||||
return;
|
||||
}
|
||||
var propValues = cmbPropValues.Text.Split(new char[] { ',', ' ' }, StringSplitOptions.RemoveEmptyEntries).ToList();
|
||||
if (propValues.Count <= propCatTempInfo.chooseMaxNum.ParseToInt())
|
||||
{
|
||||
if (propValues.All(p => cmbPropValues.Items.Cast<Object>().Any(i => i.ParseToString() == p)))
|
||||
cmbPropValues.ForeColor = Color.Black;
|
||||
}
|
||||
}
|
||||
|
||||
private void BtnDel_Click(object sender, EventArgs e)
|
||||
{
|
||||
PanelEx btnDel = sender as PanelEx;
|
||||
@@ -82,6 +323,18 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
if (imgListItem == null)
|
||||
return;
|
||||
|
||||
flowLayoutPanel1.Controls.Remove(imgListItem);
|
||||
}
|
||||
|
||||
private void BtnEdit_Click(object sender, EventArgs e)
|
||||
{
|
||||
PanelEx btnEdit = sender as PanelEx;
|
||||
if (btnEdit == null)
|
||||
return;
|
||||
UcSkuImgListItem imgListItem = btnEdit.Tag as UcSkuImgListItem;
|
||||
if (imgListItem == null)
|
||||
return;
|
||||
|
||||
int newIndex = imgListItem.txtUseCount.Text.ParseToInt();
|
||||
if (newIndex < minIndex || newIndex > maxIndex)
|
||||
{
|
||||
@@ -131,11 +384,14 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
if (dbProd != null && prodInfo != null)
|
||||
{
|
||||
var oldMainImgUrls = prodInfo.carouselImageUrls;
|
||||
dbProd.product_json = dbProd.product_json.Replace(JsonHelper.SerializeObject(oldMainImgUrls), JsonHelper.SerializeObject(imgUrlLst));
|
||||
// 尽量使用字符串替换防止序列化时破坏原json结构
|
||||
var newProductJson = dbProd.product_json.Replace(JsonHelper.SerializeObject(oldMainImgUrls), JsonHelper.SerializeObject(imgUrlLst));
|
||||
|
||||
var url = BaseClass.BuildObjString("product/mdy_db_product");
|
||||
if (selectType == SetProductSelectType.ThirdProduct)
|
||||
url = BaseClass.BuildObjString("product_third/mdy_db_product");
|
||||
var data = UserLogin.GetSignaturex() + "&db_id=" + dbProd.id;
|
||||
data += "&product_json=" + HttpUtility.UrlEncode(dbProd.product_json, Encoding.UTF8);
|
||||
data += "&product_json=" + HttpUtility.UrlEncode(newProductJson, Encoding.UTF8);
|
||||
var html = GetHtml.PostUtf8(url, data);
|
||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||
html = GetHtml.PostUtf8(url, data);
|
||||
@@ -146,6 +402,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
}
|
||||
else
|
||||
{
|
||||
dbProd.product_json = newProductJson;
|
||||
this.Close();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -165,7 +165,8 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
Task.Run(() =>
|
||||
{
|
||||
int pageCount;
|
||||
var list = GetProductList(out pageCount, page);
|
||||
decimal seconds;
|
||||
var list = GetProductList(out pageCount, out seconds, page);
|
||||
lstTemuDbProduct.AddRange(list);
|
||||
this.ucSplitPage1.TotalPage = pageCount;
|
||||
|
||||
@@ -215,6 +216,10 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
this.pbLoading.Visible = false;
|
||||
this.statusBar.lblTaskStatus.Text = "商品查询完毕";
|
||||
#if DEBUG
|
||||
this.statusBar.lblTaskStatus.Text += ",耗时:" + seconds;
|
||||
#endif
|
||||
}));
|
||||
});
|
||||
}
|
||||
@@ -261,10 +266,11 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
}
|
||||
}
|
||||
|
||||
public List<KJDDBProduct> GetProductList(out int pageCount, int page = 1, int pageSize = 200)
|
||||
public List<KJDDBProduct> GetProductList(out int pageCount, out decimal seconds, int page = 1, int pageSize = 200)
|
||||
{
|
||||
List<KJDDBProduct> list = new List<KJDDBProduct>();
|
||||
pageCount = 1;
|
||||
seconds = 0;
|
||||
|
||||
var url = BaseClass.BuildObjString("product/get_product_list");
|
||||
var data = "";
|
||||
@@ -278,7 +284,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
"&search_skc=" + txtSKC.Text.Trim() +
|
||||
"&search_notes=" + txtNotes.Text.Trim() +
|
||||
"&search_cat=" + txtCat.Text.Trim() +
|
||||
"&search_ext_code=" + txtExtCode.Text.Trim() +
|
||||
"&search_ext_code=" + string.Join(",", txtExtCode.Text.Trim().Split(new string[] { ",", ",", " "}, StringSplitOptions.RemoveEmptyEntries)) +
|
||||
"&search_prod_name=" + txtProdName.Text.Trim();
|
||||
if (!IsClientJit)
|
||||
data += "&search_group=" + cmbGroup.Text.Trim();
|
||||
@@ -293,6 +299,12 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
{
|
||||
data += "&product_get_type=all";
|
||||
}
|
||||
if (BaseClass.SaLevel == 1 && !IsClientJit)
|
||||
{
|
||||
#if DEBUG
|
||||
//data += "&sa_level=" + BaseClass.SaLevel;
|
||||
#endif
|
||||
}
|
||||
|
||||
if (this.cmbSort.Text == "认领总数")
|
||||
{
|
||||
@@ -301,8 +313,6 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
|
||||
}));
|
||||
var html = GetHtml.PostUtf8(url, data);
|
||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||
html = GetHtml.PostUtf8(url, data);
|
||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||
html = GetHtml.PostUtf8(url, data);
|
||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||
@@ -314,6 +324,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
return list;
|
||||
}
|
||||
|
||||
seconds = BaseRegex.GetDecimalJson(ref html, "seconds");
|
||||
int count = BaseRegex.GetIntJson(ref html, "count");
|
||||
pageCount = Math.Ceiling(1.0 * count / pageSize).ParseToInt();
|
||||
pageCount = Math.Max(pageCount, 1);
|
||||
@@ -1150,10 +1161,16 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
decimal GetExchangeRate(string inputStr)
|
||||
{
|
||||
if (inputStr.StartsWith("CA$"))
|
||||
return 5.1m;
|
||||
return 5.1m * 1.5m;
|
||||
if (inputStr.StartsWith("US$"))
|
||||
return 7.1m;
|
||||
return 1;
|
||||
return 7.1m * 1.5m;
|
||||
if (inputStr.StartsWith("AU$"))
|
||||
return 4.7m * 1.5m;
|
||||
if (inputStr.StartsWith("EU$") || inputStr.StartsWith("EUR$") || inputStr.StartsWith("EU€") || inputStr.StartsWith("EUR€"))
|
||||
return 8.3m * 1.5m;
|
||||
if (inputStr.StartsWith("CNY") || inputStr.StartsWith("CN$"))
|
||||
return 1m * 1.5m;
|
||||
return 10m;
|
||||
}
|
||||
|
||||
private void dgvSelectShop_CellContentClick(object sender, DataGridViewCellEventArgs e)
|
||||
|
||||
+44
-2
@@ -50,13 +50,17 @@
|
||||
this.pictureBox1 = new System.Windows.Forms.PictureBox();
|
||||
this.label8 = new System.Windows.Forms.Label();
|
||||
this.txtNotes = new DevComponents.DotNetBar.Controls.TextBoxX();
|
||||
this.btnEditDbProd = new DevComponents.DotNetBar.PanelEx();
|
||||
this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
|
||||
this.panel2.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
|
||||
this.flowLayoutPanel1.SuspendLayout();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// panel2
|
||||
//
|
||||
this.panel2.BackColor = System.Drawing.Color.White;
|
||||
this.panel2.Controls.Add(this.flowLayoutPanel1);
|
||||
this.panel2.Controls.Add(this.label7);
|
||||
this.panel2.Controls.Add(this.btnOk);
|
||||
this.panel2.Controls.Add(this.cmbUserNotes);
|
||||
@@ -64,7 +68,6 @@
|
||||
this.panel2.Controls.Add(this.label6);
|
||||
this.panel2.Controls.Add(this.txtDraftId);
|
||||
this.panel2.Controls.Add(this.label5);
|
||||
this.panel2.Controls.Add(this.btnFission);
|
||||
this.panel2.Controls.Add(this.lblTextCount);
|
||||
this.panel2.Controls.Add(this.txtSkc);
|
||||
this.panel2.Controls.Add(this.txtSpu);
|
||||
@@ -176,7 +179,8 @@
|
||||
this.btnFission.CanvasColor = System.Drawing.SystemColors.Control;
|
||||
this.btnFission.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnFission.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnFission.Location = new System.Drawing.Point(88, 490);
|
||||
this.btnFission.Location = new System.Drawing.Point(0, 0);
|
||||
this.btnFission.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
|
||||
this.btnFission.Name = "btnFission";
|
||||
this.btnFission.Size = new System.Drawing.Size(56, 26);
|
||||
this.btnFission.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
@@ -325,6 +329,41 @@
|
||||
this.txtNotes.Size = new System.Drawing.Size(265, 44);
|
||||
this.txtNotes.TabIndex = 385;
|
||||
//
|
||||
// btnEditDbProd
|
||||
//
|
||||
this.btnEditDbProd.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnEditDbProd.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnEditDbProd.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnEditDbProd.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnEditDbProd.Location = new System.Drawing.Point(59, 0);
|
||||
this.btnEditDbProd.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
|
||||
this.btnEditDbProd.Name = "btnEditDbProd";
|
||||
this.btnEditDbProd.Size = new System.Drawing.Size(72, 26);
|
||||
this.btnEditDbProd.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnEditDbProd.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnEditDbProd.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnEditDbProd.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
|
||||
this.btnEditDbProd.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
|
||||
this.btnEditDbProd.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
|
||||
this.btnEditDbProd.Style.ForeColor.Color = System.Drawing.Color.White;
|
||||
this.btnEditDbProd.Style.GradientAngle = 90;
|
||||
this.btnEditDbProd.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnEditDbProd.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnEditDbProd.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnEditDbProd.TabIndex = 504;
|
||||
this.btnEditDbProd.Text = "编辑源商品";
|
||||
this.btnEditDbProd.Visible = false;
|
||||
this.btnEditDbProd.Click += new System.EventHandler(this.btnEditDbProd_Click);
|
||||
//
|
||||
// flowLayoutPanel1
|
||||
//
|
||||
this.flowLayoutPanel1.Controls.Add(this.btnFission);
|
||||
this.flowLayoutPanel1.Controls.Add(this.btnEditDbProd);
|
||||
this.flowLayoutPanel1.Location = new System.Drawing.Point(88, 490);
|
||||
this.flowLayoutPanel1.Name = "flowLayoutPanel1";
|
||||
this.flowLayoutPanel1.Size = new System.Drawing.Size(200, 28);
|
||||
this.flowLayoutPanel1.TabIndex = 505;
|
||||
//
|
||||
// DbProductSelectEditNotesForm
|
||||
//
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
|
||||
@@ -340,6 +379,7 @@
|
||||
this.panel2.ResumeLayout(false);
|
||||
this.panel2.PerformLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
|
||||
this.flowLayoutPanel1.ResumeLayout(false);
|
||||
this.ResumeLayout(false);
|
||||
|
||||
}
|
||||
@@ -367,5 +407,7 @@
|
||||
private System.Windows.Forms.ComboBox cmbUserNotes;
|
||||
private DevComponents.DotNetBar.PanelEx btnOk;
|
||||
private System.Windows.Forms.Label label7;
|
||||
private DevComponents.DotNetBar.PanelEx btnEditDbProd;
|
||||
private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
|
||||
}
|
||||
}
|
||||
@@ -13,17 +13,19 @@ using System.Windows.Forms;
|
||||
using AllBase;
|
||||
using Work;
|
||||
using TemuKJD.BLL;
|
||||
using NaiBa.Util.Extension;
|
||||
|
||||
namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
{
|
||||
public partial class DbProductSelectEditNotesForm : LRBaseForm
|
||||
{
|
||||
public bool IsClientJit { get; set; } = false;
|
||||
public EnumClientMode ClientMode { get; set; } = EnumClientMode.Admin;
|
||||
public ShopLoginInfo shop { get; set; }
|
||||
|
||||
TemuDBProductSelect dbProdSelect = null;
|
||||
SetProductSelectNotesType selectNotesType;
|
||||
SetProductSelectType selectNotesType;
|
||||
|
||||
public DbProductSelectEditNotesForm(TemuDBProductSelect prod, SetProductSelectNotesType notesType= SetProductSelectNotesType.DbProduct)
|
||||
public DbProductSelectEditNotesForm(TemuDBProductSelect prod, SetProductSelectType notesType= SetProductSelectType.DbProduct)
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
@@ -46,7 +48,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
this.cmbUserNotes.Text = dbProdSelect.user_notes;
|
||||
}
|
||||
|
||||
if (selectNotesType == SetProductSelectNotesType.DbProduct)
|
||||
if (selectNotesType == SetProductSelectType.DbProduct)
|
||||
{
|
||||
this.txtProdName.ReadOnly = false;
|
||||
this.lblTextCount.Visible = true;
|
||||
@@ -58,12 +60,21 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
this.lblTextCount.Visible = false;
|
||||
this.btnFission.Visible = false;
|
||||
}
|
||||
|
||||
if (ClientMode == EnumClientMode.Admin && BaseClass.SaLevel == 1)
|
||||
{
|
||||
this.btnEditDbProd.Visible = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
this.btnEditDbProd.Visible = false;
|
||||
}
|
||||
}
|
||||
|
||||
private void btnOk_Click(object sender, EventArgs e)
|
||||
{
|
||||
var url = "";
|
||||
if (selectNotesType == SetProductSelectNotesType.DbProduct)
|
||||
if (selectNotesType == SetProductSelectType.DbProduct)
|
||||
url = BaseClass.BuildObjString("product/mdy_product_select_notes");
|
||||
else
|
||||
url = BaseClass.BuildObjString("product_third/mdy_product_select_notes");
|
||||
@@ -72,9 +83,9 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
data += "&select_add_time=" + dbProdSelect.add_time.ToString("yyyy-MM-dd HH:mm:ss");
|
||||
data += "¬es=" + this.txtNotes.Text.Trim();
|
||||
data += "&user_notes=" + this.cmbUserNotes.Text.Trim();
|
||||
if (IsClientJit)
|
||||
if (ClientMode == EnumClientMode.ClientJit)
|
||||
data += "&is_client_jit=true";
|
||||
if (selectNotesType == SetProductSelectNotesType.DbProduct)
|
||||
if (selectNotesType == SetProductSelectType.DbProduct)
|
||||
{
|
||||
byte[] bytes = Encoding.GetEncoding("gb2312").GetBytes(txtProdName.Text.Trim());
|
||||
if (bytes.Length > 1250)
|
||||
@@ -100,7 +111,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
{
|
||||
dbProdSelect.notes = this.txtNotes.Text.Trim();
|
||||
dbProdSelect.user_notes = this.cmbUserNotes.Text.Trim();
|
||||
if (selectNotesType == SetProductSelectNotesType.DbProduct)
|
||||
if (selectNotesType == SetProductSelectType.DbProduct)
|
||||
{
|
||||
dbProdSelect.fission_product_name = this.txtProdName.Text.Trim();
|
||||
}
|
||||
@@ -135,5 +146,14 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
|
||||
this.txtProdName.Text = DbProductListForm.GetFissionProductName(temuDBProd);
|
||||
}
|
||||
|
||||
private void btnEditDbProd_Click(object sender, EventArgs e)
|
||||
{
|
||||
var dbProd = new KJDDBProduct() { id = dbProdSelect.out_product_Id.ParseToInt() };
|
||||
DbProductEditDetailForm editDetailForm = new DbProductEditDetailForm(dbProd, dbProdSelect, selectNotesType);
|
||||
editDetailForm.shop = shop;
|
||||
editDetailForm.productDraftId = dbProdSelect.draft_id;
|
||||
editDetailForm.ShowDialog();
|
||||
}
|
||||
}
|
||||
}
|
||||
+27
-12
@@ -42,6 +42,7 @@
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DbProductSelectListManageForm));
|
||||
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
|
||||
this.label12 = new System.Windows.Forms.Label();
|
||||
this.numMaxWaitSecond = new System.Windows.Forms.NumericUpDown();
|
||||
this.pbFissionSetting = new System.Windows.Forms.PictureBox();
|
||||
this.btnForceEnable = new DevComponents.DotNetBar.PanelEx();
|
||||
@@ -216,6 +217,7 @@
|
||||
//
|
||||
// splitContainer1.Panel1
|
||||
//
|
||||
this.splitContainer1.Panel1.Controls.Add(this.label12);
|
||||
this.splitContainer1.Panel1.Controls.Add(this.numMaxWaitSecond);
|
||||
this.splitContainer1.Panel1.Controls.Add(this.pbFissionSetting);
|
||||
this.splitContainer1.Panel1.Controls.Add(this.btnForceEnable);
|
||||
@@ -267,6 +269,16 @@
|
||||
this.splitContainer1.SplitterDistance = 120;
|
||||
this.splitContainer1.TabIndex = 2;
|
||||
//
|
||||
// label12
|
||||
//
|
||||
this.label12.AutoSize = true;
|
||||
this.label12.Location = new System.Drawing.Point(817, 71);
|
||||
this.label12.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
|
||||
this.label12.Name = "label12";
|
||||
this.label12.Size = new System.Drawing.Size(56, 17);
|
||||
this.label12.TabIndex = 802;
|
||||
this.label12.Text = "加价配置";
|
||||
//
|
||||
// numMaxWaitSecond
|
||||
//
|
||||
this.numMaxWaitSecond.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
@@ -558,8 +570,8 @@
|
||||
// chkSkuRandomPrice
|
||||
//
|
||||
this.chkSkuRandomPrice.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.chkSkuRandomPrice.Location = new System.Drawing.Point(763, 4);
|
||||
this.chkSkuRandomPrice.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0);
|
||||
this.chkSkuRandomPrice.Location = new System.Drawing.Point(761, 4);
|
||||
this.chkSkuRandomPrice.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.chkSkuRandomPrice.Name = "chkSkuRandomPrice";
|
||||
this.chkSkuRandomPrice.Size = new System.Drawing.Size(110, 21);
|
||||
this.chkSkuRandomPrice.TabIndex = 468;
|
||||
@@ -575,7 +587,7 @@
|
||||
0,
|
||||
0,
|
||||
131072});
|
||||
this.numSkuRandomPrice.Location = new System.Drawing.Point(873, 3);
|
||||
this.numSkuRandomPrice.Location = new System.Drawing.Point(871, 3);
|
||||
this.numSkuRandomPrice.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
|
||||
this.numSkuRandomPrice.Name = "numSkuRandomPrice";
|
||||
this.numSkuRandomPrice.Size = new System.Drawing.Size(44, 23);
|
||||
@@ -591,7 +603,7 @@
|
||||
//
|
||||
this.label11.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.label11.AutoSize = true;
|
||||
this.label11.Location = new System.Drawing.Point(917, 6);
|
||||
this.label11.Location = new System.Drawing.Point(915, 6);
|
||||
this.label11.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.label11.Name = "label11";
|
||||
this.label11.Size = new System.Drawing.Size(20, 17);
|
||||
@@ -602,13 +614,14 @@
|
||||
//
|
||||
this.chkOriginalPriceMarkUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.chkOriginalPriceMarkUp.AutoSize = true;
|
||||
this.chkOriginalPriceMarkUp.Location = new System.Drawing.Point(939, 4);
|
||||
this.chkOriginalPriceMarkUp.Location = new System.Drawing.Point(937, 4);
|
||||
this.chkOriginalPriceMarkUp.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0);
|
||||
this.chkOriginalPriceMarkUp.Name = "chkOriginalPriceMarkUp";
|
||||
this.chkOriginalPriceMarkUp.Size = new System.Drawing.Size(95, 21);
|
||||
this.chkOriginalPriceMarkUp.TabIndex = 469;
|
||||
this.chkOriginalPriceMarkUp.Text = "sku原价加价";
|
||||
this.chkOriginalPriceMarkUp.UseVisualStyleBackColor = true;
|
||||
this.chkOriginalPriceMarkUp.CheckedChanged += new System.EventHandler(this.chkOriginalPriceMarkUp_CheckedChanged);
|
||||
//
|
||||
// btnSetSubSa
|
||||
//
|
||||
@@ -1000,7 +1013,7 @@
|
||||
// label17
|
||||
//
|
||||
this.label17.AutoSize = true;
|
||||
this.label17.Location = new System.Drawing.Point(933, 71);
|
||||
this.label17.Location = new System.Drawing.Point(1007, 71);
|
||||
this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
|
||||
this.label17.Name = "label17";
|
||||
this.label17.Size = new System.Drawing.Size(20, 17);
|
||||
@@ -1015,7 +1028,7 @@
|
||||
0,
|
||||
0,
|
||||
131072});
|
||||
this.numAddPrice.Location = new System.Drawing.Point(889, 68);
|
||||
this.numAddPrice.Location = new System.Drawing.Point(963, 68);
|
||||
this.numAddPrice.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
|
||||
this.numAddPrice.Name = "numAddPrice";
|
||||
this.numAddPrice.Size = new System.Drawing.Size(44, 23);
|
||||
@@ -1029,7 +1042,7 @@
|
||||
// label16
|
||||
//
|
||||
this.label16.AutoSize = true;
|
||||
this.label16.Location = new System.Drawing.Point(843, 71);
|
||||
this.label16.Location = new System.Drawing.Point(917, 71);
|
||||
this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
|
||||
this.label16.Name = "label16";
|
||||
this.label16.Size = new System.Drawing.Size(48, 17);
|
||||
@@ -1044,7 +1057,7 @@
|
||||
0,
|
||||
0,
|
||||
131072});
|
||||
this.numAddPriceTimes.Location = new System.Drawing.Point(799, 68);
|
||||
this.numAddPriceTimes.Location = new System.Drawing.Point(873, 68);
|
||||
this.numAddPriceTimes.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
|
||||
this.numAddPriceTimes.Name = "numAddPriceTimes";
|
||||
this.numAddPriceTimes.Size = new System.Drawing.Size(44, 23);
|
||||
@@ -1395,13 +1408,14 @@
|
||||
// chkAddPrice
|
||||
//
|
||||
this.chkAddPrice.AutoSize = true;
|
||||
this.chkAddPrice.Location = new System.Drawing.Point(755, 69);
|
||||
this.chkAddPrice.Location = new System.Drawing.Point(750, 69);
|
||||
this.chkAddPrice.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
|
||||
this.chkAddPrice.Name = "chkAddPrice";
|
||||
this.chkAddPrice.Size = new System.Drawing.Size(51, 21);
|
||||
this.chkAddPrice.Size = new System.Drawing.Size(75, 21);
|
||||
this.chkAddPrice.TabIndex = 550;
|
||||
this.chkAddPrice.Text = "加价";
|
||||
this.chkAddPrice.Text = "额外加价";
|
||||
this.chkAddPrice.UseVisualStyleBackColor = true;
|
||||
this.chkAddPrice.CheckedChanged += new System.EventHandler(this.chkAddPrice_CheckedChanged);
|
||||
//
|
||||
// flowLayoutPanel2
|
||||
//
|
||||
@@ -2238,5 +2252,6 @@
|
||||
private System.Windows.Forms.DataGridViewLinkColumn colEditNotes;
|
||||
private System.Windows.Forms.DataGridViewLinkColumn colDelete;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colOpResult;
|
||||
private System.Windows.Forms.Label label12;
|
||||
}
|
||||
}
|
||||
@@ -34,13 +34,6 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
{
|
||||
public partial class DbProductSelectListManageForm : LRBaseForm
|
||||
{
|
||||
public enum EnumClientMode
|
||||
{
|
||||
Admin,
|
||||
Client,
|
||||
ClientJit,
|
||||
}
|
||||
|
||||
public EnumClientMode ClientMode { get; set; } = EnumClientMode.Admin;
|
||||
public CancellationTokenSource cancellationTokenSource { get; set; } = null;
|
||||
|
||||
@@ -494,7 +487,8 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
break;
|
||||
case "编辑备注":
|
||||
DbProductSelectEditNotesForm editForm = new DbProductSelectEditNotesForm(dbSelectProduct);
|
||||
editForm.IsClientJit = (ClientMode == EnumClientMode.ClientJit);
|
||||
editForm.ClientMode = ClientMode;
|
||||
editForm.shop = GetShop(shopId);
|
||||
editForm.ShowDialog();
|
||||
dgvSelectProduct.Rows[e.RowIndex].Cells["colNotes"].Value = dbSelectProduct.notes;
|
||||
dgvSelectProduct.Rows[e.RowIndex].Cells["colUserNotes"].Value = dbSelectProduct.user_notes;
|
||||
@@ -980,6 +974,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
string opRst = prod.status == "已上传" ? "已成功上传" : "已上传草稿箱";
|
||||
row.Cells["colOpResult"].Value = opRst + "但保存到服务端失败:" + BaseRegex.GetStringJson(ref html, "msg") + (" " + error).Trim(' ');
|
||||
row.Cells["colStatus"].Value = prod.status;
|
||||
row.Cells["colSelect"].Value = false;
|
||||
}));
|
||||
}
|
||||
else
|
||||
@@ -989,6 +984,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
row.Cells["colDraftId"].Value = productDraftId; // 草稿箱id
|
||||
row.Cells["colOpResult"].Value = prod.status == "已上传" ? "已成功上传" : "已上传草稿箱" + (" " + error).TrimEnd(' ');
|
||||
row.Cells["colStatus"].Value = prod.status;
|
||||
row.Cells["colSelect"].Value = false;
|
||||
}));
|
||||
}
|
||||
}
|
||||
@@ -1207,13 +1203,13 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
}
|
||||
|
||||
prodParam.carouselImageI18nReqs = prodInfo.carouselImageI18nVOList;
|
||||
prodParam.carouselImageUrls = prodInfo.carouselImageUrls;
|
||||
prodParam.carouselImageUrls = prodInfo.carouselImageUrls.Take(10).ToList();
|
||||
|
||||
List<ProductSkuReqsItem> realSkuItems = new List<ProductSkuReqsItem>();
|
||||
Dictionary<string, AiSkuImgInfo> aiImgInfoDic = new Dictionary<string, AiSkuImgInfo>();
|
||||
List<AiSkuImgInfo> aiImgInfoList = new List<AiSkuImgInfo>();
|
||||
List<string> realCarouselImageUrls = new List<string>();
|
||||
realCarouselImageUrls.AddRange(prodInfo.carouselImageUrls);
|
||||
realCarouselImageUrls.AddRange(prodInfo.carouselImageUrls.Take(10));
|
||||
|
||||
if (chkCustomPic.Checked) // 上传自定义图片 自定义主图
|
||||
{
|
||||
@@ -2057,9 +2053,19 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
// 按照批号原价取商品原价和加价规则并修改商品上传价格
|
||||
if (chkOriginalPriceMarkUp.Checked)
|
||||
{
|
||||
var dbPrice = lstDbPrice.FirstOrDefault(p => p.ext_code == dbProd.ext_code);
|
||||
if (dbPrice != null)
|
||||
skuItem.supplierPrice = dbPrice.original_price * dbPrice.markup_times + dbPrice.extra_price;
|
||||
if (dbProd.cost_price != null && dbProd.cost_price.ParseToInt() > 0)
|
||||
{
|
||||
skuItem.supplierPrice = (dbProd.cost_price.ParseToDecimal() * 100).ParseToInt();
|
||||
skuItem.supplierPrice = (skuItem.supplierPrice * numAddPriceTimes.Value + numAddPrice.Value * 100).ParseToInt();
|
||||
}
|
||||
else
|
||||
{
|
||||
var dbPrice = lstDbPrice.FirstOrDefault(p => p.ext_code == dbProd.ext_code);
|
||||
if (dbPrice != null)
|
||||
skuItem.supplierPrice = dbPrice.original_price * dbPrice.markup_times + dbPrice.extra_price;
|
||||
else
|
||||
skuItem.supplierPrice = (skuInfo.supplierPrice * numAddPriceTimes.Value + numAddPrice.Value * 100).ParseToInt();
|
||||
}
|
||||
}
|
||||
if (chkAddPrice.Checked) //自定义加价
|
||||
{
|
||||
@@ -3126,7 +3132,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
return HttpResponseBLL.PostResponse2(shop, url, body, refere);
|
||||
}
|
||||
|
||||
private string QueryCategoryTemplate(ShopLoginInfo shop, string draftId, string catId)
|
||||
public static string QueryCategoryTemplate(ShopLoginInfo shop, string draftId, string catId)
|
||||
{
|
||||
string url = "https://agentseller.temu.com/anniston-agent-seller/category/template/query";
|
||||
string body = @"{""catId"":" + catId + @",""langList"":[""en""]}";
|
||||
@@ -3746,5 +3752,17 @@ Content-Disposition: form-data; name=""sign""
|
||||
ProductThirdSelectForms.ProductThirdTitleForm titleForm = new ProductThirdSelectForms.ProductThirdTitleForm();
|
||||
titleForm.ShowDialog();
|
||||
}
|
||||
|
||||
private void chkAddPrice_CheckedChanged(object sender, EventArgs e)
|
||||
{
|
||||
if (chkAddPrice.Checked)
|
||||
chkOriginalPriceMarkUp.Checked = false;
|
||||
}
|
||||
|
||||
private void chkOriginalPriceMarkUp_CheckedChanged(object sender, EventArgs e)
|
||||
{
|
||||
if (chkOriginalPriceMarkUp.Checked)
|
||||
chkAddPrice.Checked = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -19,9 +19,9 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
public partial class DbProductUserSelectEditNotesForm : LRBaseForm
|
||||
{
|
||||
TemuDBProductSelect dbProdSelect = null;
|
||||
SetProductSelectNotesType selectNotesType;
|
||||
SetProductSelectType selectNotesType;
|
||||
|
||||
public DbProductUserSelectEditNotesForm(TemuDBProductSelect prod, SetProductSelectNotesType notesType= SetProductSelectNotesType.DbProduct)
|
||||
public DbProductUserSelectEditNotesForm(TemuDBProductSelect prod, SetProductSelectType notesType= SetProductSelectType.DbProduct)
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
@@ -41,7 +41,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
this.cmbUserNotes.Text = dbProdSelect.user_notes;
|
||||
}
|
||||
|
||||
if (selectNotesType == SetProductSelectNotesType.DbProduct)
|
||||
if (selectNotesType == SetProductSelectType.DbProduct)
|
||||
{
|
||||
this.txtProdName.ReadOnly = true;
|
||||
this.lblTextCount.Visible = false;
|
||||
@@ -59,7 +59,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
this.cmbUserNotes.Text = "已买";
|
||||
|
||||
var url = "";
|
||||
if (selectNotesType == SetProductSelectNotesType.DbProduct)
|
||||
if (selectNotesType == SetProductSelectType.DbProduct)
|
||||
url = BaseClass.BuildObjString("product/mdy_product_select_notes");
|
||||
else
|
||||
url = BaseClass.BuildObjString("product_third/mdy_product_select_notes");
|
||||
@@ -80,7 +80,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
else
|
||||
{
|
||||
dbProdSelect.user_notes = this.cmbUserNotes.Text.Trim();
|
||||
if (selectNotesType == SetProductSelectNotesType.DbProduct)
|
||||
if (selectNotesType == SetProductSelectType.DbProduct)
|
||||
{
|
||||
dbProdSelect.fission_product_name = this.txtProdName.Text.Trim();
|
||||
}
|
||||
|
||||
@@ -0,0 +1,100 @@
|
||||
|
||||
namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
{
|
||||
partial class UcPropEdit
|
||||
{
|
||||
/// <summary>
|
||||
/// 必需的设计器变量。
|
||||
/// </summary>
|
||||
private System.ComponentModel.IContainer components = null;
|
||||
|
||||
/// <summary>
|
||||
/// 清理所有正在使用的资源。
|
||||
/// </summary>
|
||||
/// <param name="disposing">如果应释放托管资源,为 true;否则为 false。</param>
|
||||
protected override void Dispose(bool disposing)
|
||||
{
|
||||
if (disposing && (components != null))
|
||||
{
|
||||
components.Dispose();
|
||||
}
|
||||
base.Dispose(disposing);
|
||||
}
|
||||
|
||||
#region 组件设计器生成的代码
|
||||
|
||||
/// <summary>
|
||||
/// 设计器支持所需的方法 - 不要修改
|
||||
/// 使用代码编辑器修改此方法的内容。
|
||||
/// </summary>
|
||||
private void InitializeComponent()
|
||||
{
|
||||
this.cmbPropValues = new System.Windows.Forms.ComboBox();
|
||||
this.lblPropName = new System.Windows.Forms.Label();
|
||||
this.lblNotes = new System.Windows.Forms.Label();
|
||||
this.lblRequired = new System.Windows.Forms.Label();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// cmbPropValues
|
||||
//
|
||||
this.cmbPropValues.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.cmbPropValues.FormattingEnabled = true;
|
||||
this.cmbPropValues.Location = new System.Drawing.Point(24, 32);
|
||||
this.cmbPropValues.Name = "cmbPropValues";
|
||||
this.cmbPropValues.Size = new System.Drawing.Size(273, 25);
|
||||
this.cmbPropValues.TabIndex = 0;
|
||||
//
|
||||
// lblPropName
|
||||
//
|
||||
this.lblPropName.AutoSize = true;
|
||||
this.lblPropName.Location = new System.Drawing.Point(29, 11);
|
||||
this.lblPropName.Name = "lblPropName";
|
||||
this.lblPropName.Size = new System.Drawing.Size(85, 17);
|
||||
this.lblPropName.TabIndex = 1;
|
||||
this.lblPropName.Text = "lblPropName";
|
||||
//
|
||||
// lblNotes
|
||||
//
|
||||
this.lblNotes.Location = new System.Drawing.Point(173, 11);
|
||||
this.lblNotes.Name = "lblNotes";
|
||||
this.lblNotes.Size = new System.Drawing.Size(124, 17);
|
||||
this.lblNotes.TabIndex = 2;
|
||||
this.lblNotes.Text = "lblNotes";
|
||||
this.lblNotes.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
|
||||
this.lblNotes.Visible = false;
|
||||
//
|
||||
// lblRequired
|
||||
//
|
||||
this.lblRequired.AutoSize = true;
|
||||
this.lblRequired.ForeColor = System.Drawing.Color.Red;
|
||||
this.lblRequired.Location = new System.Drawing.Point(21, 11);
|
||||
this.lblRequired.Name = "lblRequired";
|
||||
this.lblRequired.Size = new System.Drawing.Size(13, 17);
|
||||
this.lblRequired.TabIndex = 3;
|
||||
this.lblRequired.Text = "*";
|
||||
//
|
||||
// UcPropEdit
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
|
||||
this.Controls.Add(this.lblPropName);
|
||||
this.Controls.Add(this.lblRequired);
|
||||
this.Controls.Add(this.lblNotes);
|
||||
this.Controls.Add(this.cmbPropValues);
|
||||
this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.Name = "UcPropEdit";
|
||||
this.Size = new System.Drawing.Size(323, 71);
|
||||
this.ResumeLayout(false);
|
||||
this.PerformLayout();
|
||||
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
public System.Windows.Forms.ComboBox cmbPropValues;
|
||||
public System.Windows.Forms.Label lblPropName;
|
||||
public System.Windows.Forms.Label lblNotes;
|
||||
public System.Windows.Forms.Label lblRequired;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel;
|
||||
using System.Data;
|
||||
using System.Drawing;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
{
|
||||
public partial class UcPropEdit : UserControl
|
||||
{
|
||||
public UcPropEdit()
|
||||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,120 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<root>
|
||||
<!--
|
||||
Microsoft ResX Schema
|
||||
|
||||
Version 2.0
|
||||
|
||||
The primary goals of this format is to allow a simple XML format
|
||||
that is mostly human readable. The generation and parsing of the
|
||||
various data types are done through the TypeConverter classes
|
||||
associated with the data types.
|
||||
|
||||
Example:
|
||||
|
||||
... ado.net/XML headers & schema ...
|
||||
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||
<resheader name="version">2.0</resheader>
|
||||
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||
</data>
|
||||
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||
<comment>This is a comment</comment>
|
||||
</data>
|
||||
|
||||
There are any number of "resheader" rows that contain simple
|
||||
name/value pairs.
|
||||
|
||||
Each data row contains a name, and value. The row also contains a
|
||||
type or mimetype. Type corresponds to a .NET class that support
|
||||
text/value conversion through the TypeConverter architecture.
|
||||
Classes that don't support this are serialized and stored with the
|
||||
mimetype set.
|
||||
|
||||
The mimetype is used for serialized objects, and tells the
|
||||
ResXResourceReader how to depersist the object. This is currently not
|
||||
extensible. For a given mimetype the value must be set accordingly:
|
||||
|
||||
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||
that the ResXResourceWriter will generate, however the reader can
|
||||
read any of the formats listed below.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.binary.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.soap.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||
value : The object must be serialized into a byte array
|
||||
: using a System.ComponentModel.TypeConverter
|
||||
: and then encoded with base64 encoding.
|
||||
-->
|
||||
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||
<xsd:element name="root" msdata:IsDataSet="true">
|
||||
<xsd:complexType>
|
||||
<xsd:choice maxOccurs="unbounded">
|
||||
<xsd:element name="metadata">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||
<xsd:attribute name="type" type="xsd:string" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="assembly">
|
||||
<xsd:complexType>
|
||||
<xsd:attribute name="alias" type="xsd:string" />
|
||||
<xsd:attribute name="name" type="xsd:string" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="data">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="resheader">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:choice>
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:schema>
|
||||
<resheader name="resmimetype">
|
||||
<value>text/microsoft-resx</value>
|
||||
</resheader>
|
||||
<resheader name="version">
|
||||
<value>2.0</value>
|
||||
</resheader>
|
||||
<resheader name="reader">
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
</root>
|
||||
@@ -1,6 +1,7 @@
|
||||
using AllBase;
|
||||
using AllBase.Model.Result;
|
||||
using NaiBa.Util.Extension;
|
||||
using NaiBa.Util.Winform.Extension;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel;
|
||||
@@ -51,6 +52,8 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
|
||||
|
||||
private void ProductSelectAddShopForm_Load(object sender, EventArgs e)
|
||||
{
|
||||
this.dgvSelectShop.AddSelectorColumn("colSelect");
|
||||
|
||||
dgvSelectShop.Rows.Clear();
|
||||
lstShop.Clear();
|
||||
|
||||
|
||||
+13
-13
@@ -590,16 +590,16 @@
|
||||
this.chkDeleteLowPriceSku.Location = new System.Drawing.Point(567, 4);
|
||||
this.chkDeleteLowPriceSku.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.chkDeleteLowPriceSku.Name = "chkDeleteLowPriceSku";
|
||||
this.chkDeleteLowPriceSku.Size = new System.Drawing.Size(95, 21);
|
||||
this.chkDeleteLowPriceSku.Size = new System.Drawing.Size(99, 21);
|
||||
this.chkDeleteLowPriceSku.TabIndex = 472;
|
||||
this.chkDeleteLowPriceSku.Text = "删除低价sku";
|
||||
this.chkDeleteLowPriceSku.Text = "删除低价SKU";
|
||||
this.chkDeleteLowPriceSku.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// chkRandomSkuOrder
|
||||
//
|
||||
this.chkRandomSkuOrder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.chkRandomSkuOrder.AutoSize = true;
|
||||
this.chkRandomSkuOrder.Location = new System.Drawing.Point(662, 4);
|
||||
this.chkRandomSkuOrder.Location = new System.Drawing.Point(666, 4);
|
||||
this.chkRandomSkuOrder.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.chkRandomSkuOrder.Name = "chkRandomSkuOrder";
|
||||
this.chkRandomSkuOrder.Size = new System.Drawing.Size(95, 21);
|
||||
@@ -610,7 +610,7 @@
|
||||
// chkSkuRandomPrice
|
||||
//
|
||||
this.chkSkuRandomPrice.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.chkSkuRandomPrice.Location = new System.Drawing.Point(757, 4);
|
||||
this.chkSkuRandomPrice.Location = new System.Drawing.Point(761, 4);
|
||||
this.chkSkuRandomPrice.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.chkSkuRandomPrice.Name = "chkSkuRandomPrice";
|
||||
this.chkSkuRandomPrice.Size = new System.Drawing.Size(110, 21);
|
||||
@@ -626,7 +626,7 @@
|
||||
0,
|
||||
0,
|
||||
131072});
|
||||
this.numSkuRandomPrice.Location = new System.Drawing.Point(867, 3);
|
||||
this.numSkuRandomPrice.Location = new System.Drawing.Point(871, 3);
|
||||
this.numSkuRandomPrice.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
|
||||
this.numSkuRandomPrice.Name = "numSkuRandomPrice";
|
||||
this.numSkuRandomPrice.Size = new System.Drawing.Size(44, 23);
|
||||
@@ -641,7 +641,7 @@
|
||||
//
|
||||
this.label11.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.label11.AutoSize = true;
|
||||
this.label11.Location = new System.Drawing.Point(911, 6);
|
||||
this.label11.Location = new System.Drawing.Point(915, 6);
|
||||
this.label11.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.label11.Name = "label11";
|
||||
this.label11.Size = new System.Drawing.Size(20, 17);
|
||||
@@ -907,7 +907,7 @@
|
||||
// label17
|
||||
//
|
||||
this.label17.AutoSize = true;
|
||||
this.label17.Location = new System.Drawing.Point(933, 71);
|
||||
this.label17.Location = new System.Drawing.Point(952, 71);
|
||||
this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
|
||||
this.label17.Name = "label17";
|
||||
this.label17.Size = new System.Drawing.Size(20, 17);
|
||||
@@ -922,7 +922,7 @@
|
||||
0,
|
||||
0,
|
||||
131072});
|
||||
this.numAddPrice.Location = new System.Drawing.Point(889, 68);
|
||||
this.numAddPrice.Location = new System.Drawing.Point(908, 68);
|
||||
this.numAddPrice.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
|
||||
this.numAddPrice.Name = "numAddPrice";
|
||||
this.numAddPrice.Size = new System.Drawing.Size(44, 23);
|
||||
@@ -936,7 +936,7 @@
|
||||
// label16
|
||||
//
|
||||
this.label16.AutoSize = true;
|
||||
this.label16.Location = new System.Drawing.Point(843, 71);
|
||||
this.label16.Location = new System.Drawing.Point(862, 71);
|
||||
this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
|
||||
this.label16.Name = "label16";
|
||||
this.label16.Size = new System.Drawing.Size(48, 17);
|
||||
@@ -951,7 +951,7 @@
|
||||
0,
|
||||
0,
|
||||
131072});
|
||||
this.numAddPriceTimes.Location = new System.Drawing.Point(799, 68);
|
||||
this.numAddPriceTimes.Location = new System.Drawing.Point(818, 68);
|
||||
this.numAddPriceTimes.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
|
||||
this.numAddPriceTimes.Name = "numAddPriceTimes";
|
||||
this.numAddPriceTimes.Size = new System.Drawing.Size(44, 23);
|
||||
@@ -976,12 +976,12 @@
|
||||
// chkAddPrice
|
||||
//
|
||||
this.chkAddPrice.AutoSize = true;
|
||||
this.chkAddPrice.Location = new System.Drawing.Point(755, 69);
|
||||
this.chkAddPrice.Location = new System.Drawing.Point(750, 69);
|
||||
this.chkAddPrice.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
|
||||
this.chkAddPrice.Name = "chkAddPrice";
|
||||
this.chkAddPrice.Size = new System.Drawing.Size(51, 21);
|
||||
this.chkAddPrice.Size = new System.Drawing.Size(75, 21);
|
||||
this.chkAddPrice.TabIndex = 615;
|
||||
this.chkAddPrice.Text = "加价";
|
||||
this.chkAddPrice.Text = "额外加价";
|
||||
this.chkAddPrice.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// btnStop
|
||||
|
||||
@@ -36,13 +36,6 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
|
||||
/// </summary>
|
||||
public partial class ProductThirdSelectListManageForm : LRBaseForm
|
||||
{
|
||||
public enum EnumClientMode
|
||||
{
|
||||
Admin,
|
||||
Client,
|
||||
ClientJit,
|
||||
}
|
||||
|
||||
public EnumClientMode ClientMode { get; set; } = EnumClientMode.Admin;
|
||||
|
||||
public CancellationTokenSource cancellationTokenSource { get; set; } = null;
|
||||
@@ -395,7 +388,9 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
|
||||
}
|
||||
break;
|
||||
case "编辑备注":
|
||||
DbProductSelectEditNotesForm editForm = new DbProductSelectEditNotesForm(dbSelectProduct, SetProductSelectNotesType.ThirdProduct);
|
||||
DbProductSelectEditNotesForm editForm = new DbProductSelectEditNotesForm(dbSelectProduct, SetProductSelectType.ThirdProduct);
|
||||
editForm.ClientMode = this.ClientMode;
|
||||
editForm.shop = GetShop(shopId);
|
||||
editForm.ShowDialog();
|
||||
dgvSelectProduct.Rows[e.RowIndex].Cells["colNotes"].Value = dbSelectProduct.notes;
|
||||
dgvSelectProduct.Rows[e.RowIndex].Cells["colUserNotes"].Value = dbSelectProduct.user_notes;
|
||||
@@ -410,7 +405,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
|
||||
case "商品类目":
|
||||
{
|
||||
var shop = GetShop(shopId);
|
||||
DbProductCategorySearch searchForm = new DbProductCategorySearch(shop, dbSelectProduct, SetProductSelectNotesType.ThirdProduct);
|
||||
DbProductCategorySearch searchForm = new DbProductCategorySearch(shop, dbSelectProduct, SetProductSelectType.ThirdProduct);
|
||||
searchForm.SaveComplete += SearchForm_SaveComplete;
|
||||
searchForm.ShowDialog();
|
||||
}
|
||||
@@ -899,6 +894,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
|
||||
string opRst = prod.status == "已上传" ? "已成功上传" : "已上传草稿箱";
|
||||
row.Cells["colOpResult"].Value = opRst + "但保存到服务端失败:" + BaseRegex.GetStringJson(ref html, "msg") + (" " + error).Trim(' ');
|
||||
row.Cells["colStatus"].Value = prod.status;
|
||||
row.Cells["colSelect"].Value = false;
|
||||
}));
|
||||
}
|
||||
else
|
||||
@@ -908,6 +904,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
|
||||
row.Cells["colDraftId"].Value = productDraftId; // 草稿箱id
|
||||
row.Cells["colOpResult"].Value = prod.status == "已上传" ? "已成功上传" : "已上传草稿箱" + (" " + error).TrimEnd(' ');
|
||||
row.Cells["colStatus"].Value = prod.status;
|
||||
row.Cells["colSelect"].Value = false;
|
||||
}));
|
||||
}
|
||||
}
|
||||
@@ -937,7 +934,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
|
||||
return list.FirstOrDefault();
|
||||
}
|
||||
|
||||
public KJDDBProduct GetProductDetail(string prodDbId)
|
||||
public static KJDDBProduct GetProductDetail(string prodDbId)
|
||||
{
|
||||
if (string.IsNullOrEmpty(prodDbId))
|
||||
return new KJDDBProduct();
|
||||
@@ -1125,7 +1122,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
|
||||
}
|
||||
|
||||
prodParam.carouselImageI18nReqs = prodInfo.carouselImageI18nVOList;
|
||||
prodParam.carouselImageUrls = prodInfo.carouselImageUrls;
|
||||
prodParam.carouselImageUrls = prodInfo.carouselImageUrls.Take(10).ToList();
|
||||
|
||||
prodParam.goodsAdvantageLabelTypes = prodInfo.goodsAdvantageLabelVOList != null ?
|
||||
prodInfo.goodsAdvantageLabelVOList : new List<object>();
|
||||
|
||||
@@ -406,7 +406,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
|
||||
break;
|
||||
case "重上/已买":
|
||||
{
|
||||
DbProductUserSelectEditNotesForm userNotesForm = new DbProductUserSelectEditNotesForm(dbProduct, SetProductSelectNotesType.ThirdProduct);
|
||||
DbProductUserSelectEditNotesForm userNotesForm = new DbProductUserSelectEditNotesForm(dbProduct, SetProductSelectType.ThirdProduct);
|
||||
userNotesForm.ShowDialog();
|
||||
dgvSelectProduct.Rows[e.RowIndex].Cells["colUserNotes"].Value = (dbProduct.user_notes + " 编辑").Trim();
|
||||
}
|
||||
|
||||
+119
-76
@@ -73,6 +73,14 @@ namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
this.splitContainer3 = new System.Windows.Forms.SplitContainer();
|
||||
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
|
||||
this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx();
|
||||
this.colSelect = new TemuKJD.UserComponent.UcDataGridViewCheckBoxColumn(this.components);
|
||||
this.colShopLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colShopNotes = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colLoginStatus = new System.Windows.Forms.DataGridViewLinkColumn();
|
||||
this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn();
|
||||
this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.splitContainer5 = new System.Windows.Forms.SplitContainer();
|
||||
this.actDiscountLess60 = new TemuKJD.KJDForms.SalesCenterForms.UcActivityDiscountCtrl();
|
||||
this.chkIfLowCancel = new TemuKJD.UserComponent.UcCheckBox(this.components);
|
||||
@@ -109,14 +117,8 @@ namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
|
||||
this.btnClear = new DevComponents.DotNetBar.PanelEx();
|
||||
this.panel1 = new System.Windows.Forms.Panel();
|
||||
this.colSelect = new TemuKJD.UserComponent.UcDataGridViewCheckBoxColumn(this.components);
|
||||
this.colShopLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colShopNotes = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colLoginStatus = new System.Windows.Forms.DataGridViewLinkColumn();
|
||||
this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn();
|
||||
this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.btnSearchShop = new DevComponents.DotNetBar.PanelEx();
|
||||
this.pbShopLoading = new System.Windows.Forms.PictureBox();
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
|
||||
this.splitContainer1.Panel1.SuspendLayout();
|
||||
this.splitContainer1.Panel2.SuspendLayout();
|
||||
@@ -148,6 +150,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
this.splitContainer4.Panel2.SuspendLayout();
|
||||
this.splitContainer4.SuspendLayout();
|
||||
this.panel1.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pbShopLoading)).BeginInit();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// splitContainer1
|
||||
@@ -177,6 +180,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
| System.Windows.Forms.AnchorStyles.Left)));
|
||||
this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
|
||||
this.ucGroupBoxEx1.Controls.Add(this.btnSearchShop);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.btnEmpty);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.txtNotes);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.label14);
|
||||
@@ -197,9 +201,9 @@ namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
this.btnEmpty.CanvasColor = System.Drawing.SystemColors.Control;
|
||||
this.btnEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnEmpty.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnEmpty.Location = new System.Drawing.Point(173, 90);
|
||||
this.btnEmpty.Location = new System.Drawing.Point(201, 90);
|
||||
this.btnEmpty.Name = "btnEmpty";
|
||||
this.btnEmpty.Size = new System.Drawing.Size(88, 23);
|
||||
this.btnEmpty.Size = new System.Drawing.Size(60, 23);
|
||||
this.btnEmpty.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
|
||||
this.btnEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
|
||||
@@ -213,7 +217,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
this.btnEmpty.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnEmpty.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
|
||||
this.btnEmpty.TabIndex = 725;
|
||||
this.btnEmpty.Text = "重置查询条件";
|
||||
this.btnEmpty.Text = "重置查询";
|
||||
this.btnEmpty.Click += new System.EventHandler(this.btnEmpty_Click);
|
||||
//
|
||||
// txtNotes
|
||||
@@ -266,14 +270,13 @@ namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
//
|
||||
// btnRefreshShop
|
||||
//
|
||||
this.btnRefreshShop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.btnRefreshShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnRefreshShop.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnRefreshShop.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnRefreshShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnRefreshShop.Location = new System.Drawing.Point(75, 90);
|
||||
this.btnRefreshShop.Name = "btnRefreshShop";
|
||||
this.btnRefreshShop.Size = new System.Drawing.Size(96, 23);
|
||||
this.btnRefreshShop.Size = new System.Drawing.Size(61, 23);
|
||||
this.btnRefreshShop.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnRefreshShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnRefreshShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
@@ -286,7 +289,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
this.btnRefreshShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnRefreshShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnRefreshShop.TabIndex = 431;
|
||||
this.btnRefreshShop.Text = "查询/刷新店铺";
|
||||
this.btnRefreshShop.Text = "刷新店铺";
|
||||
this.btnRefreshShop.Click += new System.EventHandler(this.btnRefreshShop_Click);
|
||||
//
|
||||
// ucGroupBoxEx2
|
||||
@@ -638,6 +641,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
//
|
||||
// splitContainer2.Panel1
|
||||
//
|
||||
this.splitContainer2.Panel1.Controls.Add(this.pbShopLoading);
|
||||
this.splitContainer2.Panel1.Controls.Add(this.dgvShop);
|
||||
this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0);
|
||||
//
|
||||
@@ -687,6 +691,72 @@ namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
this.dgvShop.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellClick);
|
||||
this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick);
|
||||
//
|
||||
// colSelect
|
||||
//
|
||||
this.colSelect.HeaderText = "全选";
|
||||
this.colSelect.Name = "colSelect";
|
||||
this.colSelect.ReadOnly = true;
|
||||
this.colSelect.Resizable = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colSelect.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
|
||||
this.colSelect.Width = 28;
|
||||
//
|
||||
// colShopLoginName
|
||||
//
|
||||
this.colShopLoginName.HeaderText = "店铺登录名";
|
||||
this.colShopLoginName.Name = "colShopLoginName";
|
||||
this.colShopLoginName.ReadOnly = true;
|
||||
this.colShopLoginName.Visible = false;
|
||||
//
|
||||
// colShopId
|
||||
//
|
||||
this.colShopId.HeaderText = "店铺Id";
|
||||
this.colShopId.Name = "colShopId";
|
||||
this.colShopId.ReadOnly = true;
|
||||
this.colShopId.Visible = false;
|
||||
this.colShopId.Width = 55;
|
||||
//
|
||||
// colShopName
|
||||
//
|
||||
this.colShopName.FillWeight = 150F;
|
||||
this.colShopName.HeaderText = "店铺名称";
|
||||
this.colShopName.Name = "colShopName";
|
||||
this.colShopName.ReadOnly = true;
|
||||
this.colShopName.Resizable = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colShopName.Width = 70;
|
||||
//
|
||||
// colShopNotes
|
||||
//
|
||||
this.colShopNotes.HeaderText = "分组";
|
||||
this.colShopNotes.Name = "colShopNotes";
|
||||
this.colShopNotes.ReadOnly = true;
|
||||
this.colShopNotes.Width = 70;
|
||||
//
|
||||
// colLoginStatus
|
||||
//
|
||||
this.colLoginStatus.HeaderText = "状态";
|
||||
this.colLoginStatus.Name = "colLoginStatus";
|
||||
this.colLoginStatus.ReadOnly = true;
|
||||
this.colLoginStatus.Resizable = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colLoginStatus.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
|
||||
this.colLoginStatus.Width = 38;
|
||||
//
|
||||
// colCanUse
|
||||
//
|
||||
this.colCanUse.HeaderText = "可用";
|
||||
this.colCanUse.Name = "colCanUse";
|
||||
this.colCanUse.ReadOnly = true;
|
||||
this.colCanUse.Resizable = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colCanUse.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
|
||||
this.colCanUse.Visible = false;
|
||||
this.colCanUse.Width = 28;
|
||||
//
|
||||
// colMessage
|
||||
//
|
||||
this.colMessage.HeaderText = "消息";
|
||||
this.colMessage.Name = "colMessage";
|
||||
this.colMessage.ReadOnly = true;
|
||||
this.colMessage.Width = 120;
|
||||
//
|
||||
// splitContainer5
|
||||
//
|
||||
this.splitContainer5.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
@@ -1095,71 +1165,41 @@ namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
this.panel1.Size = new System.Drawing.Size(1438, 566);
|
||||
this.panel1.TabIndex = 12;
|
||||
//
|
||||
// colSelect
|
||||
// btnSearchShop
|
||||
//
|
||||
this.colSelect.HeaderText = "全选";
|
||||
this.colSelect.Name = "colSelect";
|
||||
this.colSelect.ReadOnly = true;
|
||||
this.colSelect.Resizable = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colSelect.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
|
||||
this.colSelect.Width = 28;
|
||||
this.btnSearchShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnSearchShop.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnSearchShop.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnSearchShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnSearchShop.Location = new System.Drawing.Point(138, 90);
|
||||
this.btnSearchShop.Name = "btnSearchShop";
|
||||
this.btnSearchShop.Size = new System.Drawing.Size(61, 23);
|
||||
this.btnSearchShop.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnSearchShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnSearchShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnSearchShop.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
|
||||
this.btnSearchShop.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
|
||||
this.btnSearchShop.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
|
||||
this.btnSearchShop.Style.ForeColor.Color = System.Drawing.Color.White;
|
||||
this.btnSearchShop.Style.GradientAngle = 90;
|
||||
this.btnSearchShop.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnSearchShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnSearchShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnSearchShop.TabIndex = 735;
|
||||
this.btnSearchShop.Text = "查询店铺";
|
||||
this.btnSearchShop.Click += new System.EventHandler(this.btnSearchShop_Click);
|
||||
//
|
||||
// colShopLoginName
|
||||
// pbShopLoading
|
||||
//
|
||||
this.colShopLoginName.HeaderText = "店铺登录名";
|
||||
this.colShopLoginName.Name = "colShopLoginName";
|
||||
this.colShopLoginName.ReadOnly = true;
|
||||
this.colShopLoginName.Visible = false;
|
||||
//
|
||||
// colShopId
|
||||
//
|
||||
this.colShopId.HeaderText = "店铺Id";
|
||||
this.colShopId.Name = "colShopId";
|
||||
this.colShopId.ReadOnly = true;
|
||||
this.colShopId.Visible = false;
|
||||
this.colShopId.Width = 55;
|
||||
//
|
||||
// colShopName
|
||||
//
|
||||
this.colShopName.FillWeight = 150F;
|
||||
this.colShopName.HeaderText = "店铺名称";
|
||||
this.colShopName.Name = "colShopName";
|
||||
this.colShopName.ReadOnly = true;
|
||||
this.colShopName.Resizable = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colShopName.Width = 70;
|
||||
//
|
||||
// colShopNotes
|
||||
//
|
||||
this.colShopNotes.HeaderText = "分组";
|
||||
this.colShopNotes.Name = "colShopNotes";
|
||||
this.colShopNotes.ReadOnly = true;
|
||||
this.colShopNotes.Width = 70;
|
||||
//
|
||||
// colLoginStatus
|
||||
//
|
||||
this.colLoginStatus.HeaderText = "状态";
|
||||
this.colLoginStatus.Name = "colLoginStatus";
|
||||
this.colLoginStatus.ReadOnly = true;
|
||||
this.colLoginStatus.Resizable = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colLoginStatus.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
|
||||
this.colLoginStatus.Width = 38;
|
||||
//
|
||||
// colCanUse
|
||||
//
|
||||
this.colCanUse.HeaderText = "可用";
|
||||
this.colCanUse.Name = "colCanUse";
|
||||
this.colCanUse.ReadOnly = true;
|
||||
this.colCanUse.Resizable = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colCanUse.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
|
||||
this.colCanUse.Visible = false;
|
||||
this.colCanUse.Width = 28;
|
||||
//
|
||||
// colMessage
|
||||
//
|
||||
this.colMessage.HeaderText = "消息";
|
||||
this.colMessage.Name = "colMessage";
|
||||
this.colMessage.ReadOnly = true;
|
||||
this.colMessage.Width = 120;
|
||||
this.pbShopLoading.Anchor = System.Windows.Forms.AnchorStyles.None;
|
||||
this.pbShopLoading.Image = global::TemuKJD.Properties.Resources.loading_blue;
|
||||
this.pbShopLoading.Location = new System.Drawing.Point(117, 181);
|
||||
this.pbShopLoading.Name = "pbShopLoading";
|
||||
this.pbShopLoading.Size = new System.Drawing.Size(50, 50);
|
||||
this.pbShopLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
|
||||
this.pbShopLoading.TabIndex = 190;
|
||||
this.pbShopLoading.TabStop = false;
|
||||
this.pbShopLoading.Visible = false;
|
||||
//
|
||||
// MarketingActivityForm
|
||||
//
|
||||
@@ -1213,6 +1253,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).EndInit();
|
||||
this.splitContainer4.ResumeLayout(false);
|
||||
this.panel1.ResumeLayout(false);
|
||||
((System.ComponentModel.ISupportInitialize)(this.pbShopLoading)).EndInit();
|
||||
this.ResumeLayout(false);
|
||||
|
||||
}
|
||||
@@ -1299,5 +1340,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
private System.Windows.Forms.DataGridViewLinkColumn colLoginStatus;
|
||||
private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colMessage;
|
||||
private DevComponents.DotNetBar.PanelEx btnSearchShop;
|
||||
private System.Windows.Forms.PictureBox pbShopLoading;
|
||||
}
|
||||
}
|
||||
@@ -154,15 +154,29 @@ namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
private void MarketingActivityForm_VisibleChanged(object sender, EventArgs e)
|
||||
{
|
||||
if (this.Visible)
|
||||
RefreshShop();
|
||||
FiltShop();
|
||||
}
|
||||
|
||||
private void btnRefreshShop_Click(object sender, EventArgs e)
|
||||
{
|
||||
RefreshShop();
|
||||
pbShopLoading.Visible = true;
|
||||
Task.Run(() =>
|
||||
{
|
||||
ShopListForm.UpdateShop();
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
FiltShop();
|
||||
pbShopLoading.Visible = false;
|
||||
}));
|
||||
});
|
||||
}
|
||||
|
||||
private void RefreshShop()
|
||||
private void btnSearchShop_Click(object sender, EventArgs e)
|
||||
{
|
||||
FiltShop();
|
||||
}
|
||||
|
||||
private void FiltShop()
|
||||
{
|
||||
// 店铺Id
|
||||
var selectIds = dgvShop.Rows.Cast<DataGridViewRow>().Where(row
|
||||
@@ -201,6 +215,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
private void btnEmpty_Click(object sender, EventArgs e)
|
||||
{
|
||||
txtNotes.Text = txtShopId.Text = txtShopName.Text = "";
|
||||
FiltShop();
|
||||
}
|
||||
|
||||
private void BindShop(ShopLoginInfo shopEntity, List<string> selectShopId = null)
|
||||
@@ -323,7 +338,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
ShopLoginForm shopLoginForm = new ShopLoginForm(shop);
|
||||
shopLoginForm.openType = EnumOpenType.login;
|
||||
shopLoginForm.ShowDialog();
|
||||
RefreshShop();
|
||||
FiltShop();
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -48,31 +48,14 @@ namespace TemuKJD.KJDForms.ShopForms
|
||||
#region 服务端店铺管理
|
||||
public static void UpdateShop()
|
||||
{
|
||||
// 获取本地店铺和服务端店铺。将服务端相关信息与本地店铺合并后暂时存在内存中(不保存敏感信息)。
|
||||
//GlobalConfig.ShopLoginList = new ConcurrentList<ShopLoginInfo>();
|
||||
GlobalConfig.ShopLoginList.Clear();
|
||||
// 获取服务端店铺
|
||||
var serverShopList = ShopListForm.GetServerShop();
|
||||
//var localShopList = NaiBa.Util.Helper.ConfigHelper.LoadConfig<ConcurrentList<ShopLoginInfo>>("dou_shop_login");
|
||||
//if (localShopList == null)
|
||||
// localShopList = new ConcurrentList<ShopLoginInfo>();
|
||||
//foreach (var serverShop in serverShopList)
|
||||
//{
|
||||
// var localShop = localShopList.FirstOrDefault(s => s.LoginName == serverShop.LoginName && s.ShopId == serverShop.ShopId);
|
||||
// if (localShop == null)
|
||||
// {
|
||||
// localShopList.Add(serverShop);
|
||||
// }
|
||||
//}
|
||||
var localShopList = new ConcurrentList<ShopLoginInfo>();
|
||||
localShopList.AddRange(serverShopList);
|
||||
foreach (var localShop in localShopList)
|
||||
GlobalConfig.ShopLoginList.RemoveAll(s => serverShopList.Any(s1 => s1.LoginName == s.LoginName && s1.ShopId == s.ShopId));
|
||||
|
||||
foreach (var serverShop in serverShopList)
|
||||
{
|
||||
if (GlobalConfig.ShopLoginList.Any(s => s.LoginName == localShop.LoginName && s.ShopId == localShop.ShopId))
|
||||
continue;
|
||||
|
||||
var serverShop = serverShopList.FirstOrDefault(s => s.LoginName == localShop.LoginName && s.ShopId == localShop.ShopId);
|
||||
if (serverShop != null)
|
||||
var localShop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.LoginName == serverShop.LoginName && s.ShopId == serverShop.ShopId);
|
||||
if (localShop != null)
|
||||
{
|
||||
localShop.ShopAccount = serverShop.ShopAccount;
|
||||
localShop.LoginName = serverShop.LoginName;
|
||||
@@ -95,9 +78,11 @@ namespace TemuKJD.KJDForms.ShopForms
|
||||
localShop.LoginStatus2 = serverShop.LoginStatus2;
|
||||
localShop.AddProductRemaining = serverShop.AddProductRemaining;
|
||||
localShop.OperateSubSaName = serverShop.OperateSubSaName;
|
||||
if (localShop.TrialUploadCount < 0)
|
||||
localShop.TrialUploadCount = 0;
|
||||
GlobalConfig.ShopLoginList.Add(localShop);
|
||||
localShop.TrialUploadCount = Math.Max(0, serverShop.TrialUploadCount);
|
||||
}
|
||||
else
|
||||
{
|
||||
GlobalConfig.ShopLoginList.Add(serverShop);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user