调整客户端所有页面支持 店铺id 名称 分组 筛选功能
This commit is contained in:
1 parent
a23020725a
commit
ec170f4285
33 files changed
+1571
-799
No files matched your search
@@ -26,7 +26,7 @@ namespace TemuKJD.KJDForms.AdminForms
|
||||
public Lazy<DbProductSelectListManageForm> dbProductSelectListManageForm = new Lazy<DbProductSelectListManageForm>();
|
||||
public Lazy<ProductThirdSelectListManageForm> productThirdSelectListManageForm = new Lazy<ProductThirdSelectListManageForm>();
|
||||
public Lazy<AdminProductPriceCheckForm> adminProductPriceCheckForm = new Lazy<AdminProductPriceCheckForm>();
|
||||
public Lazy<JoinDeliveryFrom> joinDeliveryFrom = new Lazy<JoinDeliveryFrom>();
|
||||
public Lazy<JoinDeliveryForm> joinDeliveryFrom = new Lazy<JoinDeliveryForm>();
|
||||
public Lazy<TemuJitForm> jitForm = new Lazy<TemuJitForm>();
|
||||
|
||||
public AdminForm()
|
||||
|
||||
+23
-22
@@ -103,7 +103,7 @@ namespace TemuKJD.KJDForms.AdminForms
|
||||
this.label9 = new System.Windows.Forms.Label();
|
||||
this.label11 = new System.Windows.Forms.Label();
|
||||
this.chkSearchAllShop = new TemuKJD.UserComponent.UcCheckBox(this.components);
|
||||
this.ucCheckBox1 = new TemuKJD.UserComponent.UcCheckBox(this.components);
|
||||
this.chkFilterSize = new TemuKJD.UserComponent.UcCheckBox(this.components);
|
||||
this.splitContainer3 = new System.Windows.Forms.SplitContainer();
|
||||
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
|
||||
this.pbShopLoading = new System.Windows.Forms.PictureBox();
|
||||
@@ -236,7 +236,6 @@ namespace TemuKJD.KJDForms.AdminForms
|
||||
this.ucGroupBoxEx1.Controls.Add(this.numHeight1);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.numWidth1);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.btnMutliOk);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.chkSearchTime);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.dtpEndTime);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.numLen2);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.dtpStartTime);
|
||||
@@ -266,7 +265,8 @@ namespace TemuKJD.KJDForms.AdminForms
|
||||
this.ucGroupBoxEx1.Controls.Add(this.label9);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.label11);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.chkSearchAllShop);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.ucCheckBox1);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.chkFilterSize);
|
||||
this.ucGroupBoxEx1.Controls.Add(this.chkSearchTime);
|
||||
this.ucGroupBoxEx1.Location = new System.Drawing.Point(2, 2);
|
||||
this.ucGroupBoxEx1.Name = "ucGroupBoxEx1";
|
||||
this.ucGroupBoxEx1.Size = new System.Drawing.Size(1480, 140);
|
||||
@@ -499,7 +499,7 @@ namespace TemuKJD.KJDForms.AdminForms
|
||||
// label12
|
||||
//
|
||||
this.label12.AutoSize = true;
|
||||
this.label12.Location = new System.Drawing.Point(292, 42);
|
||||
this.label12.Location = new System.Drawing.Point(292, 41);
|
||||
this.label12.Name = "label12";
|
||||
this.label12.Size = new System.Drawing.Size(44, 17);
|
||||
this.label12.TabIndex = 954;
|
||||
@@ -719,17 +719,18 @@ namespace TemuKJD.KJDForms.AdminForms
|
||||
this.chkSearchTime.AutoSize = true;
|
||||
this.chkSearchTime.Checked = true;
|
||||
this.chkSearchTime.CheckState = System.Windows.Forms.CheckState.Checked;
|
||||
this.chkSearchTime.Location = new System.Drawing.Point(287, 68);
|
||||
this.chkSearchTime.Location = new System.Drawing.Point(280, 63);
|
||||
this.chkSearchTime.Name = "chkSearchTime";
|
||||
this.chkSearchTime.Size = new System.Drawing.Size(15, 14);
|
||||
this.chkSearchTime.Size = new System.Drawing.Size(63, 21);
|
||||
this.chkSearchTime.TabIndex = 827;
|
||||
this.chkSearchTime.Text = "日期:";
|
||||
this.chkSearchTime.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// dtpEndTime
|
||||
//
|
||||
this.dtpEndTime.Location = new System.Drawing.Point(303, 86);
|
||||
this.dtpEndTime.Location = new System.Drawing.Point(326, 86);
|
||||
this.dtpEndTime.Name = "dtpEndTime";
|
||||
this.dtpEndTime.Size = new System.Drawing.Size(206, 23);
|
||||
this.dtpEndTime.Size = new System.Drawing.Size(183, 23);
|
||||
this.dtpEndTime.TabIndex = 826;
|
||||
//
|
||||
// numLen2
|
||||
@@ -752,9 +753,9 @@ namespace TemuKJD.KJDForms.AdminForms
|
||||
//
|
||||
// dtpStartTime
|
||||
//
|
||||
this.dtpStartTime.Location = new System.Drawing.Point(303, 62);
|
||||
this.dtpStartTime.Location = new System.Drawing.Point(326, 62);
|
||||
this.dtpStartTime.Name = "dtpStartTime";
|
||||
this.dtpStartTime.Size = new System.Drawing.Size(206, 23);
|
||||
this.dtpStartTime.Size = new System.Drawing.Size(183, 23);
|
||||
this.dtpStartTime.TabIndex = 825;
|
||||
//
|
||||
// numWidth2
|
||||
@@ -922,9 +923,9 @@ namespace TemuKJD.KJDForms.AdminForms
|
||||
this.btnSearchPrice.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnSearchPrice.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnSearchPrice.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnSearchPrice.Location = new System.Drawing.Point(287, 110);
|
||||
this.btnSearchPrice.Location = new System.Drawing.Point(280, 110);
|
||||
this.btnSearchPrice.Name = "btnSearchPrice";
|
||||
this.btnSearchPrice.Size = new System.Drawing.Size(68, 23);
|
||||
this.btnSearchPrice.Size = new System.Drawing.Size(75, 23);
|
||||
this.btnSearchPrice.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnSearchPrice.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnSearchPrice.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
@@ -1167,16 +1168,16 @@ namespace TemuKJD.KJDForms.AdminForms
|
||||
this.chkSearchAllShop.Text = "二级超管查询所有店铺";
|
||||
this.chkSearchAllShop.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// ucCheckBox1
|
||||
// chkFilterSize
|
||||
//
|
||||
this.ucCheckBox1.AutoSize = true;
|
||||
this.ucCheckBox1.Location = new System.Drawing.Point(925, 108);
|
||||
this.ucCheckBox1.Name = "ucCheckBox1";
|
||||
this.ucCheckBox1.Size = new System.Drawing.Size(63, 21);
|
||||
this.ucCheckBox1.TabIndex = 1076;
|
||||
this.ucCheckBox1.Text = "仅显示";
|
||||
this.ucCheckBox1.UseVisualStyleBackColor = true;
|
||||
this.ucCheckBox1.CheckedChanged += new System.EventHandler(this.chkFilterSize_CheckedChanged);
|
||||
this.chkFilterSize.AutoSize = true;
|
||||
this.chkFilterSize.Location = new System.Drawing.Point(925, 108);
|
||||
this.chkFilterSize.Name = "chkFilterSize";
|
||||
this.chkFilterSize.Size = new System.Drawing.Size(63, 21);
|
||||
this.chkFilterSize.TabIndex = 1076;
|
||||
this.chkFilterSize.Text = "仅显示";
|
||||
this.chkFilterSize.UseVisualStyleBackColor = true;
|
||||
this.chkFilterSize.CheckedChanged += new System.EventHandler(this.chkFilterSize_CheckedChanged);
|
||||
//
|
||||
// splitContainer3
|
||||
//
|
||||
@@ -1895,6 +1896,6 @@ namespace TemuKJD.KJDForms.AdminForms
|
||||
private System.Windows.Forms.DataGridViewCheckBoxColumn colSelectExtCode;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colFilterExtCode;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colFilterRule;
|
||||
private UserComponent.UcCheckBox ucCheckBox1;
|
||||
private UserComponent.UcCheckBox chkFilterSize;
|
||||
}
|
||||
}
|
||||
@@ -22,7 +22,7 @@ using Work;
|
||||
|
||||
namespace TemuKJD.KJDForms.AdminForms
|
||||
{
|
||||
public partial class AdminProductPriceCheckForm : Form
|
||||
public partial class AdminProductPriceCheckForm : BaseForm
|
||||
{
|
||||
PriceCheckConfig priceCheckConfig = null;
|
||||
List<PriceCheckFilterConfig> lstPriceCheckFilterConfig = new List<PriceCheckFilterConfig>();
|
||||
@@ -45,6 +45,8 @@ namespace TemuKJD.KJDForms.AdminForms
|
||||
this.dgvPriceCheck.AddSelectorColumn("colCheck");
|
||||
this.dgvPriceCheck.AddMergeColumnHeader(new List<string>() { "colOk", "colCancel" }, "同意/拒绝报价");
|
||||
this.dgvPriceCheck.AddImgColumn("colProductSkcPic", "colImgUrl");
|
||||
var chkSelectExtCode = this.dgvExtCode.AddSelectorColumn("colSelectExtCode");
|
||||
chkSelectExtCode.CheckedChanged += ChkSelectExtCode_CheckedChanged;
|
||||
|
||||
this.dtpEndTime.Value = DateTime.Now.Date.AddDays(1).AddMilliseconds(-1);
|
||||
this.dtpStartTime.Value = DateTime.Now.Date.AddDays(-7);
|
||||
@@ -72,6 +74,10 @@ namespace TemuKJD.KJDForms.AdminForms
|
||||
this.txtPriceDown.TextChanged += Txt_TextChanged;
|
||||
this.chkSearchAllShop.CheckedChanged += Txt_TextChanged;
|
||||
}
|
||||
private void ChkSelectExtCode_CheckedChanged(object sender, EventArgs e)
|
||||
{
|
||||
FilterRows();
|
||||
}
|
||||
|
||||
private void Txt_TextChanged(object sender, EventArgs e)
|
||||
{
|
||||
@@ -556,9 +562,11 @@ namespace TemuKJD.KJDForms.AdminForms
|
||||
}
|
||||
}
|
||||
|
||||
this.chkFilterTitle.Checked = false;
|
||||
this.dgvPriceCheck.Rows.Clear();
|
||||
this.dgvExtCode.Rows.Clear();
|
||||
this.lstCheckPriceInfo.Clear();
|
||||
this.chkFilterTitle.Checked = false;
|
||||
this.chkFilterSize.Checked = false;
|
||||
this.pbLoading.Visible = true;
|
||||
cancellationTokenSource = new CancellationTokenSource();
|
||||
Task.Run(() =>
|
||||
@@ -753,20 +761,6 @@ namespace TemuKJD.KJDForms.AdminForms
|
||||
dgvPriceCheck.Rows[rowId].DefaultCellStyle.BackColor = Color.White;
|
||||
else
|
||||
dgvPriceCheck.Rows[rowId].DefaultCellStyle.BackColor = Color.WhiteSmoke;
|
||||
|
||||
var extCodeLst = this.dgvPriceCheck.Rows.Cast<DataGridViewRow>()
|
||||
.Select(r => r.Cells["colExtCode"].Value.ParseToString())
|
||||
.Where(s => !string.IsNullOrEmpty(s.Trim('-'))).Distinct().ToList();
|
||||
this.dgvExtCode.Rows.Clear();
|
||||
foreach (var ext in extCodeLst)
|
||||
{
|
||||
var filterConfig = lstPriceCheckFilterConfig.FirstOrDefault(c => c.ExtCode == ext);
|
||||
var pos = this.dgvExtCode.Rows.Add(
|
||||
false,
|
||||
ext,
|
||||
filterConfig == null ? "" : GetConfigDesStr(filterConfig.Symbol, filterConfig.Price1, filterConfig.Price2)
|
||||
);
|
||||
}
|
||||
}));
|
||||
}
|
||||
}
|
||||
@@ -781,6 +775,19 @@ namespace TemuKJD.KJDForms.AdminForms
|
||||
|
||||
}
|
||||
Invoke(new Action(() => {
|
||||
var extCodeLst = this.dgvPriceCheck.Rows.Cast<DataGridViewRow>()
|
||||
.Select(r => r.Cells["colExtCode"].Value.ParseToString())
|
||||
.Where(s => !string.IsNullOrEmpty(s.Trim('-'))).Distinct().ToList();
|
||||
this.dgvExtCode.Rows.Clear();
|
||||
foreach (var ext in extCodeLst)
|
||||
{
|
||||
var filterConfig = lstPriceCheckFilterConfig.FirstOrDefault(c => c.ExtCode == ext);
|
||||
var pos = this.dgvExtCode.Rows.Add(
|
||||
false,
|
||||
ext,
|
||||
filterConfig == null ? "" : GetConfigDesStr(filterConfig.Symbol, filterConfig.Price1, filterConfig.Price2)
|
||||
);
|
||||
}
|
||||
this.pbLoading.Visible = false;
|
||||
string sRst = type + " 查询结束!";
|
||||
if (cancellationTokenSource.IsCancellationRequested)
|
||||
@@ -1786,7 +1793,7 @@ namespace TemuKJD.KJDForms.AdminForms
|
||||
{
|
||||
}
|
||||
}
|
||||
if (ucCheckBox1.Checked)
|
||||
if (chkFilterSize.Checked)
|
||||
{
|
||||
var priceInfo = lstCheckPriceInfo.FirstOrDefault(p => p.productId.ParseToString() == prodId);
|
||||
if (priceInfo != null)
|
||||
|
||||
Reference in new issue
Block a user