From 898a739b657241a96425f4175c424d67ecb9c945 Mon Sep 17 00:00:00 2001 From: wule Date: Sat, 30 May 2026 14:03:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BE=AE=E4=BF=A1=E9=80=89?= =?UTF-8?q?=E5=93=81=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AllBase/BaseClass.cs | 4 +- .../ProductForms/WXDBProdUploadForm.cs | 33 +++++-- TEMUKJD/WXForms/ProductForms/WXProductForm.cs | 2 + .../WXUserCollectAuthProdListForm.Designer.cs | 4 +- .../WXUserCollectAuthProdListForm.cs | 33 ++++--- .../WXUserProdListForm.Designer.cs | 88 +++++++++---------- .../ProductForms/WXUserProdListForm.cs | 17 ++-- 7 files changed, 109 insertions(+), 72 deletions(-) diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs index e1c0839..4816119 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -27,8 +27,8 @@ namespace AllBase /// /// 版本ID /// - public static int VersionCount = 1120; - public static string MainPath = "29wx"; + public static int VersionCount = 1121; + public static string MainPath = "29pdd"; //public static string MainPath = "29wx"; //public static string MainPath = "29pdd"; //public static string MainPath = "kuajingda"; diff --git a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs index a3075af..c907b95 100644 --- a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs @@ -310,8 +310,8 @@ namespace TemuKJD.WXForms.ProductForms cmbSourceType.Visible = true; if (!string.IsNullOrWhiteSpace(cmbSourceType.Text)) { - lblGroupFilter.Visible = true; - cmbGroupFilter.Visible = true; + //lblGroupFilter.Visible = true; + //cmbGroupFilter.Visible = true; } } if (BaseClass.UserAuthority.ParseToString().Contains("微信回采")) @@ -325,8 +325,8 @@ namespace TemuKJD.WXForms.ProductForms cmbHot.Visible = true; if (!string.IsNullOrWhiteSpace(cmbSourceType.Text)) { - lblGroupFilter.Visible = true; - cmbGroupFilter.Visible = true; + //lblGroupFilter.Visible = true; + //cmbGroupFilter.Visible = true; } } if (BaseClass.UserAuthority.Contains("商品采集") || BaseClass.ParentAuthority.Contains("商品采集")) @@ -341,6 +341,18 @@ namespace TemuKJD.WXForms.ProductForms //chkImgRandomBlock.Visible = true; } + List ctrlLst = new List() { + lblSourceType, cmbSourceType, lblGroupFilter, cmbGroupFilter, lblHot, cmbHot, lblIdFilter, txtIdFilter, lblJstInitSet, cmbJstInitSet + }; + for (int i = 0; i < ctrlLst.Count - 1; i++) + { + if (ctrlLst[i].Visible == false) + { + for (int j= ctrlLst.Count - 1; j > i; j--) + ctrlLst[j].Location = new Point(ctrlLst[j -1].Location.X, ctrlLst[j - 1].Location.Y); + } + } + IsLoadComplate = true; } @@ -4682,14 +4694,19 @@ namespace TemuKJD.WXForms.ProductForms data += "&product_name=" + txtSearchGoodsName.Text.Trim(); - // 同时刷新下商品分组 + // 商品采集权限可以随机管理員或自己采集的商品 string addUserName = BaseClass.UserAuthority.Contains("商品采集") ? ("admin," + BaseClass.UserName) : "admin"; if (BaseClass.GroupId != 3) addUserName = BaseClass.ParentAuthority.Contains("商品采集") ? ("admin," + BaseClass.ParentUserName) : "admin"; - data += "&add_user_name=" + addUserName; + // 如果指定是自己采集的商品，则只随机自己采集的商品 + if (cmbSourceType.Text.Trim().Contains("多多商品") || cmbSourceType.Text.Trim().Contains("1688商品")) + data += "&add_user_name=" + (BaseClass.GroupId == 3 ? BaseClass.UserName : BaseClass.ParentUserName); + else + data += "&add_user_name=" + addUserName; // 采集来源判断 data += "&product_get_type=" + cmbSourceType.Text.Trim().Replace("多多商品","机会商品").Replace("1688商品", "1688厂家,1688外部数据"); + if (cmbSourceType.Text != "厂商直采" && cmbSourceType.Text != "1688厂家" && cmbSourceType.Text != "微信店采" && cmbSourceType.Text != "微信小店") data += "&in_cates=" + (cmbCateFilter1.Text == "全部" ? "" : cmbCateFilter1.Text); else @@ -5195,8 +5212,8 @@ namespace TemuKJD.WXForms.ProductForms }); if (!string.IsNullOrWhiteSpace(cmbSourceType.Text) || cmbSourceType.Text == "我的商品") { - lblGroupFilter.Visible = true; - cmbGroupFilter.Visible = true; + //lblGroupFilter.Visible = true; + //cmbGroupFilter.Visible = true; } else { diff --git a/TEMUKJD/WXForms/ProductForms/WXProductForm.cs b/TEMUKJD/WXForms/ProductForms/WXProductForm.cs index a78bf21..1fff8eb 100644 --- a/TEMUKJD/WXForms/ProductForms/WXProductForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXProductForm.cs @@ -48,6 +48,8 @@ namespace TemuKJD.WXForms.ProductForms hideName.Remove("多多商品采集"); hideName.Remove("我的商品库"); } + if (BaseClass.ParentAuthority.Contains("商品采集")) + hideName.Remove("我的商品库"); if (BaseClass.GroupId == 3) { //hideName.Remove("设置进货价"); diff --git a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.Designer.cs index 89acc08..ebe678a 100644 --- a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.Designer.cs +++ b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.Designer.cs @@ -176,7 +176,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnStopStop.CanvasColor = System.Drawing.SystemColors.Control; this.btnStopStop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnStopStop.DisabledBackColor = System.Drawing.Color.Empty; - this.btnStopStop.Location = new System.Drawing.Point(1345, 42); + this.btnStopStop.Location = new System.Drawing.Point(1209, 42); this.btnStopStop.Name = "btnStopStop"; this.btnStopStop.Size = new System.Drawing.Size(84, 25); this.btnStopStop.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -204,7 +204,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnGetProdWxCate.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnGetProdWxCate.Location = new System.Drawing.Point(1209, 9); this.btnGetProdWxCate.Name = "btnGetProdWxCate"; - this.btnGetProdWxCate.Size = new System.Drawing.Size(90, 25); + this.btnGetProdWxCate.Size = new System.Drawing.Size(84, 25); this.btnGetProdWxCate.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnGetProdWxCate.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnGetProdWxCate.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); diff --git a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.cs b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.cs index d3693a7..3a85f65 100644 --- a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.cs @@ -74,16 +74,19 @@ namespace TemuKJD.WXForms.ProductForms // PDDDBProdListForm.GetPDDProductGroup(new List { cmbGroupFilter, }, "", "", BaseClass.UserName); // GetPddProductCate(); //}); + fillCate(); - if (BaseClass.SaLevel == 1 && shop == null) // 一级管理员且不是选品状态 - { - this.dgvDbProduct.Columns["colPriceText"].Visible = true; - } - else - { - this.dgvDbProduct.Columns["colPriceText"].Visible = true; - lblGroup.Visible = false; - } + + //if (BaseClass.SaLevel == 1 && shop == null) // 一级管理员且不是选品状态 + //{ + // this.dgvDbProduct.Columns["colPriceText"].Visible = true; + //} + //else + //{ + // this.dgvDbProduct.Columns["colPriceText"].Visible = true; + // lblGroup.Visible = false; + //} + if (BaseClass.MainPath != "29pdd") { this.dgvDbProduct.Columns["colExtCodePrice"].Visible = false; @@ -115,7 +118,7 @@ namespace TemuKJD.WXForms.ProductForms ucSplitPage1.cmbPageSize.DropDownStyle = ComboBoxStyle.DropDownList; ucSplitPage1.cmbPageSize.SelectedIndex = 0; - if (BaseClass.SaLevel > 0 || BaseClass.UserAuthority.ParseToString().Contains("货源选择")) + if (/*BaseClass.SaLevel > 0 || */ BaseClass.UserAuthority.ParseToString().Contains("货源选择")) { lblSourceType.Visible = true; cmbSourceType.Visible = true; @@ -128,6 +131,14 @@ namespace TemuKJD.WXForms.ProductForms { tableLayoutPanel1.ColumnStyles[9].SizeType = SizeType.AutoSize; } + + if (BaseClass.GroupId != 3) + { + btnDel.Visible = false; + btnGetProdWxCate.Visible = false; + btnStopStop.Visible = false; + this.dgvDbProduct.Columns["col_edit"].Visible = false; + } } private void btnSearch_Click(object sender, EventArgs e) @@ -343,7 +354,7 @@ namespace TemuKJD.WXForms.ProductForms //"&search_group=" + cmbGroupFilter.Text.Trim() + "&search_prod_name=" + txtProdName.Text.Trim() + "&wx_safe_status=" + cmbWxSafe.Text.Trim().Replace("安全+未校验", "安全商品,未校验").Replace("违规商品", ""); - data += "&add_user_name=" + BaseClass.UserName; + data += "&add_user_name=" + (BaseClass.GroupId == 3 ? BaseClass.UserName : BaseClass.ParentUserName); if (BaseClass.MainPath == "29wx") data += "&ban_wx=0"; if (BaseClass.MainPath == "29pdd") diff --git a/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.Designer.cs index cc71a01..2adbc1a 100644 --- a/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.Designer.cs +++ b/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.Designer.cs @@ -78,7 +78,7 @@ namespace TemuKJD.WXForms.ProductForms this.txtCatBoundLessThan = new System.Windows.Forms.TextBox(); this.cmbGroupFilter = new System.Windows.Forms.ComboBox(); this.lblSourceType = new System.Windows.Forms.Label(); - this.lblGroup = new System.Windows.Forms.Label(); + this.lblGroupFilter = new System.Windows.Forms.Label(); this.cmbSourceType = new System.Windows.Forms.ComboBox(); this.lblSetShop = new System.Windows.Forms.Label(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); @@ -316,7 +316,7 @@ namespace TemuKJD.WXForms.ProductForms this.tableLayoutPanel1.Controls.Add(this.txtCatBoundLessThan, 5, 1); this.tableLayoutPanel1.Controls.Add(this.cmbGroupFilter, 9, 1); this.tableLayoutPanel1.Controls.Add(this.lblSourceType, 6, 1); - this.tableLayoutPanel1.Controls.Add(this.lblGroup, 8, 1); + this.tableLayoutPanel1.Controls.Add(this.lblGroupFilter, 8, 1); this.tableLayoutPanel1.Controls.Add(this.cmbSourceType, 7, 1); this.tableLayoutPanel1.Location = new System.Drawing.Point(4, 4); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; @@ -330,16 +330,16 @@ namespace TemuKJD.WXForms.ProductForms // txtViewUvMin // this.txtViewUvMin.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtViewUvMin.Location = new System.Drawing.Point(1123, 41); + this.txtViewUvMin.Location = new System.Drawing.Point(1133, 41); this.txtViewUvMin.Name = "txtViewUvMin"; - this.txtViewUvMin.Size = new System.Drawing.Size(67, 23); + this.txtViewUvMin.Size = new System.Drawing.Size(57, 23); this.txtViewUvMin.TabIndex = 882; this.txtViewUvMin.Visible = false; // // chkViewUvMin // this.chkViewUvMin.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.chkViewUvMin.Location = new System.Drawing.Point(1069, 42); + this.chkViewUvMin.Location = new System.Drawing.Point(1079, 42); this.chkViewUvMin.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3); this.chkViewUvMin.Name = "chkViewUvMin"; this.chkViewUvMin.Size = new System.Drawing.Size(48, 21); @@ -356,10 +356,10 @@ namespace TemuKJD.WXForms.ProductForms "", "爆款数据", "普通商品"}); - this.cmbHot.Location = new System.Drawing.Point(914, 7); + this.cmbHot.Location = new System.Drawing.Point(922, 7); this.cmbHot.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbHot.Name = "cmbHot"; - this.cmbHot.Size = new System.Drawing.Size(146, 25); + this.cmbHot.Size = new System.Drawing.Size(148, 25); this.cmbHot.TabIndex = 882; this.cmbHot.Text = "普通商品"; this.cmbHot.Visible = false; @@ -369,7 +369,7 @@ namespace TemuKJD.WXForms.ProductForms // this.lblHot.Anchor = System.Windows.Forms.AnchorStyles.Right; this.lblHot.AutoSize = true; - this.lblHot.Location = new System.Drawing.Point(870, 9); + this.lblHot.Location = new System.Drawing.Point(878, 9); this.lblHot.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.lblHot.Name = "lblHot"; this.lblHot.Size = new System.Drawing.Size(44, 17); @@ -384,7 +384,7 @@ namespace TemuKJD.WXForms.ProductForms 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(1066, 5); + this.btnSearch.Location = new System.Drawing.Point(1076, 5); this.btnSearch.Name = "btnSearch"; this.btnSearch.Size = new System.Drawing.Size(51, 25); this.btnSearch.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -408,9 +408,9 @@ namespace TemuKJD.WXForms.ProductForms this.btnEmpty.CanvasColor = System.Drawing.SystemColors.Control; this.btnEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnEmpty.DisabledBackColor = System.Drawing.Color.Empty; - this.btnEmpty.Location = new System.Drawing.Point(1123, 5); + this.btnEmpty.Location = new System.Drawing.Point(1133, 5); this.btnEmpty.Name = "btnEmpty"; - this.btnEmpty.Size = new System.Drawing.Size(67, 25); + this.btnEmpty.Size = new System.Drawing.Size(57, 25); this.btnEmpty.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); this.btnEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); @@ -435,10 +435,10 @@ namespace TemuKJD.WXForms.ProductForms this.cmbCat3.DropDownWidth = 1; this.cmbCat3.FormattingEnabled = true; this.cmbCat3.IntegralHeight = false; - this.cmbCat3.Location = new System.Drawing.Point(718, 7); + this.cmbCat3.Location = new System.Drawing.Point(724, 7); this.cmbCat3.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat3.Name = "cmbCat3"; - this.cmbCat3.Size = new System.Drawing.Size(146, 25); + this.cmbCat3.Size = new System.Drawing.Size(148, 25); this.cmbCat3.TabIndex = 811; this.cmbCat3.Text = "全部"; this.cmbCat3.SelectedIndexChanged += new System.EventHandler(this.cmbCat3_SelectedIndexChanged); @@ -448,7 +448,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label17.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(667, 9); + this.label17.Location = new System.Drawing.Point(673, 9); this.label17.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label17.Name = "label17"; this.label17.Size = new System.Drawing.Size(51, 17); @@ -463,10 +463,10 @@ namespace TemuKJD.WXForms.ProductForms this.cmbCat2.DropDownWidth = 1; this.cmbCat2.FormattingEnabled = true; this.cmbCat2.IntegralHeight = false; - this.cmbCat2.Location = new System.Drawing.Point(515, 7); + this.cmbCat2.Location = new System.Drawing.Point(519, 7); this.cmbCat2.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat2.Name = "cmbCat2"; - this.cmbCat2.Size = new System.Drawing.Size(146, 25); + this.cmbCat2.Size = new System.Drawing.Size(148, 25); this.cmbCat2.TabIndex = 804; this.cmbCat2.Text = "全部"; this.cmbCat2.SelectedIndexChanged += new System.EventHandler(this.cmbCat2_SelectedIndexChanged); @@ -476,7 +476,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label14.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(464, 9); + this.label14.Location = new System.Drawing.Point(468, 9); this.label14.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label14.Name = "label14"; this.label14.Size = new System.Drawing.Size(51, 17); @@ -491,10 +491,10 @@ namespace TemuKJD.WXForms.ProductForms this.cmbCat1.DropDownWidth = 1; this.cmbCat1.FormattingEnabled = true; this.cmbCat1.IntegralHeight = false; - this.cmbCat1.Location = new System.Drawing.Point(293, 7); + this.cmbCat1.Location = new System.Drawing.Point(295, 7); this.cmbCat1.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat1.Name = "cmbCat1"; - this.cmbCat1.Size = new System.Drawing.Size(146, 25); + this.cmbCat1.Size = new System.Drawing.Size(148, 25); this.cmbCat1.TabIndex = 805; this.cmbCat1.Text = "全部"; this.cmbCat1.SelectedIndexChanged += new System.EventHandler(this.cmbCat1_SelectedIndexChanged); @@ -504,7 +504,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label2.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(242, 9); + this.label2.Location = new System.Drawing.Point(244, 9); this.label2.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(51, 17); @@ -517,7 +517,7 @@ namespace TemuKJD.WXForms.ProductForms this.txtProdName.Location = new System.Drawing.Point(71, 6); this.txtProdName.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtProdName.Name = "txtProdName"; - this.txtProdName.Size = new System.Drawing.Size(146, 23); + this.txtProdName.Size = new System.Drawing.Size(148, 23); this.txtProdName.TabIndex = 427; // // label3 @@ -554,14 +554,14 @@ namespace TemuKJD.WXForms.ProductForms this.cmbWxSafe.Location = new System.Drawing.Point(71, 42); this.cmbWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbWxSafe.Name = "cmbWxSafe"; - this.cmbWxSafe.Size = new System.Drawing.Size(146, 25); + this.cmbWxSafe.Size = new System.Drawing.Size(148, 25); this.cmbWxSafe.TabIndex = 676; this.cmbWxSafe.Text = "安全+未校验"; // // chkCatBoundMoreThan // this.chkCatBoundMoreThan.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.chkCatBoundMoreThan.Location = new System.Drawing.Point(226, 42); + this.chkCatBoundMoreThan.Location = new System.Drawing.Point(228, 42); this.chkCatBoundMoreThan.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3); this.chkCatBoundMoreThan.Name = "chkCatBoundMoreThan"; this.chkCatBoundMoreThan.Size = new System.Drawing.Size(64, 21); @@ -573,10 +573,10 @@ namespace TemuKJD.WXForms.ProductForms // txtCatBoundMoreThan // this.txtCatBoundMoreThan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtCatBoundMoreThan.Location = new System.Drawing.Point(293, 41); + this.txtCatBoundMoreThan.Location = new System.Drawing.Point(295, 41); this.txtCatBoundMoreThan.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtCatBoundMoreThan.Name = "txtCatBoundMoreThan"; - this.txtCatBoundMoreThan.Size = new System.Drawing.Size(146, 23); + this.txtCatBoundMoreThan.Size = new System.Drawing.Size(148, 23); this.txtCatBoundMoreThan.TabIndex = 882; this.txtCatBoundMoreThan.Text = "1000"; this.txtCatBoundMoreThan.Visible = false; @@ -584,7 +584,7 @@ namespace TemuKJD.WXForms.ProductForms // chkCatBoundLessThan // this.chkCatBoundLessThan.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.chkCatBoundLessThan.Location = new System.Drawing.Point(448, 42); + this.chkCatBoundLessThan.Location = new System.Drawing.Point(452, 42); this.chkCatBoundLessThan.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3); this.chkCatBoundLessThan.Name = "chkCatBoundLessThan"; this.chkCatBoundLessThan.Size = new System.Drawing.Size(64, 21); @@ -596,10 +596,10 @@ namespace TemuKJD.WXForms.ProductForms // txtCatBoundLessThan // this.txtCatBoundLessThan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtCatBoundLessThan.Location = new System.Drawing.Point(515, 41); + this.txtCatBoundLessThan.Location = new System.Drawing.Point(519, 41); this.txtCatBoundLessThan.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtCatBoundLessThan.Name = "txtCatBoundLessThan"; - this.txtCatBoundLessThan.Size = new System.Drawing.Size(146, 23); + this.txtCatBoundLessThan.Size = new System.Drawing.Size(148, 23); this.txtCatBoundLessThan.TabIndex = 883; this.txtCatBoundLessThan.Text = "100000"; this.txtCatBoundLessThan.Visible = false; @@ -608,10 +608,10 @@ namespace TemuKJD.WXForms.ProductForms // this.cmbGroupFilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.cmbGroupFilter.FormattingEnabled = true; - this.cmbGroupFilter.Location = new System.Drawing.Point(914, 42); + this.cmbGroupFilter.Location = new System.Drawing.Point(922, 42); this.cmbGroupFilter.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbGroupFilter.Name = "cmbGroupFilter"; - this.cmbGroupFilter.Size = new System.Drawing.Size(146, 25); + this.cmbGroupFilter.Size = new System.Drawing.Size(148, 25); this.cmbGroupFilter.TabIndex = 653; this.cmbGroupFilter.Visible = false; this.cmbGroupFilter.SelectedIndexChanged += new System.EventHandler(this.cmbGroupFilter_SelectedIndexChanged); @@ -620,7 +620,7 @@ namespace TemuKJD.WXForms.ProductForms // this.lblSourceType.Anchor = System.Windows.Forms.AnchorStyles.Right; this.lblSourceType.AutoSize = true; - this.lblSourceType.Location = new System.Drawing.Point(674, 44); + this.lblSourceType.Location = new System.Drawing.Point(680, 44); this.lblSourceType.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.lblSourceType.Name = "lblSourceType"; this.lblSourceType.Size = new System.Drawing.Size(44, 17); @@ -628,17 +628,17 @@ namespace TemuKJD.WXForms.ProductForms this.lblSourceType.Text = "来源："; this.lblSourceType.Visible = false; // - // lblGroup + // lblGroupFilter // - this.lblGroup.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.lblGroup.AutoSize = true; - this.lblGroup.Location = new System.Drawing.Point(870, 44); - this.lblGroup.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); - this.lblGroup.Name = "lblGroup"; - this.lblGroup.Size = new System.Drawing.Size(44, 17); - this.lblGroup.TabIndex = 641; - this.lblGroup.Text = "分组："; - this.lblGroup.Visible = false; + this.lblGroupFilter.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.lblGroupFilter.AutoSize = true; + this.lblGroupFilter.Location = new System.Drawing.Point(878, 44); + this.lblGroupFilter.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.lblGroupFilter.Name = "lblGroupFilter"; + this.lblGroupFilter.Size = new System.Drawing.Size(44, 17); + this.lblGroupFilter.TabIndex = 641; + this.lblGroupFilter.Text = "分组："; + this.lblGroupFilter.Visible = false; // // cmbSourceType // @@ -655,10 +655,10 @@ namespace TemuKJD.WXForms.ProductForms "机会商品", "以图搜品", "外部数据"}); - this.cmbSourceType.Location = new System.Drawing.Point(718, 42); + this.cmbSourceType.Location = new System.Drawing.Point(724, 42); this.cmbSourceType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbSourceType.Name = "cmbSourceType"; - this.cmbSourceType.Size = new System.Drawing.Size(146, 25); + this.cmbSourceType.Size = new System.Drawing.Size(148, 25); this.cmbSourceType.TabIndex = 654; this.cmbSourceType.Text = "厂商直采"; this.cmbSourceType.Visible = false; @@ -1699,7 +1699,7 @@ namespace TemuKJD.WXForms.ProductForms private System.Windows.Forms.Label lblNotes; private System.Windows.Forms.ComboBox cmbSort; private System.Windows.Forms.Label label6; - private System.Windows.Forms.Label lblGroup; + private System.Windows.Forms.Label lblGroupFilter; private DevComponents.DotNetBar.PanelEx btnSearch; private DevComponents.DotNetBar.PanelEx btnSelect; private System.Windows.Forms.ComboBox cmbGroupFilter; diff --git a/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.cs b/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.cs index 721a18f..d536ec4 100644 --- a/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.cs @@ -90,7 +90,7 @@ namespace TemuKJD.WXForms.ProductForms else { this.dgvDbProduct.Columns["colPriceText"].Visible = true; - lblGroup.Visible = false; + lblGroupFilter.Visible = false; } if (BaseClass.MainPath != "29pdd") { @@ -129,8 +129,11 @@ namespace TemuKJD.WXForms.ProductForms { lblSourceType.Visible = true; cmbSourceType.Visible = true; - lblGroup.Visible = true; - cmbGroupFilter.Visible = true; + if (BaseClass.MainPath == "29pdd") + { + lblGroupFilter.Visible = true; + cmbGroupFilter.Visible = true; + } } if (BaseClass.SaLevel > 0 || BaseClass.UserAuthority.ParseToString().Contains("爆款数据")) { @@ -427,11 +430,15 @@ namespace TemuKJD.WXForms.ProductForms data += "&min_view_uv=" + txtViewUvMin.Text.ParseToInt(); } - // 同时刷新下商品分组 + // 商品采集权限可以随机管理員或自己采集的商品 string addUserName = BaseClass.UserAuthority.Contains("商品采集") ? ("admin," + BaseClass.UserName) : "admin"; if (BaseClass.GroupId != 3) addUserName = BaseClass.ParentAuthority.Contains("商品采集") ? ("admin," + BaseClass.ParentUserName) : "admin"; - data += "&add_user_name=" + addUserName; + // 如果指定是自己采集的商品，则只随机自己采集的商品 + if (cmbSourceType.Text.Trim().Contains("多多商品") || cmbSourceType.Text.Trim().Contains("1688商品")) + data += "&add_user_name=" + (BaseClass.GroupId == 3 ? BaseClass.UserName : BaseClass.ParentUserName); + else + data += "&add_user_name=" + addUserName; if (BaseClass.MainPath == "29wx") data += "&ban_wx=0";