商品选品 更新类目 子账户单独批量修改 及其他功能
This commit is contained in:
1 parent
8e919b0bd7
commit
52220daa8b
46 files changed
+4960
-211
No files matched your search
+72
-62
@@ -28,26 +28,27 @@
|
||||
/// </summary>
|
||||
private void InitializeComponent()
|
||||
{
|
||||
this.components = new System.ComponentModel.Container();
|
||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WXShopAddEditForm));
|
||||
this.panel2 = new System.Windows.Forms.Panel();
|
||||
this.txtChatNick = new DevComponents.DotNetBar.Controls.TextBoxX();
|
||||
this.label7 = new System.Windows.Forms.Label();
|
||||
this.btnOk = new TemuKJD.UserControls.ButtonEx();
|
||||
this.label8 = new System.Windows.Forms.Label();
|
||||
this.txtNotes = new DevComponents.DotNetBar.Controls.TextBoxX();
|
||||
this.lblAttention = new System.Windows.Forms.Label();
|
||||
this.cmbGroup = new System.Windows.Forms.ComboBox();
|
||||
this.txtBuyAccount = new DevComponents.DotNetBar.Controls.TextBoxX();
|
||||
this.label6 = new System.Windows.Forms.Label();
|
||||
this.txtChatAccount = new DevComponents.DotNetBar.Controls.TextBoxX();
|
||||
this.label4 = new System.Windows.Forms.Label();
|
||||
this.txtUploadAccount = new DevComponents.DotNetBar.Controls.TextBoxX();
|
||||
this.label3 = new System.Windows.Forms.Label();
|
||||
this.txtShopPassword = new System.Windows.Forms.TextBox();
|
||||
this.label2 = new System.Windows.Forms.Label();
|
||||
this.txtLoginName = new System.Windows.Forms.TextBox();
|
||||
this.label1 = new System.Windows.Forms.Label();
|
||||
this.label5 = new System.Windows.Forms.Label();
|
||||
this.txtChatNick = new DevComponents.DotNetBar.Controls.TextBoxX();
|
||||
this.label7 = new System.Windows.Forms.Label();
|
||||
this.chkSubAccount = new TemuKJD.UserComponent.UcCheckBox(this.components);
|
||||
this.chkNotes = new TemuKJD.UserComponent.UcCheckBox(this.components);
|
||||
this.chkShopGroup = new TemuKJD.UserComponent.UcCheckBox(this.components);
|
||||
this.panel2.SuspendLayout();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
@@ -57,21 +58,21 @@
|
||||
this.panel2.Controls.Add(this.txtChatNick);
|
||||
this.panel2.Controls.Add(this.label7);
|
||||
this.panel2.Controls.Add(this.btnOk);
|
||||
this.panel2.Controls.Add(this.label8);
|
||||
this.panel2.Controls.Add(this.txtNotes);
|
||||
this.panel2.Controls.Add(this.lblAttention);
|
||||
this.panel2.Controls.Add(this.cmbGroup);
|
||||
this.panel2.Controls.Add(this.txtBuyAccount);
|
||||
this.panel2.Controls.Add(this.label6);
|
||||
this.panel2.Controls.Add(this.txtChatAccount);
|
||||
this.panel2.Controls.Add(this.label4);
|
||||
this.panel2.Controls.Add(this.txtUploadAccount);
|
||||
this.panel2.Controls.Add(this.label3);
|
||||
this.panel2.Controls.Add(this.txtShopPassword);
|
||||
this.panel2.Controls.Add(this.label2);
|
||||
this.panel2.Controls.Add(this.txtLoginName);
|
||||
this.panel2.Controls.Add(this.label1);
|
||||
this.panel2.Controls.Add(this.label5);
|
||||
this.panel2.Controls.Add(this.chkSubAccount);
|
||||
this.panel2.Controls.Add(this.chkNotes);
|
||||
this.panel2.Controls.Add(this.chkShopGroup);
|
||||
this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.panel2.Location = new System.Drawing.Point(1, 33);
|
||||
this.panel2.Name = "panel2";
|
||||
@@ -79,6 +80,36 @@
|
||||
this.panel2.TabIndex = 1;
|
||||
this.panel2.Paint += new System.Windows.Forms.PaintEventHandler(this.panel2_Paint);
|
||||
//
|
||||
// txtChatNick
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
this.txtChatNick.Border.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
|
||||
this.txtChatNick.Border.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
|
||||
this.txtChatNick.Border.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
|
||||
this.txtChatNick.Border.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
|
||||
this.txtChatNick.Border.Class = "CrumbBarBackgroundKey";
|
||||
this.txtChatNick.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||
this.txtChatNick.Border.PaddingBottom = 2;
|
||||
this.txtChatNick.Border.PaddingLeft = 2;
|
||||
this.txtChatNick.Border.PaddingRight = 2;
|
||||
this.txtChatNick.Border.PaddingTop = 2;
|
||||
this.txtChatNick.Location = new System.Drawing.Point(91, 95);
|
||||
this.txtChatNick.Name = "txtChatNick";
|
||||
this.txtChatNick.ReadOnly = true;
|
||||
this.txtChatNick.Size = new System.Drawing.Size(172, 23);
|
||||
this.txtChatNick.TabIndex = 388;
|
||||
//
|
||||
// label7
|
||||
//
|
||||
this.label7.AutoSize = true;
|
||||
this.label7.Location = new System.Drawing.Point(17, 98);
|
||||
this.label7.Name = "label7";
|
||||
this.label7.Size = new System.Drawing.Size(68, 17);
|
||||
this.label7.TabIndex = 387;
|
||||
this.label7.Text = "子账户昵称";
|
||||
//
|
||||
// btnOk
|
||||
//
|
||||
this.btnOk.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
@@ -95,15 +126,6 @@
|
||||
this.btnOk.UseVisualStyleBackColor = false;
|
||||
this.btnOk.Click += new System.EventHandler(this.btnOk_Click);
|
||||
//
|
||||
// label8
|
||||
//
|
||||
this.label8.AutoSize = true;
|
||||
this.label8.Location = new System.Drawing.Point(29, 131);
|
||||
this.label8.Name = "label8";
|
||||
this.label8.Size = new System.Drawing.Size(56, 17);
|
||||
this.label8.TabIndex = 386;
|
||||
this.label8.Text = " 备注";
|
||||
//
|
||||
// txtNotes
|
||||
//
|
||||
//
|
||||
@@ -202,15 +224,6 @@
|
||||
this.txtChatAccount.Click += new System.EventHandler(this.txt_Click);
|
||||
this.txtChatAccount.TextChanged += new System.EventHandler(this.txtChat_TextChanged);
|
||||
//
|
||||
// label4
|
||||
//
|
||||
this.label4.AutoSize = true;
|
||||
this.label4.Location = new System.Drawing.Point(29, 65);
|
||||
this.label4.Name = "label4";
|
||||
this.label4.Size = new System.Drawing.Size(56, 17);
|
||||
this.label4.TabIndex = 379;
|
||||
this.label4.Text = " 子账户";
|
||||
//
|
||||
// txtUploadAccount
|
||||
//
|
||||
//
|
||||
@@ -275,44 +288,41 @@
|
||||
this.label1.TabIndex = 0;
|
||||
this.label1.Text = "登录账号";
|
||||
//
|
||||
// label5
|
||||
// chkSubAccount
|
||||
//
|
||||
this.label5.AutoSize = true;
|
||||
this.label5.Location = new System.Drawing.Point(29, 167);
|
||||
this.label5.Name = "label5";
|
||||
this.label5.Size = new System.Drawing.Size(56, 17);
|
||||
this.label5.TabIndex = 377;
|
||||
this.label5.Text = "店铺分组";
|
||||
this.chkSubAccount.AutoSize = true;
|
||||
this.chkSubAccount.Checked = true;
|
||||
this.chkSubAccount.CheckState = System.Windows.Forms.CheckState.Checked;
|
||||
this.chkSubAccount.Location = new System.Drawing.Point(30, 63);
|
||||
this.chkSubAccount.Name = "chkSubAccount";
|
||||
this.chkSubAccount.Size = new System.Drawing.Size(63, 21);
|
||||
this.chkSubAccount.TabIndex = 389;
|
||||
this.chkSubAccount.Text = "子账户";
|
||||
this.chkSubAccount.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// txtChatNick
|
||||
// chkNotes
|
||||
//
|
||||
this.chkNotes.AutoSize = true;
|
||||
this.chkNotes.Checked = true;
|
||||
this.chkNotes.CheckState = System.Windows.Forms.CheckState.Checked;
|
||||
this.chkNotes.Location = new System.Drawing.Point(42, 129);
|
||||
this.chkNotes.Name = "chkNotes";
|
||||
this.chkNotes.Size = new System.Drawing.Size(51, 21);
|
||||
this.chkNotes.TabIndex = 390;
|
||||
this.chkNotes.Text = "备注";
|
||||
this.chkNotes.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// chkShopGroup
|
||||
//
|
||||
//
|
||||
this.txtChatNick.Border.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
|
||||
this.txtChatNick.Border.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
|
||||
this.txtChatNick.Border.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
|
||||
this.txtChatNick.Border.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
|
||||
this.txtChatNick.Border.Class = "CrumbBarBackgroundKey";
|
||||
this.txtChatNick.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||
this.txtChatNick.Border.PaddingBottom = 2;
|
||||
this.txtChatNick.Border.PaddingLeft = 2;
|
||||
this.txtChatNick.Border.PaddingRight = 2;
|
||||
this.txtChatNick.Border.PaddingTop = 2;
|
||||
this.txtChatNick.Location = new System.Drawing.Point(91, 95);
|
||||
this.txtChatNick.Name = "txtChatNick";
|
||||
this.txtChatNick.ReadOnly = true;
|
||||
this.txtChatNick.Size = new System.Drawing.Size(172, 23);
|
||||
this.txtChatNick.TabIndex = 388;
|
||||
//
|
||||
// label7
|
||||
//
|
||||
this.label7.AutoSize = true;
|
||||
this.label7.Location = new System.Drawing.Point(17, 98);
|
||||
this.label7.Name = "label7";
|
||||
this.label7.Size = new System.Drawing.Size(68, 17);
|
||||
this.label7.TabIndex = 387;
|
||||
this.label7.Text = "子账户昵称";
|
||||
this.chkShopGroup.AutoSize = true;
|
||||
this.chkShopGroup.Checked = true;
|
||||
this.chkShopGroup.CheckState = System.Windows.Forms.CheckState.Checked;
|
||||
this.chkShopGroup.Location = new System.Drawing.Point(18, 163);
|
||||
this.chkShopGroup.Name = "chkShopGroup";
|
||||
this.chkShopGroup.Size = new System.Drawing.Size(75, 21);
|
||||
this.chkShopGroup.TabIndex = 391;
|
||||
this.chkShopGroup.Text = "店铺分组";
|
||||
this.chkShopGroup.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// WXShopAddEditForm
|
||||
//
|
||||
@@ -340,18 +350,18 @@
|
||||
private System.Windows.Forms.Label label2;
|
||||
private System.Windows.Forms.TextBox txtLoginName;
|
||||
private UserControls.ButtonEx btnOk;
|
||||
private System.Windows.Forms.Label label5;
|
||||
private DevComponents.DotNetBar.Controls.TextBoxX txtUploadAccount;
|
||||
private System.Windows.Forms.Label label3;
|
||||
private DevComponents.DotNetBar.Controls.TextBoxX txtBuyAccount;
|
||||
private System.Windows.Forms.Label label6;
|
||||
private DevComponents.DotNetBar.Controls.TextBoxX txtChatAccount;
|
||||
private System.Windows.Forms.Label label4;
|
||||
private System.Windows.Forms.ComboBox cmbGroup;
|
||||
private System.Windows.Forms.Label lblAttention;
|
||||
private System.Windows.Forms.Label label8;
|
||||
private DevComponents.DotNetBar.Controls.TextBoxX txtNotes;
|
||||
private DevComponents.DotNetBar.Controls.TextBoxX txtChatNick;
|
||||
private System.Windows.Forms.Label label7;
|
||||
public UserComponent.UcCheckBox chkSubAccount;
|
||||
public UserComponent.UcCheckBox chkNotes;
|
||||
public UserComponent.UcCheckBox chkShopGroup;
|
||||
}
|
||||
}
|
||||
@@ -10,6 +10,7 @@ using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
using AllBase;
|
||||
|
||||
namespace TemuKJD.WXForms.ShopForms
|
||||
{
|
||||
@@ -52,19 +53,28 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
shop.LoginName = this.txtLoginName.Text.Trim();
|
||||
if (!string.IsNullOrEmpty(this.txtShopPassword.Text.Trim()))
|
||||
shop.Password = DataOpenSSL.EncryptString(this.txtShopPassword.Text.Trim());
|
||||
shop.GroupName = this.cmbGroup.Text;
|
||||
shop.Notes = this.txtNotes.Text;
|
||||
|
||||
if (chkNotes.Checked)
|
||||
shop.Notes = this.txtNotes.Text;
|
||||
if (chkShopGroup.Checked)
|
||||
shop.GroupName = this.cmbGroup.Text;
|
||||
if (chkSubAccount.Checked)
|
||||
shop.SubUserName = shopSubAccountTmp.SubUserName;
|
||||
|
||||
shop.CompanyName = AllBase.BaseClass.CompanyName;
|
||||
|
||||
foreach (var sp in lstShopLoginInfo)
|
||||
{
|
||||
sp.GroupName = this.cmbGroup.Text;
|
||||
sp.Notes = this.txtNotes.Text;
|
||||
sp.CompanyName = AllBase.BaseClass.CompanyName;
|
||||
sp.SubUserName = shop.SubUserName;
|
||||
if (chkNotes.Checked)
|
||||
sp.Notes = this.txtNotes.Text;
|
||||
if (chkShopGroup.Checked)
|
||||
sp.GroupName = this.cmbGroup.Text;
|
||||
if (chkSubAccount.Checked)
|
||||
sp.SubUserName = shop.SubUserName;
|
||||
}
|
||||
|
||||
this.OnSaveComplete(lstShopLoginInfo, isAdd);
|
||||
this.OnSaveComplete(lstShopLoginInfo, isAdd, this);
|
||||
this.Close();
|
||||
}
|
||||
|
||||
@@ -131,26 +141,28 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
|
||||
}
|
||||
|
||||
ShopLoginInfo shopSubAccountTmp;
|
||||
private void txt_Click(object sender, EventArgs e)
|
||||
{
|
||||
WXSubAccountShopEditForm f = new WXSubAccountShopEditForm(shop);
|
||||
shopSubAccountTmp = JsonHelper.DeserializeJsonToObject<ShopLoginInfo>(JsonHelper.SerializeObject(shop));
|
||||
WXSubAccountShopEditForm f = new WXSubAccountShopEditForm(shopSubAccountTmp);
|
||||
f.SaveComplete += F_SaveComplete;
|
||||
f.ShowDialog();
|
||||
}
|
||||
|
||||
private void F_SaveComplete(object obj)
|
||||
{
|
||||
var shop = obj as ShopLoginInfo;
|
||||
if (shop != null)
|
||||
var shopSubAccountTmp = obj as ShopLoginInfo;
|
||||
if (shopSubAccountTmp != null)
|
||||
{
|
||||
this.txtBuyAccount.Text = shop.BuyAccount;
|
||||
this.txtChatAccount.Text = shop.ChatAccount;
|
||||
this.txtUploadAccount.Text = shop.UploadAccount;
|
||||
this.txtBuyAccount.Text = shopSubAccountTmp.BuyAccount;
|
||||
this.txtChatAccount.Text = shopSubAccountTmp.ChatAccount;
|
||||
this.txtUploadAccount.Text = shopSubAccountTmp.UploadAccount;
|
||||
|
||||
this.txtChatAccount.Text = shop.SubUserName;
|
||||
if (!string.IsNullOrEmpty(shop.SubUserName))
|
||||
this.txtChatAccount.Text = shopSubAccountTmp.SubUserName;
|
||||
if (!string.IsNullOrEmpty(shopSubAccountTmp.SubUserName))
|
||||
{
|
||||
var subUserNames = shop.SubUserName.Split(',').Where(su => !string.IsNullOrEmpty(su));
|
||||
var subUserNames = shopSubAccountTmp.SubUserName.Split(',').Where(su => !string.IsNullOrEmpty(su));
|
||||
var subUsers = WXSubAccountShopEditForm.lstAllSubAccount.Where(su => subUserNames.Contains(su.user_name));
|
||||
this.txtChatNick.Text = string.Join(",", subUsers.Select(s => s.nick_name));
|
||||
}
|
||||
|
||||
+3
-3
@@ -288,7 +288,7 @@
|
||||
this.cmbGroup.DropDownWidth = 1;
|
||||
this.cmbGroup.FormattingEnabled = true;
|
||||
this.cmbGroup.IntegralHeight = false;
|
||||
this.cmbGroup.Location = new System.Drawing.Point(307, 5);
|
||||
this.cmbGroup.Location = new System.Drawing.Point(307, 8);
|
||||
this.cmbGroup.Margin = new System.Windows.Forms.Padding(0, 0, 0, 4);
|
||||
this.cmbGroup.Name = "cmbGroup";
|
||||
this.cmbGroup.Size = new System.Drawing.Size(48, 25);
|
||||
@@ -314,7 +314,7 @@
|
||||
this.cmbNotes.DropDownWidth = 1;
|
||||
this.cmbNotes.FormattingEnabled = true;
|
||||
this.cmbNotes.IntegralHeight = false;
|
||||
this.cmbNotes.Location = new System.Drawing.Point(224, 5);
|
||||
this.cmbNotes.Location = new System.Drawing.Point(224, 8);
|
||||
this.cmbNotes.Margin = new System.Windows.Forms.Padding(0, 0, 0, 4);
|
||||
this.cmbNotes.Name = "cmbNotes";
|
||||
this.cmbNotes.Size = new System.Drawing.Size(48, 25);
|
||||
@@ -447,7 +447,7 @@
|
||||
this.cmbSubAccount.DropDownWidth = 1;
|
||||
this.cmbSubAccount.FormattingEnabled = true;
|
||||
this.cmbSubAccount.IntegralHeight = false;
|
||||
this.cmbSubAccount.Location = new System.Drawing.Point(402, 5);
|
||||
this.cmbSubAccount.Location = new System.Drawing.Point(402, 8);
|
||||
this.cmbSubAccount.Margin = new System.Windows.Forms.Padding(0, 0, 0, 4);
|
||||
this.cmbSubAccount.Name = "cmbSubAccount";
|
||||
this.cmbSubAccount.Size = new System.Drawing.Size(48, 25);
|
||||
|
||||
@@ -255,8 +255,9 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
btnRefreshCookie_Click(null, null);
|
||||
}
|
||||
|
||||
private void Sae_SaveComplete(object obj, object isAdd)
|
||||
private void Sae_SaveComplete(object obj, object isAdd, object sender)
|
||||
{
|
||||
WXShopAddEditForm saeForm = sender as WXShopAddEditForm;
|
||||
var shopInfoLst = obj as List<ShopLoginInfo>;
|
||||
if (shopInfoLst != null)
|
||||
{
|
||||
@@ -296,7 +297,7 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
this.statusBar.pgbTaskProgress.Maximum = shopInfoLst.Count;
|
||||
i++;
|
||||
}));
|
||||
ShopBLL.MdyPDDServerShopSubInfo(shopInfo);
|
||||
ShopBLL.MdyPDDWXServerShopSubInfo(shopInfo, saeForm.chkNotes.Checked, saeForm.chkShopGroup.Checked, saeForm.chkSubAccount.Checked);
|
||||
}
|
||||
RefreshDataGridView(false);
|
||||
//btnRefreshCookie_Click(null, null);
|
||||
@@ -1156,6 +1157,7 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
List<string> shopNameList = GetCheckedList();
|
||||
List<ShopLoginInfo> shops = GlobalConfig.ShopLoginList.Where(s => shopNameList.Contains(s.ShopId)).ToList();
|
||||
WXShopAddEditForm editForm = new WXShopAddEditForm(shops);
|
||||
editForm.chkSubAccount.Checked = editForm.chkShopGroup.Checked = editForm.chkNotes.Checked = false;
|
||||
editForm.SaveCompleteWithDescribe += Sae_SaveComplete;
|
||||
editForm.ShowDialog();
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user