管理员与OEM增加 修改用户的同步物流金额
This commit is contained in:
1 parent
90dbd7fedc
commit
fe9bad9983
6 files changed
+2754
-2324
No files matched your search
@@ -321,10 +321,14 @@ namespace AllBase.Model.Result
|
||||
/// 每一单礼物额外收取费用
|
||||
/// </summary>
|
||||
public decimal gift_oem_amount_per_order { get; set; } = 0m;
|
||||
/// <summary>
|
||||
/// 子账号禁止访问的页面
|
||||
/// </summary>
|
||||
public string forbidden_page { get; set; }
|
||||
/// <summary>
|
||||
/// 同步物流额外收费
|
||||
/// </summary>
|
||||
public decimal sync_logistics_per_order { get; set; } = 0m;
|
||||
/// <summary>
|
||||
/// 子账号禁止访问的页面
|
||||
/// </summary>
|
||||
public string forbidden_page { get; set; }
|
||||
public string oem_id { get; set; }
|
||||
public string oem_name { get; set; }
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<ErrorReportUrlHistory />
|
||||
<FallbackCulture>zh-CN</FallbackCulture>
|
||||
<VerifyUploadedFiles>false</VerifyUploadedFiles>
|
||||
<ActiveDebugProfile>Production</ActiveDebugProfile>
|
||||
<ActiveDebugProfile>Development</ActiveDebugProfile>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
|
||||
<EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
|
||||
|
||||
+248
-87
@@ -30,9 +30,9 @@ 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();
|
||||
@@ -86,6 +86,14 @@ namespace TemuKJD.WXForms.AdminForms
|
||||
this.txtSearch = new System.Windows.Forms.TextBox();
|
||||
this.label4 = new System.Windows.Forms.Label();
|
||||
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
|
||||
this.pnlSyncLogisticsPerOrder = new System.Windows.Forms.Panel();
|
||||
this.lblSyncLogisticsPerOrderUserId = new System.Windows.Forms.Label();
|
||||
this.lblSyncLogisticsPerOrderUserInfo = new System.Windows.Forms.Label();
|
||||
this.panel8 = new System.Windows.Forms.Panel();
|
||||
this.numSyncLogisticsPerOrder = new System.Windows.Forms.NumericUpDown();
|
||||
this.label20 = new System.Windows.Forms.Label();
|
||||
this.btnSyncLogisticsPerOrderCancel = new DevComponents.DotNetBar.PanelEx();
|
||||
this.btnSyncLogisticsPerOrder = new DevComponents.DotNetBar.PanelEx();
|
||||
this.pnlGiftOemAmountPerOrder = new System.Windows.Forms.Panel();
|
||||
this.lblGiftOemAmountPerOrderUserId = new System.Windows.Forms.Label();
|
||||
this.lblGiftOemAmountPerOrderUserInfo = new System.Windows.Forms.Label();
|
||||
@@ -139,6 +147,8 @@ namespace TemuKJD.WXForms.AdminForms
|
||||
this.btnTopUpCancel = new DevComponents.DotNetBar.PanelEx();
|
||||
this.btnTopUpOK = new DevComponents.DotNetBar.PanelEx();
|
||||
this.dgvUser = new TemuKJD.UserComponent.DataGridViewEx();
|
||||
this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage();
|
||||
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();
|
||||
@@ -165,11 +175,11 @@ namespace TemuKJD.WXForms.AdminForms
|
||||
this.colChangeRefundPostagePerOrder = new System.Windows.Forms.DataGridViewLinkColumn();
|
||||
this.colGiftOemAmountPerOrder = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colChangeGiftOemAmountPerOrder = new System.Windows.Forms.DataGridViewLinkColumn();
|
||||
this.colSyncLogisticsPerOrder = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colChangeSyncLogisticsPerOrder = 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();
|
||||
this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage();
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitContainer5)).BeginInit();
|
||||
this.splitContainer5.Panel1.SuspendLayout();
|
||||
this.splitContainer5.Panel2.SuspendLayout();
|
||||
@@ -179,6 +189,9 @@ namespace TemuKJD.WXForms.AdminForms
|
||||
this.splitContainer1.Panel1.SuspendLayout();
|
||||
this.splitContainer1.Panel2.SuspendLayout();
|
||||
this.splitContainer1.SuspendLayout();
|
||||
this.pnlSyncLogisticsPerOrder.SuspendLayout();
|
||||
this.panel8.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.numSyncLogisticsPerOrder)).BeginInit();
|
||||
this.pnlGiftOemAmountPerOrder.SuspendLayout();
|
||||
this.panel7.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.numGiftOemAmountPerOrder)).BeginInit();
|
||||
@@ -811,6 +824,7 @@ namespace TemuKJD.WXForms.AdminForms
|
||||
//
|
||||
// splitContainer1.Panel1
|
||||
//
|
||||
this.splitContainer1.Panel1.Controls.Add(this.pnlSyncLogisticsPerOrder);
|
||||
this.splitContainer1.Panel1.Controls.Add(this.pnlGiftOemAmountPerOrder);
|
||||
this.splitContainer1.Panel1.Controls.Add(this.pnlRefundPostagePerOrder);
|
||||
this.splitContainer1.Panel1.Controls.Add(this.pnlPostagePerOrder);
|
||||
@@ -827,6 +841,122 @@ namespace TemuKJD.WXForms.AdminForms
|
||||
this.splitContainer1.SplitterDistance = 620;
|
||||
this.splitContainer1.TabIndex = 2;
|
||||
//
|
||||
// pnlSyncLogisticsPerOrderr
|
||||
//
|
||||
this.pnlSyncLogisticsPerOrder.AccessibleDescription = "";
|
||||
this.pnlSyncLogisticsPerOrder.Anchor = System.Windows.Forms.AnchorStyles.None;
|
||||
this.pnlSyncLogisticsPerOrder.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
this.pnlSyncLogisticsPerOrder.Controls.Add(this.lblSyncLogisticsPerOrderUserId);
|
||||
this.pnlSyncLogisticsPerOrder.Controls.Add(this.lblSyncLogisticsPerOrderUserInfo);
|
||||
this.pnlSyncLogisticsPerOrder.Controls.Add(this.panel8);
|
||||
this.pnlSyncLogisticsPerOrder.Location = new System.Drawing.Point(40, 389);
|
||||
this.pnlSyncLogisticsPerOrder.Name = "pnlSyncLogisticsPerOrderr";
|
||||
this.pnlSyncLogisticsPerOrder.Size = new System.Drawing.Size(360, 146);
|
||||
this.pnlSyncLogisticsPerOrder.TabIndex = 458;
|
||||
this.pnlSyncLogisticsPerOrder.Visible = false;
|
||||
//
|
||||
// lblSyncLogisticsPerOrderUserId
|
||||
//
|
||||
this.lblSyncLogisticsPerOrderUserId.AutoSize = true;
|
||||
this.lblSyncLogisticsPerOrderUserId.Location = new System.Drawing.Point(256, 19);
|
||||
this.lblSyncLogisticsPerOrderUserId.Name = "lblSyncLogisticsPerOrderUserId";
|
||||
this.lblSyncLogisticsPerOrderUserId.Size = new System.Drawing.Size(47, 17);
|
||||
this.lblSyncLogisticsPerOrderUserId.TabIndex = 457;
|
||||
this.lblSyncLogisticsPerOrderUserId.Text = "UserId";
|
||||
this.lblSyncLogisticsPerOrderUserId.Visible = false;
|
||||
//
|
||||
// lblSyncLogisticsPerOrderUserInfo
|
||||
//
|
||||
this.lblSyncLogisticsPerOrderUserInfo.AutoSize = true;
|
||||
this.lblSyncLogisticsPerOrderUserInfo.Location = new System.Drawing.Point(20, 19);
|
||||
this.lblSyncLogisticsPerOrderUserInfo.Name = "lblSyncLogisticsPerOrderUserInfo";
|
||||
this.lblSyncLogisticsPerOrderUserInfo.Size = new System.Drawing.Size(58, 17);
|
||||
this.lblSyncLogisticsPerOrderUserInfo.TabIndex = 455;
|
||||
this.lblSyncLogisticsPerOrderUserInfo.Text = "UserInfo";
|
||||
//
|
||||
// panel8
|
||||
//
|
||||
this.panel8.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.panel8.Controls.Add(this.numSyncLogisticsPerOrder);
|
||||
this.panel8.Controls.Add(this.label20);
|
||||
this.panel8.Controls.Add(this.btnSyncLogisticsPerOrderCancel);
|
||||
this.panel8.Controls.Add(this.btnSyncLogisticsPerOrder);
|
||||
this.panel8.Location = new System.Drawing.Point(23, 52);
|
||||
this.panel8.Name = "panel8";
|
||||
this.panel8.Size = new System.Drawing.Size(310, 57);
|
||||
this.panel8.TabIndex = 454;
|
||||
//
|
||||
// numSyncLogisticsPerOrder
|
||||
//
|
||||
this.numSyncLogisticsPerOrder.DecimalPlaces = 2;
|
||||
this.numSyncLogisticsPerOrder.Location = new System.Drawing.Point(125, 16);
|
||||
this.numSyncLogisticsPerOrder.Maximum = new decimal(new int[] {
|
||||
100000,
|
||||
0,
|
||||
0,
|
||||
0});
|
||||
this.numSyncLogisticsPerOrder.Name = "numSyncLogisticsPerOrder";
|
||||
this.numSyncLogisticsPerOrder.Size = new System.Drawing.Size(56, 23);
|
||||
this.numSyncLogisticsPerOrder.TabIndex = 1;
|
||||
//
|
||||
// label20
|
||||
//
|
||||
this.label20.AutoSize = true;
|
||||
this.label20.Location = new System.Drawing.Point(7, 19);
|
||||
this.label20.Name = "label20";
|
||||
this.label20.Size = new System.Drawing.Size(116, 17);
|
||||
this.label20.TabIndex = 456;
|
||||
this.label20.Text = "同步物流额外收取:";
|
||||
//
|
||||
// btnSyncLogisticsPerOrderCancel
|
||||
//
|
||||
this.btnSyncLogisticsPerOrderCancel.CanvasColor = System.Drawing.SystemColors.Control;
|
||||
this.btnSyncLogisticsPerOrderCancel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnSyncLogisticsPerOrderCancel.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnSyncLogisticsPerOrderCancel.Location = new System.Drawing.Point(244, 16);
|
||||
this.btnSyncLogisticsPerOrderCancel.Name = "btnSyncLogisticsPerOrderCancel";
|
||||
this.btnSyncLogisticsPerOrderCancel.Size = new System.Drawing.Size(56, 23);
|
||||
this.btnSyncLogisticsPerOrderCancel.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnSyncLogisticsPerOrderCancel.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
|
||||
this.btnSyncLogisticsPerOrderCancel.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
|
||||
this.btnSyncLogisticsPerOrderCancel.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
|
||||
this.btnSyncLogisticsPerOrderCancel.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnSyncLogisticsPerOrderCancel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
|
||||
this.btnSyncLogisticsPerOrderCancel.Style.GradientAngle = 90;
|
||||
this.btnSyncLogisticsPerOrderCancel.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnSyncLogisticsPerOrderCancel.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnSyncLogisticsPerOrderCancel.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnSyncLogisticsPerOrderCancel.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnSyncLogisticsPerOrderCancel.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
|
||||
this.btnSyncLogisticsPerOrderCancel.TabIndex = 458;
|
||||
this.btnSyncLogisticsPerOrderCancel.Text = "取消";
|
||||
this.btnSyncLogisticsPerOrderCancel.Click += new System.EventHandler(this.btnSyncLogisticsPerOrderCancel_Click);
|
||||
//
|
||||
// btnSyncLogisticsPerOrder
|
||||
//
|
||||
this.btnSyncLogisticsPerOrder.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnSyncLogisticsPerOrder.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnSyncLogisticsPerOrder.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnSyncLogisticsPerOrder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnSyncLogisticsPerOrder.Location = new System.Drawing.Point(185, 16);
|
||||
this.btnSyncLogisticsPerOrder.Name = "btnSyncLogisticsPerOrder";
|
||||
this.btnSyncLogisticsPerOrder.Size = new System.Drawing.Size(56, 23);
|
||||
this.btnSyncLogisticsPerOrder.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnSyncLogisticsPerOrder.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnSyncLogisticsPerOrder.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnSyncLogisticsPerOrder.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
|
||||
this.btnSyncLogisticsPerOrder.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
|
||||
this.btnSyncLogisticsPerOrder.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
|
||||
this.btnSyncLogisticsPerOrder.Style.ForeColor.Color = System.Drawing.Color.White;
|
||||
this.btnSyncLogisticsPerOrder.Style.GradientAngle = 90;
|
||||
this.btnSyncLogisticsPerOrder.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnSyncLogisticsPerOrder.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnSyncLogisticsPerOrder.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnSyncLogisticsPerOrder.TabIndex = 453;
|
||||
this.btnSyncLogisticsPerOrder.Text = "确定";
|
||||
this.btnSyncLogisticsPerOrder.Click += new System.EventHandler(this.btnSyncLogisticsPerOrder_Click);
|
||||
//
|
||||
// pnlGiftOemAmountPerOrder
|
||||
//
|
||||
this.pnlGiftOemAmountPerOrder.Anchor = System.Windows.Forms.AnchorStyles.None;
|
||||
@@ -1603,20 +1733,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,
|
||||
@@ -1645,6 +1775,8 @@ namespace TemuKJD.WXForms.AdminForms
|
||||
this.colChangeRefundPostagePerOrder,
|
||||
this.colGiftOemAmountPerOrder,
|
||||
this.colChangeGiftOemAmountPerOrder,
|
||||
this.colSyncLogisticsPerOrder,
|
||||
this.colChangeSyncLogisticsPerOrder,
|
||||
this.colAddShop,
|
||||
this.editColumn,
|
||||
this.deleteColumn});
|
||||
@@ -1659,6 +1791,47 @@ namespace TemuKJD.WXForms.AdminForms
|
||||
this.dgvUser.TabIndex = 1;
|
||||
this.dgvUser.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvUser_CellContentClick);
|
||||
//
|
||||
// ucSplitPage1
|
||||
//
|
||||
this.ucSplitPage1.CurrentPage = 1;
|
||||
this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right;
|
||||
this.ucSplitPage1.IsShowPageSize = true;
|
||||
this.ucSplitPage1.IsShowTotalCount = false;
|
||||
this.ucSplitPage1.Location = new System.Drawing.Point(783, 0);
|
||||
this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.ucSplitPage1.MaxPageSizeValue = 5000;
|
||||
this.ucSplitPage1.Name = "ucSplitPage1";
|
||||
this.ucSplitPage1.PageSize = 50;
|
||||
this.ucSplitPage1.Size = new System.Drawing.Size(389, 27);
|
||||
this.ucSplitPage1.TabIndex = 443;
|
||||
this.ucSplitPage1.TotalCount = ((long)(0));
|
||||
this.ucSplitPage1.TotalPage = 1;
|
||||
//
|
||||
// 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;
|
||||
@@ -1765,8 +1938,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";
|
||||
@@ -1842,6 +2015,20 @@ namespace TemuKJD.WXForms.AdminForms
|
||||
this.colChangeGiftOemAmountPerOrder.Name = "colChangeGiftOemAmountPerOrder";
|
||||
this.colChangeGiftOemAmountPerOrder.ReadOnly = true;
|
||||
//
|
||||
// colSyncLogisticsPerOrder
|
||||
//
|
||||
this.colSyncLogisticsPerOrder.FillWeight = 60F;
|
||||
this.colSyncLogisticsPerOrder.HeaderText = "每单同步物流额外收费";
|
||||
this.colSyncLogisticsPerOrder.Name = "colSyncLogisticsPerOrder";
|
||||
this.colSyncLogisticsPerOrder.ReadOnly = true;
|
||||
//
|
||||
// colChangeSyncLogisticsPerOrder
|
||||
//
|
||||
this.colChangeSyncLogisticsPerOrder.FillWeight = 25F;
|
||||
this.colChangeSyncLogisticsPerOrder.HeaderText = "改";
|
||||
this.colChangeSyncLogisticsPerOrder.Name = "colChangeSyncLogisticsPerOrder";
|
||||
this.colChangeSyncLogisticsPerOrder.ReadOnly = true;
|
||||
//
|
||||
// colAddShop
|
||||
//
|
||||
this.colAddShop.FillWeight = 70F;
|
||||
@@ -1867,47 +2054,6 @@ 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);
|
||||
//
|
||||
// ucSplitPage1
|
||||
//
|
||||
this.ucSplitPage1.CurrentPage = 1;
|
||||
this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right;
|
||||
this.ucSplitPage1.IsShowPageSize = true;
|
||||
this.ucSplitPage1.IsShowTotalCount = false;
|
||||
this.ucSplitPage1.Location = new System.Drawing.Point(783, 0);
|
||||
this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.ucSplitPage1.MaxPageSizeValue = 5000;
|
||||
this.ucSplitPage1.Name = "ucSplitPage1";
|
||||
this.ucSplitPage1.PageSize = 50;
|
||||
this.ucSplitPage1.Size = new System.Drawing.Size(389, 27);
|
||||
this.ucSplitPage1.TabIndex = 443;
|
||||
this.ucSplitPage1.TotalCount = ((long)(0));
|
||||
this.ucSplitPage1.TotalPage = 1;
|
||||
//
|
||||
// WXAdminAccountForm
|
||||
//
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
|
||||
@@ -1930,6 +2076,11 @@ namespace TemuKJD.WXForms.AdminForms
|
||||
this.splitContainer1.Panel2.ResumeLayout(false);
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
|
||||
this.splitContainer1.ResumeLayout(false);
|
||||
this.pnlSyncLogisticsPerOrder.ResumeLayout(false);
|
||||
this.pnlSyncLogisticsPerOrder.PerformLayout();
|
||||
this.panel8.ResumeLayout(false);
|
||||
this.panel8.PerformLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.numSyncLogisticsPerOrder)).EndInit();
|
||||
this.pnlGiftOemAmountPerOrder.ResumeLayout(false);
|
||||
this.pnlGiftOemAmountPerOrder.PerformLayout();
|
||||
this.panel7.ResumeLayout(false);
|
||||
@@ -2074,35 +2225,45 @@ namespace TemuKJD.WXForms.AdminForms
|
||||
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;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn mobileColumn;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colParentUserName;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn groupIdColumn;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn groupNameColumn;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colCompany;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn shopCountColumn;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colSaLevel;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colSaLevelName;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colAuthority;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colOemId;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colOemName;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colPoints;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colPlus;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colShopPointsPerMonth;
|
||||
private System.Windows.Forms.DataGridViewLinkColumn colChangePointsPerMonth;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colBalance;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colBalancePlus;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colPostagePerOrder;
|
||||
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;
|
||||
private UserControls.UcSplitPage ucSplitPage1;
|
||||
private System.Windows.Forms.Panel pnlSyncLogisticsPerOrder;
|
||||
private System.Windows.Forms.Label lblSyncLogisticsPerOrderUserId;
|
||||
private System.Windows.Forms.Label lblSyncLogisticsPerOrderUserInfo;
|
||||
private System.Windows.Forms.Panel panel8;
|
||||
private System.Windows.Forms.NumericUpDown numSyncLogisticsPerOrder;
|
||||
private System.Windows.Forms.Label label20;
|
||||
private DevComponents.DotNetBar.PanelEx btnSyncLogisticsPerOrderCancel;
|
||||
private DevComponents.DotNetBar.PanelEx btnSyncLogisticsPerOrder;
|
||||
private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn UserIdColumn;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn UserNickNameColumn;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn mobileColumn;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colParentUserName;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn groupIdColumn;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn groupNameColumn;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colCompany;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn shopCountColumn;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colSaLevel;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colSaLevelName;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colAuthority;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colOemId;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colOemName;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colPoints;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colPlus;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colShopPointsPerMonth;
|
||||
private System.Windows.Forms.DataGridViewLinkColumn colChangePointsPerMonth;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colBalance;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colBalancePlus;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colPostagePerOrder;
|
||||
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.DataGridViewTextBoxColumn colSyncLogisticsPerOrder;
|
||||
private System.Windows.Forms.DataGridViewLinkColumn colChangeSyncLogisticsPerOrder;
|
||||
private System.Windows.Forms.DataGridViewLinkColumn colAddShop;
|
||||
private System.Windows.Forms.DataGridViewLinkColumn editColumn;
|
||||
private System.Windows.Forms.DataGridViewLinkColumn deleteColumn;
|
||||
}
|
||||
}
|
||||
@@ -186,6 +186,7 @@ namespace TemuKJD.WXForms.AdminForms
|
||||
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.sync_logistics_per_order = BaseRegex.GetDecimalJson(ref oStr, "sync_logistics_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");
|
||||
@@ -218,6 +219,8 @@ namespace TemuKJD.WXForms.AdminForms
|
||||
(user.group_id == "3") ? "改" : null,
|
||||
Math.Max(0m, user.gift_oem_amount_per_order.ParseToDecimal()),
|
||||
(user.group_id == "3") ? "改" : null,
|
||||
Math.Max(0m, user.sync_logistics_per_order.ParseToDecimal()),
|
||||
(user.group_id == "3") ? "改" : null,
|
||||
user.group_id == "3" ? "添加店铺" : "",
|
||||
"编辑",
|
||||
"删除");
|
||||
@@ -288,6 +291,7 @@ namespace TemuKJD.WXForms.AdminForms
|
||||
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();
|
||||
decimal syncLogisticsPerOrder = dgvUser.Rows[e.RowIndex].Cells["colSyncLogisticsPerOrder"].Value.ParseToDecimal();
|
||||
string oemId = dgvUser.Rows[e.RowIndex].Cells["colOemId"].Value.ParseToString();
|
||||
var row = dgvUser.Rows[e.RowIndex];
|
||||
if (columText == "编辑")
|
||||
@@ -402,6 +406,16 @@ namespace TemuKJD.WXForms.AdminForms
|
||||
this.pnlGiftOemAmountPerOrder.BringToFront();
|
||||
this.lblGiftOemAmountPerOrderUserId.Text = uid;
|
||||
}
|
||||
|
||||
if (columName == "colChangeSyncLogisticsPerOrder")
|
||||
{
|
||||
this.lblSyncLogisticsPerOrderUserInfo.Text = mobile + " - " + nickName;
|
||||
this.numSyncLogisticsPerOrder.Value = syncLogisticsPerOrder;
|
||||
this.pnlSyncLogisticsPerOrder.Tag = row;
|
||||
this.pnlSyncLogisticsPerOrder.Visible = true;
|
||||
this.pnlSyncLogisticsPerOrder.BringToFront();
|
||||
this.lblSyncLogisticsPerOrderUserId.Text = uid;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -446,6 +460,7 @@ namespace TemuKJD.WXForms.AdminForms
|
||||
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);
|
||||
pnlSyncLogisticsPerOrder.Location = new Point(pnlTopUp.Location.X, pnlTopUp.Location.Y);
|
||||
|
||||
this.cmbGroup.Items.Clear();
|
||||
this.cmbGroup.Items.Add("主账户");
|
||||
@@ -739,5 +754,42 @@ namespace TemuKJD.WXForms.AdminForms
|
||||
{
|
||||
pnlGiftOemAmountPerOrder.Visible = false;
|
||||
}
|
||||
|
||||
private void btnSyncLogisticsPerOrder_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (updateSyncLogisticsPerOrder(lblSyncLogisticsPerOrderUserId.Text))
|
||||
{
|
||||
pnlSyncLogisticsPerOrder.Visible = false;
|
||||
BaseMsgForm.ShowInfo("修改同步物流额外金额成功");
|
||||
}
|
||||
}
|
||||
public bool updateSyncLogisticsPerOrder(string userDbId, bool showFailBox = true)
|
||||
{
|
||||
string url = BaseClass.BuildObjString("user/update_user");
|
||||
string data = UserLogin.GetSignaturex();
|
||||
data += "&id=" + userDbId;
|
||||
data += "&sync_logistics_per_order=" + numSyncLogisticsPerOrder.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<DataGridViewRow>().FirstOrDefault(r => r.Cells["UserIdColumn"].Value.ParseToString() == userDbId);
|
||||
if (row != null)
|
||||
{
|
||||
Invoke(new Action(() => { row.Cells["colSyncLogisticsPerOrder"].Value = numSyncLogisticsPerOrder.Value; }));
|
||||
}
|
||||
return true;
|
||||
}
|
||||
private void btnSyncLogisticsPerOrderCancel_Click(object sender, EventArgs e)
|
||||
{
|
||||
pnlSyncLogisticsPerOrder.Visible = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
+1846
-1685
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
Reference in new issue
Block a user