diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs index 873fa30..6f1e755 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -31,7 +31,7 @@ namespace AllBase /// /// 版本ID /// - public static int VersionCount = 1285; + public static int VersionCount = 1286; public static string MainPath = "29wx"; //public static string MainPath = "29wx"; //public static string MainPath = "29pdd"; @@ -115,6 +115,7 @@ namespace AllBase public static decimal Balance { get; set; } = 0; public static decimal PostagePerOrder { get; set; } = 2.2m; public static decimal RefundPostagePerOrder { get; set; } = 2.5m; + public static decimal GiftOemAmountPerOrder { get; set; } = 0m; /// /// 采集最低销量 /// diff --git a/AllBase/Model/Result/ShopLoginInfo.cs b/AllBase/Model/Result/ShopLoginInfo.cs index ad7d46b..0530624 100644 --- a/AllBase/Model/Result/ShopLoginInfo.cs +++ b/AllBase/Model/Result/ShopLoginInfo.cs @@ -316,11 +316,11 @@ namespace AllBase.Model.Result /// /// 每一单中转退货快递费用 /// - public decimal refund_postage_per_order { get; set; } = 2.2m; + public decimal refund_postage_per_order { get; set; } = 2.5m; /// - /// 每一单退货费用 + /// 每一单礼物额外收取费用 /// - //public decimal refund_postage_per_order { get; set; } = 2.5m; + public decimal gift_oem_amount_per_order { get; set; } = 0m; /// /// 子账号禁止访问的页面 /// diff --git a/KJDService/KJD_WebService/BLL/WXXD/WXUserManage.cs b/KJDService/KJD_WebService/BLL/WXXD/WXUserManage.cs index 70c3a38..da1760d 100644 --- a/KJDService/KJD_WebService/BLL/WXXD/WXUserManage.cs +++ b/KJDService/KJD_WebService/BLL/WXXD/WXUserManage.cs @@ -97,8 +97,8 @@ namespace KJD_Web.BLL.WXXD string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; MysqlUtils mySql = new MysqlUtils(conn); - string sql = "select u.*,uu.authority as main_authority,uu.oem_id as main_oem_id,uu.postage_per_order as main_postage_per_order" + - ",uu.refund_postage_per_order as main_refund_postage_per_order " + + string sql = "select u.*,uu.authority as main_authority,uu.oem_id as main_oem_id,uu.postage_per_order as main_postage_per_order," + + "uu.refund_postage_per_order as main_refund_postage_per_order,uu.gift_oem_amount_per_order as main_gift_oem_amount_per_order " + "FROM wxxd.user u LEFT JOIN wxxd.user uu ON uu.user_name=u.parent_user_name where u.user_name='" + mobile + "' and u.password='" + password + "'"; @@ -136,11 +136,13 @@ namespace KJD_Web.BLL.WXXD recharge_amount_total = row.Table.Columns.Contains("recharge_amount_total") ? row["recharge_amount_total"].ParseToDecimal() : 0, postage_per_order = row.Table.Columns.Contains("postage_per_order") ? row["postage_per_order"].ParseToNullableDecimal() : null, refund_postage_per_order = row.Table.Columns.Contains("refund_postage_per_order") ? row["refund_postage_per_order"].ParseToNullableDecimal() : null, + gift_oem_amount_per_order = row.Table.Columns.Contains("gift_oem_amount_per_order") ? row["gift_oem_amount_per_order"].ParseToNullableDecimal() : null, }; var main_authority = row.Table.Columns.Contains("main_authority") ? row["main_authority"].ParseToString() : ""; var main_oem_id = row.Table.Columns.Contains("main_oem_id") ? row["main_oem_id"].ParseToString() : ""; var main_postage_per_order = row.Table.Columns.Contains("main_postage_per_order") ? row["main_postage_per_order"].ParseToDecimal() : 0m; var main_refund_postage_per_order = row.Table.Columns.Contains("main_refund_postage_per_order") ? row["main_refund_postage_per_order"].ParseToDecimal() : 0m; + var main_gift_oem_amount_per_order = row.Table.Columns.Contains("main_gift_oem_amount_per_order") ? row["main_gift_oem_amount_per_order"].ParseToDecimal() : 0m; // 填写子账号的父账号权限 if (user.group_id != "3") @@ -164,7 +166,8 @@ namespace KJD_Web.BLL.WXXD // 子账号每单扣费金额跟随主账号 user.postage_per_order = Math.Max(2.2m, main_postage_per_order); - user.refund_postage_per_order = Math.Max(2.2m, main_refund_postage_per_order); + user.refund_postage_per_order = Math.Max(2.5m, main_refund_postage_per_order); + user.gift_oem_amount_per_order = Math.Max(0m, main_gift_oem_amount_per_order); } if (string.IsNullOrEmpty(user.company_name)) { @@ -491,7 +494,8 @@ namespace KJD_Web.BLL.WXXD sql = "select u.*,uu.authority as main_authority,uu.oem_id as main_oem_id," + " uu.postage_per_order as main_postage_per_order," + - " uu.refund_postage_per_order as main_refund_postage_per_order,o.oem_name " + + " uu.refund_postage_per_order as main_refund_postage_per_order," + + " uu.gift_oem_amount_per_order as main_gift_oem_amount_per_order,o.oem_name " + " FROM wxxd.user u " + " LEFT JOIN wxxd.user uu ON uu.user_name=u.parent_user_name " + " LEFT JOIN wxxd.oem o ON uu.oem_id=o.oem_id or u.oem_id=o.oem_id " + @@ -537,11 +541,13 @@ namespace KJD_Web.BLL.WXXD recharge_amount_total = row.Table.Columns.Contains("recharge_amount_total") ? row["recharge_amount_total"].ParseToDecimal() : 0, postage_per_order = row.Table.Columns.Contains("postage_per_order") ? row["postage_per_order"].ParseToNullableDecimal() : null, refund_postage_per_order = row.Table.Columns.Contains("refund_postage_per_order") ? row["refund_postage_per_order"].ParseToNullableDecimal() : null, + gift_oem_amount_per_order = row.Table.Columns.Contains("gift_oem_amount_per_order") ? row["gift_oem_amount_per_order"].ParseToNullableDecimal() : null, }; var main_authority = row.Table.Columns.Contains("main_authority") ? row["main_authority"].ParseToString() : ""; var main_oem_id = row.Table.Columns.Contains("main_oem_id") ? row["main_oem_id"].ParseToString() : ""; var main_postage_per_order = row.Table.Columns.Contains("main_postage_per_order") ? row["main_postage_per_order"].ParseToDecimal() : 0m; var main_refund_postage_per_order = row.Table.Columns.Contains("main_refund_postage_per_order") ? row["main_refund_postage_per_order"].ParseToDecimal() : 0m; + var main_gift_oem_amount_per_order = row.Table.Columns.Contains("main_gift_oem_amount_per_order") ? row["main_gift_oem_amount_per_order"].ParseToDecimal() : 0m; if (user.group_id != "3") { @@ -563,6 +569,7 @@ namespace KJD_Web.BLL.WXXD // 子账号每单扣费金额跟随主账号 user.postage_per_order = Math.Max(2.2m, main_postage_per_order); user.refund_postage_per_order = Math.Max(2.5m, main_refund_postage_per_order); + user.gift_oem_amount_per_order = Math.Max(0m, main_gift_oem_amount_per_order); } if (string.IsNullOrEmpty(user.mobile)) { @@ -606,6 +613,9 @@ namespace KJD_Web.BLL.WXXD var refund_postage_per_order = RegexUtils.GetStringQuery(ref inputData, "refund_postage_per_order")?.Replace("'", "\\'"); if (refund_postage_per_order.ParseToDecimal() <= 2.5m) // 每单费用 refund_postage_per_order = "2.5"; + var gift_oem_amount_per_order = RegexUtils.GetStringQuery(ref inputData, "gift_oem_amount_per_order")?.Replace("'", "\\'"); + if (gift_oem_amount_per_order.ParseToDecimal() < 0m) // 每单费用 + gift_oem_amount_per_order = "0"; string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; MysqlUtils mySql = new MysqlUtils(conn); @@ -619,10 +629,10 @@ namespace KJD_Web.BLL.WXXD } sql = "insert into wxxd.user (nick_name,user_name,mobile,password,card_id,group_id,company_name,notes,sa_level,authority," + - "forbidden_page,shop_points_per_month,postage_per_order,refund_postage_per_order,oem_id,add_time,mdy_time) " + + "forbidden_page,shop_points_per_month,postage_per_order,refund_postage_per_order,gift_oem_amount_per_order,oem_id,add_time,mdy_time) " + "values ('" + nick_name + "','" + user_name + "','" + mobile + "','" + password + "','" + card_id + "','" + group_id + "','" + company_name + "','" + notes + "'," + sa_level + ",'" + authority + "','" + forbidden_page + "'," + - shop_points_per_month + ",'" + postage_per_order + "','" + refund_postage_per_order + "',@oem_id,'" + + shop_points_per_month + "," + postage_per_order + "," + refund_postage_per_order + "," + gift_oem_amount_per_order + ",@oem_id,'" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "','" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "');"; @@ -661,6 +671,7 @@ namespace KJD_Web.BLL.WXXD var shop_points_per_month = RegexUtils.GetStringQuery(ref inputData, "shop_points_per_month")?.Replace("'", "\\'"); var postage_per_order = RegexUtils.GetStringQuery(ref inputData, "postage_per_order")?.Replace("'", "\\'"); var refund_postage_per_order = RegexUtils.GetStringQuery(ref inputData, "refund_postage_per_order")?.Replace("'", "\\'"); + var gift_oem_amount_per_order = RegexUtils.GetStringQuery(ref inputData, "gift_oem_amount_per_order")?.Replace("'", "\\'"); var oem_id = RegexUtils.GetStringQuery(ref inputData, "oem_id")?.Replace("'", "\\'"); string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; @@ -697,6 +708,8 @@ namespace KJD_Web.BLL.WXXD sql += " postage_per_order=" + postage_per_order + ","; if (refund_postage_per_order != null) sql += " refund_postage_per_order=" + refund_postage_per_order + ","; + if (gift_oem_amount_per_order != null) + sql += " gift_oem_amount_per_order=" + gift_oem_amount_per_order + ","; if (oem_id != null) sql += " oem_id='" + oem_id + "',"; sql = sql.TrimEnd(','); diff --git a/KJDService/KJD_WebService/KJD_WebService.csproj b/KJDService/KJD_WebService/KJD_WebService.csproj index 29b6209..a7caf23 100644 --- a/KJDService/KJD_WebService/KJD_WebService.csproj +++ b/KJDService/KJD_WebService/KJD_WebService.csproj @@ -289,6 +289,7 @@ + Web.config diff --git a/KJDService/KJD_WebService/Model/UserLoginResultParam.cs b/KJDService/KJD_WebService/Model/UserLoginResultParam.cs index 52b56d2..8ac1038 100644 --- a/KJDService/KJD_WebService/Model/UserLoginResultParam.cs +++ b/KJDService/KJD_WebService/Model/UserLoginResultParam.cs @@ -101,5 +101,9 @@ namespace KJD_Web.Model /// 每单退货运费金额 /// public decimal? refund_postage_per_order { get; set; } + /// + /// 每一单礼物额外收取费用 + /// + public decimal? gift_oem_amount_per_order { get; set; } } } \ No newline at end of file diff --git a/TEMUKJD/KJDForms/AdminForms/AdminShopLoginForm.cs b/TEMUKJD/KJDForms/AdminForms/AdminShopLoginForm.cs index 56fa470..3ac0782 100644 --- a/TEMUKJD/KJDForms/AdminForms/AdminShopLoginForm.cs +++ b/TEMUKJD/KJDForms/AdminForms/AdminShopLoginForm.cs @@ -461,12 +461,12 @@ namespace TemuKJD.KJDForms.AdminForms if (cefWebBrowser == null) { //cefWebBrowser = CEFBrowser.CreateChromiumWebBrowser("about:blank", false); - var setting = new CefSettings(); - if (Cef.IsInitialized != true) - { - var rst = Cef.InitializeAsync(setting); - rst.Wait(); - } + //var setting = new CefSettings(); + //if (Cef.IsInitialized != true) + //{ + // var rst = Cef.InitializeAsync(setting); + // rst.Wait(); + //} if (!string.IsNullOrEmpty(InitUrl)) cefWebBrowser = CEFBrowser.CreateChromiumWebBrowser(InitUrl, true); diff --git a/TEMUKJD/PDDForms/AdminForms/PDDAdminShopLoginForm.cs b/TEMUKJD/PDDForms/AdminForms/PDDAdminShopLoginForm.cs index 970565a..b53c4b8 100644 --- a/TEMUKJD/PDDForms/AdminForms/PDDAdminShopLoginForm.cs +++ b/TEMUKJD/PDDForms/AdminForms/PDDAdminShopLoginForm.cs @@ -290,12 +290,12 @@ namespace TemuKJD.PDDForms.AdminForms if (cefWebBrowser == null) { //cefWebBrowser = CEFBrowser.CreateChromiumWebBrowser("about:blank", false); - var setting = new CefSettings(); - if (Cef.IsInitialized != true) - { - var rst = Cef.InitializeAsync(setting); - rst.Wait(); - } + //var setting = new CefSettings(); + //if (Cef.IsInitialized != true) + //{ + // var rst = Cef.InitializeAsync(setting); + // rst.Wait(); + //} if (!string.IsNullOrEmpty(InitUrl)) cefWebBrowser = CEFBrowser.CreateChromiumWebBrowser(InitUrl, true); diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminAccountBalanceForm.cs b/TEMUKJD/WXForms/AdminForms/WXAdminAccountBalanceForm.cs index 1699673..0404867 100644 --- a/TEMUKJD/WXForms/AdminForms/WXAdminAccountBalanceForm.cs +++ b/TEMUKJD/WXForms/AdminForms/WXAdminAccountBalanceForm.cs @@ -240,6 +240,7 @@ namespace TemuKJD.WXForms.AdminForms user.shop_points_per_month = BaseRegex.GetIntJson(ref oStr, "shop_points_per_month"); user.postage_per_order = BaseRegex.GetDecimalJson(ref oStr, "postage_per_order"); user.refund_postage_per_order = BaseRegex.GetDecimalJson(ref oStr, "refund_postage_per_order"); + user.gift_oem_amount_per_order = BaseRegex.GetDecimalJson(ref oStr, "gift_oem_amount_per_order"); user.oem_id = BaseRegex.GetStringJson(ref oStr, "oem_id"); user.oem_name = BaseRegex.GetStringJson(ref oStr, "oem_name"); var parent_user_name = BaseRegex.GetStringJson(ref oStr, "parent_user_name"); @@ -271,6 +272,8 @@ namespace TemuKJD.WXForms.AdminForms (user.group_id == "3") ? "改" : null, Math.Max(2.5m, user.refund_postage_per_order.ParseToDecimal()), (user.group_id == "3") ? "改" : null, + Math.Max(2.5m, user.gift_oem_amount_per_order.ParseToDecimal()), + (user.group_id == "3") ? "改" : null, user.group_id == "3" ? "添加店铺" : "", "编辑", "删除"); diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.Designer.cs b/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.Designer.cs index eca22d2..e40314f 100644 --- a/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.Designer.cs +++ b/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.Designer.cs @@ -30,42 +30,34 @@ namespace TemuKJD.WXForms.AdminForms private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer5 = new System.Windows.Forms.SplitContainer(); this.pnlSuperManage = new System.Windows.Forms.Panel(); + this.label30 = new System.Windows.Forms.Label(); this.chkActivityStock = new TemuKJD.UserComponent.UcCheckBox(this.components); this.chkSpBrand = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.label10 = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); this.txtOemId = new System.Windows.Forms.TextBox(); this.line1 = new DevComponents.DotNetBar.Controls.Line(); - this.label40 = new System.Windows.Forms.Label(); this.txtNickName = new System.Windows.Forms.TextBox(); - this.label39 = new System.Windows.Forms.Label(); this.txtMobile = new System.Windows.Forms.TextBox(); this.chkTraineeData = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.label38 = new System.Windows.Forms.Label(); this.line2 = new DevComponents.DotNetBar.Controls.Line(); this.txtPassword = new System.Windows.Forms.TextBox(); this.btnFilter = new DevComponents.DotNetBar.PanelEx(); - this.label37 = new System.Windows.Forms.Label(); this.cmbGroup = new System.Windows.Forms.ComboBox(); this.label36 = new System.Windows.Forms.Label(); this.label35 = new System.Windows.Forms.Label(); this.txtAuth = new System.Windows.Forms.TextBox(); this.label34 = new System.Windows.Forms.Label(); - this.label9 = new System.Windows.Forms.Label(); this.label33 = new System.Windows.Forms.Label(); this.chkProdFission = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.label32 = new System.Windows.Forms.Label(); this.chkCommissionUpdate = new TemuKJD.UserComponent.UcCheckBox(this.components); this.txtRePass = new System.Windows.Forms.TextBox(); this.chkEcWaybill = new TemuKJD.UserComponent.UcCheckBox(this.components); this.label31 = new System.Windows.Forms.Label(); this.chkHot = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.label30 = new System.Windows.Forms.Label(); this.chkShopOptimize = new TemuKJD.UserComponent.UcCheckBox(this.components); this.btnOpUser = new TemuKJD.UserControls.ButtonEx(); this.chkChanceProdCollect = new TemuKJD.UserComponent.UcCheckBox(this.components); @@ -74,18 +66,34 @@ namespace TemuKJD.WXForms.AdminForms this.label1 = new System.Windows.Forms.Label(); this.chkWXShowProdGetFromType = new TemuKJD.UserComponent.UcCheckBox(this.components); this.label2 = new System.Windows.Forms.Label(); - this.label7 = new System.Windows.Forms.Label(); this.txtCompany = new System.Windows.Forms.TextBox(); this.chkWXComplateProd = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.label3 = new System.Windows.Forms.Label(); this.cmbSaLevel = new System.Windows.Forms.ComboBox(); this.cmbSearchGroup = new System.Windows.Forms.ComboBox(); + this.label7 = new System.Windows.Forms.Label(); + this.label10 = new System.Windows.Forms.Label(); + this.label40 = new System.Windows.Forms.Label(); + this.label39 = new System.Windows.Forms.Label(); + this.label38 = new System.Windows.Forms.Label(); + this.label37 = new System.Windows.Forms.Label(); + this.label32 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); this.label6 = new System.Windows.Forms.Label(); + this.label5 = new System.Windows.Forms.Label(); + this.label9 = new System.Windows.Forms.Label(); this.btnSearch = new DevComponents.DotNetBar.PanelEx(); this.lblWatermark = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); this.txtSearch = new System.Windows.Forms.TextBox(); + this.label4 = new System.Windows.Forms.Label(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.pnlGiftOemAmountPerOrder = new System.Windows.Forms.Panel(); + this.lblGiftOemAmountPerOrderUserId = new System.Windows.Forms.Label(); + this.lblGiftOemAmountPerOrderUserInfo = new System.Windows.Forms.Label(); + this.panel7 = new System.Windows.Forms.Panel(); + this.numGiftOemAmountPerOrder = new System.Windows.Forms.NumericUpDown(); + this.label15 = new System.Windows.Forms.Label(); + this.btnGiftOemAmountPerOrderCancel = new DevComponents.DotNetBar.PanelEx(); + this.btnGiftOemAmountPerOrder = new DevComponents.DotNetBar.PanelEx(); this.pnlRefundPostagePerOrder = new System.Windows.Forms.Panel(); this.lblRefundPostagePerOrderUserId = new System.Windows.Forms.Label(); this.lblRefundPostagePerOrderUserInfo = new System.Windows.Forms.Label(); @@ -131,7 +139,6 @@ namespace TemuKJD.WXForms.AdminForms this.btnTopUpCancel = new DevComponents.DotNetBar.PanelEx(); this.btnTopUpOK = new DevComponents.DotNetBar.PanelEx(); this.dgvUser = new TemuKJD.UserComponent.DataGridViewEx(); - this.btnExportShopErp = new DevComponents.DotNetBar.PanelEx(); this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.UserIdColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.UserNickNameColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -156,9 +163,12 @@ namespace TemuKJD.WXForms.AdminForms this.colChangePostagePerOrder = new System.Windows.Forms.DataGridViewLinkColumn(); this.colRefundPostagePerOrder = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colChangeRefundPostagePerOrder = new System.Windows.Forms.DataGridViewLinkColumn(); + this.colGiftOemAmountPerOrder = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colChangeGiftOemAmountPerOrder = new System.Windows.Forms.DataGridViewLinkColumn(); this.colAddShop = new System.Windows.Forms.DataGridViewLinkColumn(); this.editColumn = new System.Windows.Forms.DataGridViewLinkColumn(); this.deleteColumn = new System.Windows.Forms.DataGridViewLinkColumn(); + this.btnExportShopErp = new DevComponents.DotNetBar.PanelEx(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer5)).BeginInit(); this.splitContainer5.Panel1.SuspendLayout(); this.splitContainer5.Panel2.SuspendLayout(); @@ -168,6 +178,9 @@ namespace TemuKJD.WXForms.AdminForms this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.SuspendLayout(); + this.pnlGiftOemAmountPerOrder.SuspendLayout(); + this.panel7.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numGiftOemAmountPerOrder)).BeginInit(); this.pnlRefundPostagePerOrder.SuspendLayout(); this.panel6.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.numRefundPostagePerOrder)).BeginInit(); @@ -200,15 +213,15 @@ namespace TemuKJD.WXForms.AdminForms this.splitContainer5.Panel1.Controls.Add(this.pnlSuperManage); this.splitContainer5.Panel1.Controls.Add(this.btnSearch); this.splitContainer5.Panel1.Controls.Add(this.lblWatermark); - this.splitContainer5.Panel1.Controls.Add(this.label4); this.splitContainer5.Panel1.Controls.Add(this.txtSearch); + this.splitContainer5.Panel1.Controls.Add(this.label4); // // splitContainer5.Panel2 // this.splitContainer5.Panel2.Controls.Add(this.splitContainer1); this.splitContainer5.Panel2.Padding = new System.Windows.Forms.Padding(0, 5, 5, 5); this.splitContainer5.Size = new System.Drawing.Size(1484, 661); - this.splitContainer5.SplitterDistance = 340; + this.splitContainer5.SplitterDistance = 306; this.splitContainer5.SplitterWidth = 1; this.splitContainer5.TabIndex = 3; // @@ -217,37 +230,29 @@ namespace TemuKJD.WXForms.AdminForms this.pnlSuperManage.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); + this.pnlSuperManage.Controls.Add(this.label30); this.pnlSuperManage.Controls.Add(this.chkActivityStock); this.pnlSuperManage.Controls.Add(this.chkSpBrand); - this.pnlSuperManage.Controls.Add(this.label10); - this.pnlSuperManage.Controls.Add(this.label5); this.pnlSuperManage.Controls.Add(this.txtOemId); this.pnlSuperManage.Controls.Add(this.line1); - this.pnlSuperManage.Controls.Add(this.label40); this.pnlSuperManage.Controls.Add(this.txtNickName); - this.pnlSuperManage.Controls.Add(this.label39); this.pnlSuperManage.Controls.Add(this.txtMobile); this.pnlSuperManage.Controls.Add(this.chkTraineeData); - this.pnlSuperManage.Controls.Add(this.label38); this.pnlSuperManage.Controls.Add(this.line2); this.pnlSuperManage.Controls.Add(this.txtPassword); this.pnlSuperManage.Controls.Add(this.btnFilter); - this.pnlSuperManage.Controls.Add(this.label37); this.pnlSuperManage.Controls.Add(this.cmbGroup); this.pnlSuperManage.Controls.Add(this.label36); this.pnlSuperManage.Controls.Add(this.label35); this.pnlSuperManage.Controls.Add(this.txtAuth); this.pnlSuperManage.Controls.Add(this.label34); - this.pnlSuperManage.Controls.Add(this.label9); this.pnlSuperManage.Controls.Add(this.label33); this.pnlSuperManage.Controls.Add(this.chkProdFission); - this.pnlSuperManage.Controls.Add(this.label32); this.pnlSuperManage.Controls.Add(this.chkCommissionUpdate); this.pnlSuperManage.Controls.Add(this.txtRePass); this.pnlSuperManage.Controls.Add(this.chkEcWaybill); this.pnlSuperManage.Controls.Add(this.label31); this.pnlSuperManage.Controls.Add(this.chkHot); - this.pnlSuperManage.Controls.Add(this.label30); this.pnlSuperManage.Controls.Add(this.chkShopOptimize); this.pnlSuperManage.Controls.Add(this.btnOpUser); this.pnlSuperManage.Controls.Add(this.chkChanceProdCollect); @@ -256,21 +261,39 @@ namespace TemuKJD.WXForms.AdminForms this.pnlSuperManage.Controls.Add(this.label1); this.pnlSuperManage.Controls.Add(this.chkWXShowProdGetFromType); this.pnlSuperManage.Controls.Add(this.label2); - this.pnlSuperManage.Controls.Add(this.label7); this.pnlSuperManage.Controls.Add(this.txtCompany); this.pnlSuperManage.Controls.Add(this.chkWXComplateProd); - this.pnlSuperManage.Controls.Add(this.label3); this.pnlSuperManage.Controls.Add(this.cmbSaLevel); this.pnlSuperManage.Controls.Add(this.cmbSearchGroup); + this.pnlSuperManage.Controls.Add(this.label7); + this.pnlSuperManage.Controls.Add(this.label10); + this.pnlSuperManage.Controls.Add(this.label40); + this.pnlSuperManage.Controls.Add(this.label39); + this.pnlSuperManage.Controls.Add(this.label38); + this.pnlSuperManage.Controls.Add(this.label37); + this.pnlSuperManage.Controls.Add(this.label32); + this.pnlSuperManage.Controls.Add(this.label3); this.pnlSuperManage.Controls.Add(this.label6); + this.pnlSuperManage.Controls.Add(this.label5); + this.pnlSuperManage.Controls.Add(this.label9); this.pnlSuperManage.Location = new System.Drawing.Point(4, 32); this.pnlSuperManage.Name = "pnlSuperManage"; - this.pnlSuperManage.Size = new System.Drawing.Size(333, 623); + this.pnlSuperManage.Size = new System.Drawing.Size(299, 623); this.pnlSuperManage.TabIndex = 851; // + // label30 + // + this.label30.AutoSize = true; + this.label30.ForeColor = System.Drawing.SystemColors.ButtonShadow; + this.label30.Location = new System.Drawing.Point(247, 144); + this.label30.Name = "label30"; + this.label30.Size = new System.Drawing.Size(56, 17); + this.label30.TabIndex = 33; + this.label30.Text = "登录使用"; + // // chkActivityStock // - this.chkActivityStock.Location = new System.Drawing.Point(175, 474); + this.chkActivityStock.Location = new System.Drawing.Point(165, 474); this.chkActivityStock.Name = "chkActivityStock"; this.chkActivityStock.Size = new System.Drawing.Size(68, 21); this.chkActivityStock.TabIndex = 852; @@ -279,36 +302,16 @@ namespace TemuKJD.WXForms.AdminForms // // chkSpBrand // - this.chkSpBrand.Location = new System.Drawing.Point(95, 474); + this.chkSpBrand.Location = new System.Drawing.Point(85, 474); this.chkSpBrand.Name = "chkSpBrand"; this.chkSpBrand.Size = new System.Drawing.Size(68, 21); this.chkSpBrand.TabIndex = 848; this.chkSpBrand.Text = "定向品牌"; this.chkSpBrand.UseVisualStyleBackColor = true; // - // label10 - // - this.label10.AutoSize = true; - this.label10.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label10.Location = new System.Drawing.Point(10, 294); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(79, 20); - this.label10.TabIndex = 844; - this.label10.Text = "代理编码："; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(10, 5); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(79, 20); - this.label5.TabIndex = 43; - this.label5.Text = "搜索分组："; - // // txtOemId // - this.txtOemId.Location = new System.Drawing.Point(95, 293); + this.txtOemId.Location = new System.Drawing.Point(85, 293); this.txtOemId.Name = "txtOemId"; this.txtOemId.Size = new System.Drawing.Size(148, 23); this.txtOemId.TabIndex = 843; @@ -317,74 +320,44 @@ namespace TemuKJD.WXForms.AdminForms // this.line1.Location = new System.Drawing.Point(14, 31); this.line1.Name = "line1"; - this.line1.Size = new System.Drawing.Size(307, 10); + this.line1.Size = new System.Drawing.Size(300, 10); this.line1.TabIndex = 818; this.line1.Text = "line1"; // - // label40 - // - this.label40.AutoSize = true; - this.label40.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label40.Location = new System.Drawing.Point(38, 112); - this.label40.Name = "label40"; - this.label40.Size = new System.Drawing.Size(51, 20); - this.label40.TabIndex = 18; - this.label40.Text = "昵称："; - // // txtNickName // - this.txtNickName.Location = new System.Drawing.Point(95, 111); + this.txtNickName.Location = new System.Drawing.Point(85, 111); this.txtNickName.Name = "txtNickName"; this.txtNickName.Size = new System.Drawing.Size(148, 23); this.txtNickName.TabIndex = 19; // - // label39 - // - this.label39.AutoSize = true; - this.label39.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label39.Location = new System.Drawing.Point(24, 142); - this.label39.Name = "label39"; - this.label39.Size = new System.Drawing.Size(65, 20); - this.label39.TabIndex = 20; - this.label39.Text = "手机号："; - // // txtMobile // - this.txtMobile.Location = new System.Drawing.Point(95, 141); + this.txtMobile.Location = new System.Drawing.Point(85, 141); this.txtMobile.Name = "txtMobile"; this.txtMobile.Size = new System.Drawing.Size(148, 23); this.txtMobile.TabIndex = 21; // // chkTraineeData // - this.chkTraineeData.Location = new System.Drawing.Point(175, 445); + this.chkTraineeData.Location = new System.Drawing.Point(165, 445); this.chkTraineeData.Name = "chkTraineeData"; this.chkTraineeData.Size = new System.Drawing.Size(68, 21); this.chkTraineeData.TabIndex = 829; this.chkTraineeData.Text = "学员数据"; this.chkTraineeData.UseVisualStyleBackColor = true; // - // label38 - // - this.label38.AutoSize = true; - this.label38.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label38.Location = new System.Drawing.Point(38, 172); - this.label38.Name = "label38"; - this.label38.Size = new System.Drawing.Size(51, 20); - this.label38.TabIndex = 22; - this.label38.Text = "密码："; - // // line2 // this.line2.Location = new System.Drawing.Point(13, 67); this.line2.Name = "line2"; - this.line2.Size = new System.Drawing.Size(307, 10); + this.line2.Size = new System.Drawing.Size(300, 10); this.line2.TabIndex = 825; this.line2.Text = "line2"; // // txtPassword // - this.txtPassword.Location = new System.Drawing.Point(95, 171); + this.txtPassword.Location = new System.Drawing.Point(85, 171); this.txtPassword.Name = "txtPassword"; this.txtPassword.PasswordChar = '*'; this.txtPassword.Size = new System.Drawing.Size(148, 23); @@ -396,9 +369,9 @@ namespace TemuKJD.WXForms.AdminForms this.btnFilter.Cursor = System.Windows.Forms.Cursors.Hand; this.btnFilter.DisabledBackColor = System.Drawing.Color.Empty; this.btnFilter.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnFilter.Location = new System.Drawing.Point(252, 42); + this.btnFilter.Location = new System.Drawing.Point(235, 42); this.btnFilter.Name = "btnFilter"; - this.btnFilter.Size = new System.Drawing.Size(68, 23); + this.btnFilter.Size = new System.Drawing.Size(62, 23); this.btnFilter.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnFilter.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnFilter.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -414,16 +387,6 @@ namespace TemuKJD.WXForms.AdminForms this.btnFilter.Text = "过滤"; this.btnFilter.Click += new System.EventHandler(this.btnFilter_Click); // - // label37 - // - this.label37.AutoSize = true; - this.label37.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label37.Location = new System.Drawing.Point(38, 233); - this.label37.Name = "label37"; - this.label37.Size = new System.Drawing.Size(51, 20); - this.label37.TabIndex = 25; - this.label37.Text = "分组："; - // // cmbGroup // this.cmbGroup.FormattingEnabled = true; @@ -433,7 +396,7 @@ namespace TemuKJD.WXForms.AdminForms "上货", "数据", "登录"}); - this.cmbGroup.Location = new System.Drawing.Point(95, 231); + this.cmbGroup.Location = new System.Drawing.Point(85, 231); this.cmbGroup.Name = "cmbGroup"; this.cmbGroup.Size = new System.Drawing.Size(148, 25); this.cmbGroup.TabIndex = 26; @@ -443,7 +406,7 @@ namespace TemuKJD.WXForms.AdminForms // this.label36.AutoSize = true; this.label36.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128))))); - this.label36.Location = new System.Drawing.Point(249, 114); + this.label36.Location = new System.Drawing.Point(239, 114); this.label36.Name = "label36"; this.label36.Size = new System.Drawing.Size(13, 17); this.label36.TabIndex = 27; @@ -453,7 +416,7 @@ namespace TemuKJD.WXForms.AdminForms // this.label35.AutoSize = true; this.label35.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128))))); - this.label35.Location = new System.Drawing.Point(249, 144); + this.label35.Location = new System.Drawing.Point(239, 144); this.label35.Name = "label35"; this.label35.Size = new System.Drawing.Size(13, 17); this.label35.TabIndex = 28; @@ -461,7 +424,7 @@ namespace TemuKJD.WXForms.AdminForms // // txtAuth // - this.txtAuth.Location = new System.Drawing.Point(95, 42); + this.txtAuth.Location = new System.Drawing.Point(85, 42); this.txtAuth.Name = "txtAuth"; this.txtAuth.Size = new System.Drawing.Size(148, 23); this.txtAuth.TabIndex = 820; @@ -470,27 +433,17 @@ namespace TemuKJD.WXForms.AdminForms // this.label34.AutoSize = true; this.label34.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128))))); - this.label34.Location = new System.Drawing.Point(249, 174); + this.label34.Location = new System.Drawing.Point(239, 174); this.label34.Name = "label34"; this.label34.Size = new System.Drawing.Size(13, 17); this.label34.TabIndex = 29; this.label34.Text = "*"; // - // label9 - // - this.label9.AutoSize = true; - this.label9.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label9.Location = new System.Drawing.Point(10, 43); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(79, 20); - this.label9.TabIndex = 819; - this.label9.Text = "权限过滤："; - // // label33 // this.label33.AutoSize = true; this.label33.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128))))); - this.label33.Location = new System.Drawing.Point(249, 235); + this.label33.Location = new System.Drawing.Point(239, 235); this.label33.Name = "label33"; this.label33.Size = new System.Drawing.Size(13, 17); this.label33.TabIndex = 30; @@ -498,26 +451,16 @@ namespace TemuKJD.WXForms.AdminForms // // chkProdFission // - this.chkProdFission.Location = new System.Drawing.Point(95, 445); + this.chkProdFission.Location = new System.Drawing.Point(85, 445); this.chkProdFission.Name = "chkProdFission"; this.chkProdFission.Size = new System.Drawing.Size(68, 21); this.chkProdFission.TabIndex = 817; this.chkProdFission.Text = "裂变调试"; this.chkProdFission.UseVisualStyleBackColor = true; // - // label32 - // - this.label32.AutoSize = true; - this.label32.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label32.Location = new System.Drawing.Point(10, 202); - this.label32.Name = "label32"; - this.label32.Size = new System.Drawing.Size(79, 20); - this.label32.TabIndex = 31; - this.label32.Text = "重复密码："; - // // chkCommissionUpdate // - this.chkCommissionUpdate.Location = new System.Drawing.Point(175, 401); + this.chkCommissionUpdate.Location = new System.Drawing.Point(165, 401); this.chkCommissionUpdate.Name = "chkCommissionUpdate"; this.chkCommissionUpdate.Size = new System.Drawing.Size(68, 21); this.chkCommissionUpdate.TabIndex = 816; @@ -526,7 +469,7 @@ namespace TemuKJD.WXForms.AdminForms // // txtRePass // - this.txtRePass.Location = new System.Drawing.Point(95, 201); + this.txtRePass.Location = new System.Drawing.Point(85, 201); this.txtRePass.Name = "txtRePass"; this.txtRePass.PasswordChar = '*'; this.txtRePass.Size = new System.Drawing.Size(148, 23); @@ -534,7 +477,7 @@ namespace TemuKJD.WXForms.AdminForms // // chkEcWaybill // - this.chkEcWaybill.Location = new System.Drawing.Point(95, 401); + this.chkEcWaybill.Location = new System.Drawing.Point(85, 401); this.chkEcWaybill.Name = "chkEcWaybill"; this.chkEcWaybill.Size = new System.Drawing.Size(68, 21); this.chkEcWaybill.TabIndex = 815; @@ -545,7 +488,7 @@ namespace TemuKJD.WXForms.AdminForms // this.label31.AutoSize = true; this.label31.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128))))); - this.label31.Location = new System.Drawing.Point(249, 204); + this.label31.Location = new System.Drawing.Point(239, 204); this.label31.Name = "label31"; this.label31.Size = new System.Drawing.Size(13, 17); this.label31.TabIndex = 32; @@ -553,26 +496,16 @@ namespace TemuKJD.WXForms.AdminForms // // chkHot // - this.chkHot.Location = new System.Drawing.Point(175, 380); + this.chkHot.Location = new System.Drawing.Point(165, 380); this.chkHot.Name = "chkHot"; this.chkHot.Size = new System.Drawing.Size(68, 21); this.chkHot.TabIndex = 814; this.chkHot.Text = "爆款数据"; this.chkHot.UseVisualStyleBackColor = true; // - // label30 - // - this.label30.AutoSize = true; - this.label30.ForeColor = System.Drawing.SystemColors.ButtonShadow; - this.label30.Location = new System.Drawing.Point(265, 144); - this.label30.Name = "label30"; - this.label30.Size = new System.Drawing.Size(56, 17); - this.label30.TabIndex = 33; - this.label30.Text = "登录使用"; - // // chkShopOptimize // - this.chkShopOptimize.Location = new System.Drawing.Point(95, 380); + this.chkShopOptimize.Location = new System.Drawing.Point(85, 380); this.chkShopOptimize.Name = "chkShopOptimize"; this.chkShopOptimize.Size = new System.Drawing.Size(68, 21); this.chkShopOptimize.TabIndex = 813; @@ -597,7 +530,7 @@ namespace TemuKJD.WXForms.AdminForms // // chkChanceProdCollect // - this.chkChanceProdCollect.Location = new System.Drawing.Point(175, 422); + this.chkChanceProdCollect.Location = new System.Drawing.Point(165, 422); this.chkChanceProdCollect.Name = "chkChanceProdCollect"; this.chkChanceProdCollect.Size = new System.Drawing.Size(68, 21); this.chkChanceProdCollect.TabIndex = 812; @@ -623,7 +556,7 @@ namespace TemuKJD.WXForms.AdminForms // // chkShopPoints // - this.chkShopPoints.Location = new System.Drawing.Point(95, 423); + this.chkShopPoints.Location = new System.Drawing.Point(85, 423); this.chkShopPoints.Name = "chkShopPoints"; this.chkShopPoints.Size = new System.Drawing.Size(68, 21); this.chkShopPoints.TabIndex = 811; @@ -634,7 +567,7 @@ namespace TemuKJD.WXForms.AdminForms // this.label1.AutoSize = true; this.label1.ForeColor = System.Drawing.SystemColors.ButtonShadow; - this.label1.Location = new System.Drawing.Point(30, 500); + this.label1.Location = new System.Drawing.Point(26, 503); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(236, 68); this.label1.TabIndex = 37; @@ -642,7 +575,7 @@ namespace TemuKJD.WXForms.AdminForms // // chkWXShowProdGetFromType // - this.chkWXShowProdGetFromType.Location = new System.Drawing.Point(175, 359); + this.chkWXShowProdGetFromType.Location = new System.Drawing.Point(165, 359); this.chkWXShowProdGetFromType.Name = "chkWXShowProdGetFromType"; this.chkWXShowProdGetFromType.Size = new System.Drawing.Size(68, 21); this.chkWXShowProdGetFromType.TabIndex = 810; @@ -654,48 +587,28 @@ namespace TemuKJD.WXForms.AdminForms this.label2.AutoSize = true; this.label2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label2.ForeColor = System.Drawing.SystemColors.ButtonShadow; - this.label2.Location = new System.Drawing.Point(100, 81); + this.label2.Location = new System.Drawing.Point(90, 81); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(135, 20); this.label2.TabIndex = 38; this.label2.Text = "添加或编辑用户账户"; // - // label7 - // - this.label7.AutoSize = true; - this.label7.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label7.Location = new System.Drawing.Point(38, 359); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(51, 20); - this.label7.TabIndex = 809; - this.label7.Text = "权限："; - // // txtCompany // - this.txtCompany.Location = new System.Drawing.Point(95, 263); + this.txtCompany.Location = new System.Drawing.Point(85, 263); this.txtCompany.Name = "txtCompany"; this.txtCompany.Size = new System.Drawing.Size(148, 23); this.txtCompany.TabIndex = 39; // // chkWXComplateProd // - this.chkWXComplateProd.Location = new System.Drawing.Point(95, 359); + this.chkWXComplateProd.Location = new System.Drawing.Point(85, 359); this.chkWXComplateProd.Name = "chkWXComplateProd"; this.chkWXComplateProd.Size = new System.Drawing.Size(68, 21); this.chkWXComplateProd.TabIndex = 808; this.chkWXComplateProd.Text = "微信回采"; this.chkWXComplateProd.UseVisualStyleBackColor = true; // - // label3 - // - this.label3.AutoSize = true; - this.label3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(38, 264); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(51, 20); - this.label3.TabIndex = 40; - this.label3.Text = "公司："; - // // cmbSaLevel // this.cmbSaLevel.FormattingEnabled = true; @@ -703,7 +616,7 @@ namespace TemuKJD.WXForms.AdminForms "普通用户", "一级超管", "二级超管"}); - this.cmbSaLevel.Location = new System.Drawing.Point(95, 323); + this.cmbSaLevel.Location = new System.Drawing.Point(85, 323); this.cmbSaLevel.Name = "cmbSaLevel"; this.cmbSaLevel.Size = new System.Drawing.Size(148, 25); this.cmbSaLevel.TabIndex = 48; @@ -718,12 +631,92 @@ namespace TemuKJD.WXForms.AdminForms "上货", "数据", "登录"}); - this.cmbSearchGroup.Location = new System.Drawing.Point(95, 5); + this.cmbSearchGroup.Location = new System.Drawing.Point(85, 5); this.cmbSearchGroup.Name = "cmbSearchGroup"; this.cmbSearchGroup.Size = new System.Drawing.Size(148, 25); this.cmbSearchGroup.TabIndex = 44; this.cmbSearchGroup.Text = "主账户"; // + // label7 + // + this.label7.AutoSize = true; + this.label7.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label7.Location = new System.Drawing.Point(38, 359); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(51, 20); + this.label7.TabIndex = 809; + this.label7.Text = "权限："; + // + // label10 + // + this.label10.AutoSize = true; + this.label10.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label10.Location = new System.Drawing.Point(10, 294); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(79, 20); + this.label10.TabIndex = 844; + this.label10.Text = "代理编码："; + // + // label40 + // + this.label40.AutoSize = true; + this.label40.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label40.Location = new System.Drawing.Point(38, 112); + this.label40.Name = "label40"; + this.label40.Size = new System.Drawing.Size(51, 20); + this.label40.TabIndex = 18; + this.label40.Text = "昵称："; + // + // label39 + // + this.label39.AutoSize = true; + this.label39.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label39.Location = new System.Drawing.Point(24, 142); + this.label39.Name = "label39"; + this.label39.Size = new System.Drawing.Size(65, 20); + this.label39.TabIndex = 20; + this.label39.Text = "手机号："; + // + // label38 + // + this.label38.AutoSize = true; + this.label38.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label38.Location = new System.Drawing.Point(38, 172); + this.label38.Name = "label38"; + this.label38.Size = new System.Drawing.Size(51, 20); + this.label38.TabIndex = 22; + this.label38.Text = "密码："; + // + // label37 + // + this.label37.AutoSize = true; + this.label37.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label37.Location = new System.Drawing.Point(38, 233); + this.label37.Name = "label37"; + this.label37.Size = new System.Drawing.Size(51, 20); + this.label37.TabIndex = 25; + this.label37.Text = "分组："; + // + // label32 + // + this.label32.AutoSize = true; + this.label32.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label32.Location = new System.Drawing.Point(10, 202); + this.label32.Name = "label32"; + this.label32.Size = new System.Drawing.Size(79, 20); + this.label32.TabIndex = 31; + this.label32.Text = "重复密码："; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label3.Location = new System.Drawing.Point(38, 264); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(51, 20); + this.label3.TabIndex = 40; + this.label3.Text = "公司："; + // // label6 // this.label6.AutoSize = true; @@ -734,15 +727,35 @@ namespace TemuKJD.WXForms.AdminForms this.label6.TabIndex = 47; this.label6.Text = "超管等级："; // + // label5 + // + this.label5.AutoSize = true; + this.label5.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label5.Location = new System.Drawing.Point(10, 7); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(79, 20); + this.label5.TabIndex = 43; + this.label5.Text = "搜索分组："; + // + // label9 + // + this.label9.AutoSize = true; + this.label9.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label9.Location = new System.Drawing.Point(10, 43); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(79, 20); + this.label9.TabIndex = 819; + this.label9.Text = "权限过滤："; + // // btnSearch // this.btnSearch.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSearch.DisabledBackColor = System.Drawing.Color.Empty; this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSearch.Location = new System.Drawing.Point(257, 7); + this.btnSearch.Location = new System.Drawing.Point(240, 7); this.btnSearch.Name = "btnSearch"; - this.btnSearch.Size = new System.Drawing.Size(68, 23); + this.btnSearch.Size = new System.Drawing.Size(62, 23); this.btnSearch.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnSearch.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnSearch.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -763,13 +776,20 @@ namespace TemuKJD.WXForms.AdminForms this.lblWatermark.AutoSize = true; this.lblWatermark.BackColor = System.Drawing.Color.White; this.lblWatermark.ForeColor = System.Drawing.SystemColors.ButtonShadow; - this.lblWatermark.Location = new System.Drawing.Point(100, 10); + this.lblWatermark.Location = new System.Drawing.Point(90, 10); this.lblWatermark.Name = "lblWatermark"; this.lblWatermark.Size = new System.Drawing.Size(140, 17); this.lblWatermark.TabIndex = 45; this.lblWatermark.Text = "查询用户名、昵称或公司"; this.lblWatermark.Click += new System.EventHandler(this.lblWatermark_Click); // + // txtSearch + // + this.txtSearch.Location = new System.Drawing.Point(89, 7); + this.txtSearch.Name = "txtSearch"; + this.txtSearch.Size = new System.Drawing.Size(148, 23); + this.txtSearch.TabIndex = 41; + // // label4 // this.label4.AutoSize = true; @@ -780,13 +800,6 @@ namespace TemuKJD.WXForms.AdminForms this.label4.TabIndex = 42; this.label4.Text = "搜索条件："; // - // txtSearch - // - this.txtSearch.Location = new System.Drawing.Point(99, 7); - this.txtSearch.Name = "txtSearch"; - this.txtSearch.Size = new System.Drawing.Size(148, 23); - this.txtSearch.TabIndex = 41; - // // splitContainer1 // this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; @@ -797,6 +810,7 @@ namespace TemuKJD.WXForms.AdminForms // // splitContainer1.Panel1 // + this.splitContainer1.Panel1.Controls.Add(this.pnlGiftOemAmountPerOrder); this.splitContainer1.Panel1.Controls.Add(this.pnlRefundPostagePerOrder); this.splitContainer1.Panel1.Controls.Add(this.pnlPostagePerOrder); this.splitContainer1.Panel1.Controls.Add(this.pnlBalance); @@ -807,10 +821,125 @@ namespace TemuKJD.WXForms.AdminForms // splitContainer1.Panel2 // this.splitContainer1.Panel2.Controls.Add(this.btnExportShopErp); - this.splitContainer1.Size = new System.Drawing.Size(1138, 651); + this.splitContainer1.Size = new System.Drawing.Size(1172, 651); this.splitContainer1.SplitterDistance = 620; this.splitContainer1.TabIndex = 2; // + // pnlGiftOemAmountPerOrder + // + this.pnlGiftOemAmountPerOrder.Anchor = System.Windows.Forms.AnchorStyles.None; + this.pnlGiftOemAmountPerOrder.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.pnlGiftOemAmountPerOrder.Controls.Add(this.lblGiftOemAmountPerOrderUserId); + this.pnlGiftOemAmountPerOrder.Controls.Add(this.lblGiftOemAmountPerOrderUserInfo); + this.pnlGiftOemAmountPerOrder.Controls.Add(this.panel7); + this.pnlGiftOemAmountPerOrder.Location = new System.Drawing.Point(40, 237); + this.pnlGiftOemAmountPerOrder.Name = "pnlGiftOemAmountPerOrder"; + this.pnlGiftOemAmountPerOrder.Size = new System.Drawing.Size(360, 146); + this.pnlGiftOemAmountPerOrder.TabIndex = 15; + this.pnlGiftOemAmountPerOrder.Visible = false; + // + // lblGiftOemAmountPerOrderUserId + // + this.lblGiftOemAmountPerOrderUserId.AutoSize = true; + this.lblGiftOemAmountPerOrderUserId.Location = new System.Drawing.Point(256, 19); + this.lblGiftOemAmountPerOrderUserId.Name = "lblGiftOemAmountPerOrderUserId"; + this.lblGiftOemAmountPerOrderUserId.Size = new System.Drawing.Size(47, 17); + this.lblGiftOemAmountPerOrderUserId.TabIndex = 457; + this.lblGiftOemAmountPerOrderUserId.Text = "UserId"; + this.lblGiftOemAmountPerOrderUserId.Visible = false; + // + // lblGiftOemAmountPerOrderUserInfo + // + this.lblGiftOemAmountPerOrderUserInfo.AutoSize = true; + this.lblGiftOemAmountPerOrderUserInfo.Location = new System.Drawing.Point(20, 19); + this.lblGiftOemAmountPerOrderUserInfo.Name = "lblGiftOemAmountPerOrderUserInfo"; + this.lblGiftOemAmountPerOrderUserInfo.Size = new System.Drawing.Size(58, 17); + this.lblGiftOemAmountPerOrderUserInfo.TabIndex = 455; + this.lblGiftOemAmountPerOrderUserInfo.Text = "UserInfo"; + // + // panel7 + // + this.panel7.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.panel7.Controls.Add(this.numGiftOemAmountPerOrder); + this.panel7.Controls.Add(this.label15); + this.panel7.Controls.Add(this.btnGiftOemAmountPerOrderCancel); + this.panel7.Controls.Add(this.btnGiftOemAmountPerOrder); + this.panel7.Location = new System.Drawing.Point(23, 52); + this.panel7.Name = "panel7"; + this.panel7.Size = new System.Drawing.Size(310, 57); + this.panel7.TabIndex = 454; + // + // numGiftOemAmountPerOrder + // + this.numGiftOemAmountPerOrder.DecimalPlaces = 2; + this.numGiftOemAmountPerOrder.Location = new System.Drawing.Point(125, 16); + this.numGiftOemAmountPerOrder.Maximum = new decimal(new int[] { + 100000, + 0, + 0, + 0}); + this.numGiftOemAmountPerOrder.Name = "numGiftOemAmountPerOrder"; + this.numGiftOemAmountPerOrder.Size = new System.Drawing.Size(56, 23); + this.numGiftOemAmountPerOrder.TabIndex = 1; + // + // label15 + // + this.label15.AutoSize = true; + this.label15.Location = new System.Drawing.Point(7, 19); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(128, 17); + this.label15.TabIndex = 456; + this.label15.Text = "礼物单每单额外收取："; + // + // btnGiftOemAmountPerOrderCancel + // + this.btnGiftOemAmountPerOrderCancel.CanvasColor = System.Drawing.SystemColors.Control; + this.btnGiftOemAmountPerOrderCancel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnGiftOemAmountPerOrderCancel.DisabledBackColor = System.Drawing.Color.Empty; + this.btnGiftOemAmountPerOrderCancel.Location = new System.Drawing.Point(244, 16); + this.btnGiftOemAmountPerOrderCancel.Name = "btnGiftOemAmountPerOrderCancel"; + this.btnGiftOemAmountPerOrderCancel.Size = new System.Drawing.Size(56, 23); + this.btnGiftOemAmountPerOrderCancel.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnGiftOemAmountPerOrderCancel.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnGiftOemAmountPerOrderCancel.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnGiftOemAmountPerOrderCancel.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.btnGiftOemAmountPerOrderCancel.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnGiftOemAmountPerOrderCancel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.btnGiftOemAmountPerOrderCancel.Style.GradientAngle = 90; + this.btnGiftOemAmountPerOrderCancel.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.btnGiftOemAmountPerOrderCancel.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnGiftOemAmountPerOrderCancel.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnGiftOemAmountPerOrderCancel.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnGiftOemAmountPerOrderCancel.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnGiftOemAmountPerOrderCancel.TabIndex = 458; + this.btnGiftOemAmountPerOrderCancel.Text = "取消"; + this.btnGiftOemAmountPerOrderCancel.Click += new System.EventHandler(this.btnGiftOemAmountPerOrderCancel_Click); + // + // btnGiftOemAmountPerOrder + // + this.btnGiftOemAmountPerOrder.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnGiftOemAmountPerOrder.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnGiftOemAmountPerOrder.DisabledBackColor = System.Drawing.Color.Empty; + this.btnGiftOemAmountPerOrder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnGiftOemAmountPerOrder.Location = new System.Drawing.Point(185, 16); + this.btnGiftOemAmountPerOrder.Name = "btnGiftOemAmountPerOrder"; + this.btnGiftOemAmountPerOrder.Size = new System.Drawing.Size(56, 23); + this.btnGiftOemAmountPerOrder.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnGiftOemAmountPerOrder.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnGiftOemAmountPerOrder.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnGiftOemAmountPerOrder.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnGiftOemAmountPerOrder.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnGiftOemAmountPerOrder.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnGiftOemAmountPerOrder.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnGiftOemAmountPerOrder.Style.GradientAngle = 90; + this.btnGiftOemAmountPerOrder.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnGiftOemAmountPerOrder.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnGiftOemAmountPerOrder.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnGiftOemAmountPerOrder.TabIndex = 453; + this.btnGiftOemAmountPerOrder.Text = "确定"; + this.btnGiftOemAmountPerOrder.Click += new System.EventHandler(this.btnGiftOemAmountPerOrder_Click); + // // pnlRefundPostagePerOrder // this.pnlRefundPostagePerOrder.Anchor = System.Windows.Forms.AnchorStyles.None; @@ -818,7 +947,7 @@ namespace TemuKJD.WXForms.AdminForms this.pnlRefundPostagePerOrder.Controls.Add(this.lblRefundPostagePerOrderUserId); this.pnlRefundPostagePerOrder.Controls.Add(this.lblRefundPostagePerOrderUserInfo); this.pnlRefundPostagePerOrder.Controls.Add(this.panel6); - this.pnlRefundPostagePerOrder.Location = new System.Drawing.Point(23, 85); + this.pnlRefundPostagePerOrder.Location = new System.Drawing.Point(40, 85); this.pnlRefundPostagePerOrder.Name = "pnlRefundPostagePerOrder"; this.pnlRefundPostagePerOrder.Size = new System.Drawing.Size(360, 146); this.pnlRefundPostagePerOrder.TabIndex = 12; @@ -943,7 +1072,7 @@ namespace TemuKJD.WXForms.AdminForms this.pnlPostagePerOrder.Controls.Add(this.lblPostagePerOrderUserId); this.pnlPostagePerOrder.Controls.Add(this.lblPostagePerOrderUserInfo); this.pnlPostagePerOrder.Controls.Add(this.panel5); - this.pnlPostagePerOrder.Location = new System.Drawing.Point(755, 85); + this.pnlPostagePerOrder.Location = new System.Drawing.Point(772, 85); this.pnlPostagePerOrder.Name = "pnlPostagePerOrder"; this.pnlPostagePerOrder.Size = new System.Drawing.Size(360, 146); this.pnlPostagePerOrder.TabIndex = 11; @@ -1070,7 +1199,7 @@ namespace TemuKJD.WXForms.AdminForms this.pnlBalance.Controls.Add(this.label13); this.pnlBalance.Controls.Add(this.lblUserBalanceInfo); this.pnlBalance.Controls.Add(this.panel4); - this.pnlBalance.Location = new System.Drawing.Point(389, 85); + this.pnlBalance.Location = new System.Drawing.Point(406, 85); this.pnlBalance.Name = "pnlBalance"; this.pnlBalance.Size = new System.Drawing.Size(360, 146); this.pnlBalance.TabIndex = 10; @@ -1210,7 +1339,7 @@ namespace TemuKJD.WXForms.AdminForms this.pnlShopPointsPerMonth.Controls.Add(this.lblShopPointsPerMonthUserId); this.pnlShopPointsPerMonth.Controls.Add(this.lblShopPointsPerMonthUserInfo); this.pnlShopPointsPerMonth.Controls.Add(this.panel3); - this.pnlShopPointsPerMonth.Location = new System.Drawing.Point(755, 237); + this.pnlShopPointsPerMonth.Location = new System.Drawing.Point(772, 237); this.pnlShopPointsPerMonth.Name = "pnlShopPointsPerMonth"; this.pnlShopPointsPerMonth.Size = new System.Drawing.Size(360, 146); this.pnlShopPointsPerMonth.TabIndex = 9; @@ -1336,7 +1465,7 @@ namespace TemuKJD.WXForms.AdminForms this.pnlTopUp.Controls.Add(this.label14); this.pnlTopUp.Controls.Add(this.lblUserInfo); this.pnlTopUp.Controls.Add(this.panel2); - this.pnlTopUp.Location = new System.Drawing.Point(389, 237); + this.pnlTopUp.Location = new System.Drawing.Point(406, 237); this.pnlTopUp.Name = "pnlTopUp"; this.pnlTopUp.Size = new System.Drawing.Size(360, 146); this.pnlTopUp.TabIndex = 8; @@ -1472,20 +1601,20 @@ namespace TemuKJD.WXForms.AdminForms // this.dgvUser.AllowUserToAddRows = false; this.dgvUser.AllowUserToDeleteRows = false; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249))))); - this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249))))); + this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4; this.dgvUser.AutoRowNumber = true; this.dgvUser.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvUser.BackgroundColor = System.Drawing.Color.White; this.dgvUser.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + 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.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5; this.dgvUser.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvUser.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colCheck, @@ -1512,6 +1641,8 @@ namespace TemuKJD.WXForms.AdminForms this.colChangePostagePerOrder, this.colRefundPostagePerOrder, this.colChangeRefundPostagePerOrder, + this.colGiftOemAmountPerOrder, + this.colChangeGiftOemAmountPerOrder, this.colAddShop, this.editColumn, this.deleteColumn}); @@ -1522,35 +1653,10 @@ namespace TemuKJD.WXForms.AdminForms this.dgvUser.Name = "dgvUser"; this.dgvUser.ReadOnly = true; this.dgvUser.RowTemplate.Height = 23; - this.dgvUser.Size = new System.Drawing.Size(1138, 620); + this.dgvUser.Size = new System.Drawing.Size(1172, 620); this.dgvUser.TabIndex = 1; this.dgvUser.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvUser_CellContentClick); // - // btnExportShopErp - // - this.btnExportShopErp.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnExportShopErp.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnExportShopErp.DisabledBackColor = System.Drawing.Color.Empty; - this.btnExportShopErp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnExportShopErp.Location = new System.Drawing.Point(0, 1); - this.btnExportShopErp.Name = "btnExportShopErp"; - this.btnExportShopErp.Size = new System.Drawing.Size(140, 25); - this.btnExportShopErp.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnExportShopErp.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnExportShopErp.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnExportShopErp.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnExportShopErp.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnExportShopErp.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnExportShopErp.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnExportShopErp.Style.GradientAngle = 90; - this.btnExportShopErp.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnExportShopErp.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnExportShopErp.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnExportShopErp.TabIndex = 439; - this.btnExportShopErp.Text = "导出用户到后台系统"; - this.btnExportShopErp.Visible = false; - this.btnExportShopErp.Click += new System.EventHandler(this.btnExportShopErp_Click); - // // colCheck // this.colCheck.FillWeight = 30F; @@ -1594,7 +1700,7 @@ namespace TemuKJD.WXForms.AdminForms // // groupNameColumn // - this.groupNameColumn.FillWeight = 70F; + this.groupNameColumn.FillWeight = 65F; this.groupNameColumn.HeaderText = "分组"; this.groupNameColumn.Name = "groupNameColumn"; this.groupNameColumn.ReadOnly = true; @@ -1628,7 +1734,7 @@ namespace TemuKJD.WXForms.AdminForms // // colAuthority // - this.colAuthority.FillWeight = 280F; + this.colAuthority.FillWeight = 270F; this.colAuthority.HeaderText = "功能权限"; this.colAuthority.Name = "colAuthority"; this.colAuthority.ReadOnly = true; @@ -1657,8 +1763,8 @@ namespace TemuKJD.WXForms.AdminForms // // colPlus // - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.colPlus.DefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.colPlus.DefaultCellStyle = dataGridViewCellStyle6; this.colPlus.FillWeight = 22F; this.colPlus.HeaderText = "+"; this.colPlus.Name = "colPlus"; @@ -1720,6 +1826,20 @@ namespace TemuKJD.WXForms.AdminForms this.colChangeRefundPostagePerOrder.Name = "colChangeRefundPostagePerOrder"; this.colChangeRefundPostagePerOrder.ReadOnly = true; // + // colGiftOemAmountPerOrder + // + this.colGiftOemAmountPerOrder.FillWeight = 60F; + this.colGiftOemAmountPerOrder.HeaderText = "每单礼物额外收费"; + this.colGiftOemAmountPerOrder.Name = "colGiftOemAmountPerOrder"; + this.colGiftOemAmountPerOrder.ReadOnly = true; + // + // colChangeGiftOemAmountPerOrder + // + this.colChangeGiftOemAmountPerOrder.FillWeight = 25F; + this.colChangeGiftOemAmountPerOrder.HeaderText = "改"; + this.colChangeGiftOemAmountPerOrder.Name = "colChangeGiftOemAmountPerOrder"; + this.colChangeGiftOemAmountPerOrder.ReadOnly = true; + // // colAddShop // this.colAddShop.FillWeight = 70F; @@ -1745,6 +1865,31 @@ namespace TemuKJD.WXForms.AdminForms this.deleteColumn.Name = "deleteColumn"; this.deleteColumn.ReadOnly = true; // + // btnExportShopErp + // + this.btnExportShopErp.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnExportShopErp.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnExportShopErp.DisabledBackColor = System.Drawing.Color.Empty; + this.btnExportShopErp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnExportShopErp.Location = new System.Drawing.Point(0, 1); + this.btnExportShopErp.Name = "btnExportShopErp"; + this.btnExportShopErp.Size = new System.Drawing.Size(140, 25); + this.btnExportShopErp.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnExportShopErp.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnExportShopErp.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnExportShopErp.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnExportShopErp.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnExportShopErp.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnExportShopErp.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnExportShopErp.Style.GradientAngle = 90; + this.btnExportShopErp.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnExportShopErp.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnExportShopErp.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnExportShopErp.TabIndex = 439; + this.btnExportShopErp.Text = "导出用户到后台系统"; + this.btnExportShopErp.Visible = false; + this.btnExportShopErp.Click += new System.EventHandler(this.btnExportShopErp_Click); + // // WXAdminAccountForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1767,6 +1912,11 @@ namespace TemuKJD.WXForms.AdminForms this.splitContainer1.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); this.splitContainer1.ResumeLayout(false); + this.pnlGiftOemAmountPerOrder.ResumeLayout(false); + this.pnlGiftOemAmountPerOrder.PerformLayout(); + this.panel7.ResumeLayout(false); + this.panel7.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numGiftOemAmountPerOrder)).EndInit(); this.pnlRefundPostagePerOrder.ResumeLayout(false); this.pnlRefundPostagePerOrder.PerformLayout(); this.panel6.ResumeLayout(false); @@ -1898,6 +2048,14 @@ namespace TemuKJD.WXForms.AdminForms private System.Windows.Forms.Label label18; private DevComponents.DotNetBar.PanelEx btnRefundPostagePerOrderCancel; private DevComponents.DotNetBar.PanelEx btnRefundPostagePerOrder; + private System.Windows.Forms.Panel pnlGiftOemAmountPerOrder; + private System.Windows.Forms.Label lblGiftOemAmountPerOrderUserId; + private System.Windows.Forms.Label lblGiftOemAmountPerOrderUserInfo; + private System.Windows.Forms.Panel panel7; + private System.Windows.Forms.NumericUpDown numGiftOemAmountPerOrder; + private System.Windows.Forms.Label label15; + private DevComponents.DotNetBar.PanelEx btnGiftOemAmountPerOrderCancel; + private DevComponents.DotNetBar.PanelEx btnGiftOemAmountPerOrder; private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck; private System.Windows.Forms.DataGridViewTextBoxColumn UserIdColumn; private System.Windows.Forms.DataGridViewTextBoxColumn UserNickNameColumn; @@ -1922,6 +2080,8 @@ namespace TemuKJD.WXForms.AdminForms private System.Windows.Forms.DataGridViewLinkColumn colChangePostagePerOrder; private System.Windows.Forms.DataGridViewTextBoxColumn colRefundPostagePerOrder; private System.Windows.Forms.DataGridViewLinkColumn colChangeRefundPostagePerOrder; + private System.Windows.Forms.DataGridViewTextBoxColumn colGiftOemAmountPerOrder; + private System.Windows.Forms.DataGridViewLinkColumn colChangeGiftOemAmountPerOrder; private System.Windows.Forms.DataGridViewLinkColumn colAddShop; private System.Windows.Forms.DataGridViewLinkColumn editColumn; private System.Windows.Forms.DataGridViewLinkColumn deleteColumn; diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.cs b/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.cs index 4154652..3e21a97 100644 --- a/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.cs +++ b/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.cs @@ -173,6 +173,7 @@ namespace TemuKJD.WXForms.AdminForms user.shop_points_per_month = BaseRegex.GetIntJson(ref oStr, "shop_points_per_month"); user.postage_per_order = BaseRegex.GetDecimalJson(ref oStr, "postage_per_order"); user.refund_postage_per_order = BaseRegex.GetDecimalJson(ref oStr, "refund_postage_per_order"); + user.gift_oem_amount_per_order = BaseRegex.GetDecimalJson(ref oStr, "gift_oem_amount_per_order"); user.oem_id = BaseRegex.GetStringJson(ref oStr, "oem_id"); user.oem_name = BaseRegex.GetStringJson(ref oStr, "oem_name"); var parent_user_name = BaseRegex.GetStringJson(ref oStr, "parent_user_name"); @@ -203,6 +204,8 @@ namespace TemuKJD.WXForms.AdminForms (user.group_id == "3") ? "改" : null, Math.Max(2.5m, user.refund_postage_per_order.ParseToDecimal()), (user.group_id == "3") ? "改" : null, + Math.Max(0m, user.gift_oem_amount_per_order.ParseToDecimal()), + (user.group_id == "3") ? "改" : null, user.group_id == "3" ? "添加店铺" : "", "编辑", "删除"); @@ -263,6 +266,7 @@ namespace TemuKJD.WXForms.AdminForms int shopPointsPerMonth = dgvUser.Rows[e.RowIndex].Cells["colShopPointsPerMonth"].Value.ParseToInt(); decimal postagePerOrder = dgvUser.Rows[e.RowIndex].Cells["colPostagePerOrder"].Value.ParseToDecimal(); decimal refundPostagePerOrder = dgvUser.Rows[e.RowIndex].Cells["colRefundPostagePerOrder"].Value.ParseToDecimal(); + decimal giftOemAmountPerOrder = dgvUser.Rows[e.RowIndex].Cells["colGiftOemAmountPerOrder"].Value.ParseToDecimal(); string oemId = dgvUser.Rows[e.RowIndex].Cells["colOemId"].Value.ParseToString(); var row = dgvUser.Rows[e.RowIndex]; if (columText == "编辑") @@ -329,6 +333,15 @@ namespace TemuKJD.WXForms.AdminForms this.pnlBalance.Visible = true; this.pnlBalance.BringToFront(); } + if (columName == "colChangeGiftOemAmountPerOrder") + { + this.lblGiftOemAmountPerOrderUserInfo.Text = mobile + " - " + nickName; + this.numGiftOemAmountPerOrder.Value = giftOemAmountPerOrder; + this.pnlGiftOemAmountPerOrder.Tag = row; + this.pnlGiftOemAmountPerOrder.Visible = true; + this.pnlGiftOemAmountPerOrder.BringToFront(); + this.lblGiftOemAmountPerOrderUserId.Text = uid; + } } if (columText == "改") { @@ -359,6 +372,15 @@ namespace TemuKJD.WXForms.AdminForms this.pnlRefundPostagePerOrder.BringToFront(); this.lblRefundPostagePerOrderUserId.Text = uid; } + if (columName == "colChangeGiftOemAmountPerOrder") + { + this.lblGiftOemAmountPerOrderUserInfo.Text = mobile + " - " + nickName; + this.numGiftOemAmountPerOrder.Value = giftOemAmountPerOrder; + this.pnlGiftOemAmountPerOrder.Tag = row; + this.pnlGiftOemAmountPerOrder.Visible = true; + this.pnlGiftOemAmountPerOrder.BringToFront(); + this.lblGiftOemAmountPerOrderUserId.Text = uid; + } } } @@ -402,6 +424,7 @@ namespace TemuKJD.WXForms.AdminForms pnlBalance.Location = new Point(pnlTopUp.Location.X, pnlTopUp.Location.Y); pnlPostagePerOrder.Location = new Point(pnlTopUp.Location.X, pnlTopUp.Location.Y); pnlRefundPostagePerOrder.Location = new Point(pnlTopUp.Location.X, pnlTopUp.Location.Y); + pnlGiftOemAmountPerOrder.Location = new Point(pnlTopUp.Location.X, pnlTopUp.Location.Y); this.cmbGroup.Items.Clear(); this.cmbGroup.Items.Add("主账户"); @@ -656,5 +679,44 @@ namespace TemuKJD.WXForms.AdminForms { pnlRefundPostagePerOrder.Visible = false; } + + private void btnGiftOemAmountPerOrder_Click(object sender, EventArgs e) + { + if (updateGiftOemAmountPerOrder(lblGiftOemAmountPerOrderUserId.Text)) + { + pnlGiftOemAmountPerOrder.Visible = false; + BaseMsgForm.ShowInfo("修改充值用户店铺月费金额成功"); + } + } + + public bool updateGiftOemAmountPerOrder(string userDbId, bool showFailBox = true) + { + string url = BaseClass.BuildObjString("user/update_user"); + string data = UserLogin.GetSignaturex(); + data += "&id=" + userDbId; + data += "&gift_oem_amount_per_order=" + numGiftOemAmountPerOrder.Value; + + string html = GetHtml.PostUtf8(url, data.ToString()).Trim(); + if (!html.Contains("\"code\":200")) + { + var msg = BaseRegex.GetStringJsonByRegs(ref html, html, "msg"); + if (showFailBox) + { + Invoke(new Action(() => { BaseMsgForm.ShowError(msg); })); + } + return false; + } + var row = dgvUser.Rows.Cast().FirstOrDefault(r => r.Cells["UserIdColumn"].Value.ParseToString() == userDbId); + if (row != null) + { + Invoke(new Action(() => { row.Cells["colGiftOemAmountPerOrder"].Value = numGiftOemAmountPerOrder.Value; })); + } + return true; + } + + private void btnGiftOemAmountPerOrderCancel_Click(object sender, EventArgs e) + { + pnlGiftOemAmountPerOrder.Visible = false; + } } } diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.resx b/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.resx index 93bb106..10166fc 100644 --- a/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.resx +++ b/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.resx @@ -189,6 +189,12 @@ True + + True + + + True + True diff --git a/TEMUKJD/WXForms/ShopForms/WXOemAccountBalanceForm.cs b/TEMUKJD/WXForms/ShopForms/WXOemAccountBalanceForm.cs index 300f515..97341b5 100644 --- a/TEMUKJD/WXForms/ShopForms/WXOemAccountBalanceForm.cs +++ b/TEMUKJD/WXForms/ShopForms/WXOemAccountBalanceForm.cs @@ -276,6 +276,7 @@ namespace Work._29Tools.Forms.UserForms user.shop_points_per_month = BaseRegex.GetIntJson(ref oStr, "shop_points_per_month"); user.postage_per_order = BaseRegex.GetDecimalJson(ref oStr, "postage_per_order"); user.refund_postage_per_order = BaseRegex.GetDecimalJson(ref oStr, "refund_postage_per_order"); + user.gift_oem_amount_per_order = BaseRegex.GetDecimalJson(ref oStr, "gift_oem_amount_per_order"); user.oem_id = BaseRegex.GetStringJson(ref oStr, "oem_id"); user.oem_name = BaseRegex.GetStringJson(ref oStr, "oem_name"); var parent_user_name = BaseRegex.GetStringJson(ref oStr, "parent_user_name"); @@ -306,6 +307,8 @@ namespace Work._29Tools.Forms.UserForms (user.group_id == "3") ? "改" : null, Math.Max(2.5m, user.refund_postage_per_order.ParseToDecimal()), (user.group_id == "3") ? "改" : null, + Math.Max(2.5m, user.gift_oem_amount_per_order.ParseToDecimal()), + (user.group_id == "3") ? "改" : null, user.group_id == "3" ? "添加店铺" : "", "编辑", "删除"); diff --git a/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.Designer.cs b/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.Designer.cs index afaa388..0587f79 100644 --- a/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.Designer.cs +++ b/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.Designer.cs @@ -29,12 +29,14 @@ namespace TemuKJD.WXForms.ShopForms /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer5 = new System.Windows.Forms.SplitContainer(); this.pnlSuperManage = new System.Windows.Forms.Panel(); this.label10 = new System.Windows.Forms.Label(); @@ -64,6 +66,14 @@ namespace TemuKJD.WXForms.ShopForms this.label4 = new System.Windows.Forms.Label(); this.txtSearch = new System.Windows.Forms.TextBox(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.pnlGiftOemAmountPerOrder = new System.Windows.Forms.Panel(); + this.lblGiftOemAmountPerOrderUserId = new System.Windows.Forms.Label(); + this.lblGiftOemAmountPerOrderUserInfo = new System.Windows.Forms.Label(); + this.panel7 = new System.Windows.Forms.Panel(); + this.numGiftOemAmountPerOrder = new System.Windows.Forms.NumericUpDown(); + this.label7 = new System.Windows.Forms.Label(); + this.btnGiftOemAmountPerOrderCancel = new DevComponents.DotNetBar.PanelEx(); + this.btnGiftOemAmountPerOrder = new DevComponents.DotNetBar.PanelEx(); this.pnlRefundPostagePerOrder = new System.Windows.Forms.Panel(); this.lblRefundPostagePerOrderUserId = new System.Windows.Forms.Label(); this.lblRefundPostagePerOrderUserInfo = new System.Windows.Forms.Label(); @@ -129,6 +139,8 @@ namespace TemuKJD.WXForms.ShopForms this.colChangePostagePerOrder = new System.Windows.Forms.DataGridViewLinkColumn(); this.colRefundPostagePerOrder = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colChangeRefundPostagePerOrder = new System.Windows.Forms.DataGridViewLinkColumn(); + this.colGiftOemAmountPerOrder = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colChangeGiftOemAmountPerOrder = new System.Windows.Forms.DataGridViewLinkColumn(); this.editColumn = new System.Windows.Forms.DataGridViewLinkColumn(); this.deleteColumn = new System.Windows.Forms.DataGridViewLinkColumn(); this.btnExportShopErp = new DevComponents.DotNetBar.PanelEx(); @@ -141,6 +153,9 @@ namespace TemuKJD.WXForms.ShopForms this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.SuspendLayout(); + this.pnlGiftOemAmountPerOrder.SuspendLayout(); + this.panel7.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numGiftOemAmountPerOrder)).BeginInit(); this.pnlRefundPostagePerOrder.SuspendLayout(); this.panel6.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.numRefundPostagePerOrder)).BeginInit(); @@ -497,6 +512,7 @@ namespace TemuKJD.WXForms.ShopForms // // splitContainer1.Panel1 // + this.splitContainer1.Panel1.Controls.Add(this.pnlGiftOemAmountPerOrder); this.splitContainer1.Panel1.Controls.Add(this.pnlRefundPostagePerOrder); this.splitContainer1.Panel1.Controls.Add(this.pnlPostagePerOrder); this.splitContainer1.Panel1.Controls.Add(this.pnlBalance); @@ -511,6 +527,121 @@ namespace TemuKJD.WXForms.ShopForms this.splitContainer1.SplitterDistance = 620; this.splitContainer1.TabIndex = 2; // + // pnlGiftOemAmountPerOrder + // + this.pnlGiftOemAmountPerOrder.Anchor = System.Windows.Forms.AnchorStyles.None; + this.pnlGiftOemAmountPerOrder.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.pnlGiftOemAmountPerOrder.Controls.Add(this.lblGiftOemAmountPerOrderUserId); + this.pnlGiftOemAmountPerOrder.Controls.Add(this.lblGiftOemAmountPerOrderUserInfo); + this.pnlGiftOemAmountPerOrder.Controls.Add(this.panel7); + this.pnlGiftOemAmountPerOrder.Location = new System.Drawing.Point(23, 237); + this.pnlGiftOemAmountPerOrder.Name = "pnlGiftOemAmountPerOrder"; + this.pnlGiftOemAmountPerOrder.Size = new System.Drawing.Size(360, 146); + this.pnlGiftOemAmountPerOrder.TabIndex = 14; + this.pnlGiftOemAmountPerOrder.Visible = false; + // + // lblGiftOemAmountPerOrderUserId + // + this.lblGiftOemAmountPerOrderUserId.AutoSize = true; + this.lblGiftOemAmountPerOrderUserId.Location = new System.Drawing.Point(256, 19); + this.lblGiftOemAmountPerOrderUserId.Name = "lblGiftOemAmountPerOrderUserId"; + this.lblGiftOemAmountPerOrderUserId.Size = new System.Drawing.Size(47, 17); + this.lblGiftOemAmountPerOrderUserId.TabIndex = 457; + this.lblGiftOemAmountPerOrderUserId.Text = "UserId"; + this.lblGiftOemAmountPerOrderUserId.Visible = false; + // + // lblGiftOemAmountPerOrderUserInfo + // + this.lblGiftOemAmountPerOrderUserInfo.AutoSize = true; + this.lblGiftOemAmountPerOrderUserInfo.Location = new System.Drawing.Point(20, 19); + this.lblGiftOemAmountPerOrderUserInfo.Name = "lblGiftOemAmountPerOrderUserInfo"; + this.lblGiftOemAmountPerOrderUserInfo.Size = new System.Drawing.Size(58, 17); + this.lblGiftOemAmountPerOrderUserInfo.TabIndex = 455; + this.lblGiftOemAmountPerOrderUserInfo.Text = "UserInfo"; + // + // panel7 + // + this.panel7.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.panel7.Controls.Add(this.numGiftOemAmountPerOrder); + this.panel7.Controls.Add(this.label7); + this.panel7.Controls.Add(this.btnGiftOemAmountPerOrderCancel); + this.panel7.Controls.Add(this.btnGiftOemAmountPerOrder); + this.panel7.Location = new System.Drawing.Point(23, 52); + this.panel7.Name = "panel7"; + this.panel7.Size = new System.Drawing.Size(310, 57); + this.panel7.TabIndex = 454; + // + // numGiftOemAmountPerOrder + // + this.numGiftOemAmountPerOrder.DecimalPlaces = 2; + this.numGiftOemAmountPerOrder.Location = new System.Drawing.Point(125, 16); + this.numGiftOemAmountPerOrder.Maximum = new decimal(new int[] { + 100000, + 0, + 0, + 0}); + this.numGiftOemAmountPerOrder.Name = "numGiftOemAmountPerOrder"; + this.numGiftOemAmountPerOrder.Size = new System.Drawing.Size(56, 23); + this.numGiftOemAmountPerOrder.TabIndex = 1; + // + // label7 + // + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(7, 19); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(128, 17); + this.label7.TabIndex = 456; + this.label7.Text = "礼物单每单额外收取："; + // + // btnGiftOemAmountPerOrderCancel + // + this.btnGiftOemAmountPerOrderCancel.CanvasColor = System.Drawing.SystemColors.Control; + this.btnGiftOemAmountPerOrderCancel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnGiftOemAmountPerOrderCancel.DisabledBackColor = System.Drawing.Color.Empty; + this.btnGiftOemAmountPerOrderCancel.Location = new System.Drawing.Point(244, 16); + this.btnGiftOemAmountPerOrderCancel.Name = "btnGiftOemAmountPerOrderCancel"; + this.btnGiftOemAmountPerOrderCancel.Size = new System.Drawing.Size(56, 23); + this.btnGiftOemAmountPerOrderCancel.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnGiftOemAmountPerOrderCancel.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnGiftOemAmountPerOrderCancel.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnGiftOemAmountPerOrderCancel.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.btnGiftOemAmountPerOrderCancel.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnGiftOemAmountPerOrderCancel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.btnGiftOemAmountPerOrderCancel.Style.GradientAngle = 90; + this.btnGiftOemAmountPerOrderCancel.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.btnGiftOemAmountPerOrderCancel.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnGiftOemAmountPerOrderCancel.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnGiftOemAmountPerOrderCancel.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnGiftOemAmountPerOrderCancel.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnGiftOemAmountPerOrderCancel.TabIndex = 458; + this.btnGiftOemAmountPerOrderCancel.Text = "取消"; + this.btnGiftOemAmountPerOrderCancel.Click += new System.EventHandler(this.btnGiftOemAmountPerOrderCancel_Click); + // + // btnGiftOemAmountPerOrder + // + this.btnGiftOemAmountPerOrder.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnGiftOemAmountPerOrder.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnGiftOemAmountPerOrder.DisabledBackColor = System.Drawing.Color.Empty; + this.btnGiftOemAmountPerOrder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnGiftOemAmountPerOrder.Location = new System.Drawing.Point(185, 16); + this.btnGiftOemAmountPerOrder.Name = "btnGiftOemAmountPerOrder"; + this.btnGiftOemAmountPerOrder.Size = new System.Drawing.Size(56, 23); + this.btnGiftOemAmountPerOrder.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnGiftOemAmountPerOrder.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnGiftOemAmountPerOrder.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnGiftOemAmountPerOrder.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnGiftOemAmountPerOrder.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnGiftOemAmountPerOrder.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnGiftOemAmountPerOrder.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnGiftOemAmountPerOrder.Style.GradientAngle = 90; + this.btnGiftOemAmountPerOrder.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnGiftOemAmountPerOrder.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnGiftOemAmountPerOrder.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnGiftOemAmountPerOrder.TabIndex = 453; + this.btnGiftOemAmountPerOrder.Text = "确定"; + this.btnGiftOemAmountPerOrder.Click += new System.EventHandler(this.btnGiftOemAmountPerOrder_Click); + // // pnlRefundPostagePerOrder // this.pnlRefundPostagePerOrder.Anchor = System.Windows.Forms.AnchorStyles.None; @@ -1118,20 +1249,20 @@ namespace TemuKJD.WXForms.ShopForms // this.dgvUser.AllowUserToAddRows = false; this.dgvUser.AllowUserToDeleteRows = false; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249))))); - this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249))))); + this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle9; this.dgvUser.AutoRowNumber = true; this.dgvUser.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvUser.BackgroundColor = System.Drawing.Color.White; this.dgvUser.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle10; this.dgvUser.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvUser.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colCheck, @@ -1158,6 +1289,8 @@ namespace TemuKJD.WXForms.ShopForms this.colChangePostagePerOrder, this.colRefundPostagePerOrder, this.colChangeRefundPostagePerOrder, + this.colGiftOemAmountPerOrder, + this.colChangeGiftOemAmountPerOrder, this.editColumn, this.deleteColumn}); this.dgvUser.Dock = System.Windows.Forms.DockStyle.Fill; @@ -1284,8 +1417,8 @@ namespace TemuKJD.WXForms.ShopForms // // colPlus // - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - this.colPlus.DefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + this.colPlus.DefaultCellStyle = dataGridViewCellStyle11; this.colPlus.FillWeight = 22F; this.colPlus.HeaderText = "+"; this.colPlus.Name = "colPlus"; @@ -1300,8 +1433,8 @@ namespace TemuKJD.WXForms.ShopForms // // colChangePointsPerMonth // - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - this.colChangePointsPerMonth.DefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + this.colChangePointsPerMonth.DefaultCellStyle = dataGridViewCellStyle12; this.colChangePointsPerMonth.FillWeight = 25F; this.colChangePointsPerMonth.HeaderText = "改"; this.colChangePointsPerMonth.Name = "colChangePointsPerMonth"; @@ -1317,8 +1450,8 @@ namespace TemuKJD.WXForms.ShopForms // // colBalancePlus // - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - this.colBalancePlus.DefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + this.colBalancePlus.DefaultCellStyle = dataGridViewCellStyle13; this.colBalancePlus.FillWeight = 22F; this.colBalancePlus.HeaderText = "+"; this.colBalancePlus.Name = "colBalancePlus"; @@ -1334,8 +1467,8 @@ namespace TemuKJD.WXForms.ShopForms // // colChangePostagePerOrder // - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - this.colChangePostagePerOrder.DefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + this.colChangePostagePerOrder.DefaultCellStyle = dataGridViewCellStyle14; this.colChangePostagePerOrder.FillWeight = 25F; this.colChangePostagePerOrder.HeaderText = "改"; this.colChangePostagePerOrder.Name = "colChangePostagePerOrder"; @@ -1350,6 +1483,8 @@ namespace TemuKJD.WXForms.ShopForms // // colChangeRefundPostagePerOrder // + dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + this.colChangeRefundPostagePerOrder.DefaultCellStyle = dataGridViewCellStyle15; this.colChangeRefundPostagePerOrder.FillWeight = 25F; this.colChangeRefundPostagePerOrder.HeaderText = "改"; this.colChangeRefundPostagePerOrder.Name = "colChangeRefundPostagePerOrder"; @@ -1357,6 +1492,24 @@ namespace TemuKJD.WXForms.ShopForms this.colChangeRefundPostagePerOrder.Resizable = System.Windows.Forms.DataGridViewTriState.True; this.colChangeRefundPostagePerOrder.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; // + // colGiftOemAmountPerOrder + // + this.colGiftOemAmountPerOrder.FillWeight = 60F; + this.colGiftOemAmountPerOrder.HeaderText = "每单礼物额外收取"; + this.colGiftOemAmountPerOrder.Name = "colGiftOemAmountPerOrder"; + this.colGiftOemAmountPerOrder.ReadOnly = true; + // + // colChangeGiftOemAmountPerOrder + // + dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + this.colChangeGiftOemAmountPerOrder.DefaultCellStyle = dataGridViewCellStyle16; + this.colChangeGiftOemAmountPerOrder.FillWeight = 25F; + this.colChangeGiftOemAmountPerOrder.HeaderText = "改"; + this.colChangeGiftOemAmountPerOrder.Name = "colChangeGiftOemAmountPerOrder"; + this.colChangeGiftOemAmountPerOrder.ReadOnly = true; + this.colChangeGiftOemAmountPerOrder.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colChangeGiftOemAmountPerOrder.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + // // editColumn // this.editColumn.FillWeight = 40F; @@ -1422,6 +1575,11 @@ namespace TemuKJD.WXForms.ShopForms this.splitContainer1.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); this.splitContainer1.ResumeLayout(false); + this.pnlGiftOemAmountPerOrder.ResumeLayout(false); + this.pnlGiftOemAmountPerOrder.PerformLayout(); + this.panel7.ResumeLayout(false); + this.panel7.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numGiftOemAmountPerOrder)).EndInit(); this.pnlRefundPostagePerOrder.ResumeLayout(false); this.pnlRefundPostagePerOrder.PerformLayout(); this.panel6.ResumeLayout(false); @@ -1525,6 +1683,14 @@ namespace TemuKJD.WXForms.ShopForms private System.Windows.Forms.Label label18; private DevComponents.DotNetBar.PanelEx btnRefundPostagePerOrderCancel; private DevComponents.DotNetBar.PanelEx btnRefundPostagePerOrder; + private System.Windows.Forms.Panel pnlGiftOemAmountPerOrder; + private System.Windows.Forms.Label lblGiftOemAmountPerOrderUserId; + private System.Windows.Forms.Label lblGiftOemAmountPerOrderUserInfo; + private System.Windows.Forms.Panel panel7; + private System.Windows.Forms.NumericUpDown numGiftOemAmountPerOrder; + private System.Windows.Forms.Label label7; + private DevComponents.DotNetBar.PanelEx btnGiftOemAmountPerOrderCancel; + private DevComponents.DotNetBar.PanelEx btnGiftOemAmountPerOrder; private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck; private System.Windows.Forms.DataGridViewTextBoxColumn UserIdColumn; private System.Windows.Forms.DataGridViewTextBoxColumn UserNickNameColumn; @@ -1549,6 +1715,8 @@ namespace TemuKJD.WXForms.ShopForms private System.Windows.Forms.DataGridViewLinkColumn colChangePostagePerOrder; private System.Windows.Forms.DataGridViewTextBoxColumn colRefundPostagePerOrder; private System.Windows.Forms.DataGridViewLinkColumn colChangeRefundPostagePerOrder; + private System.Windows.Forms.DataGridViewTextBoxColumn colGiftOemAmountPerOrder; + private System.Windows.Forms.DataGridViewLinkColumn colChangeGiftOemAmountPerOrder; private System.Windows.Forms.DataGridViewLinkColumn editColumn; private System.Windows.Forms.DataGridViewLinkColumn deleteColumn; } diff --git a/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.cs b/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.cs index a7750af..a6de26c 100644 --- a/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.cs +++ b/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.cs @@ -127,6 +127,7 @@ namespace TemuKJD.WXForms.ShopForms user.shop_points_per_month = BaseRegex.GetIntJson(ref oStr, "shop_points_per_month"); user.postage_per_order = BaseRegex.GetDecimalJson(ref oStr, "postage_per_order"); user.refund_postage_per_order = BaseRegex.GetDecimalJson(ref oStr, "refund_postage_per_order"); + user.gift_oem_amount_per_order = BaseRegex.GetDecimalJson(ref oStr, "gift_oem_amount_per_order"); user.oem_id = BaseRegex.GetStringJson(ref oStr, "oem_id"); user.oem_name = BaseRegex.GetStringJson(ref oStr, "oem_name"); var parent_user_name = BaseRegex.GetStringJson(ref oStr, "parent_user_name"); @@ -157,6 +158,8 @@ namespace TemuKJD.WXForms.ShopForms (user.group_id == "3") ? "改" : null, Math.Max(2.5m, user.refund_postage_per_order.ParseToDecimal()), (user.group_id == "3") ? "改" : null, + Math.Max(0m, user.gift_oem_amount_per_order.ParseToDecimal()), + (user.group_id == "3") ? "改" : null, user.group_id == "3" ? "添加店铺" : "", "编辑", "删除"); @@ -202,6 +205,7 @@ namespace TemuKJD.WXForms.ShopForms int shopPointsPerMonth = dgvUser.Rows[e.RowIndex].Cells["colShopPointsPerMonth"].Value.ParseToInt(); decimal postagePerOrder = dgvUser.Rows[e.RowIndex].Cells["colPostagePerOrder"].Value.ParseToDecimal(); decimal refundPostagePerOrder = dgvUser.Rows[e.RowIndex].Cells["colRefundPostagePerOrder"].Value.ParseToDecimal(); + decimal giftOemAmountPerOrder = dgvUser.Rows[e.RowIndex].Cells["colGiftOemAmountPerOrder"].Value.ParseToDecimal(); var row = dgvUser.Rows[e.RowIndex]; if (columText == "编辑") { @@ -269,9 +273,18 @@ namespace TemuKJD.WXForms.ShopForms this.pnlRefundPostagePerOrder.BringToFront(); this.lblRefundPostagePerOrderUserId.Text = uid; } + if (columName == "colChangeGiftOemAmountPerOrder") + { + this.lblGiftOemAmountPerOrderUserInfo.Text = mobile + " - " + nickName; + this.numGiftOemAmountPerOrder.Value = giftOemAmountPerOrder; + this.pnlGiftOemAmountPerOrder.Tag = row; + this.pnlGiftOemAmountPerOrder.Visible = true; + this.pnlGiftOemAmountPerOrder.BringToFront(); + this.lblGiftOemAmountPerOrderUserId.Text = uid; + } } if (columText == "") - row.Cells["colSelect"].Value = !row.Cells["colSelect"].Value.ParseToBool(); + row.Cells["colCheck"].Value = !row.Cells["colCheck"].Value.ParseToBool(); } public void Delete(string uid) @@ -314,6 +327,7 @@ namespace TemuKJD.WXForms.ShopForms pnlBalance.Location = new Point(pnlTopUp.Location.X, pnlTopUp.Location.Y); pnlPostagePerOrder.Location = new Point(pnlTopUp.Location.X, pnlTopUp.Location.Y); pnlRefundPostagePerOrder.Location = new Point(pnlTopUp.Location.X, pnlTopUp.Location.Y); + pnlGiftOemAmountPerOrder.Location = new Point(pnlTopUp.Location.X, pnlTopUp.Location.Y); this.txtSearch.GotFocus += TxtSearch_GotFocus; this.txtSearch.LostFocus += TxtSearch_LostFocus; @@ -326,6 +340,10 @@ namespace TemuKJD.WXForms.ShopForms this.dgvUser.AddMergeColumnHeader(new List { "colBalance", "colBalancePlus" }, "快递余额"); this.dgvUser.AddMergeColumn(new List { "colPostagePerOrder", "colChangePostagePerOrder" }); this.dgvUser.AddMergeColumnHeader(new List { "colPostagePerOrder", "colChangePostagePerOrder" }, "每单快递费"); + this.dgvUser.AddMergeColumn(new List { "colRefundPostagePerOrder", "colChangeRefundPostagePerOrder" }); + this.dgvUser.AddMergeColumnHeader(new List { "colRefundPostagePerOrder", "colChangeRefundPostagePerOrder" }, "每单退货快递费"); + this.dgvUser.AddMergeColumn(new List { "colGiftOemAmountPerOrder", "colChangeRefundPostagePerOrder" }); + this.dgvUser.AddMergeColumnHeader(new List { "colGiftOemAmountPerOrder", "colChangeGiftOemAmountPerOrder" }, "每单礼物额外收取"); } private void TxtSearch_LostFocus(object sender, EventArgs e) @@ -557,5 +575,44 @@ namespace TemuKJD.WXForms.ShopForms { pnlRefundPostagePerOrder.Visible = false; } + + private void btnGiftOemAmountPerOrder_Click(object sender, EventArgs e) + { + if (updateGiftOemAmountPerOrder(lblGiftOemAmountPerOrderUserId.Text)) + { + pnlGiftOemAmountPerOrder.Visible = false; + BaseMsgForm.ShowInfo("修改充值用户店铺月费金额成功"); + } + } + + public bool updateGiftOemAmountPerOrder(string userDbId, bool showFailBox = true) + { + string url = BaseClass.BuildObjString("user/update_user"); + string data = UserLogin.GetSignaturex(); + data += "&id=" + userDbId; + data += "&gift_oem_amount_per_order=" + numGiftOemAmountPerOrder.Value; + + string html = GetHtml.PostUtf8(url, data.ToString()).Trim(); + if (!html.Contains("\"code\":200")) + { + var msg = BaseRegex.GetStringJsonByRegs(ref html, html, "msg"); + if (showFailBox) + { + Invoke(new Action(() => { BaseMsgForm.ShowError(msg); })); + } + return false; + } + var row = dgvUser.Rows.Cast().FirstOrDefault(r => r.Cells["UserIdColumn"].Value.ParseToString() == userDbId); + if (row != null) + { + Invoke(new Action(() => { row.Cells["colGiftOemAmountPerOrder"].Value = numGiftOemAmountPerOrder.Value; })); + } + return true; + } + + private void btnGiftOemAmountPerOrderCancel_Click(object sender, EventArgs e) + { + pnlGiftOemAmountPerOrder.Visible = false; + } } } diff --git a/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.resx b/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.resx index c6c54e2..bb5014e 100644 --- a/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.resx +++ b/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.resx @@ -189,6 +189,12 @@ True + + True + + + True + True diff --git a/Work/UserLogin.cs b/Work/UserLogin.cs index ed0cb6f..39b074e 100644 --- a/Work/UserLogin.cs +++ b/Work/UserLogin.cs @@ -94,6 +94,7 @@ namespace Work BaseClass.Balance = BaseRegex.GetDecimalJson(ref html, "balance"); BaseClass.PostagePerOrder = Math.Max(2.2m, BaseRegex.GetDecimalJson(ref html, "postage_per_order")); BaseClass.RefundPostagePerOrder = Math.Max(2.5m, BaseRegex.GetDecimalJson(ref html, "refund_postage_per_order")); + BaseClass.GiftOemAmountPerOrder = Math.Max(0m, BaseRegex.GetDecimalJson(ref html, "gift_oem_amount_per_order")); BaseClass.OemId = BaseRegex.GetStringJson(ref html, "oem_id"); BaseClass.OemName = BaseRegex.GetStringJson(ref html, "oem_name"); BaseClass.IsOemOwner = BaseRegex.GetBoolJson(ref html, "is_oem_owner");