From d1aa3c2529bb360c3e1dd7795ca96f563e39e3da Mon Sep 17 00:00:00 2001 From: wule Date: Mon, 28 Jul 2025 15:11:19 +0800 Subject: [PATCH] =?UTF-8?q?1=E5=AE=A2=E6=88=B7=E7=AB=AF=E4=B8=8A=E8=B4=A7?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=9C=8D=E5=8A=A1=E7=AB=AF=E7=9A=84=E5=A4=87?= =?UTF-8?q?=E6=B3=A8=20=202=E4=BC=98=E5=8C=96=E9=80=89=E5=93=81=E4=B8=8A?= =?UTF-8?q?=E8=B4=A7=E7=95=8C=E9=9D=A2=EF=BC=8C=E4=B8=80=E7=BA=A7=E8=B6=85?= =?UTF-8?q?=E7=AE=A1=E6=8F=90=E4=BE=9B=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AllBase/BaseClass.cs | 4 +- .../KJD_WebService/BLL/ProductManage.cs | 43 ++ .../KJD_WebService/ProductService.asmx.cs | 12 + .../DbProductEditNotesForm.Designer.cs | 36 +- .../DbProductEditNotesForm.cs | 6 +- .../DbProductListForm.Designer.cs | 68 +-- .../ProductSelectForms/DbProductListForm.cs | 3 +- .../ProductSelectForms/DbProductListForm.resx | 2 +- .../DbProductSelectListManageForm.Designer.cs | 568 ++++++++++-------- .../DbProductSelectListManageForm.cs | 62 +- .../DbProductSelectListManageForm.resx | 2 +- .../UserSelectDbProductForm.Designer.cs | 9 + .../UserSelectDbProductForm.cs | 1 + .../UserSelectDbProductForm.resx | 3 + ...oductThirdSelectListManageForm.Designer.cs | 1 + 15 files changed, 519 insertions(+), 301 deletions(-) diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs index a6e6458..9668d75 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -27,8 +27,8 @@ namespace AllBase /// /// 版本ID /// - public static int VersionCount = 381; - //public static int VersionCount = 381; + public static int VersionCount = 386; + //public static int VersionCount = 386; /// /// 版本号 diff --git a/KJDService/KJD_WebService/BLL/ProductManage.cs b/KJDService/KJD_WebService/BLL/ProductManage.cs index a83e713..5e7b787 100644 --- a/KJDService/KJD_WebService/BLL/ProductManage.cs +++ b/KJDService/KJD_WebService/BLL/ProductManage.cs @@ -262,6 +262,49 @@ namespace KJD_Web.BLL return "{\"code\":19999,\"msg\":\"输入为空\"}"; } + public string MdyDBProduct(string inputData, bool isAdmin = false) + { + if (!string.IsNullOrEmpty(inputData)) + { + var time = RegexUtils.GetStringQuery(ref inputData, "time").ParseToInt(); + string time1 = RegexUtils.GetStringQuery(ref inputData, "code"); + if (time1 != EncrypUtil.Encryption(time)) + return "{\"code\":50000,\"msg\":\"校验失败\"}"; + + var user_name = RegexUtils.GetStringQuery(ref inputData, "user_name")?.Replace("'", "\\'"); + var id = RegexUtils.GetStringQuery(ref inputData, "db_id")?.Replace("'", "\\'"); + string notes = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "notes"))?.Replace("'", "\\'"); + string ext_code = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "ext_code"))?.Replace("'", "\\'"); + + if (string.IsNullOrEmpty(user_name)) + { + return "{\"code\":500,\"msg\":\"没有用户名\"}"; + } + + string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; + MysqlUtils mySql = new MysqlUtils(conn); + string sql = "update kjd.product set"; + if (notes != null) + sql += " notes='" + notes + "',"; + if (ext_code != null) + sql += " ext_code='" + ext_code + "',"; + sql = sql.TrimEnd(','); + sql += " where id=" + id + ";"; + + var rst = mySql.ExecuteNonQuery(sql); + mySql.Close(); + if (rst) + { + return "{\"code\":200,\"msg\":\"success\"}"; + } + else + { + return "{\"code\":500,\"msg\":\"更新失败：" + mySql.Message + "\"}"; + } + } + return "{\"code\":19999,\"msg\":\"输入为空\"}"; + } + public string AddUserSelectProduct(string inputData, bool isAdmin = false) { diff --git a/KJDService/KJD_WebService/ProductService.asmx.cs b/KJDService/KJD_WebService/ProductService.asmx.cs index ec66ebb..2e7ee42 100644 --- a/KJDService/KJD_WebService/ProductService.asmx.cs +++ b/KJDService/KJD_WebService/ProductService.asmx.cs @@ -120,6 +120,18 @@ namespace KJD_Web Context.Response.End(); } + [WebMethod] + public void mdy_db_product() + { + string jsontext = GetRequestJsonString(); + + var result = jsontext; + result = new ProductManage().MdyDBProduct(jsontext); + + Context.Response.Write(result); + Context.Response.End(); + } + [WebMethod] public void add_user_select_product() diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductEditNotesForm.Designer.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductEditNotesForm.Designer.cs index b3e4057..70ce022 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductEditNotesForm.Designer.cs +++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductEditNotesForm.Designer.cs @@ -30,6 +30,8 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DbProductEditNotesForm)); this.panel2 = new System.Windows.Forms.Panel(); + this.txtExtCode = new System.Windows.Forms.TextBox(); + this.label4 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); @@ -47,6 +49,8 @@ // panel2 // this.panel2.BackColor = System.Drawing.Color.White; + this.panel2.Controls.Add(this.txtExtCode); + this.panel2.Controls.Add(this.label4); this.panel2.Controls.Add(this.label3); this.panel2.Controls.Add(this.label2); this.panel2.Controls.Add(this.label1); @@ -60,9 +64,25 @@ this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; this.panel2.Location = new System.Drawing.Point(1, 33); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(366, 421); + this.panel2.Size = new System.Drawing.Size(366, 461); this.panel2.TabIndex = 1; // + // txtExtCode + // + this.txtExtCode.Location = new System.Drawing.Point(90, 264); + this.txtExtCode.Name = "txtExtCode"; + this.txtExtCode.Size = new System.Drawing.Size(238, 23); + this.txtExtCode.TabIndex = 394; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(27, 267); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(56, 17); + this.label4.TabIndex = 393; + this.label4.Text = "商品货号"; + // // label3 // this.label3.AutoSize = true; @@ -121,7 +141,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(28, 266); + this.label8.Location = new System.Drawing.Point(27, 298); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(56, 17); this.label8.TabIndex = 386; @@ -142,7 +162,7 @@ this.txtNotes.Border.PaddingLeft = 2; this.txtNotes.Border.PaddingRight = 2; this.txtNotes.Border.PaddingTop = 2; - this.txtNotes.Location = new System.Drawing.Point(90, 267); + this.txtNotes.Location = new System.Drawing.Point(90, 301); this.txtNotes.Multiline = true; this.txtNotes.Name = "txtNotes"; this.txtNotes.Size = new System.Drawing.Size(239, 94); @@ -163,7 +183,7 @@ this.btnOk.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOk.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOk.ForeColor = System.Drawing.Color.White; - this.btnOk.Location = new System.Drawing.Point(274, 371); + this.btnOk.Location = new System.Drawing.Point(274, 405); this.btnOk.Margin = new System.Windows.Forms.Padding(2); this.btnOk.Name = "btnOk"; this.btnOk.Size = new System.Drawing.Size(55, 26); @@ -175,13 +195,13 @@ // DbProductEditNotesForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(368, 455); + this.ClientSize = new System.Drawing.Size(368, 495); this.Controls.Add(this.panel2); 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"))); this.Name = "DbProductEditNotesForm"; - this.Text = "编辑商品备注"; - this.TitleText = "编辑商品备注"; + this.Text = "编辑商品备注/货号"; + this.TitleText = "编辑商品备注/货号"; this.Load += new System.EventHandler(this.ProductSelectListForm_Load); this.Controls.SetChildIndex(this.panel2, 0); this.panel2.ResumeLayout(false); @@ -204,5 +224,7 @@ private System.Windows.Forms.PictureBox pictureBox1; private System.Windows.Forms.Label lblSkcId; private System.Windows.Forms.Label lblSPUId; + private System.Windows.Forms.TextBox txtExtCode; + private System.Windows.Forms.Label label4; } } \ No newline at end of file diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductEditNotesForm.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductEditNotesForm.cs index b5b01d5..93ff9b7 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductEditNotesForm.cs +++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductEditNotesForm.cs @@ -35,14 +35,17 @@ namespace TemuKJD.KJDForms.ProductSelectForms lblSPUId.Text = dbProd.spu_id; this.pictureBox1.ImageLocation = dbProd.main_img.Replace("https", "http"); this.txtNotes.Text = dbProd.notes; + this.txtExtCode.Text = dbProd.ext_code; } } private void btnOk_Click(object sender, EventArgs e) { - var url = BaseClass.BuildObjString("product/mdy_product_notes"); + //var url = BaseClass.BuildObjString("product/mdy_product_notes"); + var url = BaseClass.BuildObjString("product/mdy_db_product"); var data = UserLogin.GetSignaturex() + "&db_id=" + dbProd.id + "¬es=" + this.txtNotes.Text.Trim(); + data += "&ext_code=" + this.txtExtCode.Text.Trim(); var html = GetHtml.PostUtf8(url, data); if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) html = GetHtml.PostUtf8(url, data); @@ -55,6 +58,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms else { dbProd.notes = this.txtNotes.Text.Trim(); + dbProd.ext_code = this.txtExtCode.Text.Trim(); this.Close(); } } diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.Designer.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.Designer.cs index 78944e1..72783cb 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.Designer.cs +++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.Designer.cs @@ -33,6 +33,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DbProductListForm)); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.cmbSort = new System.Windows.Forms.ComboBox(); this.btnSelect = new TemuKJD.UserControls.ButtonEx(); this.txtNotes = new System.Windows.Forms.TextBox(); this.lblNotes = new System.Windows.Forms.Label(); @@ -48,6 +49,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.label3 = new System.Windows.Forms.Label(); this.txtCat = new System.Windows.Forms.TextBox(); this.label2 = new System.Windows.Forms.Label(); + this.label6 = new System.Windows.Forms.Label(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.pbLoading = new System.Windows.Forms.PictureBox(); this.dgvDbProduct = new TemuKJD.UserComponent.DataGridViewEx(); @@ -61,15 +63,13 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.col_spu_id = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.col_skc_id = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.col_cat_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.con_ext_code = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.col_ext_code = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colAddTimes = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colSelectTotalCount = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.col_notes = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.col_edit = new System.Windows.Forms.DataGridViewLinkColumn(); this.col_delete = new System.Windows.Forms.DataGridViewLinkColumn(); this.col_select_product = new System.Windows.Forms.DataGridViewLinkColumn(); - this.cmbSort = new System.Windows.Forms.ComboBox(); - this.label6 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -118,6 +118,18 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.splitContainer1.SplitterDistance = 53; this.splitContainer1.TabIndex = 1; // + // cmbSort + // + this.cmbSort.FormattingEnabled = true; + this.cmbSort.Items.AddRange(new object[] { + "入库时间", + "认领总数"}); + this.cmbSort.Location = new System.Drawing.Point(1001, 15); + this.cmbSort.Name = "cmbSort"; + this.cmbSort.Size = new System.Drawing.Size(79, 25); + this.cmbSort.TabIndex = 448; + this.cmbSort.Text = "入库时间"; + // // btnSelect // this.btnSelect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -272,6 +284,15 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.label2.TabIndex = 426; this.label2.Text = "类目："; // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(944, 19); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(68, 17); + this.label6.TabIndex = 449; + this.label6.Text = "排序方式："; + // // splitContainer2 // this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; @@ -332,7 +353,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.col_spu_id, this.col_skc_id, this.col_cat_name, - this.con_ext_code, + this.col_ext_code, this.colAddTimes, this.colSelectTotalCount, this.col_notes, @@ -430,11 +451,11 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.col_cat_name.Name = "col_cat_name"; this.col_cat_name.ReadOnly = true; // - // con_ext_code + // col_ext_code // - this.con_ext_code.HeaderText = "货号"; - this.con_ext_code.Name = "con_ext_code"; - this.con_ext_code.ReadOnly = true; + this.col_ext_code.HeaderText = "货号"; + this.col_ext_code.Name = "col_ext_code"; + this.col_ext_code.ReadOnly = true; // // colAddTimes // @@ -458,8 +479,8 @@ namespace TemuKJD.KJDForms.ProductSelectForms // // col_edit // - this.col_edit.FillWeight = 52F; - this.col_edit.HeaderText = "编辑备注"; + this.col_edit.FillWeight = 80F; + this.col_edit.HeaderText = "编辑备注/货号"; this.col_edit.Name = "col_edit"; this.col_edit.ReadOnly = true; this.col_edit.Resizable = System.Windows.Forms.DataGridViewTriState.True; @@ -481,27 +502,6 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.col_select_product.Resizable = System.Windows.Forms.DataGridViewTriState.True; this.col_select_product.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; // - // cmbSort - // - this.cmbSort.FormattingEnabled = true; - this.cmbSort.Items.AddRange(new object[] { - "入库时间", - "认领总数"}); - this.cmbSort.Location = new System.Drawing.Point(1001, 15); - this.cmbSort.Name = "cmbSort"; - this.cmbSort.Size = new System.Drawing.Size(79, 25); - this.cmbSort.TabIndex = 448; - this.cmbSort.Text = "入库时间"; - // - // label6 - // - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(944, 19); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(68, 17); - this.label6.TabIndex = 449; - this.label6.Text = "排序方式："; - // // DbProductListForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -553,6 +553,8 @@ namespace TemuKJD.KJDForms.ProductSelectForms private System.Windows.Forms.TextBox txtNotes; private System.Windows.Forms.Label lblNotes; private UserControls.ButtonEx btnSelect; + private System.Windows.Forms.ComboBox cmbSort; + private System.Windows.Forms.Label label6; private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; private System.Windows.Forms.DataGridViewTextBoxColumn col_db_id; private System.Windows.Forms.DataGridViewTextBoxColumn col_product_name; @@ -561,14 +563,12 @@ namespace TemuKJD.KJDForms.ProductSelectForms private System.Windows.Forms.DataGridViewTextBoxColumn col_spu_id; private System.Windows.Forms.DataGridViewTextBoxColumn col_skc_id; private System.Windows.Forms.DataGridViewTextBoxColumn col_cat_name; - private System.Windows.Forms.DataGridViewTextBoxColumn con_ext_code; + private System.Windows.Forms.DataGridViewTextBoxColumn col_ext_code; private System.Windows.Forms.DataGridViewTextBoxColumn colAddTimes; private System.Windows.Forms.DataGridViewTextBoxColumn colSelectTotalCount; private System.Windows.Forms.DataGridViewTextBoxColumn col_notes; private System.Windows.Forms.DataGridViewLinkColumn col_edit; private System.Windows.Forms.DataGridViewLinkColumn col_delete; private System.Windows.Forms.DataGridViewLinkColumn col_select_product; - private System.Windows.Forms.ComboBox cmbSort; - private System.Windows.Forms.Label label6; } } \ No newline at end of file diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.cs index 54d3163..aec9c17 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.cs +++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.cs @@ -282,10 +282,11 @@ namespace TemuKJD.KJDForms.ProductSelectForms return; DeleteProduct(dbId); break; - case "编辑备注": + case "编辑备注/货号": DbProductEditNotesForm editForm = new DbProductEditNotesForm(dbProduct); editForm.ShowDialog(); dgvDbProduct.Rows[e.RowIndex].Cells["col_notes"].Value = dbProduct.notes; + dgvDbProduct.Rows[e.RowIndex].Cells["col_ext_code"].Value = dbProduct.ext_code; break; case "认领": Task.Run(() => { SelectProduct(new TemuDBProduct[] { dbProduct }); }); diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.resx b/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.resx index 01778c4..02277b8 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.resx +++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.resx @@ -141,7 +141,7 @@ True - + True diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.Designer.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.Designer.cs index cebe905..a39de66 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.Designer.cs +++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.Designer.cs @@ -33,32 +33,32 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DbProductSelectListManageForm)); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.chkNoSubSa = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.btnSetSubSa = new TemuKJD.UserControls.ButtonEx(); + this.chkShowDel = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.label6 = new System.Windows.Forms.Label(); + this.txtShopId = new System.Windows.Forms.TextBox(); this.cmbStatus = new System.Windows.Forms.ComboBox(); + this.pnlEmpty = new DevComponents.DotNetBar.PanelEx(); + this.label7 = new System.Windows.Forms.Label(); this.label8 = new System.Windows.Forms.Label(); this.txtShopName = new System.Windows.Forms.TextBox(); - this.label7 = new System.Windows.Forms.Label(); - this.txtShopId = new System.Windows.Forms.TextBox(); - this.label6 = new System.Windows.Forms.Label(); - this.btnAdd = new TemuKJD.UserControls.ButtonEx(); - this.txtSPU = new System.Windows.Forms.TextBox(); this.label5 = new System.Windows.Forms.Label(); - this.txtSKC = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.pnlEmpty = new DevComponents.DotNetBar.PanelEx(); this.btnSearch = new TemuKJD.UserControls.ButtonEx(); + this.txtSKC = new System.Windows.Forms.TextBox(); + this.txtSPU = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.txtCat = new System.Windows.Forms.TextBox(); this.txtExtCode = new System.Windows.Forms.TextBox(); + this.label3 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); this.txtProdName = new System.Windows.Forms.TextBox(); - this.label3 = new System.Windows.Forms.Label(); - this.txtCat = new System.Windows.Forms.TextBox(); - this.label2 = new System.Windows.Forms.Label(); + this.chkNoSubSa = 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(); @@ -81,12 +81,15 @@ this.colSubSaNick = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colNotes = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colEditNotes = new System.Windows.Forms.DataGridViewLinkColumn(); - this.ColDelete = 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(); this.splitContainer1.SuspendLayout(); + this.tableLayoutPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit(); this.splitContainer2.Panel1.SuspendLayout(); this.splitContainer2.Panel2.SuspendLayout(); @@ -106,27 +109,11 @@ // // splitContainer1.Panel1 // + this.splitContainer1.Panel1.Controls.Add(this.chkShowDel); + this.splitContainer1.Panel1.Controls.Add(this.tableLayoutPanel1); this.splitContainer1.Panel1.Controls.Add(this.chkNoSubSa); this.splitContainer1.Panel1.Controls.Add(this.btnSetSubSa); - this.splitContainer1.Panel1.Controls.Add(this.cmbStatus); - this.splitContainer1.Panel1.Controls.Add(this.label8); - this.splitContainer1.Panel1.Controls.Add(this.txtShopName); - this.splitContainer1.Panel1.Controls.Add(this.label7); - this.splitContainer1.Panel1.Controls.Add(this.txtShopId); - this.splitContainer1.Panel1.Controls.Add(this.label6); this.splitContainer1.Panel1.Controls.Add(this.btnAdd); - this.splitContainer1.Panel1.Controls.Add(this.txtSPU); - this.splitContainer1.Panel1.Controls.Add(this.label5); - this.splitContainer1.Panel1.Controls.Add(this.txtSKC); - this.splitContainer1.Panel1.Controls.Add(this.label1); - this.splitContainer1.Panel1.Controls.Add(this.pnlEmpty); - this.splitContainer1.Panel1.Controls.Add(this.btnSearch); - this.splitContainer1.Panel1.Controls.Add(this.txtExtCode); - this.splitContainer1.Panel1.Controls.Add(this.label4); - this.splitContainer1.Panel1.Controls.Add(this.txtProdName); - this.splitContainer1.Panel1.Controls.Add(this.label3); - this.splitContainer1.Panel1.Controls.Add(this.txtCat); - this.splitContainer1.Panel1.Controls.Add(this.label2); // // splitContainer1.Panel2 // @@ -135,10 +122,277 @@ this.splitContainer1.SplitterDistance = 53; this.splitContainer1.TabIndex = 2; // + // chkShowDel + // + this.chkShowDel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.chkShowDel.AutoSize = true; + this.chkShowDel.Location = new System.Drawing.Point(1081, 17); + this.chkShowDel.Name = "chkShowDel"; + this.chkShowDel.Size = new System.Drawing.Size(123, 21); + this.chkShowDel.TabIndex = 468; + this.chkShowDel.Text = "显示删除功能按钮"; + this.chkShowDel.UseVisualStyleBackColor = true; + this.chkShowDel.CheckedChanged += new System.EventHandler(this.chkShowDel_CheckedChanged); + // + // tableLayoutPanel1 + // + 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 = 18; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.Controls.Add(this.label6, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.txtShopId, 1, 0); + this.tableLayoutPanel1.Controls.Add(this.cmbStatus, 15, 0); + this.tableLayoutPanel1.Controls.Add(this.pnlEmpty, 17, 0); + this.tableLayoutPanel1.Controls.Add(this.label7, 2, 0); + this.tableLayoutPanel1.Controls.Add(this.label8, 14, 0); + this.tableLayoutPanel1.Controls.Add(this.txtShopName, 3, 0); + this.tableLayoutPanel1.Controls.Add(this.label5, 4, 0); + this.tableLayoutPanel1.Controls.Add(this.btnSearch, 16, 0); + this.tableLayoutPanel1.Controls.Add(this.txtSKC, 7, 0); + this.tableLayoutPanel1.Controls.Add(this.txtSPU, 5, 0); + this.tableLayoutPanel1.Controls.Add(this.label1, 6, 0); + this.tableLayoutPanel1.Controls.Add(this.label2, 8, 0); + this.tableLayoutPanel1.Controls.Add(this.txtCat, 9, 0); + this.tableLayoutPanel1.Controls.Add(this.txtExtCode, 13, 0); + 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.Location = new System.Drawing.Point(3, 13); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 1; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(944, 28); + this.tableLayoutPanel1.TabIndex = 190; + // + // label6 + // + this.label6.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(3, 5); + 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"; + // + // txtShopId + // + this.txtShopId.Dock = System.Windows.Forms.DockStyle.Top; + this.txtShopId.Location = new System.Drawing.Point(47, 2); + this.txtShopId.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtShopId.Name = "txtShopId"; + this.txtShopId.Size = new System.Drawing.Size(57, 23); + this.txtShopId.TabIndex = 448; + // + // cmbStatus + // + this.cmbStatus.Dock = System.Windows.Forms.DockStyle.Fill; + this.cmbStatus.FormattingEnabled = true; + this.cmbStatus.Items.AddRange(new object[] { + "待上传", + "已上传", + "全部"}); + this.cmbStatus.Location = new System.Drawing.Point(758, 1); + this.cmbStatus.Margin = new System.Windows.Forms.Padding(0, 1, 0, 1); + this.cmbStatus.Name = "cmbStatus"; + this.cmbStatus.Size = new System.Drawing.Size(57, 25); + this.cmbStatus.TabIndex = 459; + this.cmbStatus.Text = "待上传"; + // + // pnlEmpty + // + 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(882, 3); + this.pnlEmpty.Name = "pnlEmpty"; + 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))))); + 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 = 431; + this.pnlEmpty.Text = "清空条件"; + this.pnlEmpty.Click += new System.EventHandler(this.pnlEmpty_Click); + // + // label7 + // + this.label7.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(110, 5); + 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 = 452; + this.label7.Text = "店铺名称"; + // + // label8 + // + this.label8.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label8.AutoSize = true; + this.label8.Location = new System.Drawing.Point(702, 5); + 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); + this.label8.TabIndex = 458; + this.label8.Text = "认领状态"; + // + // txtShopName + // + this.txtShopName.Dock = System.Windows.Forms.DockStyle.Top; + this.txtShopName.Location = new System.Drawing.Point(166, 2); + this.txtShopName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtShopName.Name = "txtShopName"; + this.txtShopName.Size = new System.Drawing.Size(57, 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(229, 5); + 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 = 435; + this.label5.Text = "SPU"; + // + // btnSearch + // + 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(821, 2); + this.btnSearch.Margin = new System.Windows.Forms.Padding(6, 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); + // + // txtSKC + // + this.txtSKC.Dock = System.Windows.Forms.DockStyle.Top; + this.txtSKC.Location = new System.Drawing.Point(354, 2); + this.txtSKC.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtSKC.Name = "txtSKC"; + this.txtSKC.Size = new System.Drawing.Size(57, 23); + this.txtSKC.TabIndex = 432; + // + // txtSPU + // + this.txtSPU.Dock = System.Windows.Forms.DockStyle.Top; + this.txtSPU.Location = new System.Drawing.Point(260, 2); + this.txtSPU.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtSPU.Name = "txtSPU"; + this.txtSPU.Size = new System.Drawing.Size(57, 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(323, 5); + 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 = 433; + this.label1.Text = "SKC"; + // + // label2 + // + this.label2.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(417, 5); + 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 = 426; + this.label2.Text = "类目"; + // + // txtCat + // + this.txtCat.Dock = System.Windows.Forms.DockStyle.Top; + this.txtCat.Location = new System.Drawing.Point(449, 2); + this.txtCat.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtCat.Name = "txtCat"; + this.txtCat.Size = new System.Drawing.Size(57, 23); + this.txtCat.TabIndex = 425; + // + // txtExtCode + // + this.txtExtCode.Dock = System.Windows.Forms.DockStyle.Top; + this.txtExtCode.Location = new System.Drawing.Point(639, 2); + this.txtExtCode.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtExtCode.Name = "txtExtCode"; + this.txtExtCode.Size = new System.Drawing.Size(57, 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(512, 5); + 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 = 428; + this.label3.Text = "标题"; + // + // label4 + // + this.label4.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(607, 5); + 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); + this.label4.TabIndex = 430; + this.label4.Text = "货号"; + // + // txtProdName + // + this.txtProdName.Dock = System.Windows.Forms.DockStyle.Top; + this.txtProdName.Location = new System.Drawing.Point(544, 2); + this.txtProdName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtProdName.Name = "txtProdName"; + this.txtProdName.Size = new System.Drawing.Size(57, 23); + this.txtProdName.TabIndex = 427; + // // chkNoSubSa // + this.chkNoSubSa.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chkNoSubSa.AutoSize = true; - this.chkNoSubSa.Location = new System.Drawing.Point(1167, 17); + this.chkNoSubSa.Location = new System.Drawing.Point(958, 17); this.chkNoSubSa.Name = "chkNoSubSa"; this.chkNoSubSa.Size = new System.Drawing.Size(123, 21); this.chkNoSubSa.TabIndex = 467; @@ -162,60 +416,6 @@ this.btnSetSubSa.UseVisualStyleBackColor = false; this.btnSetSubSa.Click += new System.EventHandler(this.btnSetSubSa_Click); // - // cmbStatus - // - this.cmbStatus.FormattingEnabled = true; - this.cmbStatus.Items.AddRange(new object[] { - "待上传", - "已上传", - "全部"}); - this.cmbStatus.Location = new System.Drawing.Point(946, 15); - this.cmbStatus.Name = "cmbStatus"; - this.cmbStatus.Size = new System.Drawing.Size(85, 25); - this.cmbStatus.TabIndex = 459; - this.cmbStatus.Text = "待上传"; - // - // label8 - // - this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(889, 19); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(68, 17); - this.label8.TabIndex = 458; - this.label8.Text = "认领状态："; - // - // txtShopName - // - this.txtShopName.Location = new System.Drawing.Point(192, 16); - this.txtShopName.Name = "txtShopName"; - this.txtShopName.Size = new System.Drawing.Size(85, 23); - this.txtShopName.TabIndex = 451; - // - // label7 - // - this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(135, 19); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(68, 17); - this.label7.TabIndex = 452; - this.label7.Text = "店铺名称："; - // - // txtShopId - // - this.txtShopId.Location = new System.Drawing.Point(46, 16); - this.txtShopId.Name = "txtShopId"; - this.txtShopId.Size = new System.Drawing.Size(85, 23); - this.txtShopId.TabIndex = 448; - // - // label6 - // - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(1, 19); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(56, 17); - this.label6.TabIndex = 449; - this.label6.Text = "店铺Id："; - // // btnAdd // this.btnAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -233,126 +433,6 @@ this.btnAdd.UseVisualStyleBackColor = false; this.btnAdd.Click += new System.EventHandler(this.btnAdd_Click); // - // txtSPU - // - this.txtSPU.Location = new System.Drawing.Point(313, 16); - this.txtSPU.Name = "txtSPU"; - this.txtSPU.Size = new System.Drawing.Size(85, 23); - this.txtSPU.TabIndex = 434; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(281, 19); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(43, 17); - this.label5.TabIndex = 435; - this.label5.Text = "SPU："; - // - // txtSKC - // - this.txtSKC.Location = new System.Drawing.Point(434, 16); - this.txtSKC.Name = "txtSKC"; - this.txtSKC.Size = new System.Drawing.Size(85, 23); - this.txtSKC.TabIndex = 432; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(402, 19); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(43, 17); - this.label1.TabIndex = 433; - this.label1.Text = "SKC："; - // - // pnlEmpty - // - 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(1100, 14); - this.pnlEmpty.Name = "pnlEmpty"; - this.pnlEmpty.Size = new System.Drawing.Size(56, 26); - 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 = 431; - this.pnlEmpty.Text = "清空条件"; - this.pnlEmpty.Click += new System.EventHandler(this.pnlEmpty_Click); - // - // btnSearch - // - 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(1039, 14); - this.btnSearch.Margin = new System.Windows.Forms.Padding(2); - this.btnSearch.Name = "btnSearch"; - this.btnSearch.Size = new System.Drawing.Size(56, 26); - this.btnSearch.TabIndex = 424; - this.btnSearch.Text = "搜索"; - this.btnSearch.UseVisualStyleBackColor = false; - this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click); - // - // txtExtCode - // - this.txtExtCode.Location = new System.Drawing.Point(800, 16); - this.txtExtCode.Name = "txtExtCode"; - this.txtExtCode.Size = new System.Drawing.Size(85, 23); - this.txtExtCode.TabIndex = 429; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(767, 19); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(44, 17); - this.label4.TabIndex = 430; - this.label4.Text = "货号："; - // - // txtProdName - // - this.txtProdName.Location = new System.Drawing.Point(678, 16); - this.txtProdName.Name = "txtProdName"; - this.txtProdName.Size = new System.Drawing.Size(85, 23); - this.txtProdName.TabIndex = 427; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(645, 19); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(44, 17); - this.label3.TabIndex = 428; - this.label3.Text = "标题："; - // - // txtCat - // - this.txtCat.Location = new System.Drawing.Point(556, 16); - this.txtCat.Name = "txtCat"; - this.txtCat.Size = new System.Drawing.Size(85, 23); - this.txtCat.TabIndex = 425; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(523, 19); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(44, 17); - this.label2.TabIndex = 426; - this.label2.Text = "类目："; - // // splitContainer2 // this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; @@ -426,7 +506,7 @@ this.colSubSaNick, this.colNotes, this.colEditNotes, - this.ColDelete, + this.colDelete, this.colOpResult}); this.dgvSelectProduct.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvSelectProduct.Location = new System.Drawing.Point(4, 0); @@ -439,29 +519,6 @@ 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 = "选择"; @@ -564,7 +621,7 @@ this.colProductName.HeaderText = "商品标题"; this.colProductName.Name = "colProductName"; this.colProductName.ReadOnly = true; - this.colProductName.Width = 200; + this.colProductName.Width = 180; // // colProductCat // @@ -615,6 +672,7 @@ this.colSubSaNick.HeaderText = "二级超管"; this.colSubSaNick.Name = "colSubSaNick"; this.colSubSaNick.ReadOnly = true; + this.colSubSaNick.Width = 80; // // colNotes // @@ -629,15 +687,14 @@ this.colEditNotes.ReadOnly = true; this.colEditNotes.Resizable = System.Windows.Forms.DataGridViewTriState.True; this.colEditNotes.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colEditNotes.Width = 70; + this.colEditNotes.Width = 62; // - // ColDelete + // colDelete // - this.ColDelete.HeaderText = "删除"; - this.ColDelete.Name = "ColDelete"; - this.ColDelete.ReadOnly = true; - this.ColDelete.Visible = false; - this.ColDelete.Width = 125; + this.colDelete.HeaderText = "删除"; + this.colDelete.Name = "colDelete"; + this.colDelete.ReadOnly = true; + this.colDelete.Width = 38; // // colOpResult // @@ -646,6 +703,29 @@ 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(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; + // // DbProductSelectListManageForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -664,6 +744,8 @@ this.splitContainer1.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); this.splitContainer1.ResumeLayout(false); + this.tableLayoutPanel1.ResumeLayout(false); + this.tableLayoutPanel1.PerformLayout(); this.splitContainer2.Panel1.ResumeLayout(false); this.splitContainer2.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit(); @@ -725,7 +807,9 @@ private System.Windows.Forms.DataGridViewTextBoxColumn colSubSaNick; private System.Windows.Forms.DataGridViewTextBoxColumn colNotes; private System.Windows.Forms.DataGridViewLinkColumn colEditNotes; - private System.Windows.Forms.DataGridViewLinkColumn ColDelete; + private System.Windows.Forms.DataGridViewLinkColumn colDelete; private System.Windows.Forms.DataGridViewTextBoxColumn colOpResult; + private UserComponent.UcCheckBox chkShowDel; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; } } \ No newline at end of file diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs index 3747766..51c5bb0 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs +++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs @@ -39,12 +39,18 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.ucSplitPage1.PageChange += UcSplitPage1_PageChange; this.dgvSelectProduct.AddSelectorColumn("colSelect"); - if (BaseClass.SaLevel != 1) + dgvSelectProduct.Columns["colSubSaNick"].Visible = false; + dgvSelectProduct.Columns["colDelete"].Visible = false; + chkShowDel.Visible = false; + btnSetSubSa.Visible = false; + chkNoSubSa.Visible = false; + + if (BaseClass.SaLevel == 1) { - dgvSelectProduct.Columns["colSubSa"].Visible = false; - dgvSelectProduct.Columns["colSubSaNick"].Visible = false; - btnSetSubSa.Visible = false; - chkNoSubSa.Visible = false; + dgvSelectProduct.Columns["colSubSaNick"].Visible = true; + chkShowDel.Visible = true; + btnSetSubSa.Visible = true; + chkNoSubSa.Visible = true; } } @@ -271,9 +277,13 @@ namespace TemuKJD.KJDForms.ProductSelectForms switch (headerText) { case "删除": - //if (BaseMsgForm.ShowConfirm("确定删除商品吗？删除后不可恢复！").DialogResult == DialogResult.Cancel) - // return; - //DeleteProduct(dbId); + if (BaseMsgForm.ShowConfirm("确定删除商品吗？删除后不可恢复！").DialogResult == DialogResult.Cancel) + return; + var rst = DeleteProduct(dbId); + if (rst) + { + SearchDbProdSelect(this.ucSplitPage1.CurrentPage); + } break; case "编辑备注": ProductSelectEditNotesForm editForm = new ProductSelectEditNotesForm(dbSelectProduct); @@ -360,6 +370,24 @@ namespace TemuKJD.KJDForms.ProductSelectForms } } + private bool DeleteProduct(string dbId) + { + var url = BaseClass.BuildObjString("product/del_select_product"); + var data = UserLogin.GetSignaturex() + + "&db_id=" + dbId; + var html = GetHtml.PostUtf8(url, data); + if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) + html = GetHtml.PostUtf8(url, data); + if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) + html = GetHtml.PostUtf8(url, data); + if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) + { + BaseMsgForm.ShowError("删除商品失败，请重试！" + BaseRegex.GetStringJson(ref html, "msg")); + return false; + } + return true; + } + private void UpdateCookieForm_SaveComplete(object obj) { } @@ -507,9 +535,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms var result = ""; try { - var prodDetailStr = GetHtml.UrlDecode(temuDBProd.product_json); - var productDetail = JsonHelper.DeserializeJsonToObject(prodDetailStr); - result = UploadProduct(shop, productDetail, temuDBProd.size_json); //将商品上传至草稿箱 + result = UploadProduct(shop, temuDBProd); //将商品上传至草稿箱 if (result.Contains("登录过期")) { @@ -666,13 +692,18 @@ namespace TemuKJD.KJDForms.ProductSelectForms } } - string UploadProduct(ShopLoginInfo shop, TemuProductInfo prodInfo, string sTemuSizeSpec = null) + string UploadProduct(ShopLoginInfo shop, TemuDBProduct dbProd) { if (shop == null || string.IsNullOrEmpty(shop.ShopId) || shop.LoginStatus != "登录成功") { return "店铺为空或未登录!"; } + //var prodDetailStr = GetHtml.UrlDecode(dbProd.product_json); + //var prodInfo = JsonHelper.DeserializeJsonToObject(prodDetailStr); + var prodInfo = JsonHelper.DeserializeJsonToObject(dbProd.product_json); + var sTemuSizeSpec = dbProd.size_json; + TemuProductParam prodParam = new TemuProductParam(); prodParam.carouselImageI18nReqs = prodInfo.carouselImageI18nVOList; prodParam.carouselImageUrls = prodInfo.carouselImageUrls; @@ -813,6 +844,8 @@ namespace TemuKJD.KJDForms.ProductSelectForms { ProductSkcReqsItem skcItem = new ProductSkcReqsItem(); skcItem.extCode = skcInfo.extCode; + if (!string.IsNullOrWhiteSpace(dbProd.ext_code)) + skcItem.extCode = dbProd.ext_code; skcItem.isBasePlate = 0; skcItem.mainProductSkuSpecReqs = new List(); foreach (var skuSpecInfo in skcInfo.productSkcSpecList) @@ -1089,5 +1122,10 @@ namespace TemuKJD.KJDForms.ProductSelectForms } } } + + private void chkShowDel_CheckedChanged(object sender, EventArgs e) + { + dgvSelectProduct.Columns["colDelete"].Visible = this.chkShowDel.Checked; + } } } diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.resx b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.resx index 58ecc01..07f1936 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.resx +++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.resx @@ -180,7 +180,7 @@ True - + True diff --git a/TEMUKJD/KJDForms/ProductSelectForms/UserSelectDbProductForm.Designer.cs b/TEMUKJD/KJDForms/ProductSelectForms/UserSelectDbProductForm.Designer.cs index e5f4413..977e11a 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/UserSelectDbProductForm.Designer.cs +++ b/TEMUKJD/KJDForms/ProductSelectForms/UserSelectDbProductForm.Designer.cs @@ -75,6 +75,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.colExtCode = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colMsg = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDraftId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colNotes = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ColDelete = new System.Windows.Forms.DataGridViewLinkColumn(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); @@ -439,6 +440,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.colExtCode, this.colMsg, this.colDraftId, + this.colNotes, this.ColDelete}); this.dgvSelectProduct.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvSelectProduct.Location = new System.Drawing.Point(0, 0); @@ -653,6 +655,12 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.colDraftId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; this.colDraftId.Width = 80; // + // colNotes + // + this.colNotes.HeaderText = "上传备注"; + this.colNotes.Name = "colNotes"; + this.colNotes.ReadOnly = true; + // // ColDelete // this.ColDelete.HeaderText = "删除"; @@ -739,6 +747,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms private System.Windows.Forms.DataGridViewTextBoxColumn colExtCode; private System.Windows.Forms.DataGridViewTextBoxColumn colMsg; private System.Windows.Forms.DataGridViewTextBoxColumn colDraftId; + private System.Windows.Forms.DataGridViewTextBoxColumn colNotes; private System.Windows.Forms.DataGridViewLinkColumn ColDelete; } } \ No newline at end of file diff --git a/TEMUKJD/KJDForms/ProductSelectForms/UserSelectDbProductForm.cs b/TEMUKJD/KJDForms/ProductSelectForms/UserSelectDbProductForm.cs index 9df0416..4e305cc 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/UserSelectDbProductForm.cs +++ b/TEMUKJD/KJDForms/ProductSelectForms/UserSelectDbProductForm.cs @@ -248,6 +248,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms prodSelect.ext_code, prodSelect.status, prodSelect.draft_id, + prodSelect.notes, "删除"); dgvSelectProduct.Rows[rowIndex].Height = 60; diff --git a/TEMUKJD/KJDForms/ProductSelectForms/UserSelectDbProductForm.resx b/TEMUKJD/KJDForms/ProductSelectForms/UserSelectDbProductForm.resx index 8a54b6d..67a396d 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/UserSelectDbProductForm.resx +++ b/TEMUKJD/KJDForms/ProductSelectForms/UserSelectDbProductForm.resx @@ -180,6 +180,9 @@ True + + True + True diff --git a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs index d0560e0..c14ecaa 100644 --- a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs +++ b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs @@ -615,6 +615,7 @@ this.colSubSaNick.HeaderText = "二级超管"; this.colSubSaNick.Name = "colSubSaNick"; this.colSubSaNick.ReadOnly = true; + this.colSubSaNick.Width = 80; // // colNotes //