1优化店铺查询 2数据库上传次数统计优化
This commit is contained in:
1 parent
ed5aec05ca
commit
ba5dfe3264
18 files changed
+414
-186
No files matched your search
@@ -345,16 +345,16 @@ namespace TemuKJD.KJDForms.AdminForms
|
||||
pageCount = 1;
|
||||
|
||||
var url = BaseClass.BuildObjString("shop/admin_get_shop_list");
|
||||
if (BaseClass.SaLevel > 1 && !chkSearchAllShop.Checked)
|
||||
url = BaseClass.BuildObjString("shop/sub_sa_get_select_prod_shop");
|
||||
//if (BaseClass.SaLevel > 1 && !chkSearchAllShop.Checked)
|
||||
// url = BaseClass.BuildObjString("shop/sub_sa_get_select_prod_shop");
|
||||
var data = UserLogin.GetSignaturex() +
|
||||
"&page=" + page +
|
||||
"&page_size=" + pageSize +
|
||||
"&shop_ids=" + txtShopId.Text.Trim().Trim(',') +
|
||||
"&shop_names=" + txtShopName.Text.Trim().Trim(',') +
|
||||
"&search_notes=" + txtNotes.Text.Trim().Trim(',');
|
||||
if (BaseClass.SaLevel > 1 && !chkSearchAllShop.Checked)
|
||||
data += "&operate_sub_sa_name=" + BaseClass.UserName;
|
||||
//if (BaseClass.SaLevel > 1 && !chkSearchAllShop.Checked)
|
||||
// data += "&operate_sub_sa_name=" + BaseClass.UserName;
|
||||
var html = GetHtml.PostUtf8(url, data);
|
||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||
html = GetHtml.PostUtf8(url, data);
|
||||
|
||||
+79
-57
@@ -30,17 +30,20 @@ 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();
|
||||
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
|
||||
this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.btnStart = new DevComponents.DotNetBar.PanelEx();
|
||||
this.btnSearch = new DevComponents.DotNetBar.PanelEx();
|
||||
this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.txtSubAccount = new System.Windows.Forms.TextBox();
|
||||
this.lblSubAccount = new System.Windows.Forms.Label();
|
||||
this.btnSearchShop = new DevComponents.DotNetBar.PanelEx();
|
||||
this.btnEmpty = new DevComponents.DotNetBar.PanelEx();
|
||||
this.btnRefreshShop = new DevComponents.DotNetBar.PanelEx();
|
||||
this.txtNotes = new System.Windows.Forms.TextBox();
|
||||
@@ -89,7 +92,6 @@ 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();
|
||||
@@ -206,6 +208,8 @@ 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.txtSubAccount);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.lblSubAccount);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.btnSearchShop);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.btnEmpty);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop);
|
||||
@@ -222,6 +226,46 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.ucGroupBoxEx1.TabStop = false;
|
||||
this.ucGroupBoxEx1.Text = "基础";
|
||||
//
|
||||
// txtSubAccount
|
||||
//
|
||||
this.txtSubAccount.Location = new System.Drawing.Point(191, 65);
|
||||
this.txtSubAccount.Name = "txtSubAccount";
|
||||
this.txtSubAccount.Size = new System.Drawing.Size(70, 23);
|
||||
this.txtSubAccount.TabIndex = 722;
|
||||
//
|
||||
// lblSubAccount
|
||||
//
|
||||
this.lblSubAccount.AutoSize = true;
|
||||
this.lblSubAccount.Location = new System.Drawing.Point(146, 68);
|
||||
this.lblSubAccount.Name = "lblSubAccount";
|
||||
this.lblSubAccount.Size = new System.Drawing.Size(56, 17);
|
||||
this.lblSubAccount.TabIndex = 721;
|
||||
this.lblSubAccount.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);
|
||||
//
|
||||
// btnEmpty
|
||||
//
|
||||
this.btnEmpty.CanvasColor = System.Drawing.SystemColors.Control;
|
||||
@@ -274,7 +318,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
//
|
||||
this.txtNotes.Location = new System.Drawing.Point(75, 65);
|
||||
this.txtNotes.Name = "txtNotes";
|
||||
this.txtNotes.Size = new System.Drawing.Size(186, 23);
|
||||
this.txtNotes.Size = new System.Drawing.Size(70, 23);
|
||||
this.txtNotes.TabIndex = 388;
|
||||
//
|
||||
// label4
|
||||
@@ -390,19 +434,19 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
//
|
||||
this.dgvShop.AllowUserToAddRows = false;
|
||||
this.dgvShop.AllowUserToDeleteRows = false;
|
||||
dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
|
||||
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
|
||||
dataGridViewCellStyle7.BackColor = System.Drawing.Color.WhiteSmoke;
|
||||
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle7;
|
||||
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;
|
||||
dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
||||
dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control;
|
||||
dataGridViewCellStyle8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText;
|
||||
dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
||||
dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
||||
dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
|
||||
this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8;
|
||||
this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
||||
this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
|
||||
this.colSelect,
|
||||
@@ -540,19 +584,19 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
//
|
||||
this.dgvStock.AllowUserToAddRows = false;
|
||||
this.dgvStock.AllowUserToDeleteRows = false;
|
||||
dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke;
|
||||
this.dgvStock.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3;
|
||||
dataGridViewCellStyle9.BackColor = System.Drawing.Color.WhiteSmoke;
|
||||
this.dgvStock.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle9;
|
||||
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)))));
|
||||
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;
|
||||
dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
||||
dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control;
|
||||
dataGridViewCellStyle10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText;
|
||||
dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
||||
dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
||||
dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
|
||||
this.dgvStock.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle10;
|
||||
this.dgvStock.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
||||
this.dgvStock.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
|
||||
this.colUpId,
|
||||
@@ -664,8 +708,8 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
//
|
||||
// colProdName
|
||||
//
|
||||
dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colProdName.DefaultCellStyle = dataGridViewCellStyle5;
|
||||
dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colProdName.DefaultCellStyle = dataGridViewCellStyle11;
|
||||
this.colProdName.HeaderText = "标题";
|
||||
this.colProdName.Name = "colProdName";
|
||||
this.colProdName.ReadOnly = true;
|
||||
@@ -687,8 +731,8 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
//
|
||||
// colCreateTime
|
||||
//
|
||||
dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colCreateTime.DefaultCellStyle = dataGridViewCellStyle6;
|
||||
dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colCreateTime.DefaultCellStyle = dataGridViewCellStyle12;
|
||||
this.colCreateTime.HeaderText = "备货单创建时间";
|
||||
this.colCreateTime.Name = "colCreateTime";
|
||||
this.colCreateTime.ReadOnly = true;
|
||||
@@ -817,30 +861,6 @@ 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;
|
||||
@@ -899,7 +919,6 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
private UserControls.UcSplitPage ucSplitPage1;
|
||||
private System.Windows.Forms.PictureBox pbShopLoading;
|
||||
private System.Windows.Forms.TextBox txtNotes;
|
||||
private System.Windows.Forms.Label label4;
|
||||
private System.Windows.Forms.TextBox txtShopName;
|
||||
private System.Windows.Forms.TextBox txtShopId;
|
||||
private System.Windows.Forms.Label label2;
|
||||
@@ -938,5 +957,8 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
private DevComponents.DotNetBar.PanelEx pnlMsg;
|
||||
private System.Windows.Forms.Label lblMsg;
|
||||
private DevComponents.DotNetBar.PanelEx btnSearchShop;
|
||||
private System.Windows.Forms.TextBox txtSubAccount;
|
||||
private System.Windows.Forms.Label lblSubAccount;
|
||||
private System.Windows.Forms.Label label4;
|
||||
}
|
||||
}
|
||||
@@ -43,7 +43,14 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
private void JoinDeliveryFrom_Load(object sender, EventArgs e)
|
||||
{
|
||||
ucSplitPage1.Visible = IsAdmin;
|
||||
btnRefreshShop.Visible = IsAdmin;
|
||||
btnRefreshShop.Visible = !IsAdmin;
|
||||
if (BaseClass.GroupId != 3 || IsAdmin)
|
||||
{
|
||||
this.txtSubAccount.Visible = false;
|
||||
this.lblSubAccount.Visible = false;
|
||||
this.txtNotes.Width = txtShopName.Width;
|
||||
}
|
||||
|
||||
dgvShop.AddSelectorColumn("colSelect");
|
||||
dgvStock.AddSelectorColumn("colCheck");
|
||||
dgvStock.AddImgColumn("colProductSkcPic", "colImgUrl");
|
||||
@@ -59,12 +66,14 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.txtShopName.Text = joinDeliveryConfig.SearchShopName;
|
||||
this.txtRetryInterval.Text = Math.Max(1, joinDeliveryConfig.RetryInterval).ParseToString();
|
||||
this.chkSearchAllShop.Checked = joinDeliveryConfig.SearchAllShop;
|
||||
this.txtSubAccount.Text = joinDeliveryConfig.SearchSubAccount;
|
||||
|
||||
this.txtNotes.TextChanged += Txt_TextChanged;
|
||||
this.txtShopId.TextChanged += Txt_TextChanged;
|
||||
this.txtShopName.TextChanged += Txt_TextChanged;
|
||||
this.txtRetryInterval.TextChanged += Txt_TextChanged;
|
||||
this.chkSearchAllShop.CheckedChanged += Txt_TextChanged;
|
||||
this.txtSubAccount.TextChanged += Txt_TextChanged;
|
||||
}
|
||||
|
||||
private void Txt_TextChanged(object sender, EventArgs e)
|
||||
@@ -74,6 +83,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
joinDeliveryConfig.SearchShopName = this.txtShopName.Text.Trim();
|
||||
joinDeliveryConfig.RetryInterval = Math.Max(1, this.txtRetryInterval.Text.Trim().ParseToInt());
|
||||
joinDeliveryConfig.SearchAllShop = this.chkSearchAllShop.Checked;
|
||||
joinDeliveryConfig.SearchSubAccount = this.txtSubAccount.Text.Trim();
|
||||
|
||||
if (IsAdmin)
|
||||
NaiBa.Util.Helper.ConfigHelper.SaveConfig("admin_join_delivery_config", joinDeliveryConfig);
|
||||
@@ -179,6 +189,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
"&page_size=" + pageSize +
|
||||
"&shop_ids=" + txtShopId.Text.Trim().Trim(',') +
|
||||
"&shop_names=" + txtShopName.Text.Trim().Trim(',') +
|
||||
"&shop_names=" + txtShopName.Text.Trim().Trim(',') +
|
||||
"&search_notes=" + txtNotes.Text.Trim().Trim(',');
|
||||
//if (BaseClass.SaLevel > 1 && !chkSearchAllShop.Checked)
|
||||
// data += "&operate_sub_sa_name=" + BaseClass.UserName;
|
||||
@@ -246,7 +257,14 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
}
|
||||
if (!string.IsNullOrWhiteSpace(txtNotes.Text.Trim()))
|
||||
{
|
||||
shopLst = shopLst.Where(s => ("," + txtNotes.Text.Trim() + ",").Contains("," + s.Notes + ",") || s.Notes.ToLower().Contains(txtNotes.Text.Trim().ToLower())).ToList();
|
||||
shopLst = shopLst.Where(s => ("," + txtNotes.Text.Trim().ToLower() + ",").Contains("," + s.Notes.ToLower() + ",") || s.Notes.ToLower().Contains(txtNotes.Text.Trim().ToLower())).ToList();
|
||||
}
|
||||
if (BaseClass.GroupId == 3 && !IsAdmin)
|
||||
{
|
||||
if (!string.IsNullOrWhiteSpace(txtSubAccount.Text.Trim()))
|
||||
{
|
||||
shopLst = shopLst.Where(s => ("," + txtSubAccount.Text.Trim() + ",").Contains("," + s.SubUserName + ",") || s.SubUserName.Contains(txtSubAccount.Text.Trim())).ToList();
|
||||
}
|
||||
}
|
||||
|
||||
// 获取被删除的店铺
|
||||
@@ -304,6 +322,8 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
private void btnEmpty_Click(object sender, EventArgs e)
|
||||
{
|
||||
txtNotes.Text = txtShopId.Text = txtShopName.Text = "";
|
||||
txtSubAccount.Text = "";
|
||||
FiltShop();
|
||||
}
|
||||
|
||||
private void btnSearch_Click(object sender, EventArgs e)
|
||||
@@ -877,6 +897,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
public string SearchShopId { get; set; } = "";
|
||||
public string SearchShopName { get; set; } = "";
|
||||
public string SearchNotes { get; set; } = "";
|
||||
public string SearchSubAccount { get; set; } = "";
|
||||
/// <summary>
|
||||
/// 重试加入发货台的时间间隔
|
||||
/// </summary>
|
||||
|
||||
+47
-25
@@ -30,10 +30,10 @@ 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();
|
||||
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
|
||||
this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.txtScale1 = new System.Windows.Forms.TextBox();
|
||||
@@ -87,6 +87,8 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
|
||||
this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
|
||||
this.btnClear = new DevComponents.DotNetBar.PanelEx();
|
||||
this.txtSubAccount = new System.Windows.Forms.TextBox();
|
||||
this.lblSubAccount = new System.Windows.Forms.Label();
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
|
||||
this.splitContainer1.Panel1.SuspendLayout();
|
||||
this.splitContainer1.Panel2.SuspendLayout();
|
||||
@@ -247,6 +249,8 @@ 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.txtSubAccount);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.lblSubAccount);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.btnSearchShop);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.btnEmpty);
|
||||
@@ -339,7 +343,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
//
|
||||
this.txtNotes.Location = new System.Drawing.Point(75, 65);
|
||||
this.txtNotes.Name = "txtNotes";
|
||||
this.txtNotes.Size = new System.Drawing.Size(186, 23);
|
||||
this.txtNotes.Size = new System.Drawing.Size(70, 23);
|
||||
this.txtNotes.TabIndex = 713;
|
||||
//
|
||||
// label14
|
||||
@@ -440,19 +444,19 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
//
|
||||
this.dgvShop.AllowUserToAddRows = false;
|
||||
this.dgvShop.AllowUserToDeleteRows = false;
|
||||
dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
|
||||
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
|
||||
dataGridViewCellStyle5.BackColor = System.Drawing.Color.WhiteSmoke;
|
||||
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5;
|
||||
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;
|
||||
dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
||||
dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control;
|
||||
dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText;
|
||||
dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
||||
dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
||||
dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
|
||||
this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6;
|
||||
this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
||||
this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
|
||||
this.colSelect,
|
||||
@@ -554,19 +558,19 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
//
|
||||
this.dgvAdjust.AllowUserToAddRows = false;
|
||||
this.dgvAdjust.AllowUserToDeleteRows = false;
|
||||
dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke;
|
||||
this.dgvAdjust.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3;
|
||||
dataGridViewCellStyle7.BackColor = System.Drawing.Color.WhiteSmoke;
|
||||
this.dgvAdjust.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle7;
|
||||
this.dgvAdjust.AutoRowNumber = true;
|
||||
this.dgvAdjust.BackgroundColor = System.Drawing.Color.White;
|
||||
this.dgvAdjust.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
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.dgvAdjust.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
|
||||
dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
||||
dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control;
|
||||
dataGridViewCellStyle8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText;
|
||||
dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
||||
dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
||||
dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
|
||||
this.dgvAdjust.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8;
|
||||
this.dgvAdjust.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
||||
this.dgvAdjust.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
|
||||
this.colCheck,
|
||||
@@ -804,6 +808,22 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.btnClear.Text = "清空结果";
|
||||
this.btnClear.Visible = false;
|
||||
//
|
||||
// txtSubAccount
|
||||
//
|
||||
this.txtSubAccount.Location = new System.Drawing.Point(191, 65);
|
||||
this.txtSubAccount.Name = "txtSubAccount";
|
||||
this.txtSubAccount.Size = new System.Drawing.Size(70, 23);
|
||||
this.txtSubAccount.TabIndex = 747;
|
||||
//
|
||||
// lblSubAccount
|
||||
//
|
||||
this.lblSubAccount.AutoSize = true;
|
||||
this.lblSubAccount.Location = new System.Drawing.Point(146, 68);
|
||||
this.lblSubAccount.Name = "lblSubAccount";
|
||||
this.lblSubAccount.Size = new System.Drawing.Size(56, 17);
|
||||
this.lblSubAccount.TabIndex = 748;
|
||||
this.lblSubAccount.Text = "子账号:";
|
||||
//
|
||||
// PriceManageForm
|
||||
//
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
|
||||
@@ -900,5 +920,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
private System.Windows.Forms.Label label22;
|
||||
private DevComponents.DotNetBar.PanelEx btnSearchShop;
|
||||
private System.Windows.Forms.PictureBox pbShopLoading;
|
||||
private System.Windows.Forms.TextBox txtSubAccount;
|
||||
private System.Windows.Forms.Label lblSubAccount;
|
||||
}
|
||||
}
|
||||
@@ -40,6 +40,13 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
chkSelectAll.CheckedChanged += chkSelectAll_CheckedChanged;
|
||||
|
||||
this.dgvAdjust.AddSelectorColumn("colCheck");
|
||||
|
||||
if (BaseClass.GroupId != 3)
|
||||
{
|
||||
this.txtSubAccount.Visible = false;
|
||||
this.lblSubAccount.Visible = false;
|
||||
this.txtNotes.Width = txtShopName.Width;
|
||||
}
|
||||
}
|
||||
|
||||
private void chkSelectAll_CheckedChanged(object sender, EventArgs e)
|
||||
@@ -105,6 +112,13 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
{
|
||||
shopLst = shopLst.Where(s => ("," + txtNotes.Text.Trim() + ",").Contains("," + s.Notes + ",") || s.Notes.ToLower().Contains(txtNotes.Text.Trim().ToLower())).ToList();
|
||||
}
|
||||
if (BaseClass.GroupId == 3)
|
||||
{
|
||||
if (!string.IsNullOrWhiteSpace(txtSubAccount.Text.Trim()))
|
||||
{
|
||||
shopLst = shopLst.Where(s => ("," + txtSubAccount.Text.Trim() + ",").Contains("," + s.SubUserName + ",") || s.SubUserName.Contains(txtSubAccount.Text.Trim())).ToList();
|
||||
}
|
||||
}
|
||||
|
||||
// 获取被删除的店铺
|
||||
List<DataGridViewRow> dgvRowList = dgvShop.Rows.Cast<DataGridViewRow>().Where(row
|
||||
@@ -733,6 +747,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
private void btnEmpty_Click(object sender, EventArgs e)
|
||||
{
|
||||
txtNotes.Text = txtShopId.Text = txtShopName.Text = "";
|
||||
txtSubAccount.Text = "";
|
||||
FiltShop();
|
||||
}
|
||||
}
|
||||
|
||||
+50
-28
@@ -30,11 +30,11 @@ 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();
|
||||
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
|
||||
this.ucGroupBoxEx4 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.txtMaxQualityRate = new System.Windows.Forms.TextBox();
|
||||
@@ -127,6 +127,8 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
|
||||
this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
|
||||
this.btnClear = new DevComponents.DotNetBar.PanelEx();
|
||||
this.txtSubAccount = new System.Windows.Forms.TextBox();
|
||||
this.lblSubAccount = new System.Windows.Forms.Label();
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
|
||||
this.splitContainer1.Panel1.SuspendLayout();
|
||||
this.splitContainer1.Panel2.SuspendLayout();
|
||||
@@ -636,6 +638,8 @@ 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.txtSubAccount);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.lblSubAccount);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.pnlSearchShop);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.btnEmpty);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop);
|
||||
@@ -728,7 +732,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
//
|
||||
this.txtNotes.Location = new System.Drawing.Point(75, 65);
|
||||
this.txtNotes.Name = "txtNotes";
|
||||
this.txtNotes.Size = new System.Drawing.Size(186, 23);
|
||||
this.txtNotes.Size = new System.Drawing.Size(70, 23);
|
||||
this.txtNotes.TabIndex = 507;
|
||||
//
|
||||
// label14
|
||||
@@ -927,19 +931,19 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
//
|
||||
this.dgvShop.AllowUserToAddRows = false;
|
||||
this.dgvShop.AllowUserToDeleteRows = false;
|
||||
dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
|
||||
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
|
||||
dataGridViewCellStyle6.BackColor = System.Drawing.Color.WhiteSmoke;
|
||||
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6;
|
||||
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;
|
||||
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;
|
||||
this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
||||
this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
|
||||
this.colSelect,
|
||||
@@ -1042,19 +1046,19 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
//
|
||||
this.dgvStock.AllowUserToAddRows = false;
|
||||
this.dgvStock.AllowUserToDeleteRows = false;
|
||||
dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke;
|
||||
this.dgvStock.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3;
|
||||
dataGridViewCellStyle8.BackColor = System.Drawing.Color.WhiteSmoke;
|
||||
this.dgvStock.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle8;
|
||||
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)))));
|
||||
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;
|
||||
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;
|
||||
this.dgvStock.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
||||
this.dgvStock.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
|
||||
this.colUpId,
|
||||
@@ -1176,8 +1180,8 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
//
|
||||
// colProdName
|
||||
//
|
||||
dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colProdName.DefaultCellStyle = dataGridViewCellStyle5;
|
||||
dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colProdName.DefaultCellStyle = dataGridViewCellStyle10;
|
||||
this.colProdName.HeaderText = "标题";
|
||||
this.colProdName.Name = "colProdName";
|
||||
this.colProdName.ReadOnly = true;
|
||||
@@ -1360,6 +1364,22 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.btnClear.Text = "清空结果";
|
||||
this.btnClear.Visible = false;
|
||||
//
|
||||
// txtSubAccount
|
||||
//
|
||||
this.txtSubAccount.Location = new System.Drawing.Point(191, 65);
|
||||
this.txtSubAccount.Name = "txtSubAccount";
|
||||
this.txtSubAccount.Size = new System.Drawing.Size(70, 23);
|
||||
this.txtSubAccount.TabIndex = 747;
|
||||
//
|
||||
// lblSubAccount
|
||||
//
|
||||
this.lblSubAccount.AutoSize = true;
|
||||
this.lblSubAccount.Location = new System.Drawing.Point(146, 68);
|
||||
this.lblSubAccount.Name = "lblSubAccount";
|
||||
this.lblSubAccount.Size = new System.Drawing.Size(56, 17);
|
||||
this.lblSubAccount.TabIndex = 748;
|
||||
this.lblSubAccount.Text = "子账号:";
|
||||
//
|
||||
// SaleStockUpForm
|
||||
//
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
|
||||
@@ -1499,5 +1519,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
private DevComponents.DotNetBar.PanelEx pnlSearchShop;
|
||||
private System.Windows.Forms.PictureBox pbShopLoading;
|
||||
private System.Windows.Forms.PictureBox pbLoading;
|
||||
private System.Windows.Forms.TextBox txtSubAccount;
|
||||
private System.Windows.Forms.Label lblSubAccount;
|
||||
}
|
||||
}
|
||||
@@ -56,6 +56,13 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
chkSelectAll.CheckedChanged += chkSelectAll_CheckedChanged;
|
||||
|
||||
this.dgvStock.AddSelectorColumn("colCheck");
|
||||
|
||||
if (BaseClass.GroupId != 3)
|
||||
{
|
||||
this.txtSubAccount.Visible = false;
|
||||
this.lblSubAccount.Visible = false;
|
||||
this.txtNotes.Width = txtShopName.Width;
|
||||
}
|
||||
}
|
||||
|
||||
private void chkSelectAll_CheckedChanged(object sender, EventArgs e)
|
||||
@@ -122,6 +129,13 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
{
|
||||
shopLst = shopLst.Where(s => ("," + txtNotes.Text.Trim() + ",").Contains("," + s.Notes + ",") || s.Notes.ToLower().Contains(txtNotes.Text.Trim().ToLower())).ToList();
|
||||
}
|
||||
if (BaseClass.GroupId == 3)
|
||||
{
|
||||
if (!string.IsNullOrWhiteSpace(txtSubAccount.Text.Trim()))
|
||||
{
|
||||
shopLst = shopLst.Where(s => ("," + txtSubAccount.Text.Trim() + ",").Contains("," + s.SubUserName + ",") || s.SubUserName.Contains(txtSubAccount.Text.Trim())).ToList();
|
||||
}
|
||||
}
|
||||
|
||||
// 获取被删除的店铺
|
||||
List<DataGridViewRow> dgvRowList = dgvShop.Rows.Cast<DataGridViewRow>().Where(row
|
||||
@@ -1376,6 +1390,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
private void btnEmpty_Click(object sender, EventArgs e)
|
||||
{
|
||||
txtNotes.Text = txtShopId.Text = txtShopName.Text = "";
|
||||
txtSubAccount.Text = "";
|
||||
FiltShop();
|
||||
}
|
||||
}
|
||||
|
||||
+23
-1
@@ -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.txtSubAccount = new System.Windows.Forms.TextBox();
|
||||
this.btnSearchShop = new DevComponents.DotNetBar.PanelEx();
|
||||
this.btnEmpty = new DevComponents.DotNetBar.PanelEx();
|
||||
this.txtNotes = new System.Windows.Forms.TextBox();
|
||||
@@ -80,6 +81,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.label8 = new System.Windows.Forms.Label();
|
||||
this.txtShopId = new System.Windows.Forms.TextBox();
|
||||
this.label7 = new System.Windows.Forms.Label();
|
||||
this.lblSubAccount = 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();
|
||||
@@ -627,6 +629,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.txtSubAccount);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.btnSearchShop);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.btnEmpty);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.txtNotes);
|
||||
@@ -637,6 +640,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.ucGroupBoxEx1.Controls.Add(this.label8);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.txtShopId);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.label7);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.lblSubAccount);
|
||||
this.ucGroupBoxEx1.Location = new System.Drawing.Point(2, 2);
|
||||
this.ucGroupBoxEx1.Name = "ucGroupBoxEx1";
|
||||
this.ucGroupBoxEx1.Size = new System.Drawing.Size(280, 120);
|
||||
@@ -644,6 +648,13 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.ucGroupBoxEx1.TabStop = false;
|
||||
this.ucGroupBoxEx1.Text = "基础";
|
||||
//
|
||||
// txtSubAccount
|
||||
//
|
||||
this.txtSubAccount.Location = new System.Drawing.Point(191, 65);
|
||||
this.txtSubAccount.Name = "txtSubAccount";
|
||||
this.txtSubAccount.Size = new System.Drawing.Size(70, 23);
|
||||
this.txtSubAccount.TabIndex = 711;
|
||||
//
|
||||
// btnSearchShop
|
||||
//
|
||||
this.btnSearchShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
@@ -696,7 +707,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
//
|
||||
this.txtNotes.Location = new System.Drawing.Point(75, 65);
|
||||
this.txtNotes.Name = "txtNotes";
|
||||
this.txtNotes.Size = new System.Drawing.Size(186, 23);
|
||||
this.txtNotes.Size = new System.Drawing.Size(70, 23);
|
||||
this.txtNotes.TabIndex = 501;
|
||||
//
|
||||
// btnCheckAdsLogin
|
||||
@@ -788,6 +799,15 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.label7.TabIndex = 498;
|
||||
this.label7.Text = "店铺ID:";
|
||||
//
|
||||
// lblSubAccount
|
||||
//
|
||||
this.lblSubAccount.AutoSize = true;
|
||||
this.lblSubAccount.Location = new System.Drawing.Point(146, 68);
|
||||
this.lblSubAccount.Name = "lblSubAccount";
|
||||
this.lblSubAccount.Size = new System.Drawing.Size(56, 17);
|
||||
this.lblSubAccount.TabIndex = 712;
|
||||
this.lblSubAccount.Text = "子账号:";
|
||||
//
|
||||
// splitContainer3
|
||||
//
|
||||
this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
@@ -1676,5 +1696,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
private System.Windows.Forms.TextBox txtShopId;
|
||||
private DevComponents.DotNetBar.PanelEx btnEmpty;
|
||||
private DevComponents.DotNetBar.PanelEx btnSearchShop;
|
||||
private System.Windows.Forms.TextBox txtSubAccount;
|
||||
private System.Windows.Forms.Label lblSubAccount;
|
||||
}
|
||||
}
|
||||
@@ -57,9 +57,15 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
dgvAds.AddImgColumn("colImg", "colImgUrl");
|
||||
chkCalculateRoas.Checked = true;
|
||||
|
||||
|
||||
this.dgvAds.AddMergeColumnHeader(new List<string>() { "colWantROAS", "colChangeROAS" }, "目标ROAS");
|
||||
this.dgvAds.AddMergeColumn(new List<string>() { "colWantROAS", "colChangeROAS" });
|
||||
|
||||
if (BaseClass.GroupId != 3)
|
||||
{
|
||||
this.txtSubAccount.Visible = false;
|
||||
this.lblSubAccount.Visible = false;
|
||||
this.txtNotes.Width = txtShopName.Width;
|
||||
}
|
||||
}
|
||||
|
||||
private void chkSelectAll_CheckedChanged(object sender, EventArgs e)
|
||||
@@ -124,7 +130,14 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
}
|
||||
if (!string.IsNullOrWhiteSpace(txtNotes.Text.Trim()))
|
||||
{
|
||||
shopLst = shopLst.Where(s => ("," + txtNotes.Text.Trim() + ",").Contains("," + s.Notes + ",") || s.Notes.ToLower().Contains(txtNotes.Text.Trim().ToLower())).ToList();
|
||||
shopLst = shopLst.Where(s => ("," + txtNotes.Text.Trim().ToLower() + ",").Contains("," + s.Notes.ToLower() + ",") || s.Notes.ToLower().Contains(txtNotes.Text.Trim().ToLower())).ToList();
|
||||
}
|
||||
if (BaseClass.GroupId == 3)
|
||||
{
|
||||
if (!string.IsNullOrWhiteSpace(txtSubAccount.Text.Trim()))
|
||||
{
|
||||
shopLst = shopLst.Where(s => ("," + txtSubAccount.Text.Trim() + ",").Contains("," + s.SubUserName + ",") || s.SubUserName.Contains(txtSubAccount.Text.Trim())).ToList();
|
||||
}
|
||||
}
|
||||
|
||||
// 获取被删除的店铺
|
||||
@@ -2416,6 +2429,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
private void btnEmpty_Click(object sender, EventArgs e)
|
||||
{
|
||||
txtNotes.Text = txtShopId.Text = txtShopName.Text = "";
|
||||
txtSubAccount.Text = "";
|
||||
FiltShop();
|
||||
}
|
||||
|
||||
|
||||
@@ -336,16 +336,16 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
pageCount = 1;
|
||||
|
||||
var url = BaseClass.BuildObjString("shop/admin_get_shop_list");
|
||||
if (BaseClass.SaLevel > 1 && !chkSearchAllShop.Checked)
|
||||
url = BaseClass.BuildObjString("shop/sub_sa_get_select_prod_shop");
|
||||
//if (BaseClass.SaLevel > 1 && !chkSearchAllShop.Checked)
|
||||
// url = BaseClass.BuildObjString("shop/sub_sa_get_select_prod_shop");
|
||||
var data = UserLogin.GetSignaturex() +
|
||||
"&page=" + page +
|
||||
"&page_size=" + pageSize +
|
||||
"&shop_ids=" + txtShopId.Text.Trim().Trim(',') +
|
||||
"&shop_names=" + txtShopName.Text.Trim().Trim(',') +
|
||||
"&search_notes=" + txtNotes.Text.Trim().Trim(',');
|
||||
if (BaseClass.SaLevel > 1 && !chkSearchAllShop.Checked)
|
||||
data += "&operate_sub_sa_name=" + BaseClass.UserName;
|
||||
//if (BaseClass.SaLevel > 1 && !chkSearchAllShop.Checked)
|
||||
// data += "&operate_sub_sa_name=" + BaseClass.UserName;
|
||||
var html = GetHtml.PostUtf8(url, data);
|
||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||
html = GetHtml.PostUtf8(url, data);
|
||||
|
||||
@@ -512,15 +512,6 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
"&shop_account=" + selectShop.ShopAccount;
|
||||
data += "&main_user_name=" + selectShop.UserName;
|
||||
data += "&sub_user_name=" + selectShop.SubUserName;
|
||||
//if (!isDbToDb)
|
||||
//{
|
||||
// data += "&main_user_name=" + selectShop.UserName;
|
||||
// data += "&sub_user_name=" + selectShop.SubUserName;
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
// data += "&main_user_name=" + BaseClass.UserName;
|
||||
//}
|
||||
if (!isDbToDb) // 数据直传不消耗次数,不计算认领次数
|
||||
data += "&add_product_remaining=" + selectShop.AddProductRemaining;
|
||||
data += "&add_fission_product_name=" + GetHtml.UrlEncodeUtf8(fissionProductName) +
|
||||
|
||||
+59
-37
@@ -39,6 +39,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MarketingActivityForm));
|
||||
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
|
||||
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.label14 = new System.Windows.Forms.Label();
|
||||
@@ -72,6 +73,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
this.label5 = 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 TemuKJD.UserComponent.UcDataGridViewCheckBoxColumn(this.components);
|
||||
this.colShopLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
@@ -117,8 +119,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.btnSearchShop = new DevComponents.DotNetBar.PanelEx();
|
||||
this.pbShopLoading = new System.Windows.Forms.PictureBox();
|
||||
this.txtSubAccount = new System.Windows.Forms.TextBox();
|
||||
this.lblSubAccount = new System.Windows.Forms.Label();
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
|
||||
this.splitContainer1.Panel1.SuspendLayout();
|
||||
this.splitContainer1.Panel2.SuspendLayout();
|
||||
@@ -138,6 +140,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
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.splitContainer5)).BeginInit();
|
||||
this.splitContainer5.Panel1.SuspendLayout();
|
||||
@@ -150,7 +153,6 @@ namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
this.splitContainer4.Panel2.SuspendLayout();
|
||||
this.splitContainer4.SuspendLayout();
|
||||
this.panel1.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pbShopLoading)).BeginInit();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// splitContainer1
|
||||
@@ -180,6 +182,8 @@ 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.txtSubAccount);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.lblSubAccount);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.btnSearchShop);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.btnEmpty);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.txtNotes);
|
||||
@@ -196,6 +200,30 @@ namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
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 = 735;
|
||||
this.btnSearchShop.Text = "查询店铺";
|
||||
this.btnSearchShop.Click += new System.EventHandler(this.btnSearchShop_Click);
|
||||
//
|
||||
// btnEmpty
|
||||
//
|
||||
this.btnEmpty.CanvasColor = System.Drawing.SystemColors.Control;
|
||||
@@ -224,7 +252,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
//
|
||||
this.txtNotes.Location = new System.Drawing.Point(75, 65);
|
||||
this.txtNotes.Name = "txtNotes";
|
||||
this.txtNotes.Size = new System.Drawing.Size(186, 23);
|
||||
this.txtNotes.Size = new System.Drawing.Size(70, 23);
|
||||
this.txtNotes.TabIndex = 723;
|
||||
//
|
||||
// label14
|
||||
@@ -653,6 +681,18 @@ namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
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, 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;
|
||||
//
|
||||
// dgvShop
|
||||
//
|
||||
this.dgvShop.AllowUserToAddRows = false;
|
||||
@@ -1165,41 +1205,21 @@ namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
this.panel1.Size = new System.Drawing.Size(1438, 566);
|
||||
this.panel1.TabIndex = 12;
|
||||
//
|
||||
// btnSearchShop
|
||||
// txtSubAccount
|
||||
//
|
||||
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);
|
||||
this.txtSubAccount.Location = new System.Drawing.Point(191, 65);
|
||||
this.txtSubAccount.Name = "txtSubAccount";
|
||||
this.txtSubAccount.Size = new System.Drawing.Size(70, 23);
|
||||
this.txtSubAccount.TabIndex = 745;
|
||||
//
|
||||
// pbShopLoading
|
||||
// lblSubAccount
|
||||
//
|
||||
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;
|
||||
this.lblSubAccount.AutoSize = true;
|
||||
this.lblSubAccount.Location = new System.Drawing.Point(146, 68);
|
||||
this.lblSubAccount.Name = "lblSubAccount";
|
||||
this.lblSubAccount.Size = new System.Drawing.Size(56, 17);
|
||||
this.lblSubAccount.TabIndex = 746;
|
||||
this.lblSubAccount.Text = "子账号:";
|
||||
//
|
||||
// MarketingActivityForm
|
||||
//
|
||||
@@ -1240,6 +1260,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
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.splitContainer5.Panel1.ResumeLayout(false);
|
||||
this.splitContainer5.Panel1.PerformLayout();
|
||||
@@ -1253,7 +1274,6 @@ 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);
|
||||
|
||||
}
|
||||
@@ -1342,5 +1362,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colMessage;
|
||||
private DevComponents.DotNetBar.PanelEx btnSearchShop;
|
||||
private System.Windows.Forms.PictureBox pbShopLoading;
|
||||
private System.Windows.Forms.TextBox txtSubAccount;
|
||||
private System.Windows.Forms.Label lblSubAccount;
|
||||
}
|
||||
}
|
||||
@@ -88,6 +88,13 @@ namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
this.actDiscount70.chkSignActivity.CheckedChanged += ChkSignActivity_CheckedChanged;
|
||||
this.actDiscount80.chkSignActivity.CheckedChanged += ChkSignActivity_CheckedChanged;
|
||||
this.actDiscount85.chkSignActivity.CheckedChanged += ChkSignActivity_CheckedChanged;
|
||||
|
||||
if (BaseClass.GroupId != 3)
|
||||
{
|
||||
this.txtSubAccount.Visible = false;
|
||||
this.lblSubAccount.Visible = false;
|
||||
this.txtNotes.Width = txtShopName.Width;
|
||||
}
|
||||
}
|
||||
|
||||
private void ChkSignActivity_CheckedChanged(object sender, EventArgs e)
|
||||
@@ -195,6 +202,13 @@ namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
{
|
||||
shopLst = shopLst.Where(s => ("," + txtNotes.Text.Trim() + ",").Contains("," + s.Notes + ",") || s.Notes.ToLower().Contains(txtNotes.Text.Trim().ToLower())).ToList();
|
||||
}
|
||||
if (BaseClass.GroupId == 3)
|
||||
{
|
||||
if (!string.IsNullOrWhiteSpace(txtSubAccount.Text.Trim()))
|
||||
{
|
||||
shopLst = shopLst.Where(s => ("," + txtSubAccount.Text.Trim() + ",").Contains("," + s.SubUserName + ",") || s.SubUserName.Contains(txtSubAccount.Text.Trim())).ToList();
|
||||
}
|
||||
}
|
||||
|
||||
// 获取被删除的店铺
|
||||
List<DataGridViewRow> dgvRowList = dgvShop.Rows.Cast<DataGridViewRow>().Where(row
|
||||
@@ -215,6 +229,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
private void btnEmpty_Click(object sender, EventArgs e)
|
||||
{
|
||||
txtNotes.Text = txtShopId.Text = txtShopName.Text = "";
|
||||
txtSubAccount.Text = "";
|
||||
FiltShop();
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user