From 9bbdddefb60eaa3b738c162410f0a1f463462620 Mon Sep 17 00:00:00 2001 From: wule Date: Mon, 11 Aug 2025 15:03:13 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E7=AB=AF=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BC=98=E5=8C=96=EF=BC=8C=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=BA=93=E5=AD=98/=E9=80=89=E5=93=81=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E6=96=B0=E5=A2=9E=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../KJD_WebService/BLL/ProductManage.cs | 14 +- .../KJD_WebService/BLL/ProductThirdManage.cs | 14 +- .../KJDForms/AdminForms/AdminShopListForm.cs | 29 +- .../ProductForms/Old/ShopProductForm.cs | 6 +- .../DbProductSelectListManageForm.Designer.cs | 407 ++++++++++-------- .../DbProductSelectListManageForm.cs | 21 +- .../DbProductUserSelectForm.Designer.cs | 337 ++++++++++++--- .../DbProductUserSelectForm.cs | 30 +- ...oductThirdSelectListManageForm.Designer.cs | 361 +++++++++------- .../ProductThirdSelectListManageForm.cs | 41 +- .../ProductThirdUserSelectForm.Designer.cs | 330 ++++++++++++-- .../ProductThirdUserSelectForm.cs | 28 +- .../MarketingActivityForm.Designer.cs | 86 ++-- .../UcActivityDiscountCtrl.Designer.cs | 9 +- 14 files changed, 1165 insertions(+), 548 deletions(-) diff --git a/KJDService/KJD_WebService/BLL/ProductManage.cs b/KJDService/KJD_WebService/BLL/ProductManage.cs index ba2bb30..d389384 100644 --- a/KJDService/KJD_WebService/BLL/ProductManage.cs +++ b/KJDService/KJD_WebService/BLL/ProductManage.cs @@ -504,7 +504,19 @@ namespace KJD_Web.BLL if (!string.IsNullOrWhiteSpace(search_shop_account)) where += " and s.shop_account like '%" + search_shop_account + "%'"; if (!string.IsNullOrWhiteSpace(search_notes)) - where += " and s.notes like '%" + search_notes + "%'"; + { + //核价成功 重复 核价成功（重复） + if (search_notes == "无备注") + where += " and s.notes = ''"; + else if (search_notes == "重复") + where += " and s.notes like '%重复%' and s.notes not like '%核价成功%' and s.notes not like '%核价通过%'"; + else if (search_notes == "核价成功") + where += " and (s.notes like '%核价成功%' or s.notes like '%核价通过%') and s.notes not like '%重复%'"; + else if (search_notes == "核价成功（重复）") + where += " and (s.notes like '%核价成功%' or s.notes like '%核价通过%') and s.notes like '%重复%'"; + else + where += " and s.notes like '%" + search_notes + "%'"; + } if (!string.IsNullOrWhiteSpace(search_user_notes)) where += " and s.user_notes like '%" + search_user_notes + "%'"; if (!string.IsNullOrWhiteSpace(search_spu)) diff --git a/KJDService/KJD_WebService/BLL/ProductThirdManage.cs b/KJDService/KJD_WebService/BLL/ProductThirdManage.cs index 60e59a6..ff4c691 100644 --- a/KJDService/KJD_WebService/BLL/ProductThirdManage.cs +++ b/KJDService/KJD_WebService/BLL/ProductThirdManage.cs @@ -458,7 +458,19 @@ namespace KJD_Web.BLL if (!string.IsNullOrWhiteSpace(search_shop_account)) where += " and s.shop_account like @search_shop_account"; if (!string.IsNullOrWhiteSpace(search_notes)) - where += " and s.notes like '%" + search_notes + "%'"; + { + //核价成功 重复 核价成功（重复） + if (search_notes == "无备注") + where += " and s.notes = ''"; + else if (search_notes == "重复") + where += " and s.notes like '%重复%' and s.notes not like '%核价成功%' and s.notes not like '%核价通过%'"; + else if (search_notes == "核价成功") + where += " and (s.notes like '%核价成功%' or s.notes like '%核价通过%') and s.notes not like '%重复%'"; + else if (search_notes == "核价成功（重复）") + where += " and (s.notes like '%核价成功%' or s.notes like '%核价通过%') and s.notes like '%重复%'"; + else + where += " and s.notes like '%" + search_notes + "%'"; + } if (!string.IsNullOrWhiteSpace(search_user_notes)) where += " and s.user_notes like '%" + search_user_notes + "%'"; if (!string.IsNullOrWhiteSpace(search_spu)) diff --git a/TEMUKJD/KJDForms/AdminForms/AdminShopListForm.cs b/TEMUKJD/KJDForms/AdminForms/AdminShopListForm.cs index a7accc1..1e16423 100644 --- a/TEMUKJD/KJDForms/AdminForms/AdminShopListForm.cs +++ b/TEMUKJD/KJDForms/AdminForms/AdminShopListForm.cs @@ -24,11 +24,20 @@ namespace TemuKJD.KJDForms.AdminForms { public partial class AdminShopListForm : BaseForm { + static AdminShopListForm inst = null; + public static AdminShopListForm Instance + { + get { if (inst == null) inst = new AdminShopListForm(); return inst; } + set { inst = value; } + } + public static List lstAdminShopInfo { get; set; } = new List(); public AdminShopListForm() { InitializeComponent(); + + Instance = this; } private void AdminShopForm_Load(object sender, EventArgs e) @@ -333,16 +342,16 @@ namespace TemuKJD.KJDForms.AdminForms private List GetCheckedList() { - List shopNameList = new List(); + List shopLoginNameList = new List(); for (int i = 0; i < dgvShop.Rows.Count; i++) { if (dgvShop.Rows[i].Cells["colSelect"].Value.ParseToBool()) { string shopName = dgvShop.Rows[i].Cells["colLoginName"].Value.ParseToString(); - shopNameList.Add(shopName); + shopLoginNameList.Add(shopName); } } - return shopNameList; + return shopLoginNameList; } private List GetCheckedShopIdList() @@ -556,8 +565,8 @@ namespace TemuKJD.KJDForms.AdminForms { if (this.btnCheck.Text == "检测选中") { - List shopNameList = GetCheckedList(); - if (!shopNameList.Any()) + List shopLoginNameList = GetCheckedList(); + if (!shopLoginNameList.Any()) { BaseMsgForm.ShowError("请选择需要检测的店铺"); return; @@ -565,7 +574,7 @@ namespace TemuKJD.KJDForms.AdminForms Task.Run(() => { - CheckShopListLogin(shopNameList.Distinct().ToArray()); + CheckShopListLogin(shopLoginNameList.Distinct().ToArray()); SearchShop(this.ucSplitPage1.CurrentPage); }); } @@ -574,9 +583,9 @@ namespace TemuKJD.KJDForms.AdminForms /// /// 检测店铺授权状态 /// - /// + /// /// - public void CheckShopListLogin(string[] shopNames, bool isShowProgress = true) + public void CheckShopListLogin(string[] shopLoginNames, bool isShowProgress = true) { if (isShowProgress) { @@ -584,12 +593,12 @@ namespace TemuKJD.KJDForms.AdminForms { this.pbLoading.Visible = true; this.statusBar.lblTaskStatus.Text = "正在检测..."; - this.statusBar.pgbTaskProgress.Maximum = shopNames.Length; + this.statusBar.pgbTaskProgress.Maximum = shopLoginNames.Length; this.statusBar.UpdateProgressBar(0); })); } - var shops = lstAdminShopInfo.Where(s => shopNames.Contains(s.LoginName)); + var shops = lstAdminShopInfo.Where(s => shopLoginNames.Contains(s.LoginName)); CheckShopLogin(shops.ToArray(), isShowProgress); if (this.Created && isShowProgress) diff --git a/TEMUKJD/KJDForms/ProductForms/Old/ShopProductForm.cs b/TEMUKJD/KJDForms/ProductForms/Old/ShopProductForm.cs index 23fafeb..4702af2 100644 --- a/TEMUKJD/KJDForms/ProductForms/Old/ShopProductForm.cs +++ b/TEMUKJD/KJDForms/ProductForms/Old/ShopProductForm.cs @@ -700,9 +700,9 @@ namespace TemuKJD.KJDForms.ProductForms // 过滤有销量的商品 if (isNotOperateHasSales) { - if (KJDForms.ShopForms.ShopListForm.Instance == null) - KJDForms.ShopForms.ShopListForm.Instance = new KJDForms.ShopForms.ShopListForm(); - KJDForms.ShopForms.ShopListForm.Instance.CheckShopLogin(new string[] { shop.ShopAccount }, false); + if (ShopForms.ShopListForm.Instance == null) + ShopForms.ShopListForm.Instance = new KJDForms.ShopForms.ShopListForm(); + ShopForms.ShopListForm.Instance.CheckShopLogin(new string[] { shop.ShopAccount }, false); if (shop.LoginStatus != "登录成功") { diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.Designer.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.Designer.cs index ceb7a01..1129aed 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.Designer.cs +++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.Designer.cs @@ -41,11 +41,10 @@ this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.btnReFission = new TemuKJD.UserControls.ButtonEx(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.cmbUserNotes = new System.Windows.Forms.ComboBox(); - this.label12 = new System.Windows.Forms.Label(); + this.label13 = new System.Windows.Forms.Label(); this.label6 = new System.Windows.Forms.Label(); + this.cmbNotes = new System.Windows.Forms.ComboBox(); this.txtShopId = new System.Windows.Forms.TextBox(); - this.chkUploadProd = new TemuKJD.UserComponent.UcCheckBox(this.components); this.cmbStatus = new System.Windows.Forms.ComboBox(); this.label7 = new System.Windows.Forms.Label(); this.label8 = new System.Windows.Forms.Label(); @@ -73,17 +72,18 @@ this.chkSkuRandomPrice = new TemuKJD.UserComponent.UcCheckBox(this.components); this.numSkuRandomPrice = new System.Windows.Forms.NumericUpDown(); this.label11 = new System.Windows.Forms.Label(); - this.chkNoSubSa = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.chkShowDel = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.btnSearch = new TemuKJD.UserControls.ButtonEx(); this.pnlEmpty = new DevComponents.DotNetBar.PanelEx(); + this.btnSearch = new TemuKJD.UserControls.ButtonEx(); + this.cmbUserNotes = new System.Windows.Forms.ComboBox(); + this.label12 = new System.Windows.Forms.Label(); + this.chkShowDel = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.chkNoSubSa = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.chkUploadProd = new TemuKJD.UserComponent.UcCheckBox(this.components); this.btnSetSubSa = new TemuKJD.UserControls.ButtonEx(); this.btnAdd = new TemuKJD.UserControls.ButtonEx(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.pbLoading = new System.Windows.Forms.PictureBox(); this.dgvSelectProduct = new TemuKJD.UserComponent.DataGridViewEx(); - this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); - this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colSelectId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colSupplierId = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -110,6 +110,8 @@ this.colEditNotes = new System.Windows.Forms.DataGridViewLinkColumn(); this.colDelete = new System.Windows.Forms.DataGridViewLinkColumn(); this.colOpResult = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -144,8 +146,8 @@ // splitContainer1.Panel2 // this.splitContainer1.Panel2.Controls.Add(this.splitContainer2); - this.splitContainer1.Size = new System.Drawing.Size(1438, 638); - this.splitContainer1.SplitterDistance = 66; + this.splitContainer1.Size = new System.Drawing.Size(1558, 638); + this.splitContainer1.SplitterDistance = 70; this.splitContainer1.TabIndex = 2; // // btnReFission @@ -156,7 +158,7 @@ this.btnReFission.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnReFission.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnReFission.ForeColor = System.Drawing.Color.White; - this.btnReFission.Location = new System.Drawing.Point(1164, 19); + this.btnReFission.Location = new System.Drawing.Point(1280, 19); this.btnReFission.Margin = new System.Windows.Forms.Padding(2); this.btnReFission.Name = "btnReFission"; this.btnReFission.Size = new System.Drawing.Size(90, 26); @@ -169,35 +171,35 @@ // this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.tableLayoutPanel1.ColumnCount = 23; + this.tableLayoutPanel1.ColumnCount = 24; this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 9.999102F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.Controls.Add(this.cmbUserNotes, 17, 0); - this.tableLayoutPanel1.Controls.Add(this.label12, 16, 0); + this.tableLayoutPanel1.Controls.Add(this.label13, 16, 0); this.tableLayoutPanel1.Controls.Add(this.label6, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.cmbNotes, 17, 0); this.tableLayoutPanel1.Controls.Add(this.txtShopId, 1, 0); - this.tableLayoutPanel1.Controls.Add(this.chkUploadProd, 22, 0); this.tableLayoutPanel1.Controls.Add(this.cmbStatus, 15, 0); this.tableLayoutPanel1.Controls.Add(this.label7, 2, 0); this.tableLayoutPanel1.Controls.Add(this.label8, 14, 0); @@ -213,76 +215,70 @@ this.tableLayoutPanel1.Controls.Add(this.label4, 12, 0); this.tableLayoutPanel1.Controls.Add(this.txtProdName, 11, 0); this.tableLayoutPanel1.Controls.Add(this.flowLayoutPanel1, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.chkNoSubSa, 18, 0); - this.tableLayoutPanel1.Controls.Add(this.chkShowDel, 19, 0); - this.tableLayoutPanel1.Controls.Add(this.btnSearch, 20, 0); - this.tableLayoutPanel1.Controls.Add(this.pnlEmpty, 21, 0); - this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 3); + this.tableLayoutPanel1.Controls.Add(this.pnlEmpty, 22, 1); + this.tableLayoutPanel1.Controls.Add(this.btnSearch, 22, 0); + this.tableLayoutPanel1.Controls.Add(this.cmbUserNotes, 19, 0); + this.tableLayoutPanel1.Controls.Add(this.label12, 18, 0); + this.tableLayoutPanel1.Controls.Add(this.chkShowDel, 23, 1); + this.tableLayoutPanel1.Controls.Add(this.chkNoSubSa, 23, 0); + this.tableLayoutPanel1.Controls.Add(this.chkUploadProd, 18, 1); + this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 2); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 2; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.Size = new System.Drawing.Size(1162, 60); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(1268, 66); this.tableLayoutPanel1.TabIndex = 190; // - // cmbUserNotes + // label13 // - this.cmbUserNotes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.cmbUserNotes.FormattingEnabled = true; - this.cmbUserNotes.Items.AddRange(new object[] { - "", - "重上", - "已买"}); - this.cmbUserNotes.Location = new System.Drawing.Point(725, 6); - this.cmbUserNotes.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); - this.cmbUserNotes.Name = "cmbUserNotes"; - this.cmbUserNotes.Size = new System.Drawing.Size(38, 25); - this.cmbUserNotes.TabIndex = 460; - // - // label12 - // - this.label12.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(669, 7); - this.label12.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(56, 17); - this.label12.TabIndex = 459; - this.label12.Text = "用户备注"; + this.label13.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.label13.AutoSize = true; + this.label13.Location = new System.Drawing.Point(885, 9); + this.label13.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(32, 17); + this.label13.TabIndex = 463; + this.label13.Text = "备注"; // // label6 // this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(3, 7); + this.label6.Location = new System.Drawing.Point(3, 9); this.label6.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(44, 17); this.label6.TabIndex = 449; this.label6.Text = "店铺Id"; // + // cmbNotes + // + this.cmbNotes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.cmbNotes.FormattingEnabled = true; + this.cmbNotes.Items.AddRange(new object[] { + "全部", + "无备注", + "核价成功", + "核价成功（重复）", + "重复"}); + this.cmbNotes.Location = new System.Drawing.Point(917, 8); + this.cmbNotes.Margin = new System.Windows.Forms.Padding(0); + this.cmbNotes.Name = "cmbNotes"; + this.cmbNotes.Size = new System.Drawing.Size(65, 25); + this.cmbNotes.TabIndex = 464; + this.cmbNotes.Text = "全部"; + // // txtShopId // this.txtShopId.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtShopId.Location = new System.Drawing.Point(47, 4); + this.txtShopId.Location = new System.Drawing.Point(47, 6); this.txtShopId.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtShopId.Name = "txtShopId"; - this.txtShopId.Size = new System.Drawing.Size(38, 23); + this.txtShopId.Size = new System.Drawing.Size(65, 23); this.txtShopId.TabIndex = 448; // - // chkUploadProd - // - this.chkUploadProd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.chkUploadProd.AutoSize = true; - this.chkUploadProd.Location = new System.Drawing.Point(1059, 19); - this.chkUploadProd.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.chkUploadProd.Name = "chkUploadProd"; - this.tableLayoutPanel1.SetRowSpan(this.chkUploadProd, 2); - this.chkUploadProd.Size = new System.Drawing.Size(103, 21); - this.chkUploadProd.TabIndex = 470; - this.chkUploadProd.Text = "上传到未发布"; - this.chkUploadProd.UseVisualStyleBackColor = true; - // // cmbStatus // this.cmbStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); @@ -290,11 +286,12 @@ this.cmbStatus.Items.AddRange(new object[] { "待上传", "已上传", + "草稿箱", "全部"}); - this.cmbStatus.Location = new System.Drawing.Point(625, 6); - this.cmbStatus.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.cmbStatus.Location = new System.Drawing.Point(814, 8); + this.cmbStatus.Margin = new System.Windows.Forms.Padding(0); this.cmbStatus.Name = "cmbStatus"; - this.cmbStatus.Size = new System.Drawing.Size(38, 25); + this.cmbStatus.Size = new System.Drawing.Size(65, 25); this.cmbStatus.TabIndex = 459; this.cmbStatus.Text = "待上传"; // @@ -302,7 +299,7 @@ // this.label7.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(91, 7); + this.label7.Location = new System.Drawing.Point(118, 9); this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(56, 17); @@ -313,7 +310,7 @@ // this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(569, 7); + this.label8.Location = new System.Drawing.Point(758, 9); this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(56, 17); @@ -323,17 +320,17 @@ // txtShopName // this.txtShopName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtShopName.Location = new System.Drawing.Point(147, 4); + this.txtShopName.Location = new System.Drawing.Point(174, 6); this.txtShopName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtShopName.Name = "txtShopName"; - this.txtShopName.Size = new System.Drawing.Size(38, 23); + this.txtShopName.Size = new System.Drawing.Size(65, 23); this.txtShopName.TabIndex = 451; // // label5 // this.label5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(191, 7); + this.label5.Location = new System.Drawing.Point(245, 9); this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(31, 17); @@ -343,26 +340,26 @@ // txtSKC // this.txtSKC.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtSKC.Location = new System.Drawing.Point(297, 4); + this.txtSKC.Location = new System.Drawing.Point(378, 6); this.txtSKC.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtSKC.Name = "txtSKC"; - this.txtSKC.Size = new System.Drawing.Size(38, 23); + this.txtSKC.Size = new System.Drawing.Size(65, 23); this.txtSKC.TabIndex = 432; // // txtSPU // this.txtSPU.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtSPU.Location = new System.Drawing.Point(222, 4); + this.txtSPU.Location = new System.Drawing.Point(276, 6); this.txtSPU.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtSPU.Name = "txtSPU"; - this.txtSPU.Size = new System.Drawing.Size(38, 23); + this.txtSPU.Size = new System.Drawing.Size(65, 23); this.txtSPU.TabIndex = 434; // // label1 // this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(266, 7); + this.label1.Location = new System.Drawing.Point(347, 9); this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(31, 17); @@ -373,7 +370,7 @@ // this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(341, 7); + this.label2.Location = new System.Drawing.Point(449, 9); this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(32, 17); @@ -383,26 +380,26 @@ // txtCat // this.txtCat.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtCat.Location = new System.Drawing.Point(373, 4); + this.txtCat.Location = new System.Drawing.Point(481, 6); this.txtCat.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtCat.Name = "txtCat"; - this.txtCat.Size = new System.Drawing.Size(38, 23); + this.txtCat.Size = new System.Drawing.Size(65, 23); this.txtCat.TabIndex = 425; // // txtExtCode // this.txtExtCode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtExtCode.Location = new System.Drawing.Point(525, 4); + this.txtExtCode.Location = new System.Drawing.Point(687, 6); this.txtExtCode.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtExtCode.Name = "txtExtCode"; - this.txtExtCode.Size = new System.Drawing.Size(38, 23); + this.txtExtCode.Size = new System.Drawing.Size(65, 23); this.txtExtCode.TabIndex = 429; // // label3 // this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(417, 7); + this.label3.Location = new System.Drawing.Point(552, 9); this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(32, 17); @@ -413,7 +410,7 @@ // this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(493, 7); + this.label4.Location = new System.Drawing.Point(655, 9); this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(32, 17); @@ -423,16 +420,16 @@ // txtProdName // this.txtProdName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtProdName.Location = new System.Drawing.Point(449, 4); + this.txtProdName.Location = new System.Drawing.Point(584, 6); this.txtProdName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtProdName.Name = "txtProdName"; - this.txtProdName.Size = new System.Drawing.Size(38, 23); + this.txtProdName.Size = new System.Drawing.Size(65, 23); this.txtProdName.TabIndex = 427; // // flowLayoutPanel1 // this.flowLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.tableLayoutPanel1.SetColumnSpan(this.flowLayoutPanel1, 20); + this.tableLayoutPanel1.SetColumnSpan(this.flowLayoutPanel1, 18); this.flowLayoutPanel1.Controls.Add(this.label9); this.flowLayoutPanel1.Controls.Add(this.txtSkuHeadText); this.flowLayoutPanel1.Controls.Add(this.label10); @@ -445,10 +442,10 @@ this.flowLayoutPanel1.Controls.Add(this.chkSkuRandomPrice); this.flowLayoutPanel1.Controls.Add(this.numSkuRandomPrice); this.flowLayoutPanel1.Controls.Add(this.label11); - this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 32); + this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 36); this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; - this.flowLayoutPanel1.Size = new System.Drawing.Size(929, 28); + this.flowLayoutPanel1.Size = new System.Drawing.Size(982, 30); this.flowLayoutPanel1.TabIndex = 471; // // label9 @@ -509,8 +506,8 @@ // this.chkHeadWords.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.chkHeadWords.AutoSize = true; - this.chkHeadWords.Location = new System.Drawing.Point(380, 4); - this.chkHeadWords.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.chkHeadWords.Location = new System.Drawing.Point(376, 4); + this.chkHeadWords.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0); this.chkHeadWords.Name = "chkHeadWords"; this.chkHeadWords.Size = new System.Drawing.Size(75, 21); this.chkHeadWords.TabIndex = 473; @@ -521,8 +518,8 @@ // this.chkEndWords.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.chkEndWords.AutoSize = true; - this.chkEndWords.Location = new System.Drawing.Point(461, 4); - this.chkEndWords.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.chkEndWords.Location = new System.Drawing.Point(453, 4); + this.chkEndWords.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0); this.chkEndWords.Name = "chkEndWords"; this.chkEndWords.Size = new System.Drawing.Size(75, 21); this.chkEndWords.TabIndex = 474; @@ -533,8 +530,8 @@ // this.chkReFissionAllProdName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.chkReFissionAllProdName.AutoSize = true; - this.chkReFissionAllProdName.Location = new System.Drawing.Point(542, 4); - this.chkReFissionAllProdName.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.chkReFissionAllProdName.Location = new System.Drawing.Point(530, 4); + this.chkReFissionAllProdName.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0); this.chkReFissionAllProdName.Name = "chkReFissionAllProdName"; this.chkReFissionAllProdName.Size = new System.Drawing.Size(99, 21); this.chkReFissionAllProdName.TabIndex = 472; @@ -546,8 +543,8 @@ // this.chkRandomSkuOrder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.chkRandomSkuOrder.AutoSize = true; - this.chkRandomSkuOrder.Location = new System.Drawing.Point(645, 4); - this.chkRandomSkuOrder.Margin = new System.Windows.Forms.Padding(4, 0, 0, 0); + this.chkRandomSkuOrder.Location = new System.Drawing.Point(631, 4); + this.chkRandomSkuOrder.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0); this.chkRandomSkuOrder.Name = "chkRandomSkuOrder"; this.chkRandomSkuOrder.Size = new System.Drawing.Size(95, 21); this.chkRandomSkuOrder.TabIndex = 469; @@ -559,8 +556,8 @@ // this.chkSkuRandomPrice.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.chkSkuRandomPrice.AutoSize = true; - this.chkSkuRandomPrice.Location = new System.Drawing.Point(746, 4); - this.chkSkuRandomPrice.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.chkSkuRandomPrice.Location = new System.Drawing.Point(728, 4); + this.chkSkuRandomPrice.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0); this.chkSkuRandomPrice.Name = "chkSkuRandomPrice"; this.chkSkuRandomPrice.Size = new System.Drawing.Size(119, 21); this.chkSkuRandomPrice.TabIndex = 468; @@ -576,7 +573,7 @@ 0, 0, 131072}); - this.numSkuRandomPrice.Location = new System.Drawing.Point(865, 3); + this.numSkuRandomPrice.Location = new System.Drawing.Point(847, 3); this.numSkuRandomPrice.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); this.numSkuRandomPrice.Name = "numSkuRandomPrice"; this.numSkuRandomPrice.Size = new System.Drawing.Size(44, 23); @@ -592,66 +589,22 @@ // this.label11.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(6, 29); + this.label11.Location = new System.Drawing.Point(897, 6); this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label11.Name = "label11"; this.label11.Size = new System.Drawing.Size(20, 17); this.label11.TabIndex = 471; this.label11.Text = "元"; // - // chkNoSubSa - // - this.chkNoSubSa.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.chkNoSubSa.AutoSize = true; - this.chkNoSubSa.Location = new System.Drawing.Point(767, 5); - this.chkNoSubSa.Margin = new System.Windows.Forms.Padding(4, 0, 0, 0); - this.chkNoSubSa.Name = "chkNoSubSa"; - this.chkNoSubSa.Size = new System.Drawing.Size(87, 21); - this.chkNoSubSa.TabIndex = 467; - this.chkNoSubSa.Text = "未分配超管"; - this.chkNoSubSa.UseVisualStyleBackColor = true; - // - // chkShowDel - // - this.chkShowDel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.chkShowDel.AutoSize = true; - this.chkShowDel.Location = new System.Drawing.Point(854, 5); - this.chkShowDel.Margin = new System.Windows.Forms.Padding(0); - this.chkShowDel.Name = "chkShowDel"; - this.chkShowDel.Size = new System.Drawing.Size(75, 21); - this.chkShowDel.TabIndex = 468; - this.chkShowDel.Text = "显示删除"; - this.chkShowDel.UseVisualStyleBackColor = true; - this.chkShowDel.CheckedChanged += new System.EventHandler(this.chkShowDel_CheckedChanged); - // - // btnSearch - // - this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.btnSearch.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnSearch.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSearch.ForeColor = System.Drawing.Color.White; - this.btnSearch.Location = new System.Drawing.Point(935, 18); - this.btnSearch.Margin = new System.Windows.Forms.Padding(6, 2, 2, 2); - this.btnSearch.Name = "btnSearch"; - this.tableLayoutPanel1.SetRowSpan(this.btnSearch, 2); - this.btnSearch.Size = new System.Drawing.Size(56, 24); - this.btnSearch.TabIndex = 424; - this.btnSearch.Text = "搜索"; - this.btnSearch.UseVisualStyleBackColor = false; - this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click); - // // pnlEmpty // this.pnlEmpty.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.pnlEmpty.CanvasColor = System.Drawing.SystemColors.Control; this.pnlEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.pnlEmpty.DisabledBackColor = System.Drawing.Color.Empty; - this.pnlEmpty.Location = new System.Drawing.Point(995, 19); - this.pnlEmpty.Margin = new System.Windows.Forms.Padding(2); + this.pnlEmpty.Location = new System.Drawing.Point(1113, 40); + this.pnlEmpty.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); this.pnlEmpty.Name = "pnlEmpty"; - this.tableLayoutPanel1.SetRowSpan(this.pnlEmpty, 2); this.pnlEmpty.Size = new System.Drawing.Size(56, 22); this.pnlEmpty.Style.Alignment = System.Drawing.StringAlignment.Center; this.pnlEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); @@ -669,6 +622,88 @@ this.pnlEmpty.Text = "清空条件"; this.pnlEmpty.Click += new System.EventHandler(this.pnlEmpty_Click); // + // btnSearch + // + this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.btnSearch.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnSearch.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnSearch.ForeColor = System.Drawing.Color.White; + this.btnSearch.Location = new System.Drawing.Point(1113, 6); + this.btnSearch.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); + this.btnSearch.Name = "btnSearch"; + this.btnSearch.Size = new System.Drawing.Size(56, 24); + this.btnSearch.TabIndex = 424; + this.btnSearch.Text = "搜索"; + this.btnSearch.UseVisualStyleBackColor = false; + this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click); + // + // cmbUserNotes + // + this.cmbUserNotes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.cmbUserNotes.FormattingEnabled = true; + this.cmbUserNotes.Items.AddRange(new object[] { + "全部", + "重上", + "已买"}); + this.cmbUserNotes.Location = new System.Drawing.Point(1044, 8); + this.cmbUserNotes.Margin = new System.Windows.Forms.Padding(0); + this.cmbUserNotes.Name = "cmbUserNotes"; + this.cmbUserNotes.Size = new System.Drawing.Size(65, 25); + this.cmbUserNotes.TabIndex = 460; + this.cmbUserNotes.Text = "全部"; + // + // label12 + // + this.label12.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.label12.AutoSize = true; + this.label12.Location = new System.Drawing.Point(988, 9); + this.label12.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(56, 17); + this.label12.TabIndex = 459; + this.label12.Text = "用户备注"; + // + // chkShowDel + // + this.chkShowDel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.chkShowDel.AutoSize = true; + this.chkShowDel.Location = new System.Drawing.Point(1177, 40); + this.chkShowDel.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.chkShowDel.Name = "chkShowDel"; + this.chkShowDel.Size = new System.Drawing.Size(91, 21); + this.chkShowDel.TabIndex = 468; + this.chkShowDel.Text = "显示删除"; + this.chkShowDel.UseVisualStyleBackColor = true; + this.chkShowDel.CheckedChanged += new System.EventHandler(this.chkShowDel_CheckedChanged); + // + // chkNoSubSa + // + this.chkNoSubSa.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.chkNoSubSa.AutoSize = true; + this.chkNoSubSa.Location = new System.Drawing.Point(1177, 7); + this.chkNoSubSa.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.chkNoSubSa.Name = "chkNoSubSa"; + this.chkNoSubSa.Size = new System.Drawing.Size(91, 21); + this.chkNoSubSa.TabIndex = 467; + this.chkNoSubSa.Text = "未分配超管"; + this.chkNoSubSa.UseVisualStyleBackColor = true; + // + // chkUploadProd + // + this.chkUploadProd.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.chkUploadProd.Checked = true; + this.chkUploadProd.CheckState = System.Windows.Forms.CheckState.Checked; + this.tableLayoutPanel1.SetColumnSpan(this.chkUploadProd, 2); + this.chkUploadProd.Location = new System.Drawing.Point(1019, 40); + this.chkUploadProd.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.chkUploadProd.Name = "chkUploadProd"; + this.chkUploadProd.Size = new System.Drawing.Size(90, 21); + this.chkUploadProd.TabIndex = 470; + this.chkUploadProd.Text = "上传到未发布"; + this.chkUploadProd.UseVisualStyleBackColor = true; + // // btnSetSubSa // this.btnSetSubSa.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -677,7 +712,7 @@ this.btnSetSubSa.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSetSubSa.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSetSubSa.ForeColor = System.Drawing.Color.White; - this.btnSetSubSa.Location = new System.Drawing.Point(1254, 19); + this.btnSetSubSa.Location = new System.Drawing.Point(1372, 19); this.btnSetSubSa.Margin = new System.Windows.Forms.Padding(2); this.btnSetSubSa.Name = "btnSetSubSa"; this.btnSetSubSa.Size = new System.Drawing.Size(90, 26); @@ -694,12 +729,12 @@ this.btnAdd.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnAdd.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnAdd.ForeColor = System.Drawing.Color.White; - this.btnAdd.Location = new System.Drawing.Point(1344, 19); + this.btnAdd.Location = new System.Drawing.Point(1464, 19); this.btnAdd.Margin = new System.Windows.Forms.Padding(2); this.btnAdd.Name = "btnAdd"; this.btnAdd.Size = new System.Drawing.Size(90, 26); this.btnAdd.TabIndex = 444; - this.btnAdd.Text = "一键上传草稿"; + this.btnAdd.Text = "一键上传"; this.btnAdd.UseVisualStyleBackColor = false; this.btnAdd.Click += new System.EventHandler(this.btnAdd_Click); // @@ -721,15 +756,15 @@ // this.splitContainer2.Panel2.Controls.Add(this.ucSplitPage1); this.splitContainer2.Panel2.Controls.Add(this.statusBar); - this.splitContainer2.Size = new System.Drawing.Size(1438, 568); - this.splitContainer2.SplitterDistance = 539; + this.splitContainer2.Size = new System.Drawing.Size(1558, 564); + this.splitContainer2.SplitterDistance = 535; this.splitContainer2.TabIndex = 0; // // pbLoading // this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None; this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pbLoading.Location = new System.Drawing.Point(694, 228); + this.pbLoading.Location = new System.Drawing.Point(754, 242); this.pbLoading.Name = "pbLoading"; this.pbLoading.Size = new System.Drawing.Size(50, 50); this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -784,36 +819,13 @@ this.dgvSelectProduct.Location = new System.Drawing.Point(4, 0); this.dgvSelectProduct.Name = "dgvSelectProduct"; this.dgvSelectProduct.ReadOnly = true; - this.dgvSelectProduct.RowHeadersWidth = 51; + this.dgvSelectProduct.RowHeadersWidth = 40; this.dgvSelectProduct.RowTemplate.Height = 23; - this.dgvSelectProduct.Size = new System.Drawing.Size(1430, 539); + this.dgvSelectProduct.Size = new System.Drawing.Size(1550, 535); this.dgvSelectProduct.TabIndex = 189; this.dgvSelectProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSelectProduct_CellContentClick); this.dgvSelectProduct.Scroll += new System.Windows.Forms.ScrollEventHandler(this.dgvSelectProduct_Scroll); // - // ucSplitPage1 - // - this.ucSplitPage1.CurrentPage = 1; - this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right; - this.ucSplitPage1.Location = new System.Drawing.Point(1076, 0); - this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0); - this.ucSplitPage1.Name = "ucSplitPage1"; - this.ucSplitPage1.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0); - this.ucSplitPage1.Size = new System.Drawing.Size(362, 25); - this.ucSplitPage1.TabIndex = 6; - this.ucSplitPage1.TotalPage = 1; - // - // statusBar - // - this.statusBar.BackColor = System.Drawing.Color.White; - this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill; - this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.statusBar.Location = new System.Drawing.Point(0, 0); - this.statusBar.Margin = new System.Windows.Forms.Padding(0); - this.statusBar.Name = "statusBar"; - this.statusBar.Size = new System.Drawing.Size(1438, 25); - this.statusBar.TabIndex = 5; - // // colSelect // this.colSelect.HeaderText = "选择"; @@ -1024,10 +1036,33 @@ this.colOpResult.ReadOnly = true; this.colOpResult.Width = 150; // + // ucSplitPage1 + // + this.ucSplitPage1.CurrentPage = 1; + this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right; + this.ucSplitPage1.Location = new System.Drawing.Point(1196, 0); + this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0); + this.ucSplitPage1.Name = "ucSplitPage1"; + this.ucSplitPage1.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0); + this.ucSplitPage1.Size = new System.Drawing.Size(362, 25); + this.ucSplitPage1.TabIndex = 6; + this.ucSplitPage1.TotalPage = 1; + // + // statusBar + // + this.statusBar.BackColor = System.Drawing.Color.White; + this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill; + this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.statusBar.Location = new System.Drawing.Point(0, 0); + this.statusBar.Margin = new System.Windows.Forms.Padding(0); + this.statusBar.Name = "statusBar"; + this.statusBar.Size = new System.Drawing.Size(1558, 25); + this.statusBar.TabIndex = 5; + // // DbProductSelectListManageForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(1440, 672); + this.ClientSize = new System.Drawing.Size(1560, 672); this.Controls.Add(this.splitContainer1); this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); @@ -1130,5 +1165,7 @@ private System.Windows.Forms.DataGridViewLinkColumn colEditNotes; private System.Windows.Forms.DataGridViewLinkColumn colDelete; private System.Windows.Forms.DataGridViewTextBoxColumn colOpResult; + private System.Windows.Forms.Label label13; + private System.Windows.Forms.ComboBox cmbNotes; } } \ No newline at end of file diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs index 96fb151..0eda055 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs +++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs @@ -49,8 +49,8 @@ namespace TemuKJD.KJDForms.ProductSelectForms chkUploadProd.Visible = false; // 直接上传 flowLayoutPanel1.Visible = false; // 一些测试操作项目显示在此处 - flowLayoutPanel1.Visible = true; chkUploadProd.Visible = true; + flowLayoutPanel1.Visible = true; if (BaseClass.SaLevel == 1) { @@ -229,6 +229,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms "&search_prod_name=" + txtProdName.Text + "&search_shop_id=" + txtShopId.Text + "&search_shop_account=" + txtShopName.Text + + "&search_notes=" + (cmbNotes.Text == "全部" ? "" : cmbNotes.Text) + "&search_user_notes=" + (cmbUserNotes.Text == "全部" ? "" : cmbUserNotes.Text) + "&status=" + (cmbStatus.Text == "全部" ? "" : cmbStatus.Text) ; if (BaseClass.SaLevel > 1) @@ -280,7 +281,8 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.txtSKC.Text = ""; this.txtSPU.Text = ""; this.cmbStatus.Text = "待上传"; - this.cmbUserNotes.Text = ""; + this.cmbNotes.Text = "全部"; + this.cmbUserNotes.Text = "全部"; } private void dgvSelectProduct_CellContentClick(object sender, DataGridViewCellEventArgs e) @@ -598,10 +600,9 @@ namespace TemuKJD.KJDForms.ProductSelectForms { result = UploadProduct(shop, temuDBProd, prod, row.Cells["colOpResult"]); //将商品上传至草稿箱 - if (result.Contains("登录过期")) - { - shop.LoginStatus = "未登录"; - ShopForms.ShopListForm.UpdateServerShopCookies(shop); // 店铺cookie写入服务端，多店共用一个登录账号一组cookie + if (result.Contains("登录过期") || result.Contains("Invalid Login State")) + { + AdminShopListForm.Instance.CheckShopLogin(shopLst.Where(s => s.LoginName == shop.LoginName).ToArray(), false); } } catch (Exception ex) @@ -611,7 +612,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms Thread.Sleep(200); var error = BaseRegex.GetStringJson(ref result, "errMsg"); - if (result.Contains("\"status\":\"未上传\"")) + if (!result.Contains("\"success\":true")) { if (string.IsNullOrWhiteSpace(error)) error = result; @@ -764,7 +765,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms if (catId == 0) catId = prodParam.cat1Id.ParseToLong(); var html = AddDraft(shop, catId.ToString()); - if (html.Contains("{\"success\":true")) + if (html.Contains("\"success\":true")) prodParam.productDraftId = BaseRegex.GetLongJson(ref html, "productDraftId"); else { @@ -1191,7 +1192,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms sizeSpec = sizeSpec.Replace("\"contentVO\"", "\"content\""); var sizeParam = JsonHelper.DeserializeJsonToObject(sizeSpec); html = CreateSizeSpec(shop, prodParam.productDraftId.ToString(), sizeParam); - if (html.Contains("{\"success\":true")) + if (html.Contains("\"success\":true")) { var sizeSpecId = BaseRegex.GetLongJson(ref html, "businessId"); prodParam.sizeTemplateIds = new List(); @@ -1219,7 +1220,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms })); } html = SaveDraft(shop, prodParam.productDraftId.ToString(), prodParam); - if (html.Contains("{\"success\":true")) + if (html.Contains("\"success\":true")) { if (!chkUploadProd.Checked) { diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductUserSelectForm.Designer.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductUserSelectForm.Designer.cs index 1924c80..09ba633 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductUserSelectForm.Designer.cs +++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductUserSelectForm.Designer.cs @@ -30,12 +30,25 @@ namespace TemuKJD.KJDForms.ProductSelectForms 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 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.label2 = new System.Windows.Forms.Label(); + this.txtExtCode = new System.Windows.Forms.TextBox(); + this.label13 = new System.Windows.Forms.Label(); + this.label6 = new System.Windows.Forms.Label(); + this.cmbNotes = new System.Windows.Forms.ComboBox(); + this.txtShopId = new System.Windows.Forms.TextBox(); + this.label7 = new System.Windows.Forms.Label(); + this.txtShopName = new System.Windows.Forms.TextBox(); + this.label3 = new System.Windows.Forms.Label(); + this.txtProdName = new System.Windows.Forms.TextBox(); + this.cmbUserNotes = new System.Windows.Forms.ComboBox(); + this.label12 = new System.Windows.Forms.Label(); this.btnDelSelect = new DevComponents.DotNetBar.PanelEx(); this.cmbStatus = new System.Windows.Forms.ComboBox(); this.label8 = new System.Windows.Forms.Label(); @@ -61,6 +74,10 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.btnClear = new DevComponents.DotNetBar.PanelEx(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); + this.label1 = new System.Windows.Forms.Label(); + this.txtSPU = new System.Windows.Forms.TextBox(); + this.txtSKC = new System.Windows.Forms.TextBox(); + this.label5 = new System.Windows.Forms.Label(); this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colSelectId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colSupplierId = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -78,6 +95,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.colNotes = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colUserNotes = new System.Windows.Forms.DataGridViewLinkColumn(); this.ColDelete = new System.Windows.Forms.DataGridViewLinkColumn(); + this.pnlEmpty = new DevComponents.DotNetBar.PanelEx(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -117,7 +135,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms // splitContainer1.Panel2 // this.splitContainer1.Panel2.Controls.Add(this.splitContainer3); - this.splitContainer1.Size = new System.Drawing.Size(1559, 546); + this.splitContainer1.Size = new System.Drawing.Size(1284, 546); this.splitContainer1.SplitterDistance = 120; this.splitContainer1.TabIndex = 11; // @@ -128,17 +146,158 @@ namespace TemuKJD.KJDForms.ProductSelectForms | System.Windows.Forms.AnchorStyles.Right))); this.ucGroupBoxEx4.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.ucGroupBoxEx4.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx4.Controls.Add(this.pnlEmpty); + this.ucGroupBoxEx4.Controls.Add(this.label5); + this.ucGroupBoxEx4.Controls.Add(this.txtSKC); + this.ucGroupBoxEx4.Controls.Add(this.txtSPU); + this.ucGroupBoxEx4.Controls.Add(this.label1); + this.ucGroupBoxEx4.Controls.Add(this.label2); + this.ucGroupBoxEx4.Controls.Add(this.txtExtCode); + this.ucGroupBoxEx4.Controls.Add(this.label13); + this.ucGroupBoxEx4.Controls.Add(this.label6); + this.ucGroupBoxEx4.Controls.Add(this.cmbNotes); + this.ucGroupBoxEx4.Controls.Add(this.txtShopId); + this.ucGroupBoxEx4.Controls.Add(this.label7); + this.ucGroupBoxEx4.Controls.Add(this.txtShopName); + this.ucGroupBoxEx4.Controls.Add(this.label3); + this.ucGroupBoxEx4.Controls.Add(this.txtProdName); + this.ucGroupBoxEx4.Controls.Add(this.cmbUserNotes); + this.ucGroupBoxEx4.Controls.Add(this.label12); this.ucGroupBoxEx4.Controls.Add(this.btnDelSelect); this.ucGroupBoxEx4.Controls.Add(this.cmbStatus); this.ucGroupBoxEx4.Controls.Add(this.label8); this.ucGroupBoxEx4.Controls.Add(this.btnSearch); this.ucGroupBoxEx4.Location = new System.Drawing.Point(147, 2); this.ucGroupBoxEx4.Name = "ucGroupBoxEx4"; - this.ucGroupBoxEx4.Size = new System.Drawing.Size(1410, 120); + this.ucGroupBoxEx4.Size = new System.Drawing.Size(1135, 120); this.ucGroupBoxEx4.TabIndex = 666; this.ucGroupBoxEx4.TabStop = false; this.ucGroupBoxEx4.Text = "认领商品查询"; // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(563, 76); + this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(32, 17); + this.label2.TabIndex = 490; + this.label2.Text = "货号"; + this.label2.Visible = false; + // + // txtExtCode + // + this.txtExtCode.Location = new System.Drawing.Point(595, 73); + this.txtExtCode.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtExtCode.Name = "txtExtCode"; + this.txtExtCode.Size = new System.Drawing.Size(86, 23); + this.txtExtCode.TabIndex = 489; + this.txtExtCode.Visible = false; + // + // label13 + // + this.label13.AutoSize = true; + this.label13.Location = new System.Drawing.Point(172, 76); + this.label13.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(56, 17); + this.label13.TabIndex = 487; + this.label13.Text = "上传备注"; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(39, 35); + this.label6.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(44, 17); + this.label6.TabIndex = 482; + this.label6.Text = "店铺Id"; + // + // cmbNotes + // + this.cmbNotes.FormattingEnabled = true; + this.cmbNotes.Items.AddRange(new object[] { + "全部", + "无备注", + "核价成功", + "核价成功（重复）", + "重复"}); + this.cmbNotes.Location = new System.Drawing.Point(229, 72); + this.cmbNotes.Margin = new System.Windows.Forms.Padding(0); + this.cmbNotes.Name = "cmbNotes"; + this.cmbNotes.Size = new System.Drawing.Size(85, 25); + this.cmbNotes.TabIndex = 488; + this.cmbNotes.Text = "全部"; + // + // txtShopId + // + this.txtShopId.Location = new System.Drawing.Point(83, 32); + this.txtShopId.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtShopId.Name = "txtShopId"; + this.txtShopId.Size = new System.Drawing.Size(85, 23); + this.txtShopId.TabIndex = 481; + // + // label7 + // + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(172, 35); + this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(56, 17); + this.label7.TabIndex = 484; + this.label7.Text = "店铺名称"; + // + // txtShopName + // + this.txtShopName.Location = new System.Drawing.Point(228, 32); + this.txtShopName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtShopName.Name = "txtShopName"; + this.txtShopName.Size = new System.Drawing.Size(86, 23); + this.txtShopName.TabIndex = 483; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(441, 76); + this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(32, 17); + this.label3.TabIndex = 476; + this.label3.Text = "标题"; + // + // txtProdName + // + this.txtProdName.Location = new System.Drawing.Point(473, 73); + this.txtProdName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtProdName.Name = "txtProdName"; + this.txtProdName.Size = new System.Drawing.Size(86, 23); + this.txtProdName.TabIndex = 475; + // + // cmbUserNotes + // + this.cmbUserNotes.FormattingEnabled = true; + this.cmbUserNotes.Items.AddRange(new object[] { + "全部", + "重上", + "已买"}); + this.cmbUserNotes.Location = new System.Drawing.Point(351, 72); + this.cmbUserNotes.Margin = new System.Windows.Forms.Padding(0); + this.cmbUserNotes.Name = "cmbUserNotes"; + this.cmbUserNotes.Size = new System.Drawing.Size(85, 25); + this.cmbUserNotes.TabIndex = 486; + this.cmbUserNotes.Text = "全部"; + // + // label12 + // + this.label12.AutoSize = true; + this.label12.Location = new System.Drawing.Point(318, 76); + this.label12.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(32, 17); + this.label12.TabIndex = 485; + this.label12.Text = "备注"; + // // btnDelSelect // this.btnDelSelect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -146,7 +305,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.btnDelSelect.Cursor = System.Windows.Forms.Cursors.Hand; this.btnDelSelect.DisabledBackColor = System.Drawing.Color.Empty; this.btnDelSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnDelSelect.Location = new System.Drawing.Point(1257, 35); + this.btnDelSelect.Location = new System.Drawing.Point(982, 32); this.btnDelSelect.Name = "btnDelSelect"; this.btnDelSelect.Size = new System.Drawing.Size(126, 23); this.btnDelSelect.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -170,8 +329,9 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.cmbStatus.Items.AddRange(new object[] { "待上传", "已上传", + "草稿箱", "全部"}); - this.cmbStatus.Location = new System.Drawing.Point(78, 31); + this.cmbStatus.Location = new System.Drawing.Point(83, 72); this.cmbStatus.Name = "cmbStatus"; this.cmbStatus.Size = new System.Drawing.Size(85, 25); this.cmbStatus.TabIndex = 461; @@ -180,11 +340,11 @@ namespace TemuKJD.KJDForms.ProductSelectForms // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(21, 35); + this.label8.Location = new System.Drawing.Point(26, 76); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(68, 17); + this.label8.Size = new System.Drawing.Size(56, 17); this.label8.TabIndex = 460; - this.label8.Text = "认领状态："; + this.label8.Text = "认领状态"; // // btnSearch // @@ -192,7 +352,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSearch.DisabledBackColor = System.Drawing.Color.Empty; this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSearch.Location = new System.Drawing.Point(179, 32); + this.btnSearch.Location = new System.Drawing.Point(572, 32); this.btnSearch.Name = "btnSearch"; this.btnSearch.Size = new System.Drawing.Size(126, 23); this.btnSearch.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -264,7 +424,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms // splitContainer3.Panel2 // this.splitContainer3.Panel2.Controls.Add(this.splitContainer4); - this.splitContainer3.Size = new System.Drawing.Size(1559, 422); + this.splitContainer3.Size = new System.Drawing.Size(1284, 422); this.splitContainer3.SplitterDistance = 392; this.splitContainer3.TabIndex = 1; // @@ -285,7 +445,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.splitContainer2.Panel2.Controls.Add(this.pbLoading); this.splitContainer2.Panel2.Controls.Add(this.dgvSelectProduct); this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0); - this.splitContainer2.Size = new System.Drawing.Size(1559, 392); + this.splitContainer2.Size = new System.Drawing.Size(1284, 392); this.splitContainer2.SplitterDistance = 270; this.splitContainer2.TabIndex = 0; // @@ -293,18 +453,18 @@ namespace TemuKJD.KJDForms.ProductSelectForms // 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.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, @@ -401,7 +561,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms // this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None; this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pbLoading.Location = new System.Drawing.Point(617, 171); + this.pbLoading.Location = new System.Drawing.Point(480, 171); this.pbLoading.Name = "pbLoading"; this.pbLoading.Size = new System.Drawing.Size(50, 50); this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -413,18 +573,18 @@ namespace TemuKJD.KJDForms.ProductSelectForms // this.dgvSelectProduct.AllowUserToAddRows = false; this.dgvSelectProduct.AllowUserToDeleteRows = false; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle8.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle8; this.dgvSelectProduct.BackgroundColor = System.Drawing.Color.White; this.dgvSelectProduct.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.dgvSelectProduct.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.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9; this.dgvSelectProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvSelectProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colCheck, @@ -449,7 +609,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.dgvSelectProduct.Name = "dgvSelectProduct"; this.dgvSelectProduct.ReadOnly = true; this.dgvSelectProduct.RowTemplate.Height = 23; - this.dgvSelectProduct.Size = new System.Drawing.Size(1281, 392); + this.dgvSelectProduct.Size = new System.Drawing.Size(1006, 392); this.dgvSelectProduct.TabIndex = 187; this.dgvSelectProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSelectProduct_CellContentClick); // @@ -469,8 +629,8 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.splitContainer4.Panel2.Controls.Add(this.btnClear); this.splitContainer4.Panel2.Controls.Add(this.panelEx1); this.splitContainer4.Panel2.Controls.Add(this.ucSplitPage1); - this.splitContainer4.Size = new System.Drawing.Size(1559, 26); - this.splitContainer4.SplitterDistance = 868; + this.splitContainer4.Size = new System.Drawing.Size(1284, 26); + this.splitContainer4.SplitterDistance = 593; this.splitContainer4.TabIndex = 3; // // statusBar @@ -481,7 +641,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.statusBar.Location = new System.Drawing.Point(0, 0); this.statusBar.Margin = new System.Windows.Forms.Padding(0); this.statusBar.Name = "statusBar"; - this.statusBar.Size = new System.Drawing.Size(868, 26); + this.statusBar.Size = new System.Drawing.Size(593, 26); this.statusBar.TabIndex = 2; // // btnClear @@ -546,6 +706,42 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.ucSplitPage1.TabIndex = 675; this.ucSplitPage1.TotalPage = 1; // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(442, 35); + this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(31, 17); + this.label1.TabIndex = 498; + this.label1.Text = "SKC"; + // + // txtSPU + // + this.txtSPU.Location = new System.Drawing.Point(351, 32); + this.txtSPU.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtSPU.Name = "txtSPU"; + this.txtSPU.Size = new System.Drawing.Size(86, 23); + this.txtSPU.TabIndex = 499; + // + // txtSKC + // + this.txtSKC.Location = new System.Drawing.Point(473, 32); + this.txtSKC.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtSKC.Name = "txtSKC"; + this.txtSKC.Size = new System.Drawing.Size(86, 23); + this.txtSKC.TabIndex = 497; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(319, 35); + this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(31, 17); + this.label5.TabIndex = 500; + this.label5.Text = "SPU"; + // // colCheck // this.colCheck.Frozen = true; @@ -605,7 +801,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.colSpuId.ReadOnly = true; this.colSpuId.Resizable = System.Windows.Forms.DataGridViewTriState.True; this.colSpuId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colSpuId.Visible = false; + this.colSpuId.Width = 80; // // colSkcId // @@ -615,13 +811,11 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.colSkcId.ReadOnly = true; this.colSkcId.Resizable = System.Windows.Forms.DataGridViewTriState.True; this.colSkcId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colSkcId.Visible = false; this.colSkcId.Width = 80; // // colProductSkcPic // - this.colProductSkcPic.Frozen = true; - this.colProductSkcPic.HeaderText = "Skc图片"; + this.colProductSkcPic.HeaderText = "图片"; this.colProductSkcPic.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom; this.colProductSkcPic.Name = "colProductSkcPic"; this.colProductSkcPic.ReadOnly = true; @@ -629,15 +823,15 @@ namespace TemuKJD.KJDForms.ProductSelectForms // // colProductName // - this.colProductName.Frozen = true; + dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colProductName.DefaultCellStyle = dataGridViewCellStyle10; this.colProductName.HeaderText = "商品标题"; this.colProductName.Name = "colProductName"; this.colProductName.ReadOnly = true; - this.colProductName.Width = 260; + this.colProductName.Width = 200; // // colProductCat // - this.colProductCat.Frozen = true; this.colProductCat.HeaderText = "商品类目"; this.colProductCat.Name = "colProductCat"; this.colProductCat.ReadOnly = true; @@ -645,22 +839,19 @@ namespace TemuKJD.KJDForms.ProductSelectForms // // colExtCode // - this.colExtCode.Frozen = true; this.colExtCode.HeaderText = "商品货号"; this.colExtCode.Name = "colExtCode"; this.colExtCode.ReadOnly = true; // // colMsg // - this.colMsg.Frozen = true; this.colMsg.HeaderText = "状态"; this.colMsg.Name = "colMsg"; this.colMsg.ReadOnly = true; // // colDraftId // - this.colDraftId.Frozen = true; - this.colDraftId.HeaderText = "草稿箱Id"; + this.colDraftId.HeaderText = "上传商品Id"; this.colDraftId.Name = "colDraftId"; this.colDraftId.ReadOnly = true; this.colDraftId.Resizable = System.Windows.Forms.DataGridViewTriState.True; @@ -669,7 +860,6 @@ namespace TemuKJD.KJDForms.ProductSelectForms // // colNotes // - this.colNotes.Frozen = true; this.colNotes.HeaderText = "上传备注"; this.colNotes.Name = "colNotes"; this.colNotes.ReadOnly = true; @@ -689,11 +879,37 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.ColDelete.ReadOnly = true; this.ColDelete.Width = 75; // + // pnlEmpty + // + this.pnlEmpty.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.pnlEmpty.CanvasColor = System.Drawing.SystemColors.Control; + this.pnlEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.pnlEmpty.DisabledBackColor = System.Drawing.Color.Empty; + this.pnlEmpty.Location = new System.Drawing.Point(705, 32); + this.pnlEmpty.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); + this.pnlEmpty.Name = "pnlEmpty"; + this.pnlEmpty.Size = new System.Drawing.Size(56, 23); + this.pnlEmpty.Style.Alignment = System.Drawing.StringAlignment.Center; + this.pnlEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.pnlEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.pnlEmpty.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.pnlEmpty.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.pnlEmpty.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.pnlEmpty.Style.GradientAngle = 90; + this.pnlEmpty.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.pnlEmpty.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.pnlEmpty.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.pnlEmpty.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.pnlEmpty.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.pnlEmpty.TabIndex = 504; + this.pnlEmpty.Text = "清空条件"; + this.pnlEmpty.Click += new System.EventHandler(this.pnlEmpty_Click); + // // DbProductUserSelectForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.BackColor = System.Drawing.Color.White; - this.ClientSize = new System.Drawing.Size(1559, 546); + this.ClientSize = new System.Drawing.Size(1284, 546); this.Controls.Add(this.splitContainer1); this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.Name = "DbProductUserSelectForm"; @@ -755,6 +971,22 @@ namespace TemuKJD.KJDForms.ProductSelectForms private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse; private System.Windows.Forms.DataGridViewTextBoxColumn colRemaining; private System.Windows.Forms.DataGridViewTextBoxColumn colMessage; + private System.Windows.Forms.Label label13; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.ComboBox cmbNotes; + private System.Windows.Forms.TextBox txtShopId; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.TextBox txtShopName; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.TextBox txtProdName; + private System.Windows.Forms.ComboBox cmbUserNotes; + private System.Windows.Forms.Label label12; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.TextBox txtExtCode; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.TextBox txtSKC; + private System.Windows.Forms.TextBox txtSPU; + private System.Windows.Forms.Label label1; private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck; private System.Windows.Forms.DataGridViewTextBoxColumn colSelectId; private System.Windows.Forms.DataGridViewTextBoxColumn colSupplierId; @@ -772,5 +1004,6 @@ namespace TemuKJD.KJDForms.ProductSelectForms private System.Windows.Forms.DataGridViewTextBoxColumn colNotes; private System.Windows.Forms.DataGridViewLinkColumn colUserNotes; private System.Windows.Forms.DataGridViewLinkColumn ColDelete; + private DevComponents.DotNetBar.PanelEx pnlEmpty; } } \ No newline at end of file diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductUserSelectForm.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductUserSelectForm.cs index b54f86d..ee7cc46 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductUserSelectForm.cs +++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductUserSelectForm.cs @@ -240,8 +240,8 @@ namespace TemuKJD.KJDForms.ProductSelectForms prodSelect.shop_account, "进店", "登录", - "",//prodSelect.spu_id, - "",//prodSelect.skc_id, + prodSelect.spu_id, + prodSelect.skc_id, image,//prod.main_img, prodSelect.product_name, // 用户端显示商品原名 prodSelect.cat_name, @@ -279,10 +279,16 @@ namespace TemuKJD.KJDForms.ProductSelectForms "&page=" + page + "&page_size=" + pageSize + //"&out_product_id=" + dbId + - //"&shop_id=" + shop.ShopId + - //"&shop_account=" + shop.ShopAccount + //"&main_user_name=" + shop.UserName + //"&sub_user_name=" + shop.SubUserName + + "&search_spu=" + txtSPU.Text + + "&search_skc=" + txtSKC.Text + + "&search_ext_code=" + txtExtCode.Text + + "&search_prod_name=" + txtProdName.Text + + "&search_shop_id=" + txtShopId.Text + + "&search_shop_account=" + txtShopName.Text + + "&search_notes=" + (cmbNotes.Text == "全部" ? "" : cmbNotes.Text) + + "&search_user_notes=" + (cmbUserNotes.Text == "全部" ? "" : cmbUserNotes.Text) + "&status=" + (cmbStatus.Text == "全部" ? "" : cmbStatus.Text) + "&shop_ids=\"" + string.Join("\",\"", lstShopId) + "\""; })); @@ -360,7 +366,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms dgvSelectProduct.Rows[e.RowIndex].Cells["colUserNotes"].Value = (dbProduct.user_notes + " 编辑").Trim(); } break; - case "草稿箱Id": + case "上传商品Id": //if (!string.IsNullOrEmpty(draftId) && shop != null) //{ // ShopLoginForm shopLoginForm = new ShopLoginForm(shop); @@ -444,5 +450,19 @@ namespace TemuKJD.KJDForms.ProductSelectForms }); } + + private void pnlEmpty_Click(object sender, EventArgs e) + { + //this.txtCat.Text = ""; + this.txtExtCode.Text = ""; + this.txtProdName.Text = ""; + this.txtShopId.Text = ""; + this.txtShopName.Text = ""; + this.txtSKC.Text = ""; + this.txtSPU.Text = ""; + this.cmbStatus.Text = "待上传"; + this.cmbNotes.Text = "全部"; + this.cmbUserNotes.Text = "全部"; + } } } diff --git a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs index 4703255..31c81e0 100644 --- a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs +++ b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs @@ -42,8 +42,9 @@ this.pbFissionSetting = new System.Windows.Forms.PictureBox(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.cmbUserNotes = new System.Windows.Forms.ComboBox(); - this.label12 = new System.Windows.Forms.Label(); - this.chkUploadProd = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.cmbNotes = new System.Windows.Forms.ComboBox(); + this.label13 = new System.Windows.Forms.Label(); + this.cmbStatus = new System.Windows.Forms.ComboBox(); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.label9 = new System.Windows.Forms.Label(); this.txtSkuHeadText = new System.Windows.Forms.TextBox(); @@ -72,19 +73,18 @@ this.label3 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); this.txtProdName = new System.Windows.Forms.TextBox(); - this.cmbStatus = new System.Windows.Forms.ComboBox(); - this.chkNoSubSa = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.chkShowDel = new TemuKJD.UserComponent.UcCheckBox(this.components); this.pnlEmpty = new DevComponents.DotNetBar.PanelEx(); this.btnSearch = new TemuKJD.UserControls.ButtonEx(); + this.label12 = new System.Windows.Forms.Label(); + this.chkNoSubSa = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.chkShowDel = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.chkUploadProd = new TemuKJD.UserComponent.UcCheckBox(this.components); this.btnReFission = new TemuKJD.UserControls.ButtonEx(); this.btnSetSubSa = new TemuKJD.UserControls.ButtonEx(); this.btnAdd = new TemuKJD.UserControls.ButtonEx(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.pbLoading = new System.Windows.Forms.PictureBox(); this.dgvSelectProduct = new TemuKJD.UserComponent.DataGridViewEx(); - this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); - this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colSelectId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colSupplierId = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -111,6 +111,8 @@ this.colEditNotes = new System.Windows.Forms.DataGridViewLinkColumn(); this.ColDelete = new System.Windows.Forms.DataGridViewLinkColumn(); this.colOpResult = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -147,15 +149,15 @@ // splitContainer1.Panel2 // this.splitContainer1.Panel2.Controls.Add(this.splitContainer2); - this.splitContainer1.Size = new System.Drawing.Size(1577, 638); - this.splitContainer1.SplitterDistance = 66; + this.splitContainer1.Size = new System.Drawing.Size(1558, 638); + this.splitContainer1.SplitterDistance = 70; this.splitContainer1.TabIndex = 2; // // pbFissionSetting // this.pbFissionSetting.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.pbFissionSetting.Image = global::TemuKJD.Properties.Resources.齿轮; - this.pbFissionSetting.Location = new System.Drawing.Point(1283, 19); + this.pbFissionSetting.Location = new System.Drawing.Point(1260, 19); this.pbFissionSetting.Name = "pbFissionSetting"; this.pbFissionSetting.Size = new System.Drawing.Size(26, 26); this.pbFissionSetting.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -168,33 +170,34 @@ // this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.tableLayoutPanel1.ColumnCount = 23; + this.tableLayoutPanel1.ColumnCount = 22; this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0001F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 9.999102F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.Controls.Add(this.cmbUserNotes, 17, 0); - this.tableLayoutPanel1.Controls.Add(this.label12, 16, 0); - this.tableLayoutPanel1.Controls.Add(this.chkUploadProd, 22, 0); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.Controls.Add(this.cmbUserNotes, 19, 0); + this.tableLayoutPanel1.Controls.Add(this.cmbNotes, 17, 0); + this.tableLayoutPanel1.Controls.Add(this.label13, 16, 0); + this.tableLayoutPanel1.Controls.Add(this.cmbStatus, 15, 0); this.tableLayoutPanel1.Controls.Add(this.flowLayoutPanel1, 0, 1); this.tableLayoutPanel1.Controls.Add(this.label6, 0, 0); this.tableLayoutPanel1.Controls.Add(this.txtShopId, 1, 0); @@ -211,17 +214,18 @@ this.tableLayoutPanel1.Controls.Add(this.label3, 10, 0); this.tableLayoutPanel1.Controls.Add(this.label4, 12, 0); this.tableLayoutPanel1.Controls.Add(this.txtProdName, 11, 0); - this.tableLayoutPanel1.Controls.Add(this.cmbStatus, 15, 0); - this.tableLayoutPanel1.Controls.Add(this.chkNoSubSa, 18, 0); - this.tableLayoutPanel1.Controls.Add(this.chkShowDel, 19, 0); - this.tableLayoutPanel1.Controls.Add(this.pnlEmpty, 21, 0); + this.tableLayoutPanel1.Controls.Add(this.pnlEmpty, 20, 1); this.tableLayoutPanel1.Controls.Add(this.btnSearch, 20, 0); - this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 3); + this.tableLayoutPanel1.Controls.Add(this.label12, 18, 0); + this.tableLayoutPanel1.Controls.Add(this.chkNoSubSa, 21, 0); + this.tableLayoutPanel1.Controls.Add(this.chkShowDel, 21, 1); + this.tableLayoutPanel1.Controls.Add(this.chkUploadProd, 18, 1); + this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 2); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 2; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.Size = new System.Drawing.Size(1287, 60); + this.tableLayoutPanel1.Size = new System.Drawing.Size(1268, 66); this.tableLayoutPanel1.TabIndex = 469; // // cmbUserNotes @@ -229,42 +233,64 @@ this.cmbUserNotes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.cmbUserNotes.FormattingEnabled = true; this.cmbUserNotes.Items.AddRange(new object[] { - "", + "全部", "重上", "已买"}); - this.cmbUserNotes.Location = new System.Drawing.Point(837, 6); - this.cmbUserNotes.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.cmbUserNotes.Location = new System.Drawing.Point(1044, 8); + this.cmbUserNotes.Margin = new System.Windows.Forms.Padding(0); this.cmbUserNotes.Name = "cmbUserNotes"; - this.cmbUserNotes.Size = new System.Drawing.Size(52, 25); - this.cmbUserNotes.TabIndex = 461; + this.cmbUserNotes.Size = new System.Drawing.Size(65, 25); + this.cmbUserNotes.TabIndex = 466; + this.cmbUserNotes.Text = "全部"; // - // label12 + // cmbNotes // - this.label12.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(781, 7); - this.label12.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(56, 17); - this.label12.TabIndex = 460; - this.label12.Text = "用户备注"; + this.cmbNotes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.cmbNotes.FormattingEnabled = true; + this.cmbNotes.Items.AddRange(new object[] { + "全部", + "无备注", + "核价成功", + "核价成功（重复）", + "重复"}); + this.cmbNotes.Location = new System.Drawing.Point(917, 8); + this.cmbNotes.Margin = new System.Windows.Forms.Padding(0); + this.cmbNotes.Name = "cmbNotes"; + this.cmbNotes.Size = new System.Drawing.Size(65, 25); + this.cmbNotes.TabIndex = 467; + this.cmbNotes.Text = "全部"; // - // chkUploadProd + // label13 // - this.chkUploadProd.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.chkUploadProd.Location = new System.Drawing.Point(1188, 19); - this.chkUploadProd.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.chkUploadProd.Name = "chkUploadProd"; - this.tableLayoutPanel1.SetRowSpan(this.chkUploadProd, 2); - this.chkUploadProd.Size = new System.Drawing.Size(96, 21); - this.chkUploadProd.TabIndex = 471; - this.chkUploadProd.Text = "上传到未发布"; - this.chkUploadProd.UseVisualStyleBackColor = true; + this.label13.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.label13.AutoSize = true; + this.label13.Location = new System.Drawing.Point(885, 9); + this.label13.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(32, 17); + this.label13.TabIndex = 461; + this.label13.Text = "备注"; + // + // cmbStatus + // + this.cmbStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.cmbStatus.FormattingEnabled = true; + this.cmbStatus.Items.AddRange(new object[] { + "待上传", + "已上传", + "草稿箱", + "全部"}); + this.cmbStatus.Location = new System.Drawing.Point(814, 8); + this.cmbStatus.Margin = new System.Windows.Forms.Padding(0); + this.cmbStatus.Name = "cmbStatus"; + this.cmbStatus.Size = new System.Drawing.Size(65, 25); + this.cmbStatus.TabIndex = 465; + this.cmbStatus.Text = "待上传"; // // flowLayoutPanel1 // this.flowLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.tableLayoutPanel1.SetColumnSpan(this.flowLayoutPanel1, 20); + this.tableLayoutPanel1.SetColumnSpan(this.flowLayoutPanel1, 18); this.flowLayoutPanel1.Controls.Add(this.label9); this.flowLayoutPanel1.Controls.Add(this.txtSkuHeadText); this.flowLayoutPanel1.Controls.Add(this.label10); @@ -277,10 +303,10 @@ this.flowLayoutPanel1.Controls.Add(this.chkSkuRandomPrice); this.flowLayoutPanel1.Controls.Add(this.numSkuRandomPrice); this.flowLayoutPanel1.Controls.Add(this.label11); - this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 32); + this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 36); this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; - this.flowLayoutPanel1.Size = new System.Drawing.Size(1060, 28); + this.flowLayoutPanel1.Size = new System.Drawing.Size(982, 30); this.flowLayoutPanel1.TabIndex = 472; // // label9 @@ -363,7 +389,8 @@ // this.chkDeleteLowPriceSku.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.chkDeleteLowPriceSku.AutoSize = true; - this.chkDeleteLowPriceSku.Enabled = false; + this.chkDeleteLowPriceSku.Checked = true; + this.chkDeleteLowPriceSku.CheckState = System.Windows.Forms.CheckState.Checked; this.chkDeleteLowPriceSku.Location = new System.Drawing.Point(530, 4); this.chkDeleteLowPriceSku.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0); this.chkDeleteLowPriceSku.Name = "chkDeleteLowPriceSku"; @@ -430,7 +457,7 @@ // this.label6.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(3, 7); + this.label6.Location = new System.Drawing.Point(3, 9); this.label6.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(44, 17); @@ -440,17 +467,17 @@ // txtShopId // this.txtShopId.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtShopId.Location = new System.Drawing.Point(47, 4); + this.txtShopId.Location = new System.Drawing.Point(47, 6); this.txtShopId.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtShopId.Name = "txtShopId"; - this.txtShopId.Size = new System.Drawing.Size(52, 23); + this.txtShopId.Size = new System.Drawing.Size(65, 23); this.txtShopId.TabIndex = 448; // // label7 // this.label7.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(105, 7); + this.label7.Location = new System.Drawing.Point(118, 9); this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(56, 17); @@ -461,7 +488,7 @@ // this.label8.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(667, 7); + this.label8.Location = new System.Drawing.Point(758, 9); this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(56, 17); @@ -471,17 +498,17 @@ // txtShopName // this.txtShopName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtShopName.Location = new System.Drawing.Point(161, 4); + this.txtShopName.Location = new System.Drawing.Point(174, 6); this.txtShopName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtShopName.Name = "txtShopName"; - this.txtShopName.Size = new System.Drawing.Size(52, 23); + this.txtShopName.Size = new System.Drawing.Size(65, 23); this.txtShopName.TabIndex = 451; // // label5 // this.label5.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(219, 7); + this.label5.Location = new System.Drawing.Point(245, 9); this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(31, 17); @@ -491,26 +518,26 @@ // txtSKC // this.txtSKC.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtSKC.Location = new System.Drawing.Point(339, 4); + this.txtSKC.Location = new System.Drawing.Point(378, 6); this.txtSKC.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtSKC.Name = "txtSKC"; - this.txtSKC.Size = new System.Drawing.Size(52, 23); + this.txtSKC.Size = new System.Drawing.Size(65, 23); this.txtSKC.TabIndex = 432; // // txtSPU // this.txtSPU.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtSPU.Location = new System.Drawing.Point(250, 4); + this.txtSPU.Location = new System.Drawing.Point(276, 6); this.txtSPU.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtSPU.Name = "txtSPU"; - this.txtSPU.Size = new System.Drawing.Size(52, 23); + this.txtSPU.Size = new System.Drawing.Size(65, 23); this.txtSPU.TabIndex = 434; // // label1 // this.label1.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(308, 7); + this.label1.Location = new System.Drawing.Point(347, 9); this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(31, 17); @@ -521,7 +548,7 @@ // this.label2.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(397, 7); + this.label2.Location = new System.Drawing.Point(449, 9); this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(32, 17); @@ -531,26 +558,26 @@ // txtCat // this.txtCat.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtCat.Location = new System.Drawing.Point(429, 4); + this.txtCat.Location = new System.Drawing.Point(481, 6); this.txtCat.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtCat.Name = "txtCat"; - this.txtCat.Size = new System.Drawing.Size(52, 23); + this.txtCat.Size = new System.Drawing.Size(65, 23); this.txtCat.TabIndex = 425; // // txtExtCode // this.txtExtCode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtExtCode.Location = new System.Drawing.Point(609, 4); + this.txtExtCode.Location = new System.Drawing.Point(687, 6); this.txtExtCode.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtExtCode.Name = "txtExtCode"; - this.txtExtCode.Size = new System.Drawing.Size(52, 23); + this.txtExtCode.Size = new System.Drawing.Size(65, 23); this.txtExtCode.TabIndex = 429; // // label3 // this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(487, 7); + this.label3.Location = new System.Drawing.Point(552, 9); this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(32, 17); @@ -561,7 +588,7 @@ // this.label4.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(577, 7); + this.label4.Location = new System.Drawing.Point(655, 9); this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(32, 17); @@ -571,62 +598,21 @@ // txtProdName // this.txtProdName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtProdName.Location = new System.Drawing.Point(519, 4); + this.txtProdName.Location = new System.Drawing.Point(584, 6); this.txtProdName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtProdName.Name = "txtProdName"; - this.txtProdName.Size = new System.Drawing.Size(52, 23); + this.txtProdName.Size = new System.Drawing.Size(65, 23); this.txtProdName.TabIndex = 427; // - // cmbStatus - // - this.cmbStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.cmbStatus.FormattingEnabled = true; - this.cmbStatus.Items.AddRange(new object[] { - "待上传", - "已上传", - "全部"}); - this.cmbStatus.Location = new System.Drawing.Point(723, 6); - this.cmbStatus.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.cmbStatus.Name = "cmbStatus"; - this.cmbStatus.Size = new System.Drawing.Size(52, 25); - this.cmbStatus.TabIndex = 459; - this.cmbStatus.Text = "待上传"; - // - // chkNoSubSa - // - this.chkNoSubSa.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.chkNoSubSa.AutoSize = true; - this.chkNoSubSa.Location = new System.Drawing.Point(895, 5); - this.chkNoSubSa.Margin = new System.Windows.Forms.Padding(6, 3, 0, 3); - this.chkNoSubSa.Name = "chkNoSubSa"; - this.chkNoSubSa.Size = new System.Drawing.Size(87, 21); - this.chkNoSubSa.TabIndex = 470; - this.chkNoSubSa.Text = "未分配超管"; - this.chkNoSubSa.UseVisualStyleBackColor = true; - // - // chkShowDel - // - this.chkShowDel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.chkShowDel.AutoSize = true; - this.chkShowDel.Location = new System.Drawing.Point(982, 5); - this.chkShowDel.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); - this.chkShowDel.Name = "chkShowDel"; - this.chkShowDel.Size = new System.Drawing.Size(75, 21); - this.chkShowDel.TabIndex = 471; - this.chkShowDel.Text = "显示删除"; - this.chkShowDel.UseVisualStyleBackColor = true; - this.chkShowDel.CheckedChanged += new System.EventHandler(this.chkShowDel_CheckedChanged); - // // pnlEmpty // this.pnlEmpty.Anchor = System.Windows.Forms.AnchorStyles.Left; this.pnlEmpty.CanvasColor = System.Drawing.SystemColors.Control; this.pnlEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.pnlEmpty.DisabledBackColor = System.Drawing.Color.Empty; - this.pnlEmpty.Location = new System.Drawing.Point(1124, 19); - this.pnlEmpty.Margin = new System.Windows.Forms.Padding(2); + this.pnlEmpty.Location = new System.Drawing.Point(1113, 40); + this.pnlEmpty.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); this.pnlEmpty.Name = "pnlEmpty"; - this.tableLayoutPanel1.SetRowSpan(this.pnlEmpty, 2); this.pnlEmpty.Size = new System.Drawing.Size(56, 22); this.pnlEmpty.Style.Alignment = System.Drawing.StringAlignment.Center; this.pnlEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); @@ -652,16 +638,65 @@ this.btnSearch.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSearch.ForeColor = System.Drawing.Color.White; - this.btnSearch.Location = new System.Drawing.Point(1064, 18); + this.btnSearch.Location = new System.Drawing.Point(1113, 6); this.btnSearch.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); this.btnSearch.Name = "btnSearch"; - this.tableLayoutPanel1.SetRowSpan(this.btnSearch, 2); this.btnSearch.Size = new System.Drawing.Size(56, 24); this.btnSearch.TabIndex = 424; this.btnSearch.Text = "搜索"; this.btnSearch.UseVisualStyleBackColor = false; this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click); // + // label12 + // + this.label12.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.label12.AutoSize = true; + this.label12.Location = new System.Drawing.Point(988, 9); + this.label12.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(56, 17); + this.label12.TabIndex = 460; + this.label12.Text = "用户备注"; + // + // chkNoSubSa + // + this.chkNoSubSa.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.chkNoSubSa.AutoSize = true; + this.chkNoSubSa.Location = new System.Drawing.Point(1177, 7); + this.chkNoSubSa.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.chkNoSubSa.Name = "chkNoSubSa"; + this.chkNoSubSa.Size = new System.Drawing.Size(91, 21); + this.chkNoSubSa.TabIndex = 470; + this.chkNoSubSa.Text = "未分配超管"; + this.chkNoSubSa.UseVisualStyleBackColor = true; + // + // chkShowDel + // + this.chkShowDel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.chkShowDel.AutoSize = true; + this.chkShowDel.Location = new System.Drawing.Point(1177, 40); + this.chkShowDel.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.chkShowDel.Name = "chkShowDel"; + this.chkShowDel.Size = new System.Drawing.Size(91, 21); + this.chkShowDel.TabIndex = 471; + this.chkShowDel.Text = "显示删除"; + this.chkShowDel.UseVisualStyleBackColor = true; + this.chkShowDel.CheckedChanged += new System.EventHandler(this.chkShowDel_CheckedChanged); + // + // chkUploadProd + // + this.chkUploadProd.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.chkUploadProd.Checked = true; + this.chkUploadProd.CheckState = System.Windows.Forms.CheckState.Checked; + this.tableLayoutPanel1.SetColumnSpan(this.chkUploadProd, 2); + this.chkUploadProd.Location = new System.Drawing.Point(1019, 40); + this.chkUploadProd.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.chkUploadProd.Name = "chkUploadProd"; + this.chkUploadProd.Size = new System.Drawing.Size(90, 21); + this.chkUploadProd.TabIndex = 471; + this.chkUploadProd.Text = "上传到未发布"; + this.chkUploadProd.UseVisualStyleBackColor = true; + // // btnReFission // this.btnReFission.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -670,7 +705,7 @@ this.btnReFission.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnReFission.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnReFission.ForeColor = System.Drawing.Color.White; - this.btnReFission.Location = new System.Drawing.Point(1301, 19); + this.btnReFission.Location = new System.Drawing.Point(1280, 19); this.btnReFission.Margin = new System.Windows.Forms.Padding(2); this.btnReFission.Name = "btnReFission"; this.btnReFission.Size = new System.Drawing.Size(90, 26); @@ -688,7 +723,7 @@ this.btnSetSubSa.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSetSubSa.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSetSubSa.ForeColor = System.Drawing.Color.White; - this.btnSetSubSa.Location = new System.Drawing.Point(1392, 19); + this.btnSetSubSa.Location = new System.Drawing.Point(1372, 19); this.btnSetSubSa.Margin = new System.Windows.Forms.Padding(2); this.btnSetSubSa.Name = "btnSetSubSa"; this.btnSetSubSa.Size = new System.Drawing.Size(90, 26); @@ -705,12 +740,12 @@ this.btnAdd.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnAdd.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnAdd.ForeColor = System.Drawing.Color.White; - this.btnAdd.Location = new System.Drawing.Point(1483, 19); + this.btnAdd.Location = new System.Drawing.Point(1464, 19); this.btnAdd.Margin = new System.Windows.Forms.Padding(2); this.btnAdd.Name = "btnAdd"; this.btnAdd.Size = new System.Drawing.Size(90, 26); this.btnAdd.TabIndex = 444; - this.btnAdd.Text = "一键上传草稿"; + this.btnAdd.Text = "一键上传"; this.btnAdd.UseVisualStyleBackColor = false; this.btnAdd.Click += new System.EventHandler(this.btnAdd_Click); // @@ -732,15 +767,15 @@ // this.splitContainer2.Panel2.Controls.Add(this.ucSplitPage1); this.splitContainer2.Panel2.Controls.Add(this.statusBar); - this.splitContainer2.Size = new System.Drawing.Size(1577, 568); - this.splitContainer2.SplitterDistance = 539; + this.splitContainer2.Size = new System.Drawing.Size(1558, 564); + this.splitContainer2.SplitterDistance = 535; this.splitContainer2.TabIndex = 0; // // pbLoading // this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None; this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pbLoading.Location = new System.Drawing.Point(763, 228); + this.pbLoading.Location = new System.Drawing.Point(754, 242); this.pbLoading.Name = "pbLoading"; this.pbLoading.Size = new System.Drawing.Size(50, 50); this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -795,36 +830,13 @@ this.dgvSelectProduct.Location = new System.Drawing.Point(4, 0); this.dgvSelectProduct.Name = "dgvSelectProduct"; this.dgvSelectProduct.ReadOnly = true; - this.dgvSelectProduct.RowHeadersWidth = 51; + this.dgvSelectProduct.RowHeadersWidth = 40; this.dgvSelectProduct.RowTemplate.Height = 23; - this.dgvSelectProduct.Size = new System.Drawing.Size(1569, 539); + this.dgvSelectProduct.Size = new System.Drawing.Size(1550, 535); this.dgvSelectProduct.TabIndex = 190; this.dgvSelectProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSelectProduct_CellContentClick); this.dgvSelectProduct.Scroll += new System.Windows.Forms.ScrollEventHandler(this.dgvSelectProduct_Scroll); // - // ucSplitPage1 - // - this.ucSplitPage1.CurrentPage = 1; - this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right; - this.ucSplitPage1.Location = new System.Drawing.Point(1215, 0); - this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0); - this.ucSplitPage1.Name = "ucSplitPage1"; - this.ucSplitPage1.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0); - this.ucSplitPage1.Size = new System.Drawing.Size(362, 25); - this.ucSplitPage1.TabIndex = 6; - this.ucSplitPage1.TotalPage = 1; - // - // statusBar - // - this.statusBar.BackColor = System.Drawing.Color.White; - this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill; - this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.statusBar.Location = new System.Drawing.Point(0, 0); - this.statusBar.Margin = new System.Windows.Forms.Padding(0); - this.statusBar.Name = "statusBar"; - this.statusBar.Size = new System.Drawing.Size(1577, 25); - this.statusBar.TabIndex = 5; - // // colSelect // this.colSelect.HeaderText = "选择"; @@ -1036,10 +1048,33 @@ this.colOpResult.ReadOnly = true; this.colOpResult.Width = 150; // + // ucSplitPage1 + // + this.ucSplitPage1.CurrentPage = 1; + this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right; + this.ucSplitPage1.Location = new System.Drawing.Point(1196, 0); + this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0); + this.ucSplitPage1.Name = "ucSplitPage1"; + this.ucSplitPage1.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0); + this.ucSplitPage1.Size = new System.Drawing.Size(362, 25); + this.ucSplitPage1.TabIndex = 6; + this.ucSplitPage1.TotalPage = 1; + // + // statusBar + // + this.statusBar.BackColor = System.Drawing.Color.White; + this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill; + this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.statusBar.Location = new System.Drawing.Point(0, 0); + this.statusBar.Margin = new System.Windows.Forms.Padding(0); + this.statusBar.Name = "statusBar"; + this.statusBar.Size = new System.Drawing.Size(1558, 25); + this.statusBar.TabIndex = 5; + // // ProductThirdSelectListManageForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(1579, 672); + this.ClientSize = new System.Drawing.Size(1560, 672); this.Controls.Add(this.splitContainer1); this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); @@ -1083,7 +1118,6 @@ private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; private System.Windows.Forms.Label label6; private System.Windows.Forms.TextBox txtShopId; - private System.Windows.Forms.ComboBox cmbStatus; private DevComponents.DotNetBar.PanelEx pnlEmpty; private System.Windows.Forms.Label label7; private System.Windows.Forms.Label label8; @@ -1117,7 +1151,6 @@ private System.Windows.Forms.Label label11; private UserComponent.UcCheckBox chkUploadProd; private System.Windows.Forms.Label label12; - private System.Windows.Forms.ComboBox cmbUserNotes; private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; private System.Windows.Forms.DataGridViewTextBoxColumn colSelectId; private System.Windows.Forms.DataGridViewTextBoxColumn colSupplierId; @@ -1144,5 +1177,9 @@ private System.Windows.Forms.DataGridViewLinkColumn colEditNotes; private System.Windows.Forms.DataGridViewLinkColumn ColDelete; private System.Windows.Forms.DataGridViewTextBoxColumn colOpResult; + private System.Windows.Forms.Label label13; + private System.Windows.Forms.ComboBox cmbUserNotes; + private System.Windows.Forms.ComboBox cmbNotes; + private System.Windows.Forms.ComboBox cmbStatus; } } \ No newline at end of file diff --git a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs index aaac634..98584e5 100644 --- a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs +++ b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs @@ -55,9 +55,8 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms chkUploadProd.Visible = false; // 直接上传 flowLayoutPanel1.Visible = false; - flowLayoutPanel1.Visible = true; - chkDeleteLowPriceSku.Checked = true; chkUploadProd.Visible = true; + flowLayoutPanel1.Visible = true; if (BaseClass.SaLevel == 1) { @@ -234,6 +233,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms "&search_prod_name=" + txtProdName.Text + "&search_shop_id=" + txtShopId.Text + "&search_shop_account=" + txtShopName.Text + + "&search_notes=" + (cmbNotes.Text == "全部" ? "" : cmbNotes.Text) + "&search_user_notes=" + (cmbUserNotes.Text == "全部" ? "" : cmbUserNotes.Text) + "&status=" + (cmbStatus.Text == "全部" ? "" : cmbStatus.Text); if (BaseClass.SaLevel > 1) @@ -285,7 +285,8 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms this.txtSKC.Text = ""; this.txtSPU.Text = ""; this.cmbStatus.Text = "待上传"; - this.cmbUserNotes.Text = ""; + this.cmbNotes.Text = "全部"; + this.cmbUserNotes.Text = "全部"; } private void dgvSelectProduct_CellContentClick(object sender, DataGridViewCellEventArgs e) @@ -501,6 +502,8 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms return; } + shopLst.Clear(); // 先清空店铺以便实时获取最新店铺信息 + Invoke(new Action(() => { this.pbLoading.Visible = true; @@ -536,17 +539,8 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms continue; } - var shop = shopLst.FirstOrDefault(s => s.ShopId == prod.shop_id); - if (shop == null) - { - shop = GetServerShopById(prod.shop_id); - if (shop == null) - { - shop = new ShopLoginInfo() { ShopId = prod.shop_id }; - shop.LoginStatus = "不存在"; - } - shopLst.Add(shop); - } + // 实时获取店铺 + var shop = GetShop(prod.shop_id); if (shop.LoginStatus != "登录成功") { @@ -610,15 +604,12 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms var prodDetailJsonReplace = Regex.Replace(prodDetailJson, pattern, "$1\\$2"); string pattern2 = @"([^\\,:""{\[])(""[^,:""}\]])";//希伯来文中的引号转义在数据库中有时候会丢失，回来发现了给配上\符号 var prodDetailJsonReplace2 = Regex.Replace(prodDetailJsonReplace, pattern2, "$1\\$2"); - //var productDetail = JsonHelper.DeserializeJsonToObject(prodDetailJsonReplace2); - //result = UploadProduct(shop, productDetail, temuDBProd.size_json); //将商品上传至草稿箱 temuDBProd.product_json = prodDetailJsonReplace2; - result = UploadProduct(shop, temuDBProd, prod, row.Cells["colOpResult"]); //将商品上传至草稿箱 + result = UploadProduct(shop, temuDBProd, prod, row.Cells["colOpResult"]); //将商品上传至草稿箱或直接上传到未发布 - if (result.Contains("登录过期")) - { - shop.LoginStatus = "未登录"; - ShopForms.ShopListForm.UpdateServerShopCookies(shop); // 店铺cookie写入服务端，多店共用一个登录账号一组cookie + if (result.Contains("登录过期") || result.Contains("Invalid Login State")) + { + AdminShopListForm.Instance.CheckShopLogin(shopLst.Where(s => s.LoginName == shop.LoginName).ToArray(), false); } } catch (Exception ex) @@ -628,7 +619,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms Thread.Sleep(200); var error = BaseRegex.GetStringJson(ref result, "errMsg"); - if (result.Contains("\"status\":\"未上传\"")) + if (!result.Contains("\"success\":true")) { if (string.IsNullOrWhiteSpace(error)) error = result; @@ -777,7 +768,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms if (catId == 0) catId = prodParam.cat1Id.ParseToLong(); var html = AddDraft(shop, catId.ToString()); - if (html.Contains("{\"success\":true")) + if (html.Contains("\"success\":true")) prodParam.productDraftId = BaseRegex.GetLongJson(ref html, "productDraftId"); else { @@ -1207,7 +1198,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms sizeSpec = sizeSpec.Replace("\"contentVO\"", "\"content\""); var sizeParam = JsonHelper.DeserializeJsonToObject(sizeSpec); html = CreateSizeSpec(shop, prodParam.productDraftId.ToString(), sizeParam); - if (html.Contains("{\"success\":true")) + if (html.Contains("\"success\":true")) { var sizeSpecId = BaseRegex.GetLongJson(ref html, "businessId"); prodParam.sizeTemplateIds = new List(); @@ -1234,7 +1225,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms })); } html = SaveDraft(shop, prodParam.productDraftId.ToString(), prodParam); - if (html.Contains("{\"success\":true")) + if (html.Contains("\"success\":true")) { if (!chkUploadProd.Checked) { diff --git a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdUserSelectForm.Designer.cs b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdUserSelectForm.Designer.cs index e3809cf..444e666 100644 --- a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdUserSelectForm.Designer.cs +++ b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdUserSelectForm.Designer.cs @@ -30,12 +30,25 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms 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 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.label2 = new System.Windows.Forms.Label(); + this.txtExtCode = new System.Windows.Forms.TextBox(); + this.label13 = new System.Windows.Forms.Label(); + this.label6 = new System.Windows.Forms.Label(); + this.cmbNotes = new System.Windows.Forms.ComboBox(); + this.txtShopId = new System.Windows.Forms.TextBox(); + this.label7 = new System.Windows.Forms.Label(); + this.txtShopName = new System.Windows.Forms.TextBox(); + this.label3 = new System.Windows.Forms.Label(); + this.txtProdName = new System.Windows.Forms.TextBox(); + this.cmbUserNotes = new System.Windows.Forms.ComboBox(); + this.label12 = new System.Windows.Forms.Label(); this.btnDelSelect = new DevComponents.DotNetBar.PanelEx(); this.cmbStatus = new System.Windows.Forms.ComboBox(); this.label8 = new System.Windows.Forms.Label(); @@ -61,6 +74,10 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms this.btnClear = new DevComponents.DotNetBar.PanelEx(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); + this.label5 = new System.Windows.Forms.Label(); + this.txtSKC = new System.Windows.Forms.TextBox(); + this.txtSPU = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colSelectId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colSupplierId = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -78,6 +95,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms this.colNotes = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colUserNotes = new System.Windows.Forms.DataGridViewLinkColumn(); this.ColDelete = new System.Windows.Forms.DataGridViewLinkColumn(); + this.pnlEmpty = new DevComponents.DotNetBar.PanelEx(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -117,7 +135,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms // splitContainer1.Panel2 // this.splitContainer1.Panel2.Controls.Add(this.splitContainer3); - this.splitContainer1.Size = new System.Drawing.Size(1553, 546); + this.splitContainer1.Size = new System.Drawing.Size(1284, 546); this.splitContainer1.SplitterDistance = 120; this.splitContainer1.TabIndex = 11; // @@ -128,17 +146,158 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms | System.Windows.Forms.AnchorStyles.Right))); this.ucGroupBoxEx4.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.ucGroupBoxEx4.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx4.Controls.Add(this.pnlEmpty); + this.ucGroupBoxEx4.Controls.Add(this.label5); + this.ucGroupBoxEx4.Controls.Add(this.txtSKC); + this.ucGroupBoxEx4.Controls.Add(this.txtSPU); + this.ucGroupBoxEx4.Controls.Add(this.label1); + this.ucGroupBoxEx4.Controls.Add(this.label2); + this.ucGroupBoxEx4.Controls.Add(this.txtExtCode); + this.ucGroupBoxEx4.Controls.Add(this.label13); + this.ucGroupBoxEx4.Controls.Add(this.label6); + this.ucGroupBoxEx4.Controls.Add(this.cmbNotes); + this.ucGroupBoxEx4.Controls.Add(this.txtShopId); + this.ucGroupBoxEx4.Controls.Add(this.label7); + this.ucGroupBoxEx4.Controls.Add(this.txtShopName); + this.ucGroupBoxEx4.Controls.Add(this.label3); + this.ucGroupBoxEx4.Controls.Add(this.txtProdName); + this.ucGroupBoxEx4.Controls.Add(this.cmbUserNotes); + this.ucGroupBoxEx4.Controls.Add(this.label12); this.ucGroupBoxEx4.Controls.Add(this.btnDelSelect); this.ucGroupBoxEx4.Controls.Add(this.cmbStatus); this.ucGroupBoxEx4.Controls.Add(this.label8); this.ucGroupBoxEx4.Controls.Add(this.btnSearch); this.ucGroupBoxEx4.Location = new System.Drawing.Point(147, 2); this.ucGroupBoxEx4.Name = "ucGroupBoxEx4"; - this.ucGroupBoxEx4.Size = new System.Drawing.Size(1404, 120); + this.ucGroupBoxEx4.Size = new System.Drawing.Size(1135, 120); this.ucGroupBoxEx4.TabIndex = 666; this.ucGroupBoxEx4.TabStop = false; this.ucGroupBoxEx4.Text = "库存商品查询"; // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(563, 76); + this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(32, 17); + this.label2.TabIndex = 502; + this.label2.Text = "货号"; + this.label2.Visible = false; + // + // txtExtCode + // + this.txtExtCode.Location = new System.Drawing.Point(595, 73); + this.txtExtCode.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtExtCode.Name = "txtExtCode"; + this.txtExtCode.Size = new System.Drawing.Size(86, 23); + this.txtExtCode.TabIndex = 501; + this.txtExtCode.Visible = false; + // + // label13 + // + this.label13.AutoSize = true; + this.label13.Location = new System.Drawing.Point(172, 76); + this.label13.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(56, 17); + this.label13.TabIndex = 499; + this.label13.Text = "上传备注"; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(39, 35); + this.label6.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(44, 17); + this.label6.TabIndex = 494; + this.label6.Text = "店铺Id"; + // + // cmbNotes + // + this.cmbNotes.FormattingEnabled = true; + this.cmbNotes.Items.AddRange(new object[] { + "全部", + "无备注", + "核价成功", + "核价成功（重复）", + "重复"}); + this.cmbNotes.Location = new System.Drawing.Point(229, 72); + this.cmbNotes.Margin = new System.Windows.Forms.Padding(0); + this.cmbNotes.Name = "cmbNotes"; + this.cmbNotes.Size = new System.Drawing.Size(85, 25); + this.cmbNotes.TabIndex = 500; + this.cmbNotes.Text = "全部"; + // + // txtShopId + // + this.txtShopId.Location = new System.Drawing.Point(83, 32); + this.txtShopId.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtShopId.Name = "txtShopId"; + this.txtShopId.Size = new System.Drawing.Size(85, 23); + this.txtShopId.TabIndex = 493; + // + // label7 + // + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(172, 35); + this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(56, 17); + this.label7.TabIndex = 496; + this.label7.Text = "店铺名称"; + // + // txtShopName + // + this.txtShopName.Location = new System.Drawing.Point(228, 32); + this.txtShopName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtShopName.Name = "txtShopName"; + this.txtShopName.Size = new System.Drawing.Size(86, 23); + this.txtShopName.TabIndex = 495; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(441, 76); + this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(32, 17); + this.label3.TabIndex = 492; + this.label3.Text = "标题"; + // + // txtProdName + // + this.txtProdName.Location = new System.Drawing.Point(473, 73); + this.txtProdName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtProdName.Name = "txtProdName"; + this.txtProdName.Size = new System.Drawing.Size(86, 23); + this.txtProdName.TabIndex = 491; + // + // cmbUserNotes + // + this.cmbUserNotes.FormattingEnabled = true; + this.cmbUserNotes.Items.AddRange(new object[] { + "全部", + "重上", + "已买"}); + this.cmbUserNotes.Location = new System.Drawing.Point(351, 72); + this.cmbUserNotes.Margin = new System.Windows.Forms.Padding(0); + this.cmbUserNotes.Name = "cmbUserNotes"; + this.cmbUserNotes.Size = new System.Drawing.Size(85, 25); + this.cmbUserNotes.TabIndex = 498; + this.cmbUserNotes.Text = "全部"; + // + // label12 + // + this.label12.AutoSize = true; + this.label12.Location = new System.Drawing.Point(318, 76); + this.label12.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(32, 17); + this.label12.TabIndex = 497; + this.label12.Text = "备注"; + // // btnDelSelect // this.btnDelSelect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -146,7 +305,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms this.btnDelSelect.Cursor = System.Windows.Forms.Cursors.Hand; this.btnDelSelect.DisabledBackColor = System.Drawing.Color.Empty; this.btnDelSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnDelSelect.Location = new System.Drawing.Point(1251, 35); + this.btnDelSelect.Location = new System.Drawing.Point(982, 32); this.btnDelSelect.Name = "btnDelSelect"; this.btnDelSelect.Size = new System.Drawing.Size(126, 23); this.btnDelSelect.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -170,8 +329,9 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms this.cmbStatus.Items.AddRange(new object[] { "待上传", "已上传", + "草稿箱", "全部"}); - this.cmbStatus.Location = new System.Drawing.Point(78, 31); + this.cmbStatus.Location = new System.Drawing.Point(83, 72); this.cmbStatus.Name = "cmbStatus"; this.cmbStatus.Size = new System.Drawing.Size(85, 25); this.cmbStatus.TabIndex = 461; @@ -180,11 +340,11 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(21, 35); + this.label8.Location = new System.Drawing.Point(26, 76); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(68, 17); + this.label8.Size = new System.Drawing.Size(56, 17); this.label8.TabIndex = 460; - this.label8.Text = "库存状态："; + this.label8.Text = "库存状态"; // // btnSearch // @@ -192,7 +352,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSearch.DisabledBackColor = System.Drawing.Color.Empty; this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSearch.Location = new System.Drawing.Point(179, 32); + this.btnSearch.Location = new System.Drawing.Point(572, 32); this.btnSearch.Name = "btnSearch"; this.btnSearch.Size = new System.Drawing.Size(126, 23); this.btnSearch.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -264,7 +424,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms // splitContainer3.Panel2 // this.splitContainer3.Panel2.Controls.Add(this.splitContainer4); - this.splitContainer3.Size = new System.Drawing.Size(1553, 422); + this.splitContainer3.Size = new System.Drawing.Size(1284, 422); this.splitContainer3.SplitterDistance = 392; this.splitContainer3.TabIndex = 1; // @@ -285,7 +445,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms this.splitContainer2.Panel2.Controls.Add(this.pbLoading); this.splitContainer2.Panel2.Controls.Add(this.dgvSelectProduct); this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0); - this.splitContainer2.Size = new System.Drawing.Size(1553, 392); + this.splitContainer2.Size = new System.Drawing.Size(1284, 392); this.splitContainer2.SplitterDistance = 270; this.splitContainer2.TabIndex = 0; // @@ -293,18 +453,18 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms // 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.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, @@ -402,7 +562,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms // this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None; this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pbLoading.Location = new System.Drawing.Point(614, 171); + this.pbLoading.Location = new System.Drawing.Point(480, 171); this.pbLoading.Name = "pbLoading"; this.pbLoading.Size = new System.Drawing.Size(50, 50); this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -414,18 +574,18 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms // this.dgvSelectProduct.AllowUserToAddRows = false; this.dgvSelectProduct.AllowUserToDeleteRows = false; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle8.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle8; this.dgvSelectProduct.BackgroundColor = System.Drawing.Color.White; this.dgvSelectProduct.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.dgvSelectProduct.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.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9; this.dgvSelectProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvSelectProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colCheck, @@ -450,7 +610,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms this.dgvSelectProduct.Name = "dgvSelectProduct"; this.dgvSelectProduct.ReadOnly = true; this.dgvSelectProduct.RowTemplate.Height = 23; - this.dgvSelectProduct.Size = new System.Drawing.Size(1275, 392); + this.dgvSelectProduct.Size = new System.Drawing.Size(1006, 392); this.dgvSelectProduct.TabIndex = 187; this.dgvSelectProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSelectProduct_CellContentClick); // @@ -470,8 +630,8 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms this.splitContainer4.Panel2.Controls.Add(this.btnClear); this.splitContainer4.Panel2.Controls.Add(this.panelEx1); this.splitContainer4.Panel2.Controls.Add(this.ucSplitPage1); - this.splitContainer4.Size = new System.Drawing.Size(1553, 26); - this.splitContainer4.SplitterDistance = 862; + this.splitContainer4.Size = new System.Drawing.Size(1284, 26); + this.splitContainer4.SplitterDistance = 593; this.splitContainer4.TabIndex = 3; // // statusBar @@ -482,7 +642,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms this.statusBar.Location = new System.Drawing.Point(0, 0); this.statusBar.Margin = new System.Windows.Forms.Padding(0); this.statusBar.Name = "statusBar"; - this.statusBar.Size = new System.Drawing.Size(862, 26); + this.statusBar.Size = new System.Drawing.Size(593, 26); this.statusBar.TabIndex = 2; // // btnClear @@ -547,6 +707,42 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms this.ucSplitPage1.TabIndex = 675; this.ucSplitPage1.TotalPage = 1; // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(319, 35); + this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(31, 17); + this.label5.TabIndex = 512; + this.label5.Text = "SPU"; + // + // txtSKC + // + this.txtSKC.Location = new System.Drawing.Point(473, 32); + this.txtSKC.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtSKC.Name = "txtSKC"; + this.txtSKC.Size = new System.Drawing.Size(86, 23); + this.txtSKC.TabIndex = 509; + // + // txtSPU + // + this.txtSPU.Location = new System.Drawing.Point(351, 32); + this.txtSPU.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtSPU.Name = "txtSPU"; + this.txtSPU.Size = new System.Drawing.Size(86, 23); + this.txtSPU.TabIndex = 511; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(442, 35); + this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(31, 17); + this.label1.TabIndex = 510; + this.label1.Text = "SKC"; + // // colCheck // this.colCheck.HeaderText = "选择"; @@ -602,7 +798,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms this.colSpuId.ReadOnly = true; this.colSpuId.Resizable = System.Windows.Forms.DataGridViewTriState.True; this.colSpuId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colSpuId.Visible = false; + this.colSpuId.Width = 80; // // colSkcId // @@ -612,12 +808,11 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms this.colSkcId.ReadOnly = true; this.colSkcId.Resizable = System.Windows.Forms.DataGridViewTriState.True; this.colSkcId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colSkcId.Visible = false; this.colSkcId.Width = 80; // // colProductSkcPic // - this.colProductSkcPic.HeaderText = "Skc图片"; + this.colProductSkcPic.HeaderText = "图片"; this.colProductSkcPic.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom; this.colProductSkcPic.Name = "colProductSkcPic"; this.colProductSkcPic.ReadOnly = true; @@ -625,10 +820,12 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms // // colProductName // + dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colProductName.DefaultCellStyle = dataGridViewCellStyle10; this.colProductName.HeaderText = "商品标题"; this.colProductName.Name = "colProductName"; this.colProductName.ReadOnly = true; - this.colProductName.Width = 260; + this.colProductName.Width = 200; // // colProductCat // @@ -651,7 +848,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms // // colDraftId // - this.colDraftId.HeaderText = "草稿箱Id"; + this.colDraftId.HeaderText = "上传商品Id"; this.colDraftId.Name = "colDraftId"; this.colDraftId.ReadOnly = true; this.colDraftId.Resizable = System.Windows.Forms.DataGridViewTriState.True; @@ -680,11 +877,37 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms this.ColDelete.ReadOnly = true; this.ColDelete.Width = 75; // + // pnlEmpty + // + this.pnlEmpty.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.pnlEmpty.CanvasColor = System.Drawing.SystemColors.Control; + this.pnlEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.pnlEmpty.DisabledBackColor = System.Drawing.Color.Empty; + this.pnlEmpty.Location = new System.Drawing.Point(705, 32); + this.pnlEmpty.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); + this.pnlEmpty.Name = "pnlEmpty"; + this.pnlEmpty.Size = new System.Drawing.Size(56, 23); + this.pnlEmpty.Style.Alignment = System.Drawing.StringAlignment.Center; + this.pnlEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.pnlEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.pnlEmpty.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.pnlEmpty.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.pnlEmpty.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.pnlEmpty.Style.GradientAngle = 90; + this.pnlEmpty.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.pnlEmpty.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.pnlEmpty.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.pnlEmpty.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.pnlEmpty.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.pnlEmpty.TabIndex = 508; + this.pnlEmpty.Text = "清空条件"; + this.pnlEmpty.Click += new System.EventHandler(this.pnlEmpty_Click); + // // ProductThirdUserSelectForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.BackColor = System.Drawing.Color.White; - this.ClientSize = new System.Drawing.Size(1553, 546); + this.ClientSize = new System.Drawing.Size(1284, 546); this.Controls.Add(this.splitContainer1); this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.Name = "ProductThirdUserSelectForm"; @@ -746,6 +969,22 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse; private System.Windows.Forms.DataGridViewTextBoxColumn colRemaining; private System.Windows.Forms.DataGridViewTextBoxColumn colMessage; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.TextBox txtExtCode; + private System.Windows.Forms.Label label13; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.ComboBox cmbNotes; + private System.Windows.Forms.TextBox txtShopId; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.TextBox txtShopName; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.TextBox txtProdName; + private System.Windows.Forms.ComboBox cmbUserNotes; + private System.Windows.Forms.Label label12; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.TextBox txtSKC; + private System.Windows.Forms.TextBox txtSPU; + private System.Windows.Forms.Label label1; private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck; private System.Windows.Forms.DataGridViewTextBoxColumn colSelectId; private System.Windows.Forms.DataGridViewTextBoxColumn colSupplierId; @@ -763,5 +1002,6 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms private System.Windows.Forms.DataGridViewTextBoxColumn colNotes; private System.Windows.Forms.DataGridViewLinkColumn colUserNotes; private System.Windows.Forms.DataGridViewLinkColumn ColDelete; + private DevComponents.DotNetBar.PanelEx pnlEmpty; } } \ No newline at end of file diff --git a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdUserSelectForm.cs b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdUserSelectForm.cs index 1f8e7d6..24060c0 100644 --- a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdUserSelectForm.cs +++ b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdUserSelectForm.cs @@ -243,8 +243,8 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms prodSelect.shop_account, "进店", "登录", - "",//prodSelect.spu_id, - "",//prodSelect.skc_id, + prodSelect.spu_id, + prodSelect.skc_id, image,//prod.main_img, prodSelect.product_name, prodSelect.cat_name, @@ -284,10 +284,16 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms "&page=" + page + "&page_size=" + pageSize + //"&out_product_id=" + dbId + - //"&shop_id=" + shop.ShopId + - //"&shop_account=" + shop.ShopAccount + //"&main_user_name=" + shop.UserName + //"&sub_user_name=" + shop.SubUserName + + "&search_spu=" + txtSPU.Text + + "&search_skc=" + txtSKC.Text + + "&search_ext_code=" + txtExtCode.Text + + "&search_prod_name=" + txtProdName.Text + + "&search_shop_id=" + txtShopId.Text + + "&search_shop_account=" + txtShopName.Text + + "&search_notes=" + (cmbNotes.Text == "全部" ? "" : cmbNotes.Text) + + "&search_user_notes=" + (cmbUserNotes.Text == "全部" ? "" : cmbUserNotes.Text) + "&status=" + (cmbStatus.Text == "全部" ? "" : cmbStatus.Text) + "&shop_ids=\"" + string.Join("\",\"", lstShopId) + "\""; })); @@ -451,5 +457,19 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms }); } + + private void pnlEmpty_Click(object sender, EventArgs e) + { + //this.txtCat.Text = ""; + this.txtExtCode.Text = ""; + this.txtProdName.Text = ""; + this.txtShopId.Text = ""; + this.txtShopName.Text = ""; + this.txtSKC.Text = ""; + this.txtSPU.Text = ""; + this.cmbStatus.Text = "待上传"; + this.cmbNotes.Text = "全部"; + this.cmbUserNotes.Text = "全部"; + } } } diff --git a/TEMUKJD/KJDForms/SalesCenterForms/MarketingActivityForm.Designer.cs b/TEMUKJD/KJDForms/SalesCenterForms/MarketingActivityForm.Designer.cs index 6c84ea4..3a89db5 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/MarketingActivityForm.Designer.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/MarketingActivityForm.Designer.cs @@ -30,12 +30,12 @@ namespace TemuKJD.KJDForms.SalesCenterForms private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.actDiscount80 = new TemuKJD.KJDForms.SalesCenterForms.UcActivityDiscountCtrl(); @@ -353,7 +353,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms this.panel1.Controls.Add(this.label2); this.panel1.Controls.Add(this.numOnSaleDays); this.panel1.Controls.Add(this.label1); - this.panel1.Location = new System.Drawing.Point(223, 24); + this.panel1.Location = new System.Drawing.Point(223, 23); this.panel1.Name = "panel1"; this.panel1.Size = new System.Drawing.Size(397, 26); this.panel1.TabIndex = 722; @@ -361,7 +361,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms // // numSaleCount // - this.numSaleCount.Location = new System.Drawing.Point(286, 1); + this.numSaleCount.Location = new System.Drawing.Point(286, 2); this.numSaleCount.Name = "numSaleCount"; this.numSaleCount.Size = new System.Drawing.Size(40, 21); this.numSaleCount.TabIndex = 726; @@ -382,7 +382,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(243, 5); + this.label4.Location = new System.Drawing.Point(243, 6); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 728; @@ -391,7 +391,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(328, 5); + this.label3.Location = new System.Drawing.Point(328, 6); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 727; @@ -400,7 +400,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(148, 5); + this.label2.Location = new System.Drawing.Point(148, 6); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(53, 12); this.label2.TabIndex = 725; @@ -408,7 +408,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms // // numOnSaleDays // - this.numOnSaleDays.Location = new System.Drawing.Point(106, 1); + this.numOnSaleDays.Location = new System.Drawing.Point(106, 2); this.numOnSaleDays.Name = "numOnSaleDays"; this.numOnSaleDays.Size = new System.Drawing.Size(40, 21); this.numOnSaleDays.TabIndex = 724; @@ -421,7 +421,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(3, 5); + this.label1.Location = new System.Drawing.Point(3, 6); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(101, 12); this.label1.TabIndex = 723; @@ -560,18 +560,18 @@ namespace TemuKJD.KJDForms.SalesCenterForms // this.dgvShop.AllowUserToAddRows = false; this.dgvShop.AllowUserToDeleteRows = false; - dataGridViewCellStyle31.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle31; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.dgvShop.BackgroundColor = System.Drawing.Color.White; this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle32.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle32.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle32.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle32.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle32.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle32; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colSelect, @@ -670,19 +670,19 @@ namespace TemuKJD.KJDForms.SalesCenterForms // this.dgvActivity.AllowUserToAddRows = false; this.dgvActivity.AllowUserToDeleteRows = false; - dataGridViewCellStyle33.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvActivity.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle33; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvActivity.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; this.dgvActivity.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvActivity.BackgroundColor = System.Drawing.Color.White; this.dgvActivity.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle34.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle34.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle34.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle34.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle34.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle34.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvActivity.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle34; + 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.dgvActivity.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dgvActivity.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvActivity.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colCheckActivity, @@ -753,18 +753,18 @@ namespace TemuKJD.KJDForms.SalesCenterForms // this.dgvProduct.AllowUserToAddRows = false; this.dgvProduct.AllowUserToDeleteRows = false; - dataGridViewCellStyle35.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle35; + dataGridViewCellStyle5.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5; this.dgvProduct.BackgroundColor = System.Drawing.Color.White; this.dgvProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle36.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle36.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle36.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle36.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle36.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle36; + 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.dgvProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6; this.dgvProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colCheckProduct, diff --git a/TEMUKJD/KJDForms/SalesCenterForms/UcActivityDiscountCtrl.Designer.cs b/TEMUKJD/KJDForms/SalesCenterForms/UcActivityDiscountCtrl.Designer.cs index 0440863..c80d66e 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/UcActivityDiscountCtrl.Designer.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/UcActivityDiscountCtrl.Designer.cs @@ -40,6 +40,11 @@ namespace TemuKJD.KJDForms.SalesCenterForms // this.numInventory.Location = new System.Drawing.Point(127, 0); this.numInventory.Margin = new System.Windows.Forms.Padding(0); + this.numInventory.Maximum = new decimal(new int[] { + 3000, + 0, + 0, + 0}); this.numInventory.Name = "numInventory"; this.numInventory.Size = new System.Drawing.Size(65, 21); this.numInventory.TabIndex = 707; @@ -50,12 +55,12 @@ namespace TemuKJD.KJDForms.SalesCenterForms 0}); this.numInventory.ValueChanged += new System.EventHandler(this.numInventory_ValueChanged); // - // chkDiscount6 + // chkDefaultInventory // this.chkDefaultInventory.AutoSize = true; this.chkDefaultInventory.Location = new System.Drawing.Point(198, 2); this.chkDefaultInventory.Margin = new System.Windows.Forms.Padding(0); - this.chkDefaultInventory.Name = "chkDiscount6"; + this.chkDefaultInventory.Name = "chkDefaultInventory"; this.chkDefaultInventory.Size = new System.Drawing.Size(48, 16); this.chkDefaultInventory.TabIndex = 706; this.chkDefaultInventory.Text = "默认";