diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs
index 3e21dd9..bd688eb 100644
--- a/AllBase/BaseClass.cs
+++ b/AllBase/BaseClass.cs
@@ -31,7 +31,7 @@ namespace AllBase
///
/// 版本ID
///
- public static int VersionCount = 1228;
+ public static int VersionCount = 1229;
public static string MainPath = "29wx";
//public static string MainPath = "29wx";
//public static string MainPath = "29pdd";
diff --git a/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs b/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs
index f24b27c..c6a84d5 100644
--- a/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs
+++ b/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs
@@ -674,6 +674,8 @@ namespace KJD_Web.BLL.BXX
forceIndex.Add("index_from_shop_id");
if (!from_shop_name.IsNullOrEmpty())
forceIndex.Add("index_from_shop_name");
+ if (!ext_code_in.IsNullOrEmpty() || !search_ext_code.IsNullOrEmpty())
+ forceIndex.Add("index_ext_code");
//if (!add_user_name.IsNullOrEmpty())
// forceIndex.Add("index_add_user_name");
diff --git a/KJDService/KJD_WebService/BLL/WXXD/WXOemManage.cs b/KJDService/KJD_WebService/BLL/WXXD/WXOemManage.cs
index 9c7fe30..619de20 100644
--- a/KJDService/KJD_WebService/BLL/WXXD/WXOemManage.cs
+++ b/KJDService/KJD_WebService/BLL/WXXD/WXOemManage.cs
@@ -88,11 +88,11 @@ namespace KJD_Web.BLL.WXXD
string where = "";
if (!string.IsNullOrEmpty(oem_id))
- where += " and p.oem_id in ('" + oem_id.Replace(",", "','") + "')";
+ where += " and oem_id in ('" + oem_id.Replace(",", "','") + "')";
if (!string.IsNullOrEmpty(oem_name))
- where += " and p.oem_name in ('" + oem_name.Replace(",", "','") + "')";
+ where += " and oem_name in ('" + oem_name.Replace(",", "','") + "')";
if (!string.IsNullOrEmpty(oem_owner))
- where += " and p.oem_owner in ('" + oem_owner.Replace(",", "','") + "')";
+ where += " and oem_owner in ('" + oem_owner.Replace(",", "','") + "')";
sql += where;
sql += " ORDER BY add_time DESC;";
diff --git a/KJDService/KJD_WebService/BLL/WXXD/WXOrderManage.cs b/KJDService/KJD_WebService/BLL/WXXD/WXOrderManage.cs
index 3a076da..07f0064 100644
--- a/KJDService/KJD_WebService/BLL/WXXD/WXOrderManage.cs
+++ b/KJDService/KJD_WebService/BLL/WXXD/WXOrderManage.cs
@@ -1291,5 +1291,86 @@ namespace KJD_Web.BLL.WXXD
}
return "{\"code\":19999,\"msg\":\"输入为空\"}";
}
+
+
+ public string WXUpdateAbnormalTransitOrder(string inputData)
+ {
+ if (!string.IsNullOrEmpty(inputData))
+ {
+ if (!WXUserManage.GetSign(inputData))
+ return "{\"code\":999,\"msg\":\"校验失败\"}";
+
+ var out_order_no = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "out_order_no"))?.Replace("'", "\\'");
+ var order_no = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "order_no"))?.Replace("'", "\\'");
+ var order_sku_id = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "order_sku_id"))?.Replace("'", "\\'");
+ var buyer_account = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "buyer_account"))?.Replace("'", "\\'");
+ var out_amount = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "out_amount"))?.Replace("'", "\\'");
+ var purchaser_note = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "purchaser_note"))?.Replace("'", "\\'");
+ var refund_status = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "refund_status"))?.Replace("'", "\\'");
+ var old_out_order_no = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "old_out_order_no"))?.Replace("'", "\\'");
+ var old_order_no = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "old_order_no"))?.Replace("'", "\\'");
+ var old_order_sku_id = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "old_order_sku_id"))?.Replace("'", "\\'");
+ var old_buyer_account = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "old_buyer_account"))?.Replace("'", "\\'");
+ var old_out_amount = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "old_out_amount"))?.Replace("'", "\\'");
+ var old_purchaser_note = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "old_purchaser_note"))?.Replace("'", "\\'");
+ var old_refund_status = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "old_refund_status"))?.Replace("'", "\\'");
+ var order_code = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "order_code"))?.Replace("'", "\\'");
+ if(order_code.IsNullOrEmpty() || old_purchaser_note.IsNullOrEmpty() || old_out_amount.ParseToInt().IsNullOrZero() || old_buyer_account.IsNullOrEmpty() || old_order_no.IsNullOrEmpty() || old_out_order_no.IsNullOrEmpty() ||
+ purchaser_note.IsNullOrEmpty() || out_amount.ParseToInt().IsNullOrZero() || buyer_account.IsNullOrEmpty() || order_no.IsNullOrEmpty() || out_order_no.IsNullOrEmpty())
+ {
+ return "{\"code\":500,\"msg\":\"异常单记录信息不完整\",\"affected_rows\":" + 0 + "}";
+ }
+
+ string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
+ MysqlUtils mySql = new MysqlUtils(conn, true);
+
+ string sql;
+
+ sql = "INSERT INTO wxxd.order_abnormal_order_record (out_order_no,order_no,order_sku_id,buyer_account,out_amount,purchaser_note,refund_status,order_code) ";
+ sql += " VALUES('" + old_out_order_no + "','" + old_order_no + "','" + old_order_sku_id + "','" + old_buyer_account + "'," + old_out_amount + ",'" +
+ old_purchaser_note + "','" + old_refund_status + "','" + order_code + "')";
+ var rows = mySql.ExecuteAffectedRows(sql);
+ if (!mySql.Message.IsNullOrEmpty())
+ {
+ mySql.RollBack();
+ mySql.Close();
+ return "{\"code\":500,\"msg\":\"" + mySql.Message + "\",\"affected_rows\":" + rows + "}";
+ }
+ if (rows == 0)
+ {
+ mySql.RollBack();
+ mySql.Close();
+ return "{\"code\":500,\"msg\":\"创建异常单记录失败\",\"affected_rows\":" + rows + "}";
+ }
+
+ sql = "UPDATE erp.oms_wei_external_procurement_log SET ";
+ sql += " out_order_no='" + out_order_no + "',";
+ sql += " order_no='" + order_no + "',";
+ sql += " order_sku_id='" + order_sku_id + "',";
+ sql += " buyer_account='" + buyer_account + "',";
+ sql += " out_amount=" + out_amount + ",";
+ sql += " purchaser_note='" + purchaser_note + "',";
+ sql += " refund_status='" + refund_status + "',";
+ sql = sql.TrimEnd(',');
+ sql += " WHERE order_code='" + order_code + "' AND order_no='" + old_order_no + "';";
+ rows = mySql.ExecuteAffectedRows(sql);
+ if (!mySql.Message.IsNullOrEmpty())
+ {
+ mySql.RollBack();
+ mySql.Close();
+ return "{\"code\":500,\"msg\":\"" + mySql.Message + "\",\"affected_rows\":" + rows + "}";
+ }
+ if (rows == 0)
+ {
+ mySql.RollBack();
+ mySql.Close();
+ return "{\"code\":500,\"msg\":\"更新异常单拍单失败\",\"affected_rows\":" + rows + "}";
+ }
+ mySql.Commit();
+ mySql.Close();
+ return "{\"code\":200,\"msg\":\"success\",\"affected_rows\":" + rows + "}";
+ }
+ return "{\"code\":19999,\"msg\":\"输入为空\"}";
+ }
}
}
\ No newline at end of file
diff --git a/KJDService/KJD_WebService/WXOrderService.asmx.cs b/KJDService/KJD_WebService/WXOrderService.asmx.cs
index f855780..c055275 100644
--- a/KJDService/KJD_WebService/WXOrderService.asmx.cs
+++ b/KJDService/KJD_WebService/WXOrderService.asmx.cs
@@ -91,7 +91,7 @@ namespace KJD_Web
[WebMethod]
public void get_refund_list()
{
-
+
string jsontext = GetRequestJsonString();
var result = jsontext;
@@ -124,7 +124,7 @@ namespace KJD_Web
Context.Response.Write(result);
Context.Response.End();
}
-
+
///
/// 获取中转仓订单信息
///
@@ -222,7 +222,7 @@ namespace KJD_Web
Context.Response.End();
}
-
+
[WebMethod]
public void wx_get_transit_warehouse_aftersale_list()
@@ -235,5 +235,18 @@ namespace KJD_Web
Context.Response.Write(result);
Context.Response.End();
}
+
+
+ [WebMethod]
+ public void wx_update_abnormal_transit_order()
+ {
+ string jsontext = GetRequestJsonString();
+
+ var result = jsontext;
+ result = new WXOrderManage().WXUpdateAbnormalTransitOrder(jsontext);
+
+ Context.Response.Write(result);
+ Context.Response.End();
+ }
}
}
diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.Designer.cs b/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.Designer.cs
index 2860c7e..96c03ef 100644
--- a/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.Designer.cs
+++ b/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.Designer.cs
@@ -30,58 +30,59 @@ namespace TemuKJD.WXForms.AdminForms
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- 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 dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
this.splitContainer5 = new System.Windows.Forms.SplitContainer();
+ this.pnlSuperManage = new System.Windows.Forms.Panel();
this.label10 = new System.Windows.Forms.Label();
- this.txtOemId = new System.Windows.Forms.TextBox();
- this.btnSearch = new DevComponents.DotNetBar.PanelEx();
- this.chkTraineeData = new TemuKJD.UserComponent.UcCheckBox(this.components);
- this.line2 = new DevComponents.DotNetBar.Controls.Line();
- this.btnFilter = new DevComponents.DotNetBar.PanelEx();
- this.txtAuth = new System.Windows.Forms.TextBox();
- this.label9 = new System.Windows.Forms.Label();
- this.chkProdFission = new TemuKJD.UserComponent.UcCheckBox(this.components);
- this.chkCommissionUpdate = new TemuKJD.UserComponent.UcCheckBox(this.components);
- this.chkEcWaybill = new TemuKJD.UserComponent.UcCheckBox(this.components);
- this.chkHot = new TemuKJD.UserComponent.UcCheckBox(this.components);
- this.chkShopOptimize = new TemuKJD.UserComponent.UcCheckBox(this.components);
- this.chkChanceProdCollect = new TemuKJD.UserComponent.UcCheckBox(this.components);
- this.chkShopPoints = new TemuKJD.UserComponent.UcCheckBox(this.components);
- this.chkWXShowProdGetFromType = new TemuKJD.UserComponent.UcCheckBox(this.components);
- this.label7 = new System.Windows.Forms.Label();
- this.chkWXComplateProd = new TemuKJD.UserComponent.UcCheckBox(this.components);
- this.cmbSaLevel = new System.Windows.Forms.ComboBox();
- this.label6 = new System.Windows.Forms.Label();
- this.lblWatermark = new System.Windows.Forms.Label();
- this.cmbSearchGroup = new System.Windows.Forms.ComboBox();
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);
+ this.btnCancel = new TemuKJD.UserControls.ButtonEx();
+ this.chkShopPoints = new TemuKJD.UserComponent.UcCheckBox(this.components);
+ 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.label6 = 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.label3 = new System.Windows.Forms.Label();
- this.txtCompany = new System.Windows.Forms.TextBox();
- this.label2 = new System.Windows.Forms.Label();
- this.label1 = new System.Windows.Forms.Label();
- this.btnCancel = new TemuKJD.UserControls.ButtonEx();
- this.btnOpUser = new TemuKJD.UserControls.ButtonEx();
- this.label30 = new System.Windows.Forms.Label();
- this.label31 = new System.Windows.Forms.Label();
- this.txtRePass = new System.Windows.Forms.TextBox();
- this.label32 = new System.Windows.Forms.Label();
- this.label33 = new System.Windows.Forms.Label();
- this.label34 = new System.Windows.Forms.Label();
- this.label35 = new System.Windows.Forms.Label();
- this.label36 = new System.Windows.Forms.Label();
- this.cmbGroup = new System.Windows.Forms.ComboBox();
- this.label37 = new System.Windows.Forms.Label();
- this.txtPassword = new System.Windows.Forms.TextBox();
- this.label38 = new System.Windows.Forms.Label();
- this.txtMobile = new System.Windows.Forms.TextBox();
- this.label39 = new System.Windows.Forms.Label();
- this.txtNickName = new System.Windows.Forms.TextBox();
- this.label40 = new System.Windows.Forms.Label();
- this.line1 = new DevComponents.DotNetBar.Controls.Line();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.pnlPostagePerOrder = new System.Windows.Forms.Panel();
this.lblPostagePerOrderUserId = new System.Windows.Forms.Label();
@@ -92,6 +93,8 @@ namespace TemuKJD.WXForms.AdminForms
this.btnPostagePerOrderCancel = new DevComponents.DotNetBar.PanelEx();
this.btnPostagePerOrder = new DevComponents.DotNetBar.PanelEx();
this.pnlBalance = new System.Windows.Forms.Panel();
+ this.lblBalanceNickName = new System.Windows.Forms.Label();
+ this.lblBalanceUserId = new System.Windows.Forms.Label();
this.label13 = new System.Windows.Forms.Label();
this.lblUserBalanceInfo = new System.Windows.Forms.Label();
this.panel4 = new System.Windows.Forms.Panel();
@@ -142,11 +145,13 @@ namespace TemuKJD.WXForms.AdminForms
this.editColumn = new System.Windows.Forms.DataGridViewLinkColumn();
this.deleteColumn = new System.Windows.Forms.DataGridViewLinkColumn();
this.btnExportShopErp = new DevComponents.DotNetBar.PanelEx();
- this.pnlSuperManage = new System.Windows.Forms.Panel();
+ this.lblTopUpNickName = new System.Windows.Forms.Label();
+ this.lblTopUpUserId = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.splitContainer5)).BeginInit();
this.splitContainer5.Panel1.SuspendLayout();
this.splitContainer5.Panel2.SuspendLayout();
this.splitContainer5.SuspendLayout();
+ this.pnlSuperManage.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@@ -164,7 +169,6 @@ namespace TemuKJD.WXForms.AdminForms
this.panel2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numAddTopUp)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dgvUser)).BeginInit();
- this.pnlSuperManage.SuspendLayout();
this.SuspendLayout();
//
// splitContainer5
@@ -193,6 +197,60 @@ namespace TemuKJD.WXForms.AdminForms
this.splitContainer5.SplitterWidth = 1;
this.splitContainer5.TabIndex = 3;
//
+ // pnlSuperManage
+ //
+ 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.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);
+ this.pnlSuperManage.Controls.Add(this.btnCancel);
+ this.pnlSuperManage.Controls.Add(this.chkShopPoints);
+ 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.label6);
+ this.pnlSuperManage.Location = new System.Drawing.Point(4, 32);
+ this.pnlSuperManage.Name = "pnlSuperManage";
+ this.pnlSuperManage.Size = new System.Drawing.Size(333, 623);
+ this.pnlSuperManage.TabIndex = 851;
+ //
// label10
//
this.label10.AutoSize = true;
@@ -203,6 +261,16 @@ namespace TemuKJD.WXForms.AdminForms
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, 305);
@@ -210,29 +278,47 @@ namespace TemuKJD.WXForms.AdminForms
this.txtOemId.Size = new System.Drawing.Size(148, 23);
this.txtOemId.TabIndex = 843;
//
- // btnSearch
+ // line1
//
- 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.Name = "btnSearch";
- this.btnSearch.Size = new System.Drawing.Size(68, 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)))));
- this.btnSearch.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
- this.btnSearch.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
- this.btnSearch.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
- this.btnSearch.Style.ForeColor.Color = System.Drawing.Color.White;
- this.btnSearch.Style.GradientAngle = 90;
- this.btnSearch.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
- this.btnSearch.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
- this.btnSearch.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
- this.btnSearch.TabIndex = 836;
- this.btnSearch.Text = "查询/刷新";
- this.btnSearch.Click += new System.EventHandler(this.btnRefresh_Click);
+ this.line1.Location = new System.Drawing.Point(14, 31);
+ this.line1.Name = "line1";
+ this.line1.Size = new System.Drawing.Size(307, 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.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, 144);
+ 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, 143);
+ this.txtMobile.Name = "txtMobile";
+ this.txtMobile.Size = new System.Drawing.Size(148, 23);
+ this.txtMobile.TabIndex = 21;
//
// chkTraineeData
//
@@ -243,6 +329,16 @@ namespace TemuKJD.WXForms.AdminForms
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, 176);
+ 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);
@@ -251,6 +347,14 @@ namespace TemuKJD.WXForms.AdminForms
this.line2.TabIndex = 825;
this.line2.Text = "line2";
//
+ // txtPassword
+ //
+ this.txtPassword.Location = new System.Drawing.Point(95, 175);
+ this.txtPassword.Name = "txtPassword";
+ this.txtPassword.PasswordChar = '*';
+ this.txtPassword.Size = new System.Drawing.Size(148, 23);
+ this.txtPassword.TabIndex = 23;
+ //
// btnFilter
//
this.btnFilter.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -275,6 +379,51 @@ 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, 241);
+ 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;
+ this.cmbGroup.Items.AddRange(new object[] {
+ "客服",
+ "采购",
+ "上货",
+ "数据",
+ "登录"});
+ this.cmbGroup.Location = new System.Drawing.Point(95, 239);
+ this.cmbGroup.Name = "cmbGroup";
+ this.cmbGroup.Size = new System.Drawing.Size(148, 25);
+ this.cmbGroup.TabIndex = 26;
+ this.cmbGroup.Text = "主账户";
+ //
+ // label36
+ //
+ 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.Name = "label36";
+ this.label36.Size = new System.Drawing.Size(13, 17);
+ this.label36.TabIndex = 27;
+ this.label36.Text = "*";
+ //
+ // label35
+ //
+ 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, 146);
+ this.label35.Name = "label35";
+ this.label35.Size = new System.Drawing.Size(13, 17);
+ this.label35.TabIndex = 28;
+ this.label35.Text = "*";
+ //
// txtAuth
//
this.txtAuth.Location = new System.Drawing.Point(95, 42);
@@ -282,6 +431,16 @@ namespace TemuKJD.WXForms.AdminForms
this.txtAuth.Size = new System.Drawing.Size(148, 23);
this.txtAuth.TabIndex = 820;
//
+ // label34
+ //
+ 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, 178);
+ 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;
@@ -292,6 +451,16 @@ namespace TemuKJD.WXForms.AdminForms
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, 243);
+ this.label33.Name = "label33";
+ this.label33.Size = new System.Drawing.Size(13, 17);
+ this.label33.TabIndex = 30;
+ this.label33.Text = "*";
+ //
// chkProdFission
//
this.chkProdFission.Location = new System.Drawing.Point(95, 456);
@@ -301,6 +470,16 @@ namespace TemuKJD.WXForms.AdminForms
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, 208);
+ 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, 412);
@@ -310,6 +489,14 @@ namespace TemuKJD.WXForms.AdminForms
this.chkCommissionUpdate.Text = "佣金上货";
this.chkCommissionUpdate.UseVisualStyleBackColor = true;
//
+ // txtRePass
+ //
+ this.txtRePass.Location = new System.Drawing.Point(95, 207);
+ this.txtRePass.Name = "txtRePass";
+ this.txtRePass.PasswordChar = '*';
+ this.txtRePass.Size = new System.Drawing.Size(148, 23);
+ this.txtRePass.TabIndex = 24;
+ //
// chkEcWaybill
//
this.chkEcWaybill.Location = new System.Drawing.Point(95, 412);
@@ -319,6 +506,16 @@ namespace TemuKJD.WXForms.AdminForms
this.chkEcWaybill.Text = "在线寄件";
this.chkEcWaybill.UseVisualStyleBackColor = true;
//
+ // label31
+ //
+ 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, 210);
+ this.label31.Name = "label31";
+ this.label31.Size = new System.Drawing.Size(13, 17);
+ this.label31.TabIndex = 32;
+ this.label31.Text = "*";
+ //
// chkHot
//
this.chkHot.Location = new System.Drawing.Point(175, 391);
@@ -328,6 +525,16 @@ namespace TemuKJD.WXForms.AdminForms
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, 146);
+ 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, 391);
@@ -337,6 +544,22 @@ namespace TemuKJD.WXForms.AdminForms
this.chkShopOptimize.Text = "评分考核";
this.chkShopOptimize.UseVisualStyleBackColor = true;
//
+ // btnOpUser
+ //
+ this.btnOpUser.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+ this.btnOpUser.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.btnOpUser.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnOpUser.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.btnOpUser.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.btnOpUser.ForeColor = System.Drawing.Color.White;
+ this.btnOpUser.Location = new System.Drawing.Point(157, 571);
+ this.btnOpUser.Name = "btnOpUser";
+ this.btnOpUser.Size = new System.Drawing.Size(86, 25);
+ this.btnOpUser.TabIndex = 34;
+ this.btnOpUser.Text = "添加用户";
+ this.btnOpUser.UseVisualStyleBackColor = false;
+ this.btnOpUser.Click += new System.EventHandler(this.btnOpUser_Click);
+ //
// chkChanceProdCollect
//
this.chkChanceProdCollect.Location = new System.Drawing.Point(175, 433);
@@ -346,158 +569,6 @@ namespace TemuKJD.WXForms.AdminForms
this.chkChanceProdCollect.Text = "商品采集";
this.chkChanceProdCollect.UseVisualStyleBackColor = true;
//
- // chkShopPoints
- //
- this.chkShopPoints.Location = new System.Drawing.Point(95, 434);
- this.chkShopPoints.Name = "chkShopPoints";
- this.chkShopPoints.Size = new System.Drawing.Size(68, 21);
- this.chkShopPoints.TabIndex = 811;
- this.chkShopPoints.Text = "充值用户";
- this.chkShopPoints.UseVisualStyleBackColor = true;
- //
- // chkWXShowProdGetFromType
- //
- this.chkWXShowProdGetFromType.Location = new System.Drawing.Point(175, 370);
- this.chkWXShowProdGetFromType.Name = "chkWXShowProdGetFromType";
- this.chkWXShowProdGetFromType.Size = new System.Drawing.Size(68, 21);
- this.chkWXShowProdGetFromType.TabIndex = 810;
- this.chkWXShowProdGetFromType.Text = "货源选择";
- this.chkWXShowProdGetFromType.UseVisualStyleBackColor = true;
- //
- // 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, 370);
- this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(51, 20);
- this.label7.TabIndex = 809;
- this.label7.Text = "权限：";
- //
- // chkWXComplateProd
- //
- this.chkWXComplateProd.Location = new System.Drawing.Point(95, 370);
- this.chkWXComplateProd.Name = "chkWXComplateProd";
- this.chkWXComplateProd.Size = new System.Drawing.Size(68, 21);
- this.chkWXComplateProd.TabIndex = 808;
- this.chkWXComplateProd.Text = "微信回采";
- this.chkWXComplateProd.UseVisualStyleBackColor = true;
- //
- // cmbSaLevel
- //
- this.cmbSaLevel.FormattingEnabled = true;
- this.cmbSaLevel.Items.AddRange(new object[] {
- "普通用户",
- "一级超管",
- "二级超管"});
- this.cmbSaLevel.Location = new System.Drawing.Point(95, 337);
- this.cmbSaLevel.Name = "cmbSaLevel";
- this.cmbSaLevel.Size = new System.Drawing.Size(148, 25);
- this.cmbSaLevel.TabIndex = 48;
- this.cmbSaLevel.Text = "普通用户";
- //
- // label6
- //
- this.label6.AutoSize = true;
- this.label6.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label6.Location = new System.Drawing.Point(10, 339);
- this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(79, 20);
- this.label6.TabIndex = 47;
- this.label6.Text = "超管等级：";
- //
- // lblWatermark
- //
- 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.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);
- //
- // cmbSearchGroup
- //
- this.cmbSearchGroup.FormattingEnabled = true;
- this.cmbSearchGroup.Items.AddRange(new object[] {
- "客服",
- "采购",
- "上货",
- "数据",
- "登录"});
- this.cmbSearchGroup.Location = new System.Drawing.Point(95, 5);
- this.cmbSearchGroup.Name = "cmbSearchGroup";
- this.cmbSearchGroup.Size = new System.Drawing.Size(148, 25);
- this.cmbSearchGroup.TabIndex = 44;
- this.cmbSearchGroup.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 = "搜索分组：";
- //
- // label4
- //
- this.label4.AutoSize = true;
- this.label4.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label4.Location = new System.Drawing.Point(14, 7);
- this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(79, 20);
- 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;
- //
- // 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, 274);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(51, 20);
- this.label3.TabIndex = 40;
- this.label3.Text = "公司：";
- //
- // txtCompany
- //
- this.txtCompany.Location = new System.Drawing.Point(95, 273);
- this.txtCompany.Name = "txtCompany";
- this.txtCompany.Size = new System.Drawing.Size(148, 23);
- this.txtCompany.TabIndex = 39;
- //
- // label2
- //
- 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.Name = "label2";
- this.label2.Size = new System.Drawing.Size(135, 20);
- this.label2.TabIndex = 38;
- this.label2.Text = "添加或编辑用户账户";
- //
- // label1
- //
- this.label1.AutoSize = true;
- this.label1.ForeColor = System.Drawing.SystemColors.ButtonShadow;
- this.label1.Location = new System.Drawing.Point(30, 490);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(236, 68);
- this.label1.TabIndex = 37;
- this.label1.Text = "备注：１编辑时密码为空不更改原密码。\r\n ２商品采集自带微信采集和商品裂变\r\n 功能，如非测试请勿重复勾选微信\r\n 回采和裂变测试功能。";
- //
// btnCancel
//
this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
@@ -515,184 +586,171 @@ namespace TemuKJD.WXForms.AdminForms
this.btnCancel.Visible = false;
this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
//
- // btnOpUser
+ // chkShopPoints
//
- this.btnOpUser.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
- this.btnOpUser.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
- this.btnOpUser.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.btnOpUser.Cursor = System.Windows.Forms.Cursors.Hand;
- this.btnOpUser.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.btnOpUser.ForeColor = System.Drawing.Color.White;
- this.btnOpUser.Location = new System.Drawing.Point(157, 571);
- this.btnOpUser.Name = "btnOpUser";
- this.btnOpUser.Size = new System.Drawing.Size(86, 25);
- this.btnOpUser.TabIndex = 34;
- this.btnOpUser.Text = "添加用户";
- this.btnOpUser.UseVisualStyleBackColor = false;
- this.btnOpUser.Click += new System.EventHandler(this.btnOpUser_Click);
+ this.chkShopPoints.Location = new System.Drawing.Point(95, 434);
+ this.chkShopPoints.Name = "chkShopPoints";
+ this.chkShopPoints.Size = new System.Drawing.Size(68, 21);
+ this.chkShopPoints.TabIndex = 811;
+ this.chkShopPoints.Text = "充值用户";
+ this.chkShopPoints.UseVisualStyleBackColor = true;
//
- // label30
+ // label1
//
- this.label30.AutoSize = true;
- this.label30.ForeColor = System.Drawing.SystemColors.ButtonShadow;
- this.label30.Location = new System.Drawing.Point(265, 146);
- this.label30.Name = "label30";
- this.label30.Size = new System.Drawing.Size(56, 17);
- this.label30.TabIndex = 33;
- this.label30.Text = "登录使用";
+ this.label1.AutoSize = true;
+ this.label1.ForeColor = System.Drawing.SystemColors.ButtonShadow;
+ this.label1.Location = new System.Drawing.Point(30, 490);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(236, 68);
+ this.label1.TabIndex = 37;
+ this.label1.Text = "备注：１编辑时密码为空不更改原密码。\r\n ２商品采集自带微信采集和商品裂变\r\n 功能，如非测试请勿重复勾选微信\r\n 回采和裂变测试功能。";
//
- // label31
+ // chkWXShowProdGetFromType
//
- 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, 210);
- this.label31.Name = "label31";
- this.label31.Size = new System.Drawing.Size(13, 17);
- this.label31.TabIndex = 32;
- this.label31.Text = "*";
+ this.chkWXShowProdGetFromType.Location = new System.Drawing.Point(175, 370);
+ this.chkWXShowProdGetFromType.Name = "chkWXShowProdGetFromType";
+ this.chkWXShowProdGetFromType.Size = new System.Drawing.Size(68, 21);
+ this.chkWXShowProdGetFromType.TabIndex = 810;
+ this.chkWXShowProdGetFromType.Text = "货源选择";
+ this.chkWXShowProdGetFromType.UseVisualStyleBackColor = true;
//
- // txtRePass
+ // label2
//
- this.txtRePass.Location = new System.Drawing.Point(95, 207);
- this.txtRePass.Name = "txtRePass";
- this.txtRePass.PasswordChar = '*';
- this.txtRePass.Size = new System.Drawing.Size(148, 23);
- this.txtRePass.TabIndex = 24;
+ 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.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(135, 20);
+ this.label2.TabIndex = 38;
+ this.label2.Text = "添加或编辑用户账户";
//
- // label32
+ // label7
//
- 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, 208);
- this.label32.Name = "label32";
- this.label32.Size = new System.Drawing.Size(79, 20);
- this.label32.TabIndex = 31;
- this.label32.Text = "重复密码：";
+ 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, 370);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(51, 20);
+ this.label7.TabIndex = 809;
+ this.label7.Text = "权限：";
//
- // label33
+ // txtCompany
//
- 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, 243);
- this.label33.Name = "label33";
- this.label33.Size = new System.Drawing.Size(13, 17);
- this.label33.TabIndex = 30;
- this.label33.Text = "*";
+ this.txtCompany.Location = new System.Drawing.Point(95, 273);
+ this.txtCompany.Name = "txtCompany";
+ this.txtCompany.Size = new System.Drawing.Size(148, 23);
+ this.txtCompany.TabIndex = 39;
//
- // label34
+ // chkWXComplateProd
//
- 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, 178);
- this.label34.Name = "label34";
- this.label34.Size = new System.Drawing.Size(13, 17);
- this.label34.TabIndex = 29;
- this.label34.Text = "*";
+ this.chkWXComplateProd.Location = new System.Drawing.Point(95, 370);
+ this.chkWXComplateProd.Name = "chkWXComplateProd";
+ this.chkWXComplateProd.Size = new System.Drawing.Size(68, 21);
+ this.chkWXComplateProd.TabIndex = 808;
+ this.chkWXComplateProd.Text = "微信回采";
+ this.chkWXComplateProd.UseVisualStyleBackColor = true;
//
- // label35
+ // label3
//
- 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, 146);
- this.label35.Name = "label35";
- this.label35.Size = new System.Drawing.Size(13, 17);
- this.label35.TabIndex = 28;
- this.label35.Text = "*";
+ 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, 274);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(51, 20);
+ this.label3.TabIndex = 40;
+ this.label3.Text = "公司：";
//
- // label36
+ // cmbSaLevel
//
- 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.Name = "label36";
- this.label36.Size = new System.Drawing.Size(13, 17);
- this.label36.TabIndex = 27;
- this.label36.Text = "*";
+ this.cmbSaLevel.FormattingEnabled = true;
+ this.cmbSaLevel.Items.AddRange(new object[] {
+ "普通用户",
+ "一级超管",
+ "二级超管"});
+ this.cmbSaLevel.Location = new System.Drawing.Point(95, 337);
+ this.cmbSaLevel.Name = "cmbSaLevel";
+ this.cmbSaLevel.Size = new System.Drawing.Size(148, 25);
+ this.cmbSaLevel.TabIndex = 48;
+ this.cmbSaLevel.Text = "普通用户";
//
- // cmbGroup
+ // cmbSearchGroup
//
- this.cmbGroup.FormattingEnabled = true;
- this.cmbGroup.Items.AddRange(new object[] {
+ this.cmbSearchGroup.FormattingEnabled = true;
+ this.cmbSearchGroup.Items.AddRange(new object[] {
"客服",
"采购",
"上货",
"数据",
"登录"});
- this.cmbGroup.Location = new System.Drawing.Point(95, 239);
- this.cmbGroup.Name = "cmbGroup";
- this.cmbGroup.Size = new System.Drawing.Size(148, 25);
- this.cmbGroup.TabIndex = 26;
- this.cmbGroup.Text = "主账户";
+ this.cmbSearchGroup.Location = new System.Drawing.Point(95, 5);
+ this.cmbSearchGroup.Name = "cmbSearchGroup";
+ this.cmbSearchGroup.Size = new System.Drawing.Size(148, 25);
+ this.cmbSearchGroup.TabIndex = 44;
+ this.cmbSearchGroup.Text = "主账户";
//
- // label37
+ // label6
//
- 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, 241);
- this.label37.Name = "label37";
- this.label37.Size = new System.Drawing.Size(51, 20);
- this.label37.TabIndex = 25;
- this.label37.Text = "分组：";
+ this.label6.AutoSize = true;
+ this.label6.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label6.Location = new System.Drawing.Point(10, 339);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(79, 20);
+ this.label6.TabIndex = 47;
+ this.label6.Text = "超管等级：";
//
- // txtPassword
+ // btnSearch
//
- this.txtPassword.Location = new System.Drawing.Point(95, 175);
- this.txtPassword.Name = "txtPassword";
- this.txtPassword.PasswordChar = '*';
- this.txtPassword.Size = new System.Drawing.Size(148, 23);
- this.txtPassword.TabIndex = 23;
+ 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.Name = "btnSearch";
+ this.btnSearch.Size = new System.Drawing.Size(68, 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)))));
+ this.btnSearch.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+ this.btnSearch.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+ this.btnSearch.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+ this.btnSearch.Style.ForeColor.Color = System.Drawing.Color.White;
+ this.btnSearch.Style.GradientAngle = 90;
+ this.btnSearch.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnSearch.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnSearch.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnSearch.TabIndex = 836;
+ this.btnSearch.Text = "查询/刷新";
+ this.btnSearch.Click += new System.EventHandler(this.btnRefresh_Click);
//
- // label38
+ // lblWatermark
//
- 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, 176);
- this.label38.Name = "label38";
- this.label38.Size = new System.Drawing.Size(51, 20);
- this.label38.TabIndex = 22;
- this.label38.Text = "密码：";
+ 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.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);
//
- // txtMobile
+ // label4
//
- this.txtMobile.Location = new System.Drawing.Point(95, 143);
- this.txtMobile.Name = "txtMobile";
- this.txtMobile.Size = new System.Drawing.Size(148, 23);
- this.txtMobile.TabIndex = 21;
+ this.label4.AutoSize = true;
+ this.label4.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label4.Location = new System.Drawing.Point(14, 7);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(79, 20);
+ this.label4.TabIndex = 42;
+ this.label4.Text = "搜索条件：";
//
- // label39
+ // txtSearch
//
- 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, 144);
- this.label39.Name = "label39";
- this.label39.Size = new System.Drawing.Size(65, 20);
- this.label39.TabIndex = 20;
- this.label39.Text = "手机号：";
- //
- // txtNickName
- //
- this.txtNickName.Location = new System.Drawing.Point(95, 111);
- this.txtNickName.Name = "txtNickName";
- this.txtNickName.Size = new System.Drawing.Size(148, 23);
- this.txtNickName.TabIndex = 19;
- //
- // 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 = "昵称：";
- //
- // line1
- //
- this.line1.Location = new System.Drawing.Point(14, 31);
- this.line1.Name = "line1";
- this.line1.Size = new System.Drawing.Size(307, 10);
- this.line1.TabIndex = 818;
- this.line1.Text = "line1";
+ 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
//
@@ -846,6 +904,8 @@ namespace TemuKJD.WXForms.AdminForms
//
this.pnlBalance.Anchor = System.Windows.Forms.AnchorStyles.None;
this.pnlBalance.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.pnlBalance.Controls.Add(this.lblBalanceNickName);
+ this.pnlBalance.Controls.Add(this.lblBalanceUserId);
this.pnlBalance.Controls.Add(this.label13);
this.pnlBalance.Controls.Add(this.lblUserBalanceInfo);
this.pnlBalance.Controls.Add(this.panel4);
@@ -855,6 +915,26 @@ namespace TemuKJD.WXForms.AdminForms
this.pnlBalance.TabIndex = 10;
this.pnlBalance.Visible = false;
//
+ // lblBalanceNickName
+ //
+ this.lblBalanceNickName.AutoSize = true;
+ this.lblBalanceNickName.Location = new System.Drawing.Point(258, 19);
+ this.lblBalanceNickName.Name = "lblBalanceNickName";
+ this.lblBalanceNickName.Size = new System.Drawing.Size(69, 17);
+ this.lblBalanceNickName.TabIndex = 459;
+ this.lblBalanceNickName.Text = "NickName";
+ this.lblBalanceNickName.Visible = false;
+ //
+ // lblBalanceUserId
+ //
+ this.lblBalanceUserId.AutoSize = true;
+ this.lblBalanceUserId.Location = new System.Drawing.Point(211, 19);
+ this.lblBalanceUserId.Name = "lblBalanceUserId";
+ this.lblBalanceUserId.Size = new System.Drawing.Size(47, 17);
+ this.lblBalanceUserId.TabIndex = 458;
+ this.lblBalanceUserId.Text = "UserId";
+ this.lblBalanceUserId.Visible = false;
+ //
// label13
//
this.label13.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -1090,6 +1170,8 @@ namespace TemuKJD.WXForms.AdminForms
//
this.pnlTopUp.Anchor = System.Windows.Forms.AnchorStyles.None;
this.pnlTopUp.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.pnlTopUp.Controls.Add(this.lblTopUpNickName);
+ this.pnlTopUp.Controls.Add(this.lblTopUpUserId);
this.pnlTopUp.Controls.Add(this.label14);
this.pnlTopUp.Controls.Add(this.lblUserInfo);
this.pnlTopUp.Controls.Add(this.panel2);
@@ -1209,20 +1291,20 @@ namespace TemuKJD.WXForms.AdminForms
//
this.dgvUser.AllowUserToAddRows = false;
this.dgvUser.AllowUserToDeleteRows = false;
- dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249)))));
- this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4;
+ dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249)))));
+ this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
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)))));
- 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;
+ 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;
this.dgvUser.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvUser.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colCheck,
@@ -1367,8 +1449,8 @@ namespace TemuKJD.WXForms.AdminForms
//
// colPlus
//
- dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- this.colPlus.DefaultCellStyle = dataGridViewCellStyle6;
+ dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ this.colPlus.DefaultCellStyle = dataGridViewCellStyle3;
this.colPlus.FillWeight = 22F;
this.colPlus.HeaderText = "+";
this.colPlus.Name = "colPlus";
@@ -1466,59 +1548,25 @@ namespace TemuKJD.WXForms.AdminForms
this.btnExportShopErp.Visible = false;
this.btnExportShopErp.Click += new System.EventHandler(this.btnExportShopErp_Click);
//
- // pnlSuperManage
+ // lblTopUpNickName
//
- 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.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);
- this.pnlSuperManage.Controls.Add(this.btnCancel);
- this.pnlSuperManage.Controls.Add(this.chkShopPoints);
- 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.label6);
- this.pnlSuperManage.Location = new System.Drawing.Point(4, 32);
- this.pnlSuperManage.Name = "pnlSuperManage";
- this.pnlSuperManage.Size = new System.Drawing.Size(333, 623);
- this.pnlSuperManage.TabIndex = 851;
+ this.lblTopUpNickName.AutoSize = true;
+ this.lblTopUpNickName.Location = new System.Drawing.Point(259, 19);
+ this.lblTopUpNickName.Name = "lblTopUpNickName";
+ this.lblTopUpNickName.Size = new System.Drawing.Size(69, 17);
+ this.lblTopUpNickName.TabIndex = 461;
+ this.lblTopUpNickName.Text = "NickName";
+ this.lblTopUpNickName.Visible = false;
+ //
+ // lblTopUpUserId
+ //
+ this.lblTopUpUserId.AutoSize = true;
+ this.lblTopUpUserId.Location = new System.Drawing.Point(212, 19);
+ this.lblTopUpUserId.Name = "lblTopUpUserId";
+ this.lblTopUpUserId.Size = new System.Drawing.Size(47, 17);
+ this.lblTopUpUserId.TabIndex = 460;
+ this.lblTopUpUserId.Text = "UserId";
+ this.lblTopUpUserId.Visible = false;
//
// WXAdminAccountForm
//
@@ -1536,6 +1584,8 @@ namespace TemuKJD.WXForms.AdminForms
this.splitContainer5.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer5)).EndInit();
this.splitContainer5.ResumeLayout(false);
+ this.pnlSuperManage.ResumeLayout(false);
+ this.pnlSuperManage.PerformLayout();
this.splitContainer1.Panel1.ResumeLayout(false);
this.splitContainer1.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
@@ -1561,8 +1611,6 @@ namespace TemuKJD.WXForms.AdminForms
this.panel2.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.numAddTopUp)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.dgvUser)).EndInit();
- this.pnlSuperManage.ResumeLayout(false);
- this.pnlSuperManage.PerformLayout();
this.ResumeLayout(false);
}
@@ -1679,5 +1727,9 @@ namespace TemuKJD.WXForms.AdminForms
private System.Windows.Forms.DataGridViewLinkColumn editColumn;
private System.Windows.Forms.DataGridViewLinkColumn deleteColumn;
public System.Windows.Forms.Panel pnlSuperManage;
+ private System.Windows.Forms.Label lblBalanceUserId;
+ private System.Windows.Forms.Label lblBalanceNickName;
+ private System.Windows.Forms.Label lblTopUpNickName;
+ private System.Windows.Forms.Label lblTopUpUserId;
}
}
\ No newline at end of file
diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.cs b/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.cs
index 89667f0..126b92f 100644
--- a/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.cs
+++ b/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.cs
@@ -303,6 +303,8 @@ namespace TemuKJD.WXForms.AdminForms
if (columName == "colPlus")
{
this.lblUserInfo.Text = mobile + " - " + nickName;
+ this.lblTopUpUserId.Text = mobile;
+ this.lblTopUpNickName.Text = nickName;
this.numAddTopUp.Value = 0;
this.pnlTopUp.Tag = row;
this.pnlTopUp.Visible = true;
@@ -311,6 +313,8 @@ namespace TemuKJD.WXForms.AdminForms
if (columName == "colBalancePlus")
{
this.lblUserBalanceInfo.Text = mobile + " - " + nickName;
+ this.lblBalanceUserId.Text = mobile;
+ this.lblBalanceNickName.Text = nickName;
this.numAddBalance.Value = 0;
this.pnlBalance.Tag = row;
this.pnlBalance.Visible = true;
@@ -449,8 +453,8 @@ namespace TemuKJD.WXForms.AdminForms
{
string url = BaseClass.BuildObjString("user/update_user_points");
string data = UserLogin.GetSignaturex();
- data += "&update_user_name=" + lblUserInfo.Text.Split('-')[0].Trim();
- data += "&update_user_nick=" + lblUserInfo.Text.Split('-')[1].Trim();
+ data += "&update_user_name=" + lblTopUpUserId.Text;
+ data += "&update_user_nick=" + lblTopUpNickName.Text;
data += "&option_type=" + "充值";
data += "&operator_type=" + "管理员";
@@ -527,8 +531,8 @@ namespace TemuKJD.WXForms.AdminForms
{
string url = BaseClass.BuildObjString("user/update_user_balance");
string data = UserLogin.GetSignaturex();
- data += "&update_user_name=" + lblUserBalanceInfo.Text.Split('-')[0].Trim();
- data += "&update_user_nick=" + lblUserBalanceInfo.Text.Split('-')[1].Trim();
+ data += "&update_user_name=" + lblBalanceUserId.Text;
+ data += "&update_user_nick=" + lblBalanceNickName.Text;
data += "&option_type=" + "充值";
data += "&operator_name=" + BaseClass.UserName;
data += "&delta_balance=" + numAddBalance.Value;
diff --git a/TEMUKJD/WXForms/AdminForms/WxOemManageForm.Designer.cs b/TEMUKJD/WXForms/AdminForms/WxOemManageForm.Designer.cs
index 12bec26..96a12aa 100644
--- a/TEMUKJD/WXForms/AdminForms/WxOemManageForm.Designer.cs
+++ b/TEMUKJD/WXForms/AdminForms/WxOemManageForm.Designer.cs
@@ -28,8 +28,8 @@
///
private void InitializeComponent()
{
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
this.splitContainer5 = new System.Windows.Forms.SplitContainer();
this.btnCancelEdit = new DevComponents.DotNetBar.PanelEx();
this.btnAddMdy = new DevComponents.DotNetBar.PanelEx();
@@ -246,6 +246,7 @@
this.btnClear.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
this.btnClear.TabIndex = 847;
this.btnClear.Text = "置空";
+ this.btnClear.Click += new System.EventHandler(this.btnClear_Click);
//
// txtSearchOemName
//
@@ -391,20 +392,20 @@
//
this.dgvOem.AllowUserToAddRows = false;
this.dgvOem.AllowUserToDeleteRows = false;
- dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249)))));
- this.dgvOem.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5;
+ dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249)))));
+ this.dgvOem.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
this.dgvOem.AutoRowNumber = true;
this.dgvOem.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
this.dgvOem.BackgroundColor = System.Drawing.Color.White;
this.dgvOem.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.dgvOem.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6;
+ 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.dgvOem.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
this.dgvOem.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvOem.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colCheck,
diff --git a/TEMUKJD/WXForms/AdminForms/WxOemManageForm.cs b/TEMUKJD/WXForms/AdminForms/WxOemManageForm.cs
index 1535c49..4cd6c7f 100644
--- a/TEMUKJD/WXForms/AdminForms/WxOemManageForm.cs
+++ b/TEMUKJD/WXForms/AdminForms/WxOemManageForm.cs
@@ -194,5 +194,11 @@ namespace TemuKJD.WXForms.AdminForms
}
}, cancellationTokenSource.Token);
}
+
+ private void btnClear_Click(object sender, EventArgs e)
+ {
+ txtSearchOemId.Text = "";
+ txtSearchOemName.Text = "";
+ }
}
}
diff --git a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs
index fd91ecb..5c4e1df 100644
--- a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs
+++ b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs
@@ -1,7 +1,15 @@
using AllBase;
+using AllBase.Extension;
using AllBase.Helper;
+using AllBase.Model.Config;
+using AllBase.Model.Param.WXParam;
using AllBase.Model.Result;
+using AllBase.Model.Result.PDDResult;
+using AllBase.Model.Result.WXResult;
+using CefSharp;
+using NaiBa.Util;
using NaiBa.Util.Extension;
+using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -12,25 +20,18 @@ using System.IO;
using System.Linq;
using System.Net.Http;
using System.Text;
+using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
-using TemuKJD.Extension;
using TemuKJD.BaseForms;
-using TemuKJD.ToolForms;
-using Work;
using TemuKJD.BLL;
-using System.Text.RegularExpressions;
+using TemuKJD.Extension;
using TemuKJD.PDDForms.ProductSelectForms;
+using TemuKJD.ToolForms;
using TemuKJD.WXForms.ShopForms;
-using AllBase.Model.Result.PDDResult;
-using AllBase.Model.Param.WXParam;
-using AllBase.Model.Result.WXResult;
-using Newtonsoft.Json;
-using NaiBa.Util;
-using AllBase.Model.Config;
-using CefSharp;
-using AllBase.Extension;
+using Work;
+using static System.Net.Mime.MediaTypeNames;
namespace TemuKJD.WXForms.ProductForms
{
@@ -4601,16 +4602,41 @@ namespace TemuKJD.WXForms.ProductForms
bookStr += address + "\r\n" + "\r\n";
bookStr += Storage + "\r\n" + "\r\n";
- var bookImg = new Bitmap(800, 800);
+ int width = 800;
+ int height = 1000;
+ var bookImg = new Bitmap(width, height);
using (Graphics g = Graphics.FromImage(bookImg))
{
- g.Clear(Color.White);
- //Font font = new Font("宋体", 15, FontStyle.Bold);
- Font font = new Font("微软雅黑", 15, FontStyle.Regular);
- Brush textBrush = Brushes.Black;
- g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.ClearTypeGridFit;
- RectangleF rectF = new RectangleF(80, 80, 800 - 80, 800 - 80);
- g.DrawString(bookStr, font, textBrush, rectF);
+ g.Clear(Color.Gray);
+
+ Brush borderBrush = Brushes.Gray;
+ Brush contentBrush = Brushes.White;
+ g.FillRectangle(contentBrush, new RectangleF(8, 8, width - 16, height - 16));
+ g.FillRectangle(borderBrush, new RectangleF(18, 18, width - 36, height - 36));
+ g.FillRectangle(contentBrush, new RectangleF(22, 22, width - 44, height - 44));
+ g.FillRectangle(borderBrush, new RectangleF(40, 140, width - 80, 4));
+
+ SizeF textSize;
+ {
+ Font font = new Font("微软雅黑", 30, FontStyle.Regular);
+ Brush textBrush = Brushes.DarkRed;
+ g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.ClearTypeGridFit;
+ // 测量文本的宽度
+ textSize = g.MeasureString("商 品 标 签", font);
+ float x = (width - textSize.Width) / 2;
+
+ RectangleF rectF = new RectangleF(x, 50, width - x, height - 200);
+ g.DrawString("商 品 标 签", font, textBrush, rectF);
+ }
+
+ {
+ //Font font = new Font("宋体", 15, FontStyle.Bold);
+ Font font = new Font("微软雅黑", 15, FontStyle.Regular);
+ Brush textBrush = Brushes.Black;
+ g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.ClearTypeGridFit;
+ RectangleF rectF = new RectangleF(80, 120 + textSize.Height, width - 160, height - 80 - 120 - textSize.Height);
+ g.DrawString(bookStr, font, textBrush, rectF);
+ }
}
Thread.Sleep(Randomx.GetId(500, 800));
@@ -5674,8 +5700,8 @@ namespace TemuKJD.WXForms.ProductForms
}
}));
var html = GetHtml.PostUtf8(url, data);
- if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
- html = GetHtml.PostUtf8(url, data);
+ //if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+ // html = GetHtml.PostUtf8(url, data);
//if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
// html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))