1中转仓订单退货功能 2中转仓订单运费根据oem或管理员设定调整 3其他一些问题修复
This commit is contained in:
1 parent
d6f81f9ef4
commit
2e20cbdf68
24 files changed
+834
-292
No files matched your search
+54
-8
@@ -31,6 +31,7 @@
|
||||
this.components = new System.ComponentModel.Container();
|
||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PddMobileBuyOrderForm));
|
||||
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
|
||||
this.pnlMask = new DevComponents.DotNetBar.PanelEx();
|
||||
this.btnJumpOrderList = new DevComponents.DotNetBar.PanelEx();
|
||||
this.txtBuySkuName = new System.Windows.Forms.TextBox();
|
||||
this.label21 = new System.Windows.Forms.Label();
|
||||
@@ -94,11 +95,13 @@
|
||||
this.btnReMap = new DevComponents.DotNetBar.PanelEx();
|
||||
this.label25 = new System.Windows.Forms.Label();
|
||||
this.txtBuyTransitWarehouse = new System.Windows.Forms.TextBox();
|
||||
this.label29 = new System.Windows.Forms.Label();
|
||||
this.pnlMap = new System.Windows.Forms.Panel();
|
||||
this.chkAutoChangeWarehouseAddress = new Work.UserComponents.UcCheckBox(this.components);
|
||||
this.pictureBox1 = new System.Windows.Forms.PictureBox();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pbCloseBase)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
|
||||
this.splitContainer1.Panel1.SuspendLayout();
|
||||
this.splitContainer1.Panel2.SuspendLayout();
|
||||
this.splitContainer1.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit();
|
||||
@@ -127,6 +130,10 @@
|
||||
this.splitContainer1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
|
||||
this.splitContainer1.Name = "splitContainer1";
|
||||
this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
|
||||
//
|
||||
// splitContainer1.Panel1
|
||||
//
|
||||
this.splitContainer1.Panel1.Controls.Add(this.pnlMask);
|
||||
this.splitContainer1.Panel1MinSize = 0;
|
||||
//
|
||||
// splitContainer1.Panel2
|
||||
@@ -139,6 +146,31 @@
|
||||
this.splitContainer1.SplitterWidth = 3;
|
||||
this.splitContainer1.TabIndex = 4;
|
||||
//
|
||||
// pnlMask
|
||||
//
|
||||
this.pnlMask.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.pnlMask.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.pnlMask.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.pnlMask.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.pnlMask.Font = new System.Drawing.Font("微软雅黑", 50F);
|
||||
this.pnlMask.Location = new System.Drawing.Point(0, 0);
|
||||
this.pnlMask.Name = "pnlMask";
|
||||
this.pnlMask.Size = new System.Drawing.Size(864, 700);
|
||||
this.pnlMask.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.pnlMask.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(245)))), ((int)(((byte)(235)))), ((int)(((byte)(255)))));
|
||||
this.pnlMask.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(245)))), ((int)(((byte)(235)))), ((int)(((byte)(255)))));
|
||||
this.pnlMask.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
|
||||
this.pnlMask.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(152)))), ((int)(((byte)(99)))), ((int)(((byte)(143)))));
|
||||
this.pnlMask.Style.ForeColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(152)))), ((int)(((byte)(99)))), ((int)(((byte)(143)))));
|
||||
this.pnlMask.Style.GradientAngle = 90;
|
||||
this.pnlMask.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.pnlMask.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(107)))), ((int)(((byte)(83)))), ((int)(((byte)(147)))));
|
||||
this.pnlMask.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(107)))), ((int)(((byte)(83)))), ((int)(((byte)(147)))));
|
||||
this.pnlMask.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
|
||||
this.pnlMask.TabIndex = 881;
|
||||
this.pnlMask.Text = "自动拍单倒计时\r\n8";
|
||||
this.pnlMask.Visible = false;
|
||||
//
|
||||
// btnJumpOrderList
|
||||
//
|
||||
this.btnJumpOrderList.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
@@ -367,9 +399,9 @@
|
||||
this.btnManualUpdateTransitWarehouse.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnManualUpdateTransitWarehouse.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnManualUpdateTransitWarehouse.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnManualUpdateTransitWarehouse.Location = new System.Drawing.Point(348, 175);
|
||||
this.btnManualUpdateTransitWarehouse.Location = new System.Drawing.Point(368, 175);
|
||||
this.btnManualUpdateTransitWarehouse.Name = "btnManualUpdateTransitWarehouse";
|
||||
this.btnManualUpdateTransitWarehouse.Size = new System.Drawing.Size(114, 23);
|
||||
this.btnManualUpdateTransitWarehouse.Size = new System.Drawing.Size(94, 23);
|
||||
this.btnManualUpdateTransitWarehouse.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnManualUpdateTransitWarehouse.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(152)))), ((int)(((byte)(99)))), ((int)(((byte)(143)))));
|
||||
this.btnManualUpdateTransitWarehouse.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(152)))), ((int)(((byte)(99)))), ((int)(((byte)(143)))));
|
||||
@@ -523,9 +555,9 @@
|
||||
this.btnManualUpdateBuyOrder.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnManualUpdateBuyOrder.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnManualUpdateBuyOrder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnManualUpdateBuyOrder.Location = new System.Drawing.Point(348, 198);
|
||||
this.btnManualUpdateBuyOrder.Location = new System.Drawing.Point(368, 198);
|
||||
this.btnManualUpdateBuyOrder.Name = "btnManualUpdateBuyOrder";
|
||||
this.btnManualUpdateBuyOrder.Size = new System.Drawing.Size(114, 23);
|
||||
this.btnManualUpdateBuyOrder.Size = new System.Drawing.Size(94, 23);
|
||||
this.btnManualUpdateBuyOrder.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnManualUpdateBuyOrder.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(152)))), ((int)(((byte)(99)))), ((int)(((byte)(143)))));
|
||||
this.btnManualUpdateBuyOrder.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(152)))), ((int)(((byte)(99)))), ((int)(((byte)(143)))));
|
||||
@@ -568,9 +600,9 @@
|
||||
this.btnManualUpdateSendProvince.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnManualUpdateSendProvince.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnManualUpdateSendProvince.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnManualUpdateSendProvince.Location = new System.Drawing.Point(348, 115);
|
||||
this.btnManualUpdateSendProvince.Location = new System.Drawing.Point(368, 115);
|
||||
this.btnManualUpdateSendProvince.Name = "btnManualUpdateSendProvince";
|
||||
this.btnManualUpdateSendProvince.Size = new System.Drawing.Size(114, 23);
|
||||
this.btnManualUpdateSendProvince.Size = new System.Drawing.Size(94, 23);
|
||||
this.btnManualUpdateSendProvince.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnManualUpdateSendProvince.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(152)))), ((int)(((byte)(99)))), ((int)(((byte)(143)))));
|
||||
this.btnManualUpdateSendProvince.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(152)))), ((int)(((byte)(99)))), ((int)(((byte)(143)))));
|
||||
@@ -662,7 +694,7 @@
|
||||
this.txtSendProvince.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
this.txtSendProvince.Location = new System.Drawing.Point(74, 115);
|
||||
this.txtSendProvince.Name = "txtSendProvince";
|
||||
this.txtSendProvince.Size = new System.Drawing.Size(268, 23);
|
||||
this.txtSendProvince.Size = new System.Drawing.Size(288, 23);
|
||||
this.txtSendProvince.TabIndex = 467;
|
||||
//
|
||||
// splitContainer2
|
||||
@@ -811,6 +843,7 @@
|
||||
this.pnlBuy.Controls.Add(this.txtBuyGoodsName);
|
||||
this.pnlBuy.Controls.Add(this.txtBuyPrice);
|
||||
this.pnlBuy.Controls.Add(this.label24);
|
||||
this.pnlBuy.Controls.Add(this.label29);
|
||||
this.pnlBuy.Location = new System.Drawing.Point(12, 291);
|
||||
this.pnlBuy.Name = "pnlBuy";
|
||||
this.pnlBuy.Size = new System.Drawing.Size(468, 226);
|
||||
@@ -844,7 +877,7 @@
|
||||
this.btnReMap.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnReMap.Location = new System.Drawing.Point(9, 198);
|
||||
this.btnReMap.Name = "btnReMap";
|
||||
this.btnReMap.Size = new System.Drawing.Size(114, 23);
|
||||
this.btnReMap.Size = new System.Drawing.Size(94, 23);
|
||||
this.btnReMap.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnReMap.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(245)))), ((int)(((byte)(235)))), ((int)(((byte)(255)))));
|
||||
this.btnReMap.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(245)))), ((int)(((byte)(235)))), ((int)(((byte)(255)))));
|
||||
@@ -879,6 +912,16 @@
|
||||
this.txtBuyTransitWarehouse.Size = new System.Drawing.Size(388, 23);
|
||||
this.txtBuyTransitWarehouse.TabIndex = 870;
|
||||
//
|
||||
// label29
|
||||
//
|
||||
this.label29.AutoSize = true;
|
||||
this.label29.ForeColor = System.Drawing.Color.SandyBrown;
|
||||
this.label29.Location = new System.Drawing.Point(121, 201);
|
||||
this.label29.Name = "label29";
|
||||
this.label29.Size = new System.Drawing.Size(248, 17);
|
||||
this.label29.TabIndex = 892;
|
||||
this.label29.Text = "如自动识别失败,请填写后点击手动确认拍单";
|
||||
//
|
||||
// pnlMap
|
||||
//
|
||||
this.pnlMap.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
|
||||
@@ -943,6 +986,7 @@
|
||||
this.Load += new System.EventHandler(this.PddBuyOrderForm_Load);
|
||||
this.Controls.SetChildIndex(this.splitContainer2, 0);
|
||||
((System.ComponentModel.ISupportInitialize)(this.pbCloseBase)).EndInit();
|
||||
this.splitContainer1.Panel1.ResumeLayout(false);
|
||||
this.splitContainer1.Panel2.ResumeLayout(false);
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
|
||||
this.splitContainer1.ResumeLayout(false);
|
||||
@@ -1031,5 +1075,7 @@
|
||||
private Work.UserComponents.UcCheckBox chkUseAppBalance;
|
||||
private System.Windows.Forms.Label label28;
|
||||
private System.Windows.Forms.TextBox txtSourceCode;
|
||||
private System.Windows.Forms.Label label29;
|
||||
public DevComponents.DotNetBar.PanelEx pnlMask;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user