From deb84144cfafc39e720d43aa0e52c99143a7e275 Mon Sep 17 00:00:00 2001 From: wule Date: Sat, 19 Jul 2025 19:17:55 +0800 Subject: [PATCH] =?UTF-8?q?ui=E9=80=82=E9=85=8D=E8=B0=83=E6=95=B4=20?= =?UTF-8?q?=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86=E8=B0=83=E6=95=B4=20?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=95=B0=E9=87=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AllBase/BaseClass.cs | 7 +- AllBase/Model/Result/ShopLoginInfo.cs | 7 +- .../KJD_WebService/BLL/ProductManage.cs | 7 + KJDService/KJD_WebService/BLL/ShopManage.cs | 32 +- .../Model/ShopModel/ShopParam.cs | 2 + TEMUKJD/ChatForms/ChatForm.cs | 2 +- TEMUKJD/DashBoardForms/DashBoardForm.cs | 2 +- TEMUKJD/InitForm.cs | 6 - TEMUKJD/KJD.csproj | 19 + .../KJDForms/AdminForms/AdminAccountForm.cs | 2 +- .../AdminForms/AdminShopForm.Designer.cs | 79 ++--- TEMUKJD/KJDForms/AdminForms/AdminShopForm.cs | 2 +- .../KJDForms/BaseForms/BaseForm.Designer.cs | 48 +++ TEMUKJD/KJDForms/BaseForms/BaseForm.cs | 51 +++ TEMUKJD/KJDForms/BaseForms/BaseForm.resx | 120 +++++++ TEMUKJD/KJDForms/BaseForms/LRBaseForm.cs | 2 +- .../CollectForms/CaiNiXiHuanCollectForm.cs | 3 +- TEMUKJD/KJDForms/CollectForms/CollectForm.cs | 3 +- .../CollectForms/FriendShopCollectForm.cs | 2 +- .../KJDForms/CollectForms/HaoWuCollectForm.cs | 3 +- .../CollectForms/KeywordCollectForm.cs | 3 +- .../CollectForms/ShopProductCollectForm.cs | 3 +- TEMUKJD/KJDForms/OrderForms/OrderForm.cs | 3 +- .../ProductForms/Old/CleanDataForm.cs | 2 +- .../ProductForms/Old/CommissionForm.cs | 2 +- .../ProductForms/Old/FissionDataBaseForm.cs | 2 +- .../ProductForms/Old/GetUpProductForm.cs | 2 +- .../ProductForms/Old/ShopProductForm.cs | 2 +- .../ProductForms/Old/SpecialDelaySendForm.cs | 2 +- .../ProductForms/Old/StockSyncForm.cs | 2 +- .../Old/UploadProductErrorForm.cs | 2 +- .../ProductForms/Old/UploadProductForm.cs | 2 +- .../ProductForms/Old/ViolateManageForm.cs | 2 +- .../ProductForms/PriceManageForm.Designer.cs | 333 +++++++++--------- .../KJDForms/ProductForms/PriceManageForm.cs | 13 +- TEMUKJD/KJDForms/ProductForms/ProductForm.cs | 3 +- .../ProductForms/SaleStockUpForm.Designer.cs | 220 ++++++------ .../KJDForms/ProductForms/SaleStockUpForm.cs | 2 +- .../DbProductListForm.Designer.cs | 3 - .../ProductSelectForms/DbProductListForm.cs | 16 +- .../DbProductSelectListManageForm.Designer.cs | 4 - .../DbProductSelectListManageForm.cs | 2 +- .../UserSelectDbProductForm.Designer.cs | 46 +-- .../UserSelectDbProductForm.cs | 7 +- .../UserSelectDbProductForm.resx | 3 + .../KJDForms/SalesCenterForms/CouponForm.cs | 2 +- .../SalesCenterForms/CouponShopForm.cs | 2 +- .../DouProductProPromotionListSkuInfoForm.cs | 2 +- .../DouProductPromotionListSkuInfoEditForm.cs | 2 +- .../SalesCenterForms/FullMinusActiveForm.cs | 2 +- .../SalesCenterForms/FullMinusForm.cs | 2 +- .../SalesCenterForms/FullMinusShopForm.cs | 3 +- .../KJDForms/SalesCenterForms/GroupBuyForm.cs | 2 +- .../SalesCenterForms/GroupBuyMonitorForm.cs | 3 +- .../SalesCenterForms/GroupBuyShopForm.cs | 2 +- .../LimitedSalesManagerActiveForm.cs | 2 +- .../SalesCenterForms/SalesCenterForm.cs | 3 +- .../SeckillingAndLimitedSalesForm.cs | 2 +- .../SeckillingAndLimitedSalesShopForm.cs | 2 +- .../ShopForms/Old/FreightTemplateAddForm.cs | 3 +- .../ShopForms/Old/FreightTemplateForm.cs | 2 +- .../ShopForms/Old/FreightTemplateListForm.cs | 3 +- .../ShopForms/Old/MaterialManageForm.cs | 2 +- TEMUKJD/KJDForms/ShopForms/ShopForm.cs | 10 +- .../ShopForms/ShopListForm.Designer.cs | 28 +- TEMUKJD/KJDForms/ShopForms/ShopListForm.cs | 4 +- .../KJDForms/ShopForms/SubAccountListForm.cs | 2 +- .../ShopOptimizeForms/ClearNoVisitorForm.cs | 2 +- .../ClearNoVisitorShopForm.cs | 2 +- .../ShopOptimizeForms/OptimizeForm.cs | 3 +- TEMUKJD/KJDForms/SystemForms/SystemForm.cs | 3 +- .../SystemRemoveRestrictionsForm.cs | 3 +- TEMUKJD/MainForm.cs | 2 +- TEMUKJD/MainForm.designer.cs | 90 ++--- TEMUKJD/UserComponent/UcCheckBox.Designer.cs | 37 ++ TEMUKJD/UserComponent/UcCheckBox.cs | 133 +++++++ .../UcDataGridViewCheckBoxColumn.Designer.cs | 37 ++ .../UcDataGridViewCheckBoxColumn.cs | 26 ++ TEMUKJD/UserForm/LoginForm.cs | 2 +- TEMUKJD/UserForm/RegeditForm.cs | 2 +- TEMUKJD/UserForm/ResetPasswordForm.cs | 2 +- Work/UserLogin.cs | 2 +- 82 files changed, 1026 insertions(+), 485 deletions(-) create mode 100644 TEMUKJD/KJDForms/BaseForms/BaseForm.Designer.cs create mode 100644 TEMUKJD/KJDForms/BaseForms/BaseForm.cs create mode 100644 TEMUKJD/KJDForms/BaseForms/BaseForm.resx create mode 100644 TEMUKJD/UserComponent/UcCheckBox.Designer.cs create mode 100644 TEMUKJD/UserComponent/UcCheckBox.cs create mode 100644 TEMUKJD/UserComponent/UcDataGridViewCheckBoxColumn.Designer.cs create mode 100644 TEMUKJD/UserComponent/UcDataGridViewCheckBoxColumn.cs diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs index 13c7dd5..cc4e97c 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -27,8 +27,8 @@ namespace AllBase /// /// 版本ID /// - public static int VersionCount = 364; - //public static int VersionCount = 364; + public static int VersionCount = 366; + //public static int VersionCount = 366; /// /// 版本号 @@ -298,7 +298,8 @@ namespace AllBase /// 注册用户名 /// public static string UserName = ""; - public static bool IsSa; + //public static bool IsSa; + public static int SaLevel = 0; /// /// 注册昵称 /// diff --git a/AllBase/Model/Result/ShopLoginInfo.cs b/AllBase/Model/Result/ShopLoginInfo.cs index b06d2ee..3502f8e 100644 --- a/AllBase/Model/Result/ShopLoginInfo.cs +++ b/AllBase/Model/Result/ShopLoginInfo.cs @@ -138,10 +138,15 @@ namespace AllBase.Model.Result public int TrialUploadCount { get; set; } = 0; /// - /// 试用版最大上货计数，超过100限制 + /// 试用版最大操作计数，超过100限制 /// public int TrialOperateCount { get; set; } = 0; + /// + /// 月选品上传限额剩余，默认40 + /// + public int AddProductRemaining { get; set; } + [JsonIgnore] [ScriptIgnore] [XmlIgnore] diff --git a/KJDService/KJD_WebService/BLL/ProductManage.cs b/KJDService/KJD_WebService/BLL/ProductManage.cs index 37f4ee8..9b31836 100644 --- a/KJDService/KJD_WebService/BLL/ProductManage.cs +++ b/KJDService/KJD_WebService/BLL/ProductManage.cs @@ -269,6 +269,7 @@ namespace KJD_Web.BLL var sub_user_name = RegexUtils.GetStringQuery(ref inputData, "sub_user_name"); var notes = RegexUtils.GetStringQuery(ref inputData, "notes"); var status = RegexUtils.GetStringQuery(ref inputData, "status"); + var add_product_remaining = RegexUtils.GetStringQuery(ref inputData, "add_product_remaining").ParseToInt(); if (string.IsNullOrEmpty(user_name)) { @@ -287,6 +288,12 @@ namespace KJD_Web.BLL notes + "','" + status + "','" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "','" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "');"; + if (add_product_remaining > 0) + { + add_product_remaining = add_product_remaining - 1; + sql += "\r\n"; + sql += "update kjd.shop set add_product_remaining=" + add_product_remaining + " where shop_id=" + shop_id + ";"; + } var rst = mySql.ExecuteNonQuery(sql); mySql.Close(); if (rst) diff --git a/KJDService/KJD_WebService/BLL/ShopManage.cs b/KJDService/KJD_WebService/BLL/ShopManage.cs index 5a4bfa8..94619d5 100644 --- a/KJDService/KJD_WebService/BLL/ShopManage.cs +++ b/KJDService/KJD_WebService/BLL/ShopManage.cs @@ -1,6 +1,7 @@ using KJD_Web.Model; using KJD_Web.Model.ShopModel; using KJD_Web.Utils; +using NaiBa.Util.Extension; using System; using System.Collections.Generic; using System.Data; @@ -61,7 +62,8 @@ namespace KJD_Web.BLL } else { - sql = "select id,login_name,login_pass,cookie,shop_id,shop_account,sub_user_name,user_name,company_name,notes,login_status" + + sql = "select id,login_name,login_pass,cookie,shop_id,shop_account,sub_user_name,user_name,company_name,notes,login_status," + + " add_product_remaining,add_product_month" + " from kjd.shop where 1=1"; if (isAdmin) sql += " and (cookie='' or shop_id!='')"; @@ -90,7 +92,7 @@ namespace KJD_Web.BLL { ShopParam shop = new ShopParam { - id = Convert.ToInt32(row["id"]), + id = Convert.ToInt32(row["id"]), login_name = row["login_name"].ToString(), login_pass = row["login_pass"].ToString(), cookie = row["cookie"].ToString(), @@ -101,10 +103,36 @@ namespace KJD_Web.BLL company_name = row["company_name"].ToString(), notes = row["notes"].ToString(), login_status = row["login_status"].ToString(), + add_product_remaining = row["add_product_remaining"].ParseToInt(), + add_product_month = row["add_product_month"].ParseToInt(), }; shopList.Add(shop); } + int month = DateTime.Now.Month; + var shopMonthList = shopList.Where(s => s.add_product_month != DateTime.Now.Month); + if (shopMonthList.Count() > 0) + { + int remainCount = 40; + var shopMonthIdList = shopMonthList.Select(s => s.id); + mySql = new MysqlUtils(conn); + string ids = string.Join(",", shopMonthIdList); + sql = "update kjd.shop set add_product_remaining=" + remainCount + ", add_product_month=" + month + + " where 1=1 and id in (" + ids + ")"; + var rst = mySql.ExecuteNonQuery(sql); + mySql.Close(); + + if (rst) + { + foreach (var shop in shopMonthList) + { + shop.add_product_month = month; + shop.add_product_remaining = remainCount; + } + } + } var data = JsonUtils.SerializerObjectToString(shopList); + + //return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + ",\"c\":\"" + EncrypUtil.Encryption(r2) + "\"}"; return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + ",\"count\":" + count + "}"; } diff --git a/KJDService/KJD_WebService/Model/ShopModel/ShopParam.cs b/KJDService/KJD_WebService/Model/ShopModel/ShopParam.cs index 1237a6e..453efd7 100644 --- a/KJDService/KJD_WebService/Model/ShopModel/ShopParam.cs +++ b/KJDService/KJD_WebService/Model/ShopModel/ShopParam.cs @@ -21,5 +21,7 @@ namespace KJD_Web.Model.ShopModel /// public string notes { get; set; } public string login_status { get; set; } + public int add_product_remaining { get; set; } + public int add_product_month { get; set; } } } \ No newline at end of file diff --git a/TEMUKJD/ChatForms/ChatForm.cs b/TEMUKJD/ChatForms/ChatForm.cs index f1787d9..aec591d 100644 --- a/TEMUKJD/ChatForms/ChatForm.cs +++ b/TEMUKJD/ChatForms/ChatForm.cs @@ -29,7 +29,7 @@ using Work; namespace TemuKJD.ChatForms { - public partial class ChatForm : Form + public partial class ChatForm : BaseForm { public delegate void SearchResultReceivedHandler(ShopLoginInfo shop); /// diff --git a/TEMUKJD/DashBoardForms/DashBoardForm.cs b/TEMUKJD/DashBoardForms/DashBoardForm.cs index 18a5995..f5752e2 100644 --- a/TEMUKJD/DashBoardForms/DashBoardForm.cs +++ b/TEMUKJD/DashBoardForms/DashBoardForm.cs @@ -22,7 +22,7 @@ using System.Windows.Forms; namespace TemuKJD.DashBoardForms { - public partial class DashBoardForm : Form + public partial class DashBoardForm : BaseForm { public enum InviteTypeEnum { diff --git a/TEMUKJD/InitForm.cs b/TEMUKJD/InitForm.cs index 71235f4..c9b2565 100644 --- a/TEMUKJD/InitForm.cs +++ b/TEMUKJD/InitForm.cs @@ -56,12 +56,6 @@ namespace TemuKJD } })); }); - - using (Graphics graphics = Graphics.FromHwnd(IntPtr.Zero)) - { - float dpi = graphics.DpiX; // 或者使用 graphics.DpiY 获取垂直方向的DPI - Console.WriteLine("Screen DPI: " + dpi); - } } private void InitForm_FormClosed(object sender, FormClosedEventArgs e) diff --git a/TEMUKJD/KJD.csproj b/TEMUKJD/KJD.csproj index a7c822f..6de8ac4 100644 --- a/TEMUKJD/KJD.csproj +++ b/TEMUKJD/KJD.csproj @@ -228,6 +228,12 @@ AdminAccountForm.cs + + Form + + + BaseForm.cs + Form @@ -772,9 +778,19 @@ Component + + Component + + + UcCheckBox.cs + Component + + + UcDataGridViewCheckBoxColumn.cs + Component @@ -863,6 +879,9 @@ AdminShopForm.cs + + BaseForm.cs + BaseMsgForm.cs diff --git a/TEMUKJD/KJDForms/AdminForms/AdminAccountForm.cs b/TEMUKJD/KJDForms/AdminForms/AdminAccountForm.cs index bb50f9d..9ed8db8 100644 --- a/TEMUKJD/KJDForms/AdminForms/AdminAccountForm.cs +++ b/TEMUKJD/KJDForms/AdminForms/AdminAccountForm.cs @@ -14,7 +14,7 @@ using Work; namespace TemuKJD.KJDForms.AdminForms { - public partial class AdminAccountForm : Form + public partial class AdminAccountForm : BaseForm { public static List AllUsers { get; set; } = new List(); public MainForm Mf { get; set; } = null; diff --git a/TEMUKJD/KJDForms/AdminForms/AdminShopForm.Designer.cs b/TEMUKJD/KJDForms/AdminForms/AdminShopForm.Designer.cs index 0866b02..74e1a04 100644 --- a/TEMUKJD/KJDForms/AdminForms/AdminShopForm.Designer.cs +++ b/TEMUKJD/KJDForms/AdminForms/AdminShopForm.Designer.cs @@ -31,7 +31,6 @@ namespace TemuKJD.KJDForms.AdminForms { 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(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); this.panel5 = new System.Windows.Forms.Panel(); @@ -54,9 +53,6 @@ namespace TemuKJD.KJDForms.AdminForms this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.pbLoading = new System.Windows.Forms.PictureBox(); this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); - this.chkAutoDrag = new System.Windows.Forms.CheckBox(); - this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); - this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -81,6 +77,9 @@ namespace TemuKJD.KJDForms.AdminForms this.colUpload = new System.Windows.Forms.DataGridViewLinkColumn(); this.colEdit = new System.Windows.Forms.DataGridViewLinkColumn(); this.colDelete = new System.Windows.Forms.DataGridViewLinkColumn(); + this.chkAutoDrag = new System.Windows.Forms.CheckBox(); + 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(); @@ -410,48 +409,11 @@ namespace TemuKJD.KJDForms.AdminForms this.dgvShop.Location = new System.Drawing.Point(4, 0); this.dgvShop.Name = "dgvShop"; this.dgvShop.ReadOnly = true; - dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.dgvShop.RowsDefaultCellStyle = dataGridViewCellStyle3; this.dgvShop.RowTemplate.Height = 23; this.dgvShop.Size = new System.Drawing.Size(1075, 473); this.dgvShop.TabIndex = 5; this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick); // - // chkAutoDrag - // - this.chkAutoDrag.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.chkAutoDrag.AutoSize = true; - this.chkAutoDrag.BackColor = System.Drawing.Color.White; - this.chkAutoDrag.Location = new System.Drawing.Point(407, 0); - this.chkAutoDrag.Name = "chkAutoDrag"; - this.chkAutoDrag.Size = new System.Drawing.Size(159, 21); - this.chkAutoDrag.TabIndex = 3; - this.chkAutoDrag.Text = "登录时自动滑动拼图验证"; - this.chkAutoDrag.UseVisualStyleBackColor = false; - this.chkAutoDrag.Visible = false; - // - // ucSplitPage1 - // - this.ucSplitPage1.CurrentPage = 1; - this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right; - this.ucSplitPage1.Location = new System.Drawing.Point(721, 0); - this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0); - this.ucSplitPage1.Name = "ucSplitPage1"; - this.ucSplitPage1.Size = new System.Drawing.Size(362, 25); - this.ucSplitPage1.TabIndex = 4; - 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(1083, 25); - this.statusBar.TabIndex = 1; - // // colSelect // this.colSelect.FillWeight = 26F; @@ -650,6 +612,41 @@ namespace TemuKJD.KJDForms.AdminForms this.colDelete.ReadOnly = true; this.colDelete.Visible = false; // + // chkAutoDrag + // + this.chkAutoDrag.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.chkAutoDrag.AutoSize = true; + this.chkAutoDrag.BackColor = System.Drawing.Color.White; + this.chkAutoDrag.Location = new System.Drawing.Point(407, 0); + this.chkAutoDrag.Name = "chkAutoDrag"; + this.chkAutoDrag.Size = new System.Drawing.Size(159, 21); + this.chkAutoDrag.TabIndex = 3; + this.chkAutoDrag.Text = "登录时自动滑动拼图验证"; + this.chkAutoDrag.UseVisualStyleBackColor = false; + this.chkAutoDrag.Visible = false; + // + // ucSplitPage1 + // + this.ucSplitPage1.CurrentPage = 1; + this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right; + this.ucSplitPage1.Location = new System.Drawing.Point(721, 0); + this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0); + this.ucSplitPage1.Name = "ucSplitPage1"; + this.ucSplitPage1.Size = new System.Drawing.Size(362, 25); + this.ucSplitPage1.TabIndex = 4; + 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(1083, 25); + this.statusBar.TabIndex = 1; + // // AdminShopForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; diff --git a/TEMUKJD/KJDForms/AdminForms/AdminShopForm.cs b/TEMUKJD/KJDForms/AdminForms/AdminShopForm.cs index 0f2ffdc..a773f3f 100644 --- a/TEMUKJD/KJDForms/AdminForms/AdminShopForm.cs +++ b/TEMUKJD/KJDForms/AdminForms/AdminShopForm.cs @@ -21,7 +21,7 @@ using Work; namespace TemuKJD.KJDForms.AdminForms { - public partial class AdminShopForm : Form + public partial class AdminShopForm : BaseForm { public static List lstAdminShopInfo = new List(); diff --git a/TEMUKJD/KJDForms/BaseForms/BaseForm.Designer.cs b/TEMUKJD/KJDForms/BaseForms/BaseForm.Designer.cs new file mode 100644 index 0000000..e4b3fbf --- /dev/null +++ b/TEMUKJD/KJDForms/BaseForms/BaseForm.Designer.cs @@ -0,0 +1,48 @@ + +namespace TemuKJD.KJDForms.BaseForms +{ + partial class BaseForm + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.SuspendLayout(); + // + // BaseForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(800, 450); + this.Name = "BaseForm"; + this.Text = "BaseForm"; + this.Load += new System.EventHandler(this.BaseForm_Load); + this.ResumeLayout(false); + + } + + #endregion + } +} \ No newline at end of file diff --git a/TEMUKJD/KJDForms/BaseForms/BaseForm.cs b/TEMUKJD/KJDForms/BaseForms/BaseForm.cs new file mode 100644 index 0000000..3274d41 --- /dev/null +++ b/TEMUKJD/KJDForms/BaseForms/BaseForm.cs @@ -0,0 +1,51 @@ +using NaiBa.Util.Extension; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace TemuKJD.KJDForms.BaseForms +{ + public partial class BaseForm : Form + { + public BaseForm() + { + InitializeComponent(); + } + + private void BaseForm_Load(object sender, EventArgs e) + { + using (Graphics graphics = Graphics.FromHwnd(IntPtr.Zero)) + { + float dpi = graphics.DpiX; + // 或者使用 graphics.DpiY 获取垂直方向的DPI + // float dpi = graphics.DpiY; + // Console.WriteLine("Screen DPI: " + dpi); // winform程序会闪退 + + SetFont(this, dpi); + } + } + + void SetFont(Control control, float dpi) + { + foreach (Control c in control.Controls) + { + SetFont(c, dpi); + + Font of = c.Font; + Font f = new Font(of.FontFamily, (of.Size * 96.0 / dpi).ParseToFloat(), of.Style, Font.Unit, Font.GdiCharSet, Font.Bold); + c.Font = f; + + if (c is DataGridView) + { + + } + } + } + } +} diff --git a/TEMUKJD/KJDForms/BaseForms/BaseForm.resx b/TEMUKJD/KJDForms/BaseForms/BaseForm.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/TEMUKJD/KJDForms/BaseForms/BaseForm.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/TEMUKJD/KJDForms/BaseForms/LRBaseForm.cs b/TEMUKJD/KJDForms/BaseForms/LRBaseForm.cs index 7611f12..99f1b8f 100644 --- a/TEMUKJD/KJDForms/BaseForms/LRBaseForm.cs +++ b/TEMUKJD/KJDForms/BaseForms/LRBaseForm.cs @@ -11,7 +11,7 @@ using System.Windows.Forms; namespace TemuKJD.KJDForms.BaseForms { - public partial class LRBaseForm : Form + public partial class LRBaseForm : BaseForm { const int WM_NCHITTEST = 0x0084; const int HTLEFT = 10; //左边界 diff --git a/TEMUKJD/KJDForms/CollectForms/CaiNiXiHuanCollectForm.cs b/TEMUKJD/KJDForms/CollectForms/CaiNiXiHuanCollectForm.cs index 06a0f23..0aa53dd 100644 --- a/TEMUKJD/KJDForms/CollectForms/CaiNiXiHuanCollectForm.cs +++ b/TEMUKJD/KJDForms/CollectForms/CaiNiXiHuanCollectForm.cs @@ -16,10 +16,11 @@ using System.Text; using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; +using TemuKJD.KJDForms.BaseForms; namespace TemuKJD.KJDForms.CollectForms { - public partial class CaiNiXiHuanCollectForm : Form + public partial class CaiNiXiHuanCollectForm : BaseForm { decimal priceMin = 0; decimal priceMax = 99999999; diff --git a/TEMUKJD/KJDForms/CollectForms/CollectForm.cs b/TEMUKJD/KJDForms/CollectForms/CollectForm.cs index 51ef0e0..2ccf8d2 100644 --- a/TEMUKJD/KJDForms/CollectForms/CollectForm.cs +++ b/TEMUKJD/KJDForms/CollectForms/CollectForm.cs @@ -8,10 +8,11 @@ using System.Text; using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; +using TemuKJD.KJDForms.BaseForms; namespace TemuKJD.KJDForms.CollectForms { - public partial class CollectForm : Form + public partial class CollectForm : BaseForm { public Lazy haoWuCollectForm = new Lazy(); public Lazy friendShopCollectForm = new Lazy(); diff --git a/TEMUKJD/KJDForms/CollectForms/FriendShopCollectForm.cs b/TEMUKJD/KJDForms/CollectForms/FriendShopCollectForm.cs index 24e7963..0ef6258 100644 --- a/TEMUKJD/KJDForms/CollectForms/FriendShopCollectForm.cs +++ b/TEMUKJD/KJDForms/CollectForms/FriendShopCollectForm.cs @@ -20,7 +20,7 @@ using System.Windows.Forms; namespace TemuKJD.KJDForms.CollectForms { - public partial class FriendShopCollectForm : Form + public partial class FriendShopCollectForm : BaseForm { List lstProduct = new List(); CancellationTokenSource cancellationTokenSource = null; diff --git a/TEMUKJD/KJDForms/CollectForms/HaoWuCollectForm.cs b/TEMUKJD/KJDForms/CollectForms/HaoWuCollectForm.cs index d8d0edb..31ce513 100644 --- a/TEMUKJD/KJDForms/CollectForms/HaoWuCollectForm.cs +++ b/TEMUKJD/KJDForms/CollectForms/HaoWuCollectForm.cs @@ -17,10 +17,11 @@ using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; using Work.BLL.Collect; +using TemuKJD.KJDForms.BaseForms; namespace TemuKJD.KJDForms.CollectForms { - public partial class HaoWuCollectForm : Form + public partial class HaoWuCollectForm : BaseForm { CancellationTokenSource cancellationTokenSource = null; /// diff --git a/TEMUKJD/KJDForms/CollectForms/KeywordCollectForm.cs b/TEMUKJD/KJDForms/CollectForms/KeywordCollectForm.cs index 25ddfb7..21b0914 100644 --- a/TEMUKJD/KJDForms/CollectForms/KeywordCollectForm.cs +++ b/TEMUKJD/KJDForms/CollectForms/KeywordCollectForm.cs @@ -16,10 +16,11 @@ using System.Text; using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; +using TemuKJD.KJDForms.BaseForms; namespace TemuKJD.KJDForms.CollectForms { - public partial class KeywordCollectForm : Form + public partial class KeywordCollectForm : BaseForm { List lstProduct = new List(); CancellationTokenSource cancellationTokenSource = null; diff --git a/TEMUKJD/KJDForms/CollectForms/ShopProductCollectForm.cs b/TEMUKJD/KJDForms/CollectForms/ShopProductCollectForm.cs index c8e6587..ce4248d 100644 --- a/TEMUKJD/KJDForms/CollectForms/ShopProductCollectForm.cs +++ b/TEMUKJD/KJDForms/CollectForms/ShopProductCollectForm.cs @@ -16,10 +16,11 @@ using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; using Work.BLL.Collect; +using TemuKJD.KJDForms.BaseForms; namespace TemuKJD.KJDForms.CollectForms { - public partial class ShopProductCollectForm : Form + public partial class ShopProductCollectForm : BaseForm { List lstFilterKeyword = new List(); List lstProduct = new List(); diff --git a/TEMUKJD/KJDForms/OrderForms/OrderForm.cs b/TEMUKJD/KJDForms/OrderForms/OrderForm.cs index 08af283..3f5026e 100644 --- a/TEMUKJD/KJDForms/OrderForms/OrderForm.cs +++ b/TEMUKJD/KJDForms/OrderForms/OrderForm.cs @@ -7,10 +7,11 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using TemuKJD.KJDForms.BaseForms; namespace TemuKJD.KJDForms.OrderForms { - public partial class OrderForm : Form + public partial class OrderForm : BaseForm { public OrderForm() { diff --git a/TEMUKJD/KJDForms/ProductForms/Old/CleanDataForm.cs b/TEMUKJD/KJDForms/ProductForms/Old/CleanDataForm.cs index 2ddc640..653c92d 100644 --- a/TEMUKJD/KJDForms/ProductForms/Old/CleanDataForm.cs +++ b/TEMUKJD/KJDForms/ProductForms/Old/CleanDataForm.cs @@ -22,7 +22,7 @@ using Work.CollectClass; namespace TemuKJD.KJDForms.ProductForms { - public partial class CleanDataForm : Form + public partial class CleanDataForm : BaseForm { private string cleaningData = ""; private string sFromUrl = ""; diff --git a/TEMUKJD/KJDForms/ProductForms/Old/CommissionForm.cs b/TEMUKJD/KJDForms/ProductForms/Old/CommissionForm.cs index 05f8846..015418a 100644 --- a/TEMUKJD/KJDForms/ProductForms/Old/CommissionForm.cs +++ b/TEMUKJD/KJDForms/ProductForms/Old/CommissionForm.cs @@ -21,7 +21,7 @@ using System.Windows.Forms; namespace TemuKJD.KJDForms.ProductForms { - public partial class CommissionForm : Form + public partial class CommissionForm : BaseForm { ChromiumWebBrowser webBrowser = null; int setPage = 99; diff --git a/TEMUKJD/KJDForms/ProductForms/Old/FissionDataBaseForm.cs b/TEMUKJD/KJDForms/ProductForms/Old/FissionDataBaseForm.cs index 9fefcc9..9b69cb3 100644 --- a/TEMUKJD/KJDForms/ProductForms/Old/FissionDataBaseForm.cs +++ b/TEMUKJD/KJDForms/ProductForms/Old/FissionDataBaseForm.cs @@ -26,7 +26,7 @@ using Work.DouyinApiClass; namespace TemuKJD.KJDForms.ProductForms { - public partial class FissionDataBaseForm : Form + public partial class FissionDataBaseForm : BaseForm { public int ClickType = 0; // 0删除 1从删除产品中恢复数据 public bool IsStop = false; diff --git a/TEMUKJD/KJDForms/ProductForms/Old/GetUpProductForm.cs b/TEMUKJD/KJDForms/ProductForms/Old/GetUpProductForm.cs index c3a524f..1a63172 100644 --- a/TEMUKJD/KJDForms/ProductForms/Old/GetUpProductForm.cs +++ b/TEMUKJD/KJDForms/ProductForms/Old/GetUpProductForm.cs @@ -17,7 +17,7 @@ using Work; namespace TemuKJD.KJDForms.ProductForms { - public partial class GetUpProductForm : Form + public partial class GetUpProductForm : BaseForm { public GetUpProductForm() { diff --git a/TEMUKJD/KJDForms/ProductForms/Old/ShopProductForm.cs b/TEMUKJD/KJDForms/ProductForms/Old/ShopProductForm.cs index c09b601..23fafeb 100644 --- a/TEMUKJD/KJDForms/ProductForms/Old/ShopProductForm.cs +++ b/TEMUKJD/KJDForms/ProductForms/Old/ShopProductForm.cs @@ -24,7 +24,7 @@ using Work.DouyinApiClass; namespace TemuKJD.KJDForms.ProductForms { - public partial class ShopProductForm : Form + public partial class ShopProductForm : BaseForm { ChromiumWebBrowser webBrowser = null; private int operateCount = 999999; diff --git a/TEMUKJD/KJDForms/ProductForms/Old/SpecialDelaySendForm.cs b/TEMUKJD/KJDForms/ProductForms/Old/SpecialDelaySendForm.cs index 1974ae2..c9e0475 100644 --- a/TEMUKJD/KJDForms/ProductForms/Old/SpecialDelaySendForm.cs +++ b/TEMUKJD/KJDForms/ProductForms/Old/SpecialDelaySendForm.cs @@ -22,7 +22,7 @@ using Work.DouyinApiClass; namespace TemuKJD.KJDForms.ProductForms { - public partial class SpecialDelaySendForm : Form + public partial class SpecialDelaySendForm : BaseForm { private CheckBox chkSelectAll = null; bool isNotOperateDays = true; diff --git a/TEMUKJD/KJDForms/ProductForms/Old/StockSyncForm.cs b/TEMUKJD/KJDForms/ProductForms/Old/StockSyncForm.cs index 3774cf1..eba3f09 100644 --- a/TEMUKJD/KJDForms/ProductForms/Old/StockSyncForm.cs +++ b/TEMUKJD/KJDForms/ProductForms/Old/StockSyncForm.cs @@ -19,7 +19,7 @@ using Work.DouyinApiClass; namespace TemuKJD.KJDForms.ProductForms { - public partial class StockSyncForm : Form + public partial class StockSyncForm : BaseForm { private int operateCount = 999999; private int stock = 99; diff --git a/TEMUKJD/KJDForms/ProductForms/Old/UploadProductErrorForm.cs b/TEMUKJD/KJDForms/ProductForms/Old/UploadProductErrorForm.cs index abe3bb5..5937f23 100644 --- a/TEMUKJD/KJDForms/ProductForms/Old/UploadProductErrorForm.cs +++ b/TEMUKJD/KJDForms/ProductForms/Old/UploadProductErrorForm.cs @@ -24,7 +24,7 @@ using Work.DouyinApiClass; namespace TemuKJD.KJDForms.ProductForms { - public partial class UploadProductErrorForm : Form + public partial class UploadProductErrorForm : BaseForm { public static List lstUploadErrorParam = new List(); diff --git a/TEMUKJD/KJDForms/ProductForms/Old/UploadProductForm.cs b/TEMUKJD/KJDForms/ProductForms/Old/UploadProductForm.cs index c403d46..3dc2b0b 100644 --- a/TEMUKJD/KJDForms/ProductForms/Old/UploadProductForm.cs +++ b/TEMUKJD/KJDForms/ProductForms/Old/UploadProductForm.cs @@ -31,7 +31,7 @@ using Work.GoodDetail; namespace TemuKJD.KJDForms.ProductForms { - public partial class UploadProductForm : Form + public partial class UploadProductForm : BaseForm { public static UploadProductForm instance = null; public static List lstFissionPcb = new List(); // 数据净化的数据列表 diff --git a/TEMUKJD/KJDForms/ProductForms/Old/ViolateManageForm.cs b/TEMUKJD/KJDForms/ProductForms/Old/ViolateManageForm.cs index 456184b..342833e 100644 --- a/TEMUKJD/KJDForms/ProductForms/Old/ViolateManageForm.cs +++ b/TEMUKJD/KJDForms/ProductForms/Old/ViolateManageForm.cs @@ -27,7 +27,7 @@ using Work.DouyinApiClass; namespace TemuKJD.KJDForms.ProductForms { - public partial class ViolateManageForm : Form + public partial class ViolateManageForm : BaseForm { private CheckBox chkSelectAllShop = null; private CheckBox chkSelectAllViolateParam = null; diff --git a/TEMUKJD/KJDForms/ProductForms/PriceManageForm.Designer.cs b/TEMUKJD/KJDForms/ProductForms/PriceManageForm.Designer.cs index a9b92f7..1477f11 100644 --- a/TEMUKJD/KJDForms/ProductForms/PriceManageForm.Designer.cs +++ b/TEMUKJD/KJDForms/ProductForms/PriceManageForm.Designer.cs @@ -34,8 +34,6 @@ namespace TemuKJD.KJDForms.ProductForms 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.ucGroupBoxEx4 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.txtScale1 = new System.Windows.Forms.TextBox(); @@ -49,18 +47,7 @@ namespace TemuKJD.KJDForms.ProductForms this.splitContainer3 = new System.Windows.Forms.SplitContainer(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); - this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.colShopLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colLoginStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dgvAdjust = new TemuKJD.UserComponent.DataGridViewEx(); - this.splitContainer4 = new System.Windows.Forms.SplitContainer(); - this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); - this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); - this.btnClear = new DevComponents.DotNetBar.PanelEx(); this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colSupplierId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colSupplierName = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -77,6 +64,17 @@ namespace TemuKJD.KJDForms.ProductForms this.colChangeType = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colChangeReason = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colMsg = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.splitContainer4 = new System.Windows.Forms.SplitContainer(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); + this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); + this.btnClear = new DevComponents.DotNetBar.PanelEx(); + this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.colShopLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colLoginStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -337,84 +335,28 @@ namespace TemuKJD.KJDForms.ProductForms this.dgvShop.Name = "dgvShop"; this.dgvShop.ReadOnly = true; this.dgvShop.RowHeadersWidth = 30; - dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.dgvShop.RowsDefaultCellStyle = dataGridViewCellStyle3; this.dgvShop.RowTemplate.Height = 23; this.dgvShop.Size = new System.Drawing.Size(266, 443); this.dgvShop.TabIndex = 6; + this.dgvShop.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellClick); this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick); // - // colSelect - // - this.colSelect.HeaderText = "全选"; - this.colSelect.Name = "colSelect"; - this.colSelect.ReadOnly = true; - this.colSelect.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colSelect.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colSelect.Width = 28; - // - // colShopLoginName - // - this.colShopLoginName.HeaderText = "店铺登录名"; - this.colShopLoginName.Name = "colShopLoginName"; - this.colShopLoginName.ReadOnly = true; - this.colShopLoginName.Visible = false; - // - // colShopId - // - this.colShopId.HeaderText = "店铺Id"; - this.colShopId.Name = "colShopId"; - this.colShopId.ReadOnly = true; - this.colShopId.Visible = false; - this.colShopId.Width = 55; - // - // colShopName - // - this.colShopName.FillWeight = 150F; - this.colShopName.HeaderText = "店铺名称"; - this.colShopName.Name = "colShopName"; - this.colShopName.ReadOnly = true; - this.colShopName.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colShopName.Width = 75; - // - // colLoginStatus - // - this.colLoginStatus.HeaderText = "登录状态"; - this.colLoginStatus.Name = "colLoginStatus"; - this.colLoginStatus.ReadOnly = true; - this.colLoginStatus.Width = 65; - // - // colCanUse - // - this.colCanUse.HeaderText = "可用"; - this.colCanUse.Name = "colCanUse"; - this.colCanUse.ReadOnly = true; - this.colCanUse.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colCanUse.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colCanUse.Width = 28; - // - // colMessage - // - this.colMessage.HeaderText = "消息"; - this.colMessage.Name = "colMessage"; - this.colMessage.ReadOnly = true; - // // dgvAdjust // this.dgvAdjust.AllowUserToAddRows = false; this.dgvAdjust.AllowUserToDeleteRows = false; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvAdjust.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvAdjust.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; this.dgvAdjust.BackgroundColor = System.Drawing.Color.White; this.dgvAdjust.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvAdjust.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5; + 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.dgvAdjust.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dgvAdjust.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvAdjust.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colCheck, @@ -437,93 +379,11 @@ namespace TemuKJD.KJDForms.ProductForms this.dgvAdjust.Location = new System.Drawing.Point(0, 0); this.dgvAdjust.Name = "dgvAdjust"; this.dgvAdjust.ReadOnly = true; - dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.dgvAdjust.RowsDefaultCellStyle = dataGridViewCellStyle6; this.dgvAdjust.RowTemplate.Height = 23; this.dgvAdjust.Size = new System.Drawing.Size(832, 443); this.dgvAdjust.TabIndex = 187; this.dgvAdjust.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvStock_CellContentClick); // - // splitContainer4 - // - this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer4.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; - this.splitContainer4.Location = new System.Drawing.Point(0, 0); - this.splitContainer4.Name = "splitContainer4"; - // - // splitContainer4.Panel1 - // - this.splitContainer4.Panel1.Controls.Add(this.statusBar); - // - // splitContainer4.Panel2 - // - this.splitContainer4.Panel2.Controls.Add(this.panelEx1); - this.splitContainer4.Panel2.Controls.Add(this.btnClear); - this.splitContainer4.Size = new System.Drawing.Size(1110, 26); - this.splitContainer4.SplitterDistance = 832; - this.splitContainer4.TabIndex = 3; - // - // 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(832, 26); - this.statusBar.TabIndex = 2; - // - // panelEx1 - // - this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; - this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; - this.panelEx1.Location = new System.Drawing.Point(155, 0); - this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(115, 21); - this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - this.panelEx1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.panelEx1.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.panelEx1.Style.GradientAngle = 90; - this.panelEx1.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx1.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx1.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panelEx1.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panelEx1.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; - this.panelEx1.TabIndex = 668; - this.panelEx1.Text = "停止当前操作"; - this.panelEx1.Click += new System.EventHandler(this.panelEx1_Click); - // - // btnClear - // - this.btnClear.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.btnClear.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnClear.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnClear.DisabledBackColor = System.Drawing.Color.Empty; - this.btnClear.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnClear.Location = new System.Drawing.Point(47, 0); - this.btnClear.Name = "btnClear"; - this.btnClear.Size = new System.Drawing.Size(90, 21); - this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnClear.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnClear.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnClear.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnClear.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnClear.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnClear.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnClear.Style.GradientAngle = 90; - this.btnClear.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnClear.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnClear.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnClear.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; - this.btnClear.TabIndex = 440; - this.btnClear.Text = "清空结果"; - this.btnClear.Visible = false; - // // colCheck // this.colCheck.HeaderText = "选择"; @@ -646,6 +506,141 @@ namespace TemuKJD.KJDForms.ProductForms this.colMsg.ReadOnly = true; this.colMsg.Width = 400; // + // splitContainer4 + // + this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer4.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; + this.splitContainer4.Location = new System.Drawing.Point(0, 0); + this.splitContainer4.Name = "splitContainer4"; + // + // splitContainer4.Panel1 + // + this.splitContainer4.Panel1.Controls.Add(this.statusBar); + // + // splitContainer4.Panel2 + // + this.splitContainer4.Panel2.Controls.Add(this.panelEx1); + this.splitContainer4.Panel2.Controls.Add(this.btnClear); + this.splitContainer4.Size = new System.Drawing.Size(1110, 26); + this.splitContainer4.SplitterDistance = 832; + this.splitContainer4.TabIndex = 3; + // + // 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(832, 26); + this.statusBar.TabIndex = 2; + // + // panelEx1 + // + this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; + this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; + this.panelEx1.Location = new System.Drawing.Point(155, 0); + this.panelEx1.Name = "panelEx1"; + this.panelEx1.Size = new System.Drawing.Size(115, 21); + this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; + this.panelEx1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.panelEx1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.panelEx1.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.panelEx1.Style.GradientAngle = 90; + this.panelEx1.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.panelEx1.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.panelEx1.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.panelEx1.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.panelEx1.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.panelEx1.TabIndex = 668; + this.panelEx1.Text = "停止当前操作"; + this.panelEx1.Click += new System.EventHandler(this.panelEx1_Click); + // + // btnClear + // + this.btnClear.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.btnClear.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnClear.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnClear.DisabledBackColor = System.Drawing.Color.Empty; + this.btnClear.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnClear.Location = new System.Drawing.Point(47, 0); + this.btnClear.Name = "btnClear"; + this.btnClear.Size = new System.Drawing.Size(90, 21); + this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnClear.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnClear.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnClear.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnClear.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnClear.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnClear.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnClear.Style.GradientAngle = 90; + this.btnClear.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnClear.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnClear.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnClear.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnClear.TabIndex = 440; + this.btnClear.Text = "清空结果"; + this.btnClear.Visible = false; + // + // colSelect + // + this.colSelect.HeaderText = "全选"; + this.colSelect.Name = "colSelect"; + this.colSelect.ReadOnly = true; + this.colSelect.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colSelect.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colSelect.Width = 28; + // + // colShopLoginName + // + this.colShopLoginName.HeaderText = "店铺登录名"; + this.colShopLoginName.Name = "colShopLoginName"; + this.colShopLoginName.ReadOnly = true; + this.colShopLoginName.Visible = false; + // + // colShopId + // + this.colShopId.HeaderText = "店铺Id"; + this.colShopId.Name = "colShopId"; + this.colShopId.ReadOnly = true; + this.colShopId.Visible = false; + this.colShopId.Width = 55; + // + // colShopName + // + this.colShopName.FillWeight = 150F; + this.colShopName.HeaderText = "店铺名称"; + this.colShopName.Name = "colShopName"; + this.colShopName.ReadOnly = true; + this.colShopName.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colShopName.Width = 75; + // + // colLoginStatus + // + this.colLoginStatus.HeaderText = "登录状态"; + this.colLoginStatus.Name = "colLoginStatus"; + this.colLoginStatus.ReadOnly = true; + this.colLoginStatus.Width = 65; + // + // colCanUse + // + this.colCanUse.HeaderText = "可用"; + this.colCanUse.Name = "colCanUse"; + this.colCanUse.ReadOnly = true; + this.colCanUse.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colCanUse.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colCanUse.Width = 28; + // + // colMessage + // + this.colMessage.HeaderText = "消息"; + this.colMessage.Name = "colMessage"; + this.colMessage.ReadOnly = true; + // // PriceManageForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -704,13 +699,6 @@ namespace TemuKJD.KJDForms.ProductForms private System.Windows.Forms.TextBox txtScale1; private System.Windows.Forms.Label label10; private System.Windows.Forms.CheckBox chkHasSuccess; - private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; - private System.Windows.Forms.DataGridViewTextBoxColumn colShopLoginName; - private System.Windows.Forms.DataGridViewTextBoxColumn colShopId; - private System.Windows.Forms.DataGridViewTextBoxColumn colShopName; - private System.Windows.Forms.DataGridViewTextBoxColumn colLoginStatus; - private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse; - private System.Windows.Forms.DataGridViewTextBoxColumn colMessage; private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck; private System.Windows.Forms.DataGridViewTextBoxColumn colSupplierId; private System.Windows.Forms.DataGridViewTextBoxColumn colSupplierName; @@ -727,5 +715,12 @@ namespace TemuKJD.KJDForms.ProductForms private System.Windows.Forms.DataGridViewTextBoxColumn colChangeType; private System.Windows.Forms.DataGridViewTextBoxColumn colChangeReason; private System.Windows.Forms.DataGridViewTextBoxColumn colMsg; + private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopLoginName; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopId; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopName; + private System.Windows.Forms.DataGridViewTextBoxColumn colLoginStatus; + private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse; + private System.Windows.Forms.DataGridViewTextBoxColumn colMessage; } } \ No newline at end of file diff --git a/TEMUKJD/KJDForms/ProductForms/PriceManageForm.cs b/TEMUKJD/KJDForms/ProductForms/PriceManageForm.cs index 022df9b..f5dd51f 100644 --- a/TEMUKJD/KJDForms/ProductForms/PriceManageForm.cs +++ b/TEMUKJD/KJDForms/ProductForms/PriceManageForm.cs @@ -20,7 +20,7 @@ using TemuKJD.KJDForms.ShopForms; namespace TemuKJD.KJDForms.ProductForms { - public partial class PriceManageForm : Form + public partial class PriceManageForm : BaseForm { private CheckBox chkSelectAll = null; public CancellationTokenSource cancellationTokenSource { get; set; } = null; @@ -122,6 +122,17 @@ namespace TemuKJD.KJDForms.ProductForms } } + + private void dgvShop_CellClick(object sender, DataGridViewCellEventArgs e) + { + string columnName = dgvShop.Columns[e.ColumnIndex].Name; + switch (columnName) + { + case "colSelect": + dgvShop_CellContentClick(sender, e); + break; + } + } private void dgvShop_CellContentClick(object sender, DataGridViewCellEventArgs e) { if (e.ColumnIndex < 0 || e.RowIndex < 0) diff --git a/TEMUKJD/KJDForms/ProductForms/ProductForm.cs b/TEMUKJD/KJDForms/ProductForms/ProductForm.cs index 90b6017..9e305ec 100644 --- a/TEMUKJD/KJDForms/ProductForms/ProductForm.cs +++ b/TEMUKJD/KJDForms/ProductForms/ProductForm.cs @@ -12,10 +12,11 @@ using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; using TemuKJD.KJDForms.ProductSelectForms; +using TemuKJD.KJDForms.BaseForms; namespace TemuKJD.KJDForms.ProductForms { - public partial class ProductForm : Form + public partial class ProductForm : BaseForm { public static ProductForm instance; public Lazy saleStockUpForm = new Lazy(); diff --git a/TEMUKJD/KJDForms/ProductForms/SaleStockUpForm.Designer.cs b/TEMUKJD/KJDForms/ProductForms/SaleStockUpForm.Designer.cs index 4f6930b..9bec28f 100644 --- a/TEMUKJD/KJDForms/ProductForms/SaleStockUpForm.Designer.cs +++ b/TEMUKJD/KJDForms/ProductForms/SaleStockUpForm.Designer.cs @@ -34,10 +34,9 @@ namespace TemuKJD.KJDForms.ProductForms 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.ucGroupBoxEx4 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.ucCheckBox1 = new TemuKJD.UserComponent.UcCheckBox(this.components); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.lblMinBound = new System.Windows.Forms.Label(); this.txtMinBound = new System.Windows.Forms.TextBox(); @@ -52,6 +51,7 @@ namespace TemuKJD.KJDForms.ProductForms this.label10 = new System.Windows.Forms.Label(); this.label16 = new System.Windows.Forms.Label(); this.label17 = new System.Windows.Forms.Label(); + this.label18 = new System.Windows.Forms.Label(); this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.btnCancelSubPurchaseOrder = new DevComponents.DotNetBar.PanelEx(); this.panelEx2 = new DevComponents.DotNetBar.PanelEx(); @@ -70,13 +70,6 @@ namespace TemuKJD.KJDForms.ProductForms this.btnStop = new DevComponents.DotNetBar.PanelEx(); this.label1 = new System.Windows.Forms.Label(); this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); - this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.colShopLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colLoginStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ucGroupBoxEx99 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.cmbCity = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.cmbProvince = new DevComponents.DotNetBar.Controls.ComboBoxEx(); @@ -139,7 +132,13 @@ namespace TemuKJD.KJDForms.ProductForms this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.btnClear = new DevComponents.DotNetBar.PanelEx(); - this.label18 = new System.Windows.Forms.Label(); + this.colSelect = new TemuKJD.UserComponent.UcDataGridViewCheckBoxColumn(this.components); + this.colShopLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colLoginStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -201,6 +200,7 @@ namespace TemuKJD.KJDForms.ProductForms | 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.ucCheckBox1); this.ucGroupBoxEx4.Controls.Add(this.flowLayoutPanel1); this.ucGroupBoxEx4.Controls.Add(this.txtScale2); this.ucGroupBoxEx4.Controls.Add(this.label14); @@ -219,6 +219,20 @@ namespace TemuKJD.KJDForms.ProductForms this.ucGroupBoxEx4.TabStop = false; this.ucGroupBoxEx4.Text = "创建备货单"; // + // ucCheckBox1 + // + this.ucCheckBox1.AutoSize = true; + this.ucCheckBox1.Checked = true; + this.ucCheckBox1.CheckState = System.Windows.Forms.CheckState.Checked; + this.ucCheckBox1.Location = new System.Drawing.Point(505, 28); + this.ucCheckBox1.Name = "ucCheckBox1"; + this.ucCheckBox1.Size = new System.Drawing.Size(69, 21); + this.ucCheckBox1.TabIndex = 713; + this.ucCheckBox1.Text = "123456"; + this.ucCheckBox1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.ucCheckBox1.UseVisualStyleBackColor = true; + this.ucCheckBox1.Visible = false; + // // flowLayoutPanel1 // this.flowLayoutPanel1.Controls.Add(this.lblMinBound); @@ -246,7 +260,7 @@ namespace TemuKJD.KJDForms.ProductForms this.txtMinBound.Location = new System.Drawing.Point(93, 2); this.txtMinBound.Margin = new System.Windows.Forms.Padding(0); this.txtMinBound.Name = "txtMinBound"; - this.txtMinBound.Size = new System.Drawing.Size(39, 23); + this.txtMinBound.Size = new System.Drawing.Size(20, 23); this.txtMinBound.TabIndex = 690; this.txtMinBound.Text = "3"; this.txtMinBound.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; @@ -256,7 +270,7 @@ namespace TemuKJD.KJDForms.ProductForms // this.label15.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(135, 5); + this.label15.Location = new System.Drawing.Point(116, 5); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(32, 17); this.label15.TabIndex = 692; @@ -268,20 +282,25 @@ namespace TemuKJD.KJDForms.ProductForms this.chkIfLessMakeZero.AutoSize = true; this.chkIfLessMakeZero.Checked = true; this.chkIfLessMakeZero.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkIfLessMakeZero.Location = new System.Drawing.Point(183, 3); - this.chkIfLessMakeZero.Margin = new System.Windows.Forms.Padding(13, 3, 3, 3); + this.chkIfLessMakeZero.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.chkIfLessMakeZero.FlatAppearance.BorderSize = 2; + this.chkIfLessMakeZero.FlatAppearance.CheckedBackColor = System.Drawing.Color.Blue; + this.chkIfLessMakeZero.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Blue; + this.chkIfLessMakeZero.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Blue; + this.chkIfLessMakeZero.Location = new System.Drawing.Point(166, 3); + this.chkIfLessMakeZero.Margin = new System.Windows.Forms.Padding(15, 3, 3, 3); this.chkIfLessMakeZero.Name = "chkIfLessMakeZero"; this.chkIfLessMakeZero.Size = new System.Drawing.Size(207, 21); this.chkIfLessMakeZero.TabIndex = 693; this.chkIfLessMakeZero.Text = "平台允许量小于最小备货量不备货"; - this.chkIfLessMakeZero.UseVisualStyleBackColor = true; + this.chkIfLessMakeZero.UseVisualStyleBackColor = false; // // txtScale2 // this.txtScale2.Location = new System.Drawing.Point(388, 54); this.txtScale2.Margin = new System.Windows.Forms.Padding(0); this.txtScale2.Name = "txtScale2"; - this.txtScale2.Size = new System.Drawing.Size(39, 23); + this.txtScale2.Size = new System.Drawing.Size(25, 23); this.txtScale2.TabIndex = 680; this.txtScale2.Text = "8"; this.txtScale2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; @@ -300,7 +319,7 @@ namespace TemuKJD.KJDForms.ProductForms this.txtScale1.Location = new System.Drawing.Point(388, 26); this.txtScale1.Margin = new System.Windows.Forms.Padding(0); this.txtScale1.Name = "txtScale1"; - this.txtScale1.Size = new System.Drawing.Size(39, 23); + this.txtScale1.Size = new System.Drawing.Size(25, 23); this.txtScale1.TabIndex = 677; this.txtScale1.Text = "7"; this.txtScale1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; @@ -406,6 +425,16 @@ namespace TemuKJD.KJDForms.ProductForms this.label17.TabIndex = 694; this.label17.Text = "－库存"; // + // label18 + // + this.label18.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label18.AutoSize = true; + this.label18.Location = new System.Drawing.Point(170, 88); + this.label18.Name = "label18"; + this.label18.Size = new System.Drawing.Size(80, 17); + this.label18.TabIndex = 712; + this.label18.Text = "最小备货量："; + // // ucGroupBoxEx3 // this.ucGroupBoxEx3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -715,69 +744,11 @@ namespace TemuKJD.KJDForms.ProductForms this.dgvShop.Name = "dgvShop"; this.dgvShop.ReadOnly = true; this.dgvShop.RowHeadersWidth = 30; - dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.dgvShop.RowsDefaultCellStyle = dataGridViewCellStyle3; this.dgvShop.RowTemplate.Height = 23; this.dgvShop.Size = new System.Drawing.Size(266, 435); this.dgvShop.TabIndex = 6; this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick); // - // colSelect - // - this.colSelect.HeaderText = "全选"; - this.colSelect.Name = "colSelect"; - this.colSelect.ReadOnly = true; - this.colSelect.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colSelect.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colSelect.Width = 28; - // - // colShopLoginName - // - this.colShopLoginName.HeaderText = "店铺登录名"; - this.colShopLoginName.Name = "colShopLoginName"; - this.colShopLoginName.ReadOnly = true; - this.colShopLoginName.Visible = false; - // - // colShopId - // - this.colShopId.HeaderText = "店铺Id"; - this.colShopId.Name = "colShopId"; - this.colShopId.ReadOnly = true; - this.colShopId.Visible = false; - this.colShopId.Width = 55; - // - // colShopName - // - this.colShopName.FillWeight = 150F; - this.colShopName.HeaderText = "店铺名称"; - this.colShopName.Name = "colShopName"; - this.colShopName.ReadOnly = true; - this.colShopName.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colShopName.Width = 75; - // - // colLoginStatus - // - this.colLoginStatus.HeaderText = "登录状态"; - this.colLoginStatus.Name = "colLoginStatus"; - this.colLoginStatus.ReadOnly = true; - this.colLoginStatus.Width = 65; - // - // colCanUse - // - this.colCanUse.HeaderText = "可用"; - this.colCanUse.Name = "colCanUse"; - this.colCanUse.ReadOnly = true; - this.colCanUse.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colCanUse.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colCanUse.Width = 28; - // - // colMessage - // - this.colMessage.HeaderText = "消息"; - this.colMessage.Name = "colMessage"; - this.colMessage.ReadOnly = true; - this.colMessage.Width = 120; - // // ucGroupBoxEx99 // this.ucGroupBoxEx99.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -1278,18 +1249,18 @@ namespace TemuKJD.KJDForms.ProductForms // this.dgvStock.AllowUserToAddRows = false; this.dgvStock.AllowUserToDeleteRows = false; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvStock.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvStock.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; this.dgvStock.BackgroundColor = System.Drawing.Color.White; this.dgvStock.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvStock.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5; + 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.dgvStock.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dgvStock.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvStock.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colUpId, @@ -1315,8 +1286,6 @@ namespace TemuKJD.KJDForms.ProductForms this.dgvStock.Location = new System.Drawing.Point(0, 0); this.dgvStock.Name = "dgvStock"; this.dgvStock.ReadOnly = true; - dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.dgvStock.RowsDefaultCellStyle = dataGridViewCellStyle6; this.dgvStock.RowTemplate.Height = 23; this.dgvStock.Size = new System.Drawing.Size(870, 435); this.dgvStock.TabIndex = 187; @@ -1555,15 +1524,61 @@ namespace TemuKJD.KJDForms.ProductForms this.btnClear.Text = "清空结果"; this.btnClear.Visible = false; // - // label18 + // colSelect // - this.label18.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label18.AutoSize = true; - this.label18.Location = new System.Drawing.Point(170, 88); - this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(80, 17); - this.label18.TabIndex = 712; - this.label18.Text = "最小备货量："; + this.colSelect.HeaderText = "全选"; + this.colSelect.Name = "colSelect"; + this.colSelect.ReadOnly = true; + this.colSelect.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colSelect.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colSelect.Width = 28; + // + // colShopLoginName + // + this.colShopLoginName.HeaderText = "店铺登录名"; + this.colShopLoginName.Name = "colShopLoginName"; + this.colShopLoginName.ReadOnly = true; + this.colShopLoginName.Visible = false; + // + // colShopId + // + this.colShopId.HeaderText = "店铺Id"; + this.colShopId.Name = "colShopId"; + this.colShopId.ReadOnly = true; + this.colShopId.Visible = false; + this.colShopId.Width = 55; + // + // colShopName + // + this.colShopName.FillWeight = 150F; + this.colShopName.HeaderText = "店铺名称"; + this.colShopName.Name = "colShopName"; + this.colShopName.ReadOnly = true; + this.colShopName.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colShopName.Width = 75; + // + // colLoginStatus + // + this.colLoginStatus.HeaderText = "登录状态"; + this.colLoginStatus.Name = "colLoginStatus"; + this.colLoginStatus.ReadOnly = true; + this.colLoginStatus.Width = 65; + // + // colCanUse + // + this.colCanUse.HeaderText = "可用"; + this.colCanUse.Name = "colCanUse"; + this.colCanUse.ReadOnly = true; + this.colCanUse.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colCanUse.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colCanUse.Width = 28; + // + // colMessage + // + this.colMessage.HeaderText = "消息"; + this.colMessage.Name = "colMessage"; + this.colMessage.ReadOnly = true; + this.colMessage.Width = 120; // // SaleStockUpForm // @@ -1679,13 +1694,6 @@ namespace TemuKJD.KJDForms.ProductForms private System.Windows.Forms.Label label9; private System.Windows.Forms.TextBox txtParentStockid; private System.Windows.Forms.Label label1; - private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; - private System.Windows.Forms.DataGridViewTextBoxColumn colShopLoginName; - private System.Windows.Forms.DataGridViewTextBoxColumn colShopId; - private System.Windows.Forms.DataGridViewTextBoxColumn colShopName; - private System.Windows.Forms.DataGridViewTextBoxColumn colLoginStatus; - private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse; - private System.Windows.Forms.DataGridViewTextBoxColumn colMessage; private System.Windows.Forms.CheckBox chkHasCreate; private UserComponent.UcGroupBoxEx ucGroupBoxEx3; private DevComponents.DotNetBar.PanelEx btnCancelSubPurchaseOrder; @@ -1726,5 +1734,13 @@ namespace TemuKJD.KJDForms.ProductForms private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1; private System.Windows.Forms.CheckBox chkIfLessMakeZero; private System.Windows.Forms.Label label18; + private UserComponent.UcCheckBox ucCheckBox1; + private UserComponent.UcDataGridViewCheckBoxColumn colSelect; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopLoginName; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopId; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopName; + private System.Windows.Forms.DataGridViewTextBoxColumn colLoginStatus; + private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse; + private System.Windows.Forms.DataGridViewTextBoxColumn colMessage; } } \ No newline at end of file diff --git a/TEMUKJD/KJDForms/ProductForms/SaleStockUpForm.cs b/TEMUKJD/KJDForms/ProductForms/SaleStockUpForm.cs index ac9affc..096d8db 100644 --- a/TEMUKJD/KJDForms/ProductForms/SaleStockUpForm.cs +++ b/TEMUKJD/KJDForms/ProductForms/SaleStockUpForm.cs @@ -25,7 +25,7 @@ namespace TemuKJD.KJDForms.ProductForms /// /// 销售备货管理 /// - public partial class SaleStockUpForm : Form + public partial class SaleStockUpForm : BaseForm { private CheckBox chkSelectAll = null; //private CheckBox chkCheckAll = null; diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.Designer.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.Designer.cs index d9d4fd0..4f1ebed 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.Designer.cs +++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.Designer.cs @@ -31,7 +31,6 @@ namespace TemuKJD.KJDForms.ProductSelectForms { 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.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DbProductListForm)); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.btnSelect = new TemuKJD.UserControls.ButtonEx(); @@ -334,8 +333,6 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.dgvDbProduct.Location = new System.Drawing.Point(4, 0); this.dgvDbProduct.Name = "dgvDbProduct"; this.dgvDbProduct.ReadOnly = true; - dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.dgvDbProduct.RowsDefaultCellStyle = dataGridViewCellStyle3; this.dgvDbProduct.RowTemplate.Height = 23; this.dgvDbProduct.Size = new System.Drawing.Size(1270, 600); this.dgvDbProduct.TabIndex = 6; diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.cs index 8c93bad..8910529 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.cs +++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.cs @@ -38,7 +38,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms private void ProductListForm_Load(object sender, EventArgs e) { - if (BaseClass.IsSa && shop == null) + if (BaseClass.SaLevel == 1 && shop == null) // 管理员且不是选品状态 { this.dgvDbProduct.Columns["col_delete"].Visible = true; this.dgvDbProduct.Columns["col_edit"].Visible = true; @@ -281,6 +281,13 @@ namespace TemuKJD.KJDForms.ProductSelectForms continue; } + if (shop.AddProductRemaining <=0) + { + if (!errorMsg.Contains("本月商品认领限额已用完")) + errorMsg += " 本月商品认领限额已用完，请下个月再操作！"; + continue; + } + try { var url = BaseClass.BuildObjString("product/add_user_select_product"); @@ -290,6 +297,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms "&shop_account=" + shop.ShopAccount + "&main_user_name=" + shop.UserName + "&sub_user_name=" + shop.SubUserName + + "&add_product_remaining=" + shop.AddProductRemaining + "&status=待上传"; var html = GetHtml.PostUtf8(url, data); if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) @@ -300,6 +308,10 @@ namespace TemuKJD.KJDForms.ProductSelectForms { errorMsg += prod.spu_id + " " + BaseRegex.GetStringJson(ref html, "msg") + "; "; } + else + { + shop.AddProductRemaining = shop.AddProductRemaining - 1; + } } catch (Exception ex) { errorMsg += ex.Message + "; "; @@ -309,7 +321,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms { Invoke(new Action(() => { - BaseMsgForm.ShowError("认领商品失败，请重试！\r\n" + errorMsg); + BaseMsgForm.ShowError("认领商品失败，请重试！\r\n" + errorMsg.Trim()); })); } else diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.Designer.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.Designer.cs index e5b948d..ae08e1e 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.Designer.cs +++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.Designer.cs @@ -30,7 +30,6 @@ { 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.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DbProductSelectListManageForm)); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.cmbStatus = new System.Windows.Forms.ComboBox(); @@ -388,8 +387,6 @@ this.dgvSelectProduct.Name = "dgvSelectProduct"; this.dgvSelectProduct.ReadOnly = true; this.dgvSelectProduct.RowHeadersWidth = 51; - dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.dgvSelectProduct.RowsDefaultCellStyle = dataGridViewCellStyle3; this.dgvSelectProduct.RowTemplate.Height = 23; this.dgvSelectProduct.Size = new System.Drawing.Size(1270, 552); this.dgvSelectProduct.TabIndex = 188; @@ -568,7 +565,6 @@ // // DbProductSelectListManageForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.ClientSize = new System.Drawing.Size(1280, 672); this.Controls.Add(this.splitContainer1); diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs index 57a08b9..d07c98d 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs +++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs @@ -120,7 +120,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms prodSelect.ext_code, prodSelect.status, prodSelect.draft_id, - prodSelect.mdy_time.ToString("yyyy/MM/dd HH:mm:ss"), + prodSelect.status == "待上传" ? "-" : prodSelect.mdy_time.ToString("yyyy/MM/dd HH:mm:ss"), "删除", ""); diff --git a/TEMUKJD/KJDForms/ProductSelectForms/UserSelectDbProductForm.Designer.cs b/TEMUKJD/KJDForms/ProductSelectForms/UserSelectDbProductForm.Designer.cs index ba5bdd8..e5f4413 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/UserSelectDbProductForm.Designer.cs +++ b/TEMUKJD/KJDForms/ProductSelectForms/UserSelectDbProductForm.Designer.cs @@ -34,8 +34,6 @@ namespace TemuKJD.KJDForms.ProductSelectForms 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.ucGroupBoxEx4 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.btnDelSelect = new DevComponents.DotNetBar.PanelEx(); @@ -54,6 +52,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.colLoginStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colSelectProduct = new System.Windows.Forms.DataGridViewLinkColumn(); this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.colRemaining = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.pbLoading = new System.Windows.Forms.PictureBox(); this.dgvSelectProduct = new TemuKJD.UserComponent.DataGridViewEx(); @@ -313,14 +312,13 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.colLoginStatus, this.colSelectProduct, this.colCanUse, + this.colRemaining, this.colMessage}); this.dgvShop.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvShop.Location = new System.Drawing.Point(4, 0); this.dgvShop.Name = "dgvShop"; this.dgvShop.ReadOnly = true; this.dgvShop.RowHeadersWidth = 30; - dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.dgvShop.RowsDefaultCellStyle = dataGridViewCellStyle3; this.dgvShop.RowTemplate.Height = 23; this.dgvShop.Size = new System.Drawing.Size(266, 392); this.dgvShop.TabIndex = 6; @@ -385,6 +383,12 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.colCanUse.Visible = false; this.colCanUse.Width = 28; // + // colRemaining + // + this.colRemaining.HeaderText = "月限额"; + this.colRemaining.Name = "colRemaining"; + this.colRemaining.ReadOnly = true; + // // colMessage // this.colMessage.HeaderText = "消息"; @@ -407,18 +411,18 @@ namespace TemuKJD.KJDForms.ProductSelectForms // this.dgvSelectProduct.AllowUserToAddRows = false; this.dgvSelectProduct.AllowUserToDeleteRows = false; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; this.dgvSelectProduct.BackgroundColor = System.Drawing.Color.White; this.dgvSelectProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5; + 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; this.dgvSelectProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvSelectProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colCheck, @@ -440,8 +444,6 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.dgvSelectProduct.Location = new System.Drawing.Point(0, 0); this.dgvSelectProduct.Name = "dgvSelectProduct"; this.dgvSelectProduct.ReadOnly = true; - dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.dgvSelectProduct.RowsDefaultCellStyle = dataGridViewCellStyle6; this.dgvSelectProduct.RowTemplate.Height = 23; this.dgvSelectProduct.Size = new System.Drawing.Size(1013, 392); this.dgvSelectProduct.TabIndex = 187; @@ -554,6 +556,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms this.colSelectId.HeaderText = "认领Id"; this.colSelectId.Name = "colSelectId"; this.colSelectId.ReadOnly = true; + this.colSelectId.Visible = false; // // colSupplierId // @@ -708,6 +711,11 @@ namespace TemuKJD.KJDForms.ProductSelectForms private UserControls.StatusBarUserControl statusBar; private DevComponents.DotNetBar.PanelEx panelEx1; private DevComponents.DotNetBar.PanelEx btnClear; + private System.Windows.Forms.PictureBox pbLoading; + private UserControls.UcSplitPage ucSplitPage1; + private System.Windows.Forms.ComboBox cmbStatus; + private System.Windows.Forms.Label label8; + private DevComponents.DotNetBar.PanelEx btnDelSelect; private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; private System.Windows.Forms.DataGridViewTextBoxColumn colShopLoginName; private System.Windows.Forms.DataGridViewTextBoxColumn colShopId; @@ -715,12 +723,8 @@ namespace TemuKJD.KJDForms.ProductSelectForms private System.Windows.Forms.DataGridViewTextBoxColumn colLoginStatus; private System.Windows.Forms.DataGridViewLinkColumn colSelectProduct; private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse; + private System.Windows.Forms.DataGridViewTextBoxColumn colRemaining; private System.Windows.Forms.DataGridViewTextBoxColumn colMessage; - private System.Windows.Forms.PictureBox pbLoading; - private UserControls.UcSplitPage ucSplitPage1; - private System.Windows.Forms.ComboBox cmbStatus; - private System.Windows.Forms.Label label8; - private DevComponents.DotNetBar.PanelEx btnDelSelect; private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck; private System.Windows.Forms.DataGridViewTextBoxColumn colSelectId; private System.Windows.Forms.DataGridViewTextBoxColumn colSupplierId; diff --git a/TEMUKJD/KJDForms/ProductSelectForms/UserSelectDbProductForm.cs b/TEMUKJD/KJDForms/ProductSelectForms/UserSelectDbProductForm.cs index 8481e54..48bf515 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/UserSelectDbProductForm.cs +++ b/TEMUKJD/KJDForms/ProductSelectForms/UserSelectDbProductForm.cs @@ -22,7 +22,7 @@ using Work; namespace TemuKJD.KJDForms.ProductSelectForms { - public partial class UserSelectDbProductForm : Form + public partial class UserSelectDbProductForm : BaseForm { bool isInit = false; CheckBox chkSelectAll = null; @@ -126,6 +126,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms shopEntity.LoginStatus, "选择商品", canUse, + shopEntity.AddProductRemaining, string.Empty ); } @@ -136,6 +137,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms row.Cells["colShopName"].Value = shopEntity.ShopAccount; row.Cells["colLoginStatus"].Value = shopEntity.LoginStatus; row.Cells["colCanUse"].Value = canUse; + row.Cells["colRemaining"].Value = shopEntity.AddProductRemaining; } isInit = false; } @@ -170,9 +172,10 @@ namespace TemuKJD.KJDForms.ProductSelectForms } break; - case "colSelectProduct": + case "colSelectProduct": // 认领商品 DbProductListForm dbProductForm = new DbProductListForm(shop); dbProductForm.ShowDialog(); + this.RefreshShop(); break; } } diff --git a/TEMUKJD/KJDForms/ProductSelectForms/UserSelectDbProductForm.resx b/TEMUKJD/KJDForms/ProductSelectForms/UserSelectDbProductForm.resx index dbd3ef5..8a54b6d 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/UserSelectDbProductForm.resx +++ b/TEMUKJD/KJDForms/ProductSelectForms/UserSelectDbProductForm.resx @@ -135,6 +135,9 @@ True + + True + True diff --git a/TEMUKJD/KJDForms/SalesCenterForms/CouponForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/CouponForm.cs index ec557ce..4642e71 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/CouponForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/CouponForm.cs @@ -23,7 +23,7 @@ using System.Windows.Forms; namespace TemuKJD.KJDForms.SalesCenterForms { - public partial class CouponForm : Form + public partial class CouponForm : BaseForm { private CheckBox chkSelectAll = null; public ChromiumWebBrowser webBrowser = null; diff --git a/TEMUKJD/KJDForms/SalesCenterForms/CouponShopForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/CouponShopForm.cs index dd06296..07146bc 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/CouponShopForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/CouponShopForm.cs @@ -20,7 +20,7 @@ using Work.BLL.Product; namespace TemuKJD.KJDForms.SalesCenterForms { - public partial class CouponShopForm : Form + public partial class CouponShopForm : BaseForm { private CheckBox chkSelectAll = null; diff --git a/TEMUKJD/KJDForms/SalesCenterForms/DouProductProPromotionListSkuInfoForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/DouProductProPromotionListSkuInfoForm.cs index 5e7e01a..1d0ce36 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/DouProductProPromotionListSkuInfoForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/DouProductProPromotionListSkuInfoForm.cs @@ -9,7 +9,7 @@ using System.Windows.Forms; namespace TemuKJD.KJDForms.SalesCenterForms { - public partial class DouProductProPromotionListSkuInfoForm : Form + public partial class DouProductProPromotionListSkuInfoForm : BaseForm { public List skuList = null; private List strList = new List(); diff --git a/TEMUKJD/KJDForms/SalesCenterForms/DouProductPromotionListSkuInfoEditForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/DouProductPromotionListSkuInfoEditForm.cs index 6ca598c..44a7818 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/DouProductPromotionListSkuInfoEditForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/DouProductPromotionListSkuInfoEditForm.cs @@ -7,7 +7,7 @@ using System.Windows.Forms; namespace TemuKJD.KJDForms.SalesCenterForms { - public partial class DouProductPromotionListSkuInfoEditForm : Form + public partial class DouProductPromotionListSkuInfoEditForm : BaseForm { public List skuList = null; private List strList = new List(); diff --git a/TEMUKJD/KJDForms/SalesCenterForms/FullMinusActiveForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/FullMinusActiveForm.cs index a316f4d..c7abb17 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/FullMinusActiveForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/FullMinusActiveForm.cs @@ -13,7 +13,7 @@ using System.Windows.Forms; namespace TemuKJD.KJDForms.SalesCenterForms { - public partial class FullMinusActiveForm : Form + public partial class FullMinusActiveForm : BaseForm { private ShopLoginInfo shop = null; public List lstActiveId = new List(); diff --git a/TEMUKJD/KJDForms/SalesCenterForms/FullMinusForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/FullMinusForm.cs index 473ae68..c6d0793 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/FullMinusForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/FullMinusForm.cs @@ -20,7 +20,7 @@ using System.Windows.Forms; namespace TemuKJD.KJDForms.SalesCenterForms { - public partial class FullMinusForm : Form + public partial class FullMinusForm : BaseForm { public FullMinusForm() { diff --git a/TEMUKJD/KJDForms/SalesCenterForms/FullMinusShopForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/FullMinusShopForm.cs index cf6204b..2898987 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/FullMinusShopForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/FullMinusShopForm.cs @@ -10,10 +10,11 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; +using TemuKJD.KJDForms.BaseForms; namespace TemuKJD.KJDForms.SalesCenterForms { - public partial class FullMinusShopForm : Form + public partial class FullMinusShopForm : BaseForm { private ShopLoginInfo shop = null; private CheckBox chkSelectAll = null; diff --git a/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyForm.cs index 328b986..a1c50ae 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyForm.cs @@ -25,7 +25,7 @@ using System.Windows.Forms; namespace TemuKJD.KJDForms.SalesCenterForms { - public partial class GroupBuyForm : Form + public partial class GroupBuyForm : BaseForm { public static List CustomActivityNames = new List(); diff --git a/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyMonitorForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyMonitorForm.cs index bd4b551..dfb1558 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyMonitorForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyMonitorForm.cs @@ -8,10 +8,11 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using TemuKJD.KJDForms.BaseForms; namespace TemuKJD.KJDForms.SalesCenterForms { - public partial class GroupBuyMonitorForm : Form + public partial class GroupBuyMonitorForm : BaseForm { public GroupBuyMonitorForm() { diff --git a/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyShopForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyShopForm.cs index 66173f5..9dde57b 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyShopForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyShopForm.cs @@ -20,7 +20,7 @@ using Work.BLL.Product; namespace TemuKJD.KJDForms.SalesCenterForms { - public partial class GroupBuyShopForm : Form + public partial class GroupBuyShopForm : BaseForm { public List lstProductId { diff --git a/TEMUKJD/KJDForms/SalesCenterForms/LimitedSalesManagerActiveForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/LimitedSalesManagerActiveForm.cs index 0048c16..ac23abe 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/LimitedSalesManagerActiveForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/LimitedSalesManagerActiveForm.cs @@ -14,7 +14,7 @@ using System.Windows.Forms; namespace TemuKJD.KJDForms.SalesCenterForms { - public partial class LimitedSalesManagerActiveForm : Form + public partial class LimitedSalesManagerActiveForm : BaseForm { private ShopLoginInfo shop = null; private CheckBox chkSelectAll = null; diff --git a/TEMUKJD/KJDForms/SalesCenterForms/SalesCenterForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/SalesCenterForm.cs index df8c8b5..b9376df 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/SalesCenterForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/SalesCenterForm.cs @@ -8,10 +8,11 @@ using System.Text; using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; +using TemuKJD.KJDForms.BaseForms; namespace TemuKJD.KJDForms.SalesCenterForms { - public partial class SalesCenterForm : Form + public partial class SalesCenterForm : BaseForm { public Lazy seckillingAndLimitedSalesForm = new Lazy(); public Lazy fullMinusForm = new Lazy(); diff --git a/TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesForm.cs index 581c668..387b1ea 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesForm.cs @@ -23,7 +23,7 @@ using System.Windows.Forms; namespace TemuKJD.KJDForms.SalesCenterForms { - public partial class SeckillingAndLimitedSalesForm : Form + public partial class SeckillingAndLimitedSalesForm : BaseForm { public static List CustomActivityNames { get; set; } = new List(); public CancellationTokenSource cancellationTokenSource { get; set; } = null; diff --git a/TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesShopForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesShopForm.cs index b3d5360..fe49925 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesShopForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesShopForm.cs @@ -22,7 +22,7 @@ using Work.BLL.Product; namespace TemuKJD.KJDForms.SalesCenterForms { - public partial class SeckillingAndLimitedSalesShopForm : Form + public partial class SeckillingAndLimitedSalesShopForm : BaseForm { private ShopLoginInfo shop = null; private CheckBox chkSelectAll = null; diff --git a/TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateAddForm.cs b/TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateAddForm.cs index 1773474..e8ec552 100644 --- a/TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateAddForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateAddForm.cs @@ -14,13 +14,14 @@ using System.Threading.Tasks; using System.Web.UI.WebControls; using System.Windows.Forms; using Work; +using TemuKJD.KJDForms.BaseForms; namespace TemuKJD.KJDForms.ShopForms { /// /// 运费模板管理窗口 /// - public partial class FreightTemplateAddForm : Form + public partial class FreightTemplateAddForm : BaseForm { public static List ids = new List(); diff --git a/TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateForm.cs b/TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateForm.cs index 968ea39..9ed164a 100644 --- a/TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateForm.cs @@ -22,7 +22,7 @@ using Work.DouyinApiClass; namespace TemuKJD.KJDForms.ShopForms { - public partial class FreightTemplateForm : Form + public partial class FreightTemplateForm : BaseForm { public static List LstAddress = new List(); public static List CustomFreightTemplateNames { get; set; } = new List(); diff --git a/TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateListForm.cs b/TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateListForm.cs index 83f46e6..8bf90f4 100644 --- a/TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateListForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/Old/FreightTemplateListForm.cs @@ -12,11 +12,12 @@ using System.Text; using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; +using TemuKJD.KJDForms.BaseForms; using Work.DouyinApiClass; namespace TemuKJD.KJDForms.ShopForms { - public partial class FreightTemplateListForm : Form + public partial class FreightTemplateListForm : BaseForm { public ShopLoginInfo Shop = null; public List LstTemplate = new List(); diff --git a/TEMUKJD/KJDForms/ShopForms/Old/MaterialManageForm.cs b/TEMUKJD/KJDForms/ShopForms/Old/MaterialManageForm.cs index 2cd50b9..182d8ad 100644 --- a/TEMUKJD/KJDForms/ShopForms/Old/MaterialManageForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/Old/MaterialManageForm.cs @@ -17,7 +17,7 @@ using Work.DouyinApiClass; namespace TemuKJD.KJDForms.ShopForms { - public partial class MaterialManageForm : Form + public partial class MaterialManageForm : BaseForm { private CheckBox chkSelectAll = null; CancellationTokenSource cancellationTokenSource = null; diff --git a/TEMUKJD/KJDForms/ShopForms/ShopForm.cs b/TEMUKJD/KJDForms/ShopForms/ShopForm.cs index f7ee4a0..38e5fd3 100644 --- a/TEMUKJD/KJDForms/ShopForms/ShopForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/ShopForm.cs @@ -10,11 +10,12 @@ using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; using TemuKJD.KJDForms.AdminForms; +using TemuKJD.KJDForms.BaseForms; using TemuKJD.KJDForms.ProductSelectForms; namespace TemuKJD.KJDForms.ShopForms { - public partial class ShopForm : Form + public partial class ShopForm : BaseForm { public Lazy shopListForm = new Lazy(); public Lazy sbuAccountForm = new Lazy(); @@ -40,13 +41,18 @@ namespace TemuKJD.KJDForms.ShopForms if (BaseClass.GroupId == 3) { hideName.Remove("用户管理"); - if (BaseClass.IsSa/*BaseClass.UserName == "18888888888" || BaseClass.UserName == "15333333333"*/) + /*BaseClass.UserName == "18888888888" || BaseClass.UserName == "15333333333"*/ + if (BaseClass.SaLevel==1) { hideName.Remove("超级用户管理"); hideName.Remove("超级店铺管理"); hideName.Remove("选品数据库"); hideName.Remove("认领待上传"); } + if (BaseClass.SaLevel==2) + { + hideName.Remove("认领待上传"); + } } foreach (var item in hideName) diff --git a/TEMUKJD/KJDForms/ShopForms/ShopListForm.Designer.cs b/TEMUKJD/KJDForms/ShopForms/ShopListForm.Designer.cs index a53edb9..67f412d 100644 --- a/TEMUKJD/KJDForms/ShopForms/ShopListForm.Designer.cs +++ b/TEMUKJD/KJDForms/ShopForms/ShopListForm.Designer.cs @@ -28,9 +28,8 @@ /// private void InitializeComponent() { - 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 dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.label1 = new System.Windows.Forms.Label(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); @@ -389,19 +388,19 @@ // this.dgvShop.AllowUserToAddRows = false; this.dgvShop.AllowUserToDeleteRows = false; - dataGridViewCellStyle7.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.dgvShop.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvShop.BackgroundColor = System.Drawing.Color.White; this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8; + 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, @@ -430,8 +429,6 @@ this.dgvShop.Location = new System.Drawing.Point(4, 0); this.dgvShop.Name = "dgvShop"; this.dgvShop.ReadOnly = true; - dataGridViewCellStyle9.Font = new System.Drawing.Font("微软雅黑", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.dgvShop.RowsDefaultCellStyle = dataGridViewCellStyle9; this.dgvShop.RowTemplate.Height = 23; this.dgvShop.Size = new System.Drawing.Size(1055, 555); this.dgvShop.TabIndex = 5; @@ -644,7 +641,6 @@ // // ShopListForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.BackColor = System.Drawing.Color.White; this.ClientSize = new System.Drawing.Size(1063, 637); diff --git a/TEMUKJD/KJDForms/ShopForms/ShopListForm.cs b/TEMUKJD/KJDForms/ShopForms/ShopListForm.cs index 27ac33a..1569ab5 100644 --- a/TEMUKJD/KJDForms/ShopForms/ShopListForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/ShopListForm.cs @@ -22,7 +22,7 @@ using NaiBa.Util; namespace TemuKJD.KJDForms.ShopForms { - public partial class ShopListForm : Form + public partial class ShopListForm : BaseForm { public static List LstShopListFormInatance = new List(); public static ShopListForm Instance { get; set; } = null; @@ -129,6 +129,7 @@ namespace TemuKJD.KJDForms.ShopForms localShop.GroupName = serverShop.GroupName; localShop.Notes = serverShop.Notes; localShop.LoginStatus = serverShop.LoginStatus; + localShop.AddProductRemaining = serverShop.AddProductRemaining; if (localShop.TrialUploadCount < 0) localShop.TrialUploadCount = 0; GlobalConfig.ShopLoginList.Add(localShop); @@ -183,6 +184,7 @@ namespace TemuKJD.KJDForms.ShopForms shop.CompanyName = BaseRegex.GetStringJson(ref shopStr, "company_name"); shop.Notes = BaseRegex.GetStringJson(ref shopStr, "notes"); shop.LoginStatus = BaseRegex.GetStringJson(ref shopStr, "login_status"); + shop.AddProductRemaining = BaseRegex.GetIntJson(ref shopStr, "add_product_remaining"); //shop.PayStatus = BaseRegex.GetIntJson(ref shopStr, "shop_pay_status"); //if (list.Any(l => l.ShopId == shop.ShopId) || list.Any(l => l.ShopName == shop.ShopName)) // continue; diff --git a/TEMUKJD/KJDForms/ShopForms/SubAccountListForm.cs b/TEMUKJD/KJDForms/ShopForms/SubAccountListForm.cs index fb8bdf2..d67d800 100644 --- a/TEMUKJD/KJDForms/ShopForms/SubAccountListForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/SubAccountListForm.cs @@ -14,7 +14,7 @@ using Work; namespace TemuKJD.KJDForms.ShopForms { - public partial class SubAccountListForm : Form + public partial class SubAccountListForm : BaseForm { public static List AllUsers { get; set; } = new List(); public MainForm Mf { get; set; } = null; diff --git a/TEMUKJD/KJDForms/ShopOptimizeForms/ClearNoVisitorForm.cs b/TEMUKJD/KJDForms/ShopOptimizeForms/ClearNoVisitorForm.cs index 0bec187..c24a066 100644 --- a/TEMUKJD/KJDForms/ShopOptimizeForms/ClearNoVisitorForm.cs +++ b/TEMUKJD/KJDForms/ShopOptimizeForms/ClearNoVisitorForm.cs @@ -26,7 +26,7 @@ using Work.DouyinApiClass; namespace TemuKJD.KJDForms.ShopOptimizeForms { - public partial class ClearNoVisitorForm : Form + public partial class ClearNoVisitorForm : BaseForm { private CheckBox chkSelectAll = null; public ChromiumWebBrowser webBrowser = null; diff --git a/TEMUKJD/KJDForms/ShopOptimizeForms/ClearNoVisitorShopForm.cs b/TEMUKJD/KJDForms/ShopOptimizeForms/ClearNoVisitorShopForm.cs index cc771a9..f2470df 100644 --- a/TEMUKJD/KJDForms/ShopOptimizeForms/ClearNoVisitorShopForm.cs +++ b/TEMUKJD/KJDForms/ShopOptimizeForms/ClearNoVisitorShopForm.cs @@ -19,7 +19,7 @@ using Work.BLL.Product; namespace TemuKJD.KJDForms.ShopOptimizeForms { - public partial class ClearNoVisitorShopForm : Form + public partial class ClearNoVisitorShopForm : BaseForm { ShopLoginInfo shop; public ClearNoVisitorForm clearNoVisitorForm = null; diff --git a/TEMUKJD/KJDForms/ShopOptimizeForms/OptimizeForm.cs b/TEMUKJD/KJDForms/ShopOptimizeForms/OptimizeForm.cs index 1e4e31f..f475910 100644 --- a/TEMUKJD/KJDForms/ShopOptimizeForms/OptimizeForm.cs +++ b/TEMUKJD/KJDForms/ShopOptimizeForms/OptimizeForm.cs @@ -8,10 +8,11 @@ using System.Text; using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; +using TemuKJD.KJDForms.BaseForms; namespace TemuKJD.KJDForms.ShopOptimizeForms { - public partial class OptimizeForm : Form + public partial class OptimizeForm : BaseForm { public Lazy clearNoVisitorForm = new Lazy(); public OptimizeForm() diff --git a/TEMUKJD/KJDForms/SystemForms/SystemForm.cs b/TEMUKJD/KJDForms/SystemForms/SystemForm.cs index d38c9e4..0be107b 100644 --- a/TEMUKJD/KJDForms/SystemForms/SystemForm.cs +++ b/TEMUKJD/KJDForms/SystemForms/SystemForm.cs @@ -8,10 +8,11 @@ using System.Text; using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; +using TemuKJD.KJDForms.BaseForms; namespace TemuKJD.KJDForms.SystemForms { - public partial class SystemForm : Form + public partial class SystemForm : BaseForm { public Lazy systemRemoveRestrictionsForm = new Lazy(); public SystemForm() diff --git a/TEMUKJD/KJDForms/SystemForms/SystemRemoveRestrictionsForm.cs b/TEMUKJD/KJDForms/SystemForms/SystemRemoveRestrictionsForm.cs index aa52269..f88b0d6 100644 --- a/TEMUKJD/KJDForms/SystemForms/SystemRemoveRestrictionsForm.cs +++ b/TEMUKJD/KJDForms/SystemForms/SystemRemoveRestrictionsForm.cs @@ -8,10 +8,11 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using TemuKJD.KJDForms.BaseForms; namespace TemuKJD.KJDForms.SystemForms { - public partial class SystemRemoveRestrictionsForm : Form + public partial class SystemRemoveRestrictionsForm : BaseForm { ChangeIPForm changeIPForm = new ChangeIPForm(); diff --git a/TEMUKJD/MainForm.cs b/TEMUKJD/MainForm.cs index 3e01511..6721133 100644 --- a/TEMUKJD/MainForm.cs +++ b/TEMUKJD/MainForm.cs @@ -42,7 +42,7 @@ using NaiBa.CefHelper.Handler; namespace TemuKJD { - public partial class MainForm : Form + public partial class MainForm : BaseForm { public static string sCurrentModule = string.Empty; diff --git a/TEMUKJD/MainForm.designer.cs b/TEMUKJD/MainForm.designer.cs index bcc8678..7fec788 100644 --- a/TEMUKJD/MainForm.designer.cs +++ b/TEMUKJD/MainForm.designer.cs @@ -48,8 +48,6 @@ namespace TemuKJD this.lblContactSupport = new DevComponents.DotNetBar.LabelX(); this.picPinDuoDuoToken = new System.Windows.Forms.PictureBox(); this.pbAnnouncement = new System.Windows.Forms.PictureBox(); - this.lblVersionName = new DevComponents.DotNetBar.LabelX(); - this.lblVersionInfo = new DevComponents.DotNetBar.LabelX(); this.max = new DevComponents.DotNetBar.PanelEx(); this.min = new DevComponents.DotNetBar.PanelEx(); this.close = new DevComponents.DotNetBar.PanelEx(); @@ -60,6 +58,8 @@ namespace TemuKJD this.pnlWebBrowserJS = new DevComponents.DotNetBar.PanelEx(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.tpMainForm = new System.Windows.Forms.ToolTip(this.components); + this.lblVersionInfo = new System.Windows.Forms.Label(); + this.lblVersionName = new System.Windows.Forms.Label(); this.navPanel.SuspendLayout(); this.flowLayoutPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pbLogo)).BeginInit(); @@ -382,11 +382,11 @@ namespace TemuKJD this.plTopRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.plTopRight.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("plTopRight.BackgroundImage"))); this.plTopRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.plTopRight.Controls.Add(this.lblVersionName); + this.plTopRight.Controls.Add(this.lblVersionInfo); this.plTopRight.Controls.Add(this.lblContactSupport); this.plTopRight.Controls.Add(this.picPinDuoDuoToken); this.plTopRight.Controls.Add(this.pbAnnouncement); - this.plTopRight.Controls.Add(this.lblVersionName); - this.plTopRight.Controls.Add(this.lblVersionInfo); this.plTopRight.Controls.Add(this.max); this.plTopRight.Controls.Add(this.min); this.plTopRight.Controls.Add(this.close); @@ -410,12 +410,12 @@ namespace TemuKJD // this.lblContactSupport.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.lblContactSupport.Cursor = System.Windows.Forms.Cursors.Hand; - this.lblContactSupport.Font = new System.Drawing.Font("宋体", 10.5F); + this.lblContactSupport.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblContactSupport.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.lblContactSupport.Location = new System.Drawing.Point(107, 5); + this.lblContactSupport.Location = new System.Drawing.Point(107, 3); this.lblContactSupport.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.lblContactSupport.Name = "lblContactSupport"; - this.lblContactSupport.Size = new System.Drawing.Size(65, 20); + this.lblContactSupport.Size = new System.Drawing.Size(65, 23); this.lblContactSupport.TabIndex = 67; this.lblContactSupport.Text = "联系客服"; this.lblContactSupport.Visible = false; @@ -453,40 +453,6 @@ namespace TemuKJD this.pbAnnouncement.MouseEnter += new System.EventHandler(this.pbAnnouncement_MouseEnter); this.pbAnnouncement.MouseLeave += new System.EventHandler(this.pbAnnouncement_MouseLeave); // - // lblVersionName - // - this.lblVersionName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - // - // - // - this.lblVersionName.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.lblVersionName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); - this.lblVersionName.Location = new System.Drawing.Point(164, 35); - this.lblVersionName.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.lblVersionName.Name = "lblVersionName"; - this.lblVersionName.Size = new System.Drawing.Size(74, 17); - this.lblVersionName.TabIndex = 20; - this.lblVersionName.Text = "版本类型"; - this.lblVersionName.TextAlignment = System.Drawing.StringAlignment.Far; - this.lblVersionName.Visible = false; - this.lblVersionName.Click += new System.EventHandler(this.lblVersionName_Click); - // - // lblVersionInfo - // - this.lblVersionInfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - // - // - // - this.lblVersionInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.lblVersionInfo.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(165)))), ((int)(((byte)(204))))); - this.lblVersionInfo.Location = new System.Drawing.Point(4, 58); - this.lblVersionInfo.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.lblVersionInfo.Name = "lblVersionInfo"; - this.lblVersionInfo.Size = new System.Drawing.Size(234, 16); - this.lblVersionInfo.TabIndex = 2; - this.lblVersionInfo.Text = "版本信息"; - this.lblVersionInfo.TextAlignment = System.Drawing.StringAlignment.Far; - // // max // this.max.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -626,18 +592,10 @@ namespace TemuKJD this.bodyPanel.Name = "bodyPanel"; this.bodyPanel.Size = new System.Drawing.Size(1278, 627); this.bodyPanel.Style.Alignment = System.Drawing.StringAlignment.Center; - this.bodyPanel.Style.BackColor1.Alpha = ((byte)(0)); - this.bodyPanel.Style.BackColor1.Color = System.Drawing.Color.Transparent; - this.bodyPanel.Style.BackColor2.Alpha = ((byte)(0)); - this.bodyPanel.Style.BackColor2.Color = System.Drawing.Color.Transparent; - this.bodyPanel.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.bodyPanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.bodyPanel.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.bodyPanel.Style.BorderWidth = 0; - this.bodyPanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.bodyPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; + this.bodyPanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; + this.bodyPanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; this.bodyPanel.Style.GradientAngle = 90; - this.bodyPanel.StyleMouseOver.BackColor1.Alpha = ((byte)(0)); - this.bodyPanel.StyleMouseOver.BackColor1.Color = System.Drawing.Color.Transparent; this.bodyPanel.TabIndex = 0; this.bodyPanel.Visible = false; // @@ -683,6 +641,27 @@ namespace TemuKJD // this.tpMainForm.AutomaticDelay = 300; // + // lblVersionInfo + // + this.lblVersionInfo.ForeColor = System.Drawing.SystemColors.ControlDark; + this.lblVersionInfo.Location = new System.Drawing.Point(3, 60); + this.lblVersionInfo.Name = "lblVersionInfo"; + this.lblVersionInfo.Size = new System.Drawing.Size(238, 23); + this.lblVersionInfo.TabIndex = 77; + this.lblVersionInfo.Text = "版本信息"; + this.lblVersionInfo.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // lblVersionName + // + this.lblVersionName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); + this.lblVersionName.Location = new System.Drawing.Point(3, 36); + this.lblVersionName.Name = "lblVersionName"; + this.lblVersionName.Size = new System.Drawing.Size(238, 23); + this.lblVersionName.TabIndex = 78; + this.lblVersionName.Text = "版本类型"; + this.lblVersionName.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.lblVersionName.Visible = false; + // // MainForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -690,10 +669,11 @@ namespace TemuKJD this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(98)))), ((int)(((byte)(200))))); this.ClientSize = new System.Drawing.Size(1280, 720); this.Controls.Add(this.tableLayoutPanel1); + this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.MinimumSize = new System.Drawing.Size(1280, 680); + this.MinimumSize = new System.Drawing.Size(1278, 670); this.Name = "MainForm"; this.Padding = new System.Windows.Forms.Padding(1); this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; @@ -720,7 +700,6 @@ namespace TemuKJD private DevComponents.DotNetBar.PanelEx navPanel; private DevComponents.DotNetBar.PanelEx bodyPanelBg; - private DevComponents.DotNetBar.LabelX lblVersionInfo; private DevComponents.DotNetBar.PanelEx close; private DevComponents.DotNetBar.PanelEx min; private DevComponents.DotNetBar.PanelEx pnlOrder; @@ -728,7 +707,6 @@ namespace TemuKJD private DevComponents.DotNetBar.PanelEx max; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; private System.Windows.Forms.Panel plTopRight; - private DevComponents.DotNetBar.LabelX lblVersionName; private System.Windows.Forms.PictureBox pbAnnouncement; private System.Windows.Forms.ToolTip tpMainForm; private System.Windows.Forms.PictureBox picPinDuoDuoToken; @@ -745,6 +723,8 @@ namespace TemuKJD public DevComponents.DotNetBar.PanelEx pnlMarket; private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1; private DevComponents.DotNetBar.PanelEx pnlSA; + private System.Windows.Forms.Label lblVersionName; + private System.Windows.Forms.Label lblVersionInfo; } } diff --git a/TEMUKJD/UserComponent/UcCheckBox.Designer.cs b/TEMUKJD/UserComponent/UcCheckBox.Designer.cs new file mode 100644 index 0000000..4b782b2 --- /dev/null +++ b/TEMUKJD/UserComponent/UcCheckBox.Designer.cs @@ -0,0 +1,37 @@ + +namespace TemuKJD.UserComponent +{ + partial class UcCheckBox + { + /// + /// 必需的设计器变量。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 清理所有正在使用的资源。 + /// + /// 如果应释放托管资源，为 true；否则为 false。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region 组件设计器生成的代码 + + /// + /// 设计器支持所需的方法 - 不要修改 + /// 使用代码编辑器修改此方法的内容。 + /// + private void InitializeComponent() + { + components = new System.ComponentModel.Container(); + } + + #endregion + } +} diff --git a/TEMUKJD/UserComponent/UcCheckBox.cs b/TEMUKJD/UserComponent/UcCheckBox.cs new file mode 100644 index 0000000..e9e4065 --- /dev/null +++ b/TEMUKJD/UserComponent/UcCheckBox.cs @@ -0,0 +1,133 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Diagnostics; +using System.Drawing; +using System.Drawing.Drawing2D; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace TemuKJD.UserComponent +{ + public partial class UcCheckBox : CheckBox + { + public UcCheckBox() + { + InitializeComponent(); + } + + public UcCheckBox(IContainer container) + { + container.Add(this); + + InitializeComponent(); + } + + private int checkBoxSize = 12; + private Color checkBoxColor = Color.White; + private Color checkBoxCheckColor = Color.Blue; + private Color checkBoxBorderColor = Color.Blue; + + protected override void OnPaint(PaintEventArgs e) + { + //base.OnPaint(e); // 禁用系统绘制 + + Graphics g = e.Graphics; + + //填充背景色 + g.FillRectangle(new SolidBrush(this.BackColor), e.ClipRectangle); + + //绘制圆形（注释此句，以备后用） + //Brush brush = new SolidBrush(this.Checked ? checkBoxCheckColor : checkBoxColor); + //g.FillEllipse(brush, 0, (Height - checkBoxSize) / 2, checkBoxSize, checkBoxSize); // 绘制圆形按钮 + + Rectangle rt = new Rectangle(); + rt.X = 0; + rt.Y = (Height - checkBoxSize) / 2; + rt.Width = checkBoxSize; + rt.Height = checkBoxSize; + + Color color = this.Checked ? checkBoxCheckColor : checkBoxColor; + DrawRoundedRectangle(g, rt, 2, color, true); + DrawRoundedRectangle(g, rt, 2, checkBoxBorderColor); + + if (this.Checked) + { + // 绘制勾号 + Pen p = new Pen(Color.FromArgb(180, 255, 255, 255)); + //g.DrawLine(Pens.SkyBlue, rt.X + 3, rt.Y + 6, rt.X + 5, rt.Y + 8); + //g.DrawLine(Pens.SkyBlue, rt.X + 5, rt.Y + 8, rt.X + 9, rt.Y + 4); + g.DrawLine(p, rt.X + 3, rt.Y + 6, rt.X + 5, rt.Y + 8); + g.DrawLine(p, rt.X + 5, rt.Y + 8, rt.X + 9, rt.Y + 4); + } + Size size = TextRenderer.MeasureText(this.Text, Font); + e.Graphics.TextRenderingHint = System.Drawing.Text.TextRenderingHint.ClearTypeGridFit; // 或者 AntiAliasGridFit // 平滑字体 + e.Graphics.DrawString(this.Text, Font, new SolidBrush(this.ForeColor), + new PointF(e.ClipRectangle.X + checkBoxSize + 2 + Padding.Left, e.ClipRectangle.Y + (Height - size.Height) / 2)); + } + + private void DrawRoundedRectangle(Graphics g, Rectangle rect, int radius, Color color, bool isFill = false) + { + using (GraphicsPath path = new GraphicsPath()) + { + path.StartFigure(); + path.AddArc(rect.X, rect.Y, radius * 2, radius * 2, 180, 90); // Upper left corner + path.AddArc(rect.Right - radius * 2, rect.Y, radius * 2, radius * 2, 270, 90); // Upper right corner + path.AddArc(rect.Right - radius * 2, rect.Bottom - radius * 2, radius * 2, radius * 2, 0, 90); // Lower right corner + path.AddArc(rect.X, rect.Bottom - radius * 2, radius * 2, radius * 2, 90, 90); // Lower left corner + path.CloseFigure(); + //g.FillPath(Brushes.LightBlue, path); + if (isFill) + g.FillPath(new SolidBrush(color), path); // Fill the rounded rectangle + else + g.DrawPath(new Pen(color), path); + } + } + + /* + protected override void OnDrawItem(DrawItemEventArgs e) + { + //int ItemsCount = Items.Count; + //Rectangle rect = new Rectangle(0, 0, e.Bounds.Width, e.Bounds.Height * ItemsCount); + e.Graphics.TextRenderingHint = System.Drawing.Text.TextRenderingHint.ClearTypeGridFit; + + //// 绘制下拉框背景 + //e.Graphics.FillRectangle(new SolidBrush(_BoxCenterColor), rect); + //// 绘制下拉框边框 + //e.Graphics.DrawRectangle(new Pen(new SolidBrush(_BorderColor)), rect); + //// 绘制选中文字背景 + //for (int i = 0; i < Items.Count; i++) + //{ + // if (SelectedItem != null) + // { + // if (SelectedItem.ToString() == Items[i].ToString()) + // { + // Rectangle rectSel = new Rectangle(1, e.Bounds.Height * (SelectedIndex), e.Bounds.Width - 2, e.Bounds.Height - 2); + // e.Graphics.FillRectangle(new SolidBrush(Color.White), rectSel); + // } + // } + // // 绘制文字 + // e.Graphics.DrawString(Items[i].ToString(), Font, new SolidBrush(_FontColor), new PointF(0, i * (e.Bounds.Height == 0 ? 16 : e.Bounds.Height))); + //} + + if (e.Index >= 0) + { + e.Graphics.FillRectangle(new SolidBrush(_BoxCenterColor), e.Bounds); + if ((e.State & DrawItemState.Focus) == DrawItemState.Focus || (e.State & DrawItemState.Selected) == DrawItemState.Selected) + { + // 设置鼠标悬浮ComboBox的item的背景色 + e.Graphics.FillRectangle(Brushes.White, e.Bounds); + } + else if (((e.State & DrawItemState.ComboBoxEdit) != DrawItemState.ComboBoxEdit)) + { + // 默认背景 + e.Graphics.FillRectangle(new SolidBrush(e.BackColor), e.Bounds); + } + // 绘制文字 + e.Graphics.DrawString(Items[e.Index].ToString(), Font, new SolidBrush(_FontColor), new PointF(e.Bounds.X, e.Bounds.Y)); + } + }*/ + } +} diff --git a/TEMUKJD/UserComponent/UcDataGridViewCheckBoxColumn.Designer.cs b/TEMUKJD/UserComponent/UcDataGridViewCheckBoxColumn.Designer.cs new file mode 100644 index 0000000..7f6f406 --- /dev/null +++ b/TEMUKJD/UserComponent/UcDataGridViewCheckBoxColumn.Designer.cs @@ -0,0 +1,37 @@ + +namespace TemuKJD.UserComponent +{ + partial class UcDataGridViewCheckBoxColumn + { + /// + /// 必需的设计器变量。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 清理所有正在使用的资源。 + /// + /// 如果应释放托管资源，为 true；否则为 false。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region 组件设计器生成的代码 + + /// + /// 设计器支持所需的方法 - 不要修改 + /// 使用代码编辑器修改此方法的内容。 + /// + private void InitializeComponent() + { + components = new System.ComponentModel.Container(); + } + + #endregion + } +} diff --git a/TEMUKJD/UserComponent/UcDataGridViewCheckBoxColumn.cs b/TEMUKJD/UserComponent/UcDataGridViewCheckBoxColumn.cs new file mode 100644 index 0000000..f75acc8 --- /dev/null +++ b/TEMUKJD/UserComponent/UcDataGridViewCheckBoxColumn.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Diagnostics; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace TemuKJD.UserComponent +{ + public partial class UcDataGridViewCheckBoxColumn : DataGridViewCheckBoxColumn + { + public UcDataGridViewCheckBoxColumn() + { + InitializeComponent(); + } + + public UcDataGridViewCheckBoxColumn(IContainer container) + { + container.Add(this); + + InitializeComponent(); + } + } +} diff --git a/TEMUKJD/UserForm/LoginForm.cs b/TEMUKJD/UserForm/LoginForm.cs index e7ca6c7..aeac51a 100644 --- a/TEMUKJD/UserForm/LoginForm.cs +++ b/TEMUKJD/UserForm/LoginForm.cs @@ -16,7 +16,7 @@ using Work; namespace TemuKJD.UserForm { - public partial class LoginForm : Form + public partial class LoginForm : BaseForm { private Point mouseOffset;//记录鼠标指针的坐标 diff --git a/TEMUKJD/UserForm/RegeditForm.cs b/TEMUKJD/UserForm/RegeditForm.cs index c01db5f..a4d8abf 100644 --- a/TEMUKJD/UserForm/RegeditForm.cs +++ b/TEMUKJD/UserForm/RegeditForm.cs @@ -13,7 +13,7 @@ using Work; namespace TemuKJD.UserForm { - public partial class RegeditForm : Form + public partial class RegeditForm : BaseForm { public LoginForm lf; private Point mouseOffset;//记录鼠标指针的坐标 diff --git a/TEMUKJD/UserForm/ResetPasswordForm.cs b/TEMUKJD/UserForm/ResetPasswordForm.cs index dcf77e8..fdcabd6 100644 --- a/TEMUKJD/UserForm/ResetPasswordForm.cs +++ b/TEMUKJD/UserForm/ResetPasswordForm.cs @@ -8,7 +8,7 @@ using Work; namespace TemuKJD.UserForm { - public partial class ResetPasswordForm : Form + public partial class ResetPasswordForm : BaseForm { private Point mouseOffset;//记录鼠标指针的坐标 private bool isMouseDown;//记录鼠标左键是否按下 diff --git a/Work/UserLogin.cs b/Work/UserLogin.cs index 9a398c6..43d3faa 100644 --- a/Work/UserLogin.cs +++ b/Work/UserLogin.cs @@ -84,7 +84,7 @@ namespace Work BaseClass.UserKey = BaseRegex.GetStringJson(ref html, "user_key").ParseToInt(); BaseClass.NickName = BaseRegex.GetStringJson(ref html, "nick_name"); BaseClass.UserName = BaseRegex.GetStringJson(ref html, "user_name"); - BaseClass.IsSa = BaseRegex.GetIntJson(ref html, "is_sa") == 1; + BaseClass.SaLevel = BaseRegex.GetIntJson(ref html, "is_sa").ParseToInt(); BaseClass.Mobile = BaseRegex.GetStringJson(ref html, "mobile"); BaseClass.UserVersion = BaseRegex.GetStringJson(ref html, "version").ParseToInt(); BaseClass.UserVersionString = BaseRegex.GetStringJson(ref html, "version_s");