店铺统计筛选功能优化
This commit is contained in:
1 parent
4e862cfb5c
commit
2dece676c1
5 files changed
+276
-231
No files matched your search
+44
-15
@@ -122,6 +122,8 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
this.colPendingAmount = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colDepositBalance = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
|
||||
this.cmbFilterShopGroup = new TemuKJD.UserComponent.UcComboBoxMutiSelect();
|
||||
this.label23 = new System.Windows.Forms.Label();
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
|
||||
this.splitContainer1.Panel1.SuspendLayout();
|
||||
this.splitContainer1.Panel2.SuspendLayout();
|
||||
@@ -166,6 +168,8 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.ucGroupBoxEx3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.ucGroupBoxEx3.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
|
||||
this.ucGroupBoxEx3.Controls.Add(this.cmbFilterShopGroup);
|
||||
this.ucGroupBoxEx3.Controls.Add(this.label23);
|
||||
this.ucGroupBoxEx3.Controls.Add(this.cmbFilterShopNotes);
|
||||
this.ucGroupBoxEx3.Controls.Add(this.label18);
|
||||
this.ucGroupBoxEx3.Controls.Add(this.txtFilterShopName);
|
||||
@@ -189,16 +193,16 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
this.cmbFilterShopNotes.DropDownWidth = 1;
|
||||
this.cmbFilterShopNotes.FormattingEnabled = true;
|
||||
this.cmbFilterShopNotes.IntegralHeight = false;
|
||||
this.cmbFilterShopNotes.Location = new System.Drawing.Point(47, 49);
|
||||
this.cmbFilterShopNotes.Location = new System.Drawing.Point(42, 49);
|
||||
this.cmbFilterShopNotes.Name = "cmbFilterShopNotes";
|
||||
this.cmbFilterShopNotes.Size = new System.Drawing.Size(130, 25);
|
||||
this.cmbFilterShopNotes.Size = new System.Drawing.Size(141, 25);
|
||||
this.cmbFilterShopNotes.TabIndex = 831;
|
||||
this.cmbFilterShopNotes.Text = "全部";
|
||||
//
|
||||
// label18
|
||||
//
|
||||
this.label18.AutoSize = true;
|
||||
this.label18.Location = new System.Drawing.Point(16, 53);
|
||||
this.label18.Location = new System.Drawing.Point(9, 53);
|
||||
this.label18.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
|
||||
this.label18.Name = "label18";
|
||||
this.label18.Size = new System.Drawing.Size(32, 17);
|
||||
@@ -208,16 +212,16 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
// txtFilterShopName
|
||||
//
|
||||
this.txtFilterShopName.Font = new System.Drawing.Font("微软雅黑", 10F);
|
||||
this.txtFilterShopName.Location = new System.Drawing.Point(47, 21);
|
||||
this.txtFilterShopName.Location = new System.Drawing.Point(42, 21);
|
||||
this.txtFilterShopName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
|
||||
this.txtFilterShopName.Name = "txtFilterShopName";
|
||||
this.txtFilterShopName.Size = new System.Drawing.Size(130, 25);
|
||||
this.txtFilterShopName.Size = new System.Drawing.Size(141, 25);
|
||||
this.txtFilterShopName.TabIndex = 832;
|
||||
//
|
||||
// label19
|
||||
//
|
||||
this.label19.AutoSize = true;
|
||||
this.label19.Location = new System.Drawing.Point(16, 25);
|
||||
this.label19.Location = new System.Drawing.Point(9, 25);
|
||||
this.label19.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
|
||||
this.label19.Name = "label19";
|
||||
this.label19.Size = new System.Drawing.Size(32, 17);
|
||||
@@ -230,7 +234,7 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
this.btnClear.CanvasColor = System.Drawing.SystemColors.Control;
|
||||
this.btnClear.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnClear.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnClear.Location = new System.Drawing.Point(180, 49);
|
||||
this.btnClear.Location = new System.Drawing.Point(186, 49);
|
||||
this.btnClear.Name = "btnClear";
|
||||
this.btnClear.Size = new System.Drawing.Size(35, 25);
|
||||
this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
@@ -256,9 +260,9 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
this.btnGetSelect.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnGetSelect.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnGetSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnGetSelect.Location = new System.Drawing.Point(112, 108);
|
||||
this.btnGetSelect.Location = new System.Drawing.Point(164, 108);
|
||||
this.btnGetSelect.Name = "btnGetSelect";
|
||||
this.btnGetSelect.Size = new System.Drawing.Size(103, 23);
|
||||
this.btnGetSelect.Size = new System.Drawing.Size(57, 23);
|
||||
this.btnGetSelect.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnGetSelect.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnGetSelect.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
@@ -281,7 +285,7 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
this.btnFliter.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnFliter.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnFliter.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnFliter.Location = new System.Drawing.Point(180, 21);
|
||||
this.btnFliter.Location = new System.Drawing.Point(186, 21);
|
||||
this.btnFliter.Name = "btnFliter";
|
||||
this.btnFliter.Size = new System.Drawing.Size(35, 25);
|
||||
this.btnFliter.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
@@ -305,9 +309,9 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
this.btnSetColumn.CanvasColor = System.Drawing.SystemColors.Control;
|
||||
this.btnSetColumn.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnSetColumn.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnSetColumn.Location = new System.Drawing.Point(21, 108);
|
||||
this.btnSetColumn.Location = new System.Drawing.Point(9, 108);
|
||||
this.btnSetColumn.Name = "btnSetColumn";
|
||||
this.btnSetColumn.Size = new System.Drawing.Size(74, 23);
|
||||
this.btnSetColumn.Size = new System.Drawing.Size(56, 23);
|
||||
this.btnSetColumn.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnSetColumn.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
|
||||
this.btnSetColumn.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
|
||||
@@ -321,7 +325,7 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
this.btnSetColumn.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnSetColumn.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
|
||||
this.btnSetColumn.TabIndex = 801;
|
||||
this.btnSetColumn.Text = "设置表格列";
|
||||
this.btnSetColumn.Text = "设置表列";
|
||||
this.btnSetColumn.Click += new System.EventHandler(this.btnSetColumn_Click);
|
||||
//
|
||||
// btnGetNotGet
|
||||
@@ -331,9 +335,9 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
this.btnGetNotGet.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnGetNotGet.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnGetNotGet.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnGetNotGet.Location = new System.Drawing.Point(112, 82);
|
||||
this.btnGetNotGet.Location = new System.Drawing.Point(68, 108);
|
||||
this.btnGetNotGet.Name = "btnGetNotGet";
|
||||
this.btnGetNotGet.Size = new System.Drawing.Size(103, 23);
|
||||
this.btnGetNotGet.Size = new System.Drawing.Size(93, 23);
|
||||
this.btnGetNotGet.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnGetNotGet.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnGetNotGet.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
@@ -1254,6 +1258,29 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
this.statusBar.Size = new System.Drawing.Size(1235, 26);
|
||||
this.statusBar.TabIndex = 1;
|
||||
//
|
||||
// cmbFilterShopGroup
|
||||
//
|
||||
this.cmbFilterShopGroup.DefaultText = "全部";
|
||||
this.cmbFilterShopGroup.DropDownHeight = 1;
|
||||
this.cmbFilterShopGroup.DropDownWidth = 1;
|
||||
this.cmbFilterShopGroup.FormattingEnabled = true;
|
||||
this.cmbFilterShopGroup.IntegralHeight = false;
|
||||
this.cmbFilterShopGroup.Location = new System.Drawing.Point(42, 77);
|
||||
this.cmbFilterShopGroup.Name = "cmbFilterShopGroup";
|
||||
this.cmbFilterShopGroup.Size = new System.Drawing.Size(141, 25);
|
||||
this.cmbFilterShopGroup.TabIndex = 851;
|
||||
this.cmbFilterShopGroup.Text = "全部";
|
||||
//
|
||||
// label23
|
||||
//
|
||||
this.label23.AutoSize = true;
|
||||
this.label23.Location = new System.Drawing.Point(9, 81);
|
||||
this.label23.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
|
||||
this.label23.Name = "label23";
|
||||
this.label23.Size = new System.Drawing.Size(32, 17);
|
||||
this.label23.TabIndex = 852;
|
||||
this.label23.Text = "分组";
|
||||
//
|
||||
// WxShopStatisticsForm
|
||||
//
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
|
||||
@@ -1377,5 +1404,7 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colAvailableAmount;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colPendingAmount;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colDepositBalance;
|
||||
private UserComponent.UcComboBoxMutiSelect cmbFilterShopGroup;
|
||||
private System.Windows.Forms.Label label23;
|
||||
}
|
||||
}
|
||||
@@ -119,12 +119,17 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
}
|
||||
|
||||
cmbFilterShopNotes.Items.Clear();
|
||||
//cmbFilterShopNotes.Items.Add("");
|
||||
foreach (var note in GlobalConfig.ShopLoginList.Select(s => s.Notes).Where(s => !s.IsNullOrEmpty()).Distinct())
|
||||
{
|
||||
cmbFilterShopNotes.Items.Add(note);
|
||||
}
|
||||
|
||||
cmbFilterShopGroup.Items.Clear();
|
||||
foreach (var group in GlobalConfig.ShopLoginList.Select(s => s.GroupName).Where(s => !s.IsNullOrEmpty()).Distinct())
|
||||
{
|
||||
cmbFilterShopGroup.Items.Add(group);
|
||||
}
|
||||
|
||||
GetShopStatistics(GlobalConfig.ShopLoginList.ToList(), selectIds);
|
||||
}
|
||||
|
||||
@@ -775,6 +780,10 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
if (notes == "全部")
|
||||
notes = "";
|
||||
List<string> notesLst = notes.Split(new string[] { ";", ";", ",", "," }, StringSplitOptions.RemoveEmptyEntries).ToList();
|
||||
string group = cmbFilterShopGroup.Text.Trim().Trim(';');
|
||||
if (group == "全部")
|
||||
group = "";
|
||||
List<string> groupLst = group.Split(new string[] { ";", ";", ",", "," }, StringSplitOptions.RemoveEmptyEntries).ToList();
|
||||
|
||||
if (!row.Cells["colShopAccount"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim()))
|
||||
{
|
||||
@@ -788,6 +797,12 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
row.Cells["colSelect"].Value = false;
|
||||
continue;
|
||||
}
|
||||
if (!string.IsNullOrWhiteSpace(group) && !groupLst.Contains(row.Cells["colGroup"].Value.ParseToString()))
|
||||
{
|
||||
row.Visible = false;
|
||||
row.Cells["colSelect"].Value = false;
|
||||
continue;
|
||||
}
|
||||
row.Visible = true;
|
||||
}
|
||||
}
|
||||
@@ -796,6 +811,7 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
{
|
||||
txtFilterShopName.Text = "";
|
||||
cmbFilterShopNotes.Text = "全部";
|
||||
cmbFilterShopGroup.Text = "全部";
|
||||
pnlFliter_Click(null, null);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user