diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs
index a8d4ac0..73632d3 100644
--- a/AllBase/BaseClass.cs
+++ b/AllBase/BaseClass.cs
@@ -27,8 +27,8 @@ namespace AllBase
///
/// 版本ID
///
- public static int VersionCount = 575;
- //public static int VersionCount = 575;
+ public static int VersionCount = 579;
+ //public static int VersionCount = 579;
///
/// 版本号
diff --git a/AllBase/Model/Result/ShopLoginInfo.cs b/AllBase/Model/Result/ShopLoginInfo.cs
index c8b22a3..8dcfbb8 100644
--- a/AllBase/Model/Result/ShopLoginInfo.cs
+++ b/AllBase/Model/Result/ShopLoginInfo.cs
@@ -373,12 +373,19 @@ namespace AllBase.Model.Result
///
/// 近7日利润（通过KJD库获取进货价计算获得）
///
- public decimal? sevenDaysProfit
- { get; set; } = null;
+ public decimal? sevenDaysProfit { get; set; } = null;
///
/// 近30日利润（通过KJD库获取进货价计算获得）
///
public decimal? thirtyDaysProfit { get; set; } = null;
+ ///
+ /// 销售货值
+ ///
+ public decimal? goodsValue { get; set; }
+ ///
+ /// 成本
+ ///
+ public decimal? goodsCost { get; set; }
}
diff --git a/TEMUKJD/KJD.csproj b/TEMUKJD/KJD.csproj
index 8f5b4d4..75eea9f 100644
--- a/TEMUKJD/KJD.csproj
+++ b/TEMUKJD/KJD.csproj
@@ -358,7 +358,6 @@
ShopLoginForm.cs
-
Form
diff --git a/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.Designer.cs b/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.Designer.cs
index 7fd32d7..3809925 100644
--- a/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.Designer.cs
+++ b/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.Designer.cs
@@ -41,11 +41,17 @@ namespace TemuKJD.KJDForms.AdminForms
this.splitContainer3 = new System.Windows.Forms.SplitContainer();
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
this.pbShopLoading = new System.Windows.Forms.PictureBox();
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.textBox1 = new System.Windows.Forms.TextBox();
+ this.btnClose = new DevComponents.DotNetBar.PanelEx();
this.pbLoading = new System.Windows.Forms.PictureBox();
this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
this.btnClear = new DevComponents.DotNetBar.PanelEx();
this.splitContainer4 = new System.Windows.Forms.SplitContainer();
this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
+ this.numJudgeWeight = new System.Windows.Forms.NumericUpDown();
+ this.numJudgeLen = new System.Windows.Forms.NumericUpDown();
+ this.label8 = new System.Windows.Forms.Label();
this.btnRestoreSizeAndNumber = new DevComponents.DotNetBar.PanelEx();
this.numWeight2 = new System.Windows.Forms.NumericUpDown();
this.numHeight2 = new System.Windows.Forms.NumericUpDown();
@@ -89,6 +95,8 @@ namespace TemuKJD.KJDForms.AdminForms
this.chkFilter = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.label18 = new System.Windows.Forms.Label();
this.label20 = new System.Windows.Forms.Label();
+ this.label9 = new System.Windows.Forms.Label();
+ this.label11 = new System.Windows.Forms.Label();
this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx();
this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.colUser = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -137,12 +145,15 @@ namespace TemuKJD.KJDForms.AdminForms
this.splitContainer2.Panel2.SuspendLayout();
this.splitContainer2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pbShopLoading)).BeginInit();
+ this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pbLoading)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).BeginInit();
this.splitContainer4.Panel1.SuspendLayout();
this.splitContainer4.Panel2.SuspendLayout();
this.splitContainer4.SuspendLayout();
this.ucGroupBoxEx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.numJudgeWeight)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.numJudgeLen)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.numWeight2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.numHeight2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.numWeight1)).BeginInit();
@@ -174,7 +185,7 @@ namespace TemuKJD.KJDForms.AdminForms
//
this.splitContainer1.Panel2.Controls.Add(this.splitContainer3);
this.splitContainer1.Size = new System.Drawing.Size(1350, 611);
- this.splitContainer1.SplitterDistance = 120;
+ this.splitContainer1.SplitterDistance = 130;
this.splitContainer1.TabIndex = 11;
//
// splitContainer3
@@ -192,8 +203,8 @@ namespace TemuKJD.KJDForms.AdminForms
// splitContainer3.Panel2
//
this.splitContainer3.Panel2.Controls.Add(this.splitContainer4);
- this.splitContainer3.Size = new System.Drawing.Size(1350, 487);
- this.splitContainer3.SplitterDistance = 457;
+ this.splitContainer3.Size = new System.Drawing.Size(1350, 477);
+ this.splitContainer3.SplitterDistance = 447;
this.splitContainer3.TabIndex = 1;
//
// splitContainer2
@@ -211,12 +222,13 @@ namespace TemuKJD.KJDForms.AdminForms
//
// splitContainer2.Panel2
//
+ this.splitContainer2.Panel2.Controls.Add(this.panel1);
this.splitContainer2.Panel2.Controls.Add(this.pbLoading);
this.splitContainer2.Panel2.Controls.Add(this.panelEx1);
this.splitContainer2.Panel2.Controls.Add(this.btnClear);
this.splitContainer2.Panel2.Controls.Add(this.dgvPriceCheck);
this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0);
- this.splitContainer2.Size = new System.Drawing.Size(1350, 457);
+ this.splitContainer2.Size = new System.Drawing.Size(1350, 447);
this.splitContainer2.SplitterDistance = 280;
this.splitContainer2.TabIndex = 0;
//
@@ -224,7 +236,7 @@ namespace TemuKJD.KJDForms.AdminForms
//
this.pbShopLoading.Anchor = System.Windows.Forms.AnchorStyles.None;
this.pbShopLoading.Image = global::TemuKJD.Properties.Resources.loading_blue;
- this.pbShopLoading.Location = new System.Drawing.Point(115, 203);
+ this.pbShopLoading.Location = new System.Drawing.Point(115, 198);
this.pbShopLoading.Name = "pbShopLoading";
this.pbShopLoading.Size = new System.Drawing.Size(50, 50);
this.pbShopLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -232,11 +244,62 @@ namespace TemuKJD.KJDForms.AdminForms
this.pbShopLoading.TabStop = false;
this.pbShopLoading.Visible = false;
//
+ // panel1
+ //
+ this.panel1.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.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.panel1.Controls.Add(this.textBox1);
+ this.panel1.Controls.Add(this.btnClose);
+ this.panel1.Location = new System.Drawing.Point(113, 58);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(837, 134);
+ this.panel1.TabIndex = 682;
+ this.panel1.Visible = false;
+ //
+ // textBox1
+ //
+ this.textBox1.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.textBox1.Location = new System.Drawing.Point(28, 17);
+ this.textBox1.Multiline = true;
+ this.textBox1.Name = "textBox1";
+ this.textBox1.ScrollBars = System.Windows.Forms.ScrollBars.Both;
+ this.textBox1.Size = new System.Drawing.Size(778, 75);
+ this.textBox1.TabIndex = 690;
+ //
+ // btnClose
+ //
+ this.btnClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.btnClose.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.btnClose.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.btnClose.DisabledBackColor = System.Drawing.Color.Empty;
+ this.btnClose.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnClose.Location = new System.Drawing.Point(748, 98);
+ this.btnClose.Name = "btnClose";
+ this.btnClose.Size = new System.Drawing.Size(58, 23);
+ this.btnClose.Style.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnClose.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnClose.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnClose.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+ this.btnClose.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+ this.btnClose.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+ this.btnClose.Style.ForeColor.Color = System.Drawing.Color.White;
+ this.btnClose.Style.GradientAngle = 90;
+ this.btnClose.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnClose.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnClose.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnClose.TabIndex = 435;
+ this.btnClose.Text = "关闭";
+ this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
+ //
// pbLoading
//
this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None;
this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue;
- this.pbLoading.Location = new System.Drawing.Point(508, 203);
+ this.pbLoading.Location = new System.Drawing.Point(492, 198);
this.pbLoading.Name = "pbLoading";
this.pbLoading.Size = new System.Drawing.Size(50, 50);
this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -250,7 +313,7 @@ namespace TemuKJD.KJDForms.AdminForms
this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control;
this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty;
- this.panelEx1.Location = new System.Drawing.Point(833, 393);
+ this.panelEx1.Location = new System.Drawing.Point(801, 383);
this.panelEx1.Name = "panelEx1";
this.panelEx1.Size = new System.Drawing.Size(115, 21);
this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -276,7 +339,7 @@ namespace TemuKJD.KJDForms.AdminForms
this.btnClear.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnClear.DisabledBackColor = System.Drawing.Color.Empty;
this.btnClear.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnClear.Location = new System.Drawing.Point(724, 393);
+ this.btnClear.Location = new System.Drawing.Point(692, 383);
this.btnClear.Name = "btnClear";
this.btnClear.Size = new System.Drawing.Size(90, 21);
this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -320,6 +383,9 @@ namespace TemuKJD.KJDForms.AdminForms
| System.Windows.Forms.AnchorStyles.Right)));
this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
+ this.ucGroupBoxEx1.Controls.Add(this.numJudgeWeight);
+ this.ucGroupBoxEx1.Controls.Add(this.numJudgeLen);
+ this.ucGroupBoxEx1.Controls.Add(this.label8);
this.ucGroupBoxEx1.Controls.Add(this.btnRestoreSizeAndNumber);
this.ucGroupBoxEx1.Controls.Add(this.numWeight2);
this.ucGroupBoxEx1.Controls.Add(this.numHeight2);
@@ -355,20 +421,68 @@ namespace TemuKJD.KJDForms.AdminForms
this.ucGroupBoxEx1.Controls.Add(this.chkFilter);
this.ucGroupBoxEx1.Controls.Add(this.label18);
this.ucGroupBoxEx1.Controls.Add(this.label20);
+ this.ucGroupBoxEx1.Controls.Add(this.label9);
+ this.ucGroupBoxEx1.Controls.Add(this.label11);
this.ucGroupBoxEx1.Location = new System.Drawing.Point(3, 2);
this.ucGroupBoxEx1.Name = "ucGroupBoxEx1";
- this.ucGroupBoxEx1.Size = new System.Drawing.Size(1344, 120);
+ this.ucGroupBoxEx1.Size = new System.Drawing.Size(1345, 130);
this.ucGroupBoxEx1.TabIndex = 399;
this.ucGroupBoxEx1.TabStop = false;
this.ucGroupBoxEx1.Text = "参数设置";
//
+ // numJudgeWeight
+ //
+ this.numJudgeWeight.Location = new System.Drawing.Point(808, 98);
+ this.numJudgeWeight.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
+ this.numJudgeWeight.Maximum = new decimal(new int[] {
+ 10000,
+ 0,
+ 0,
+ 0});
+ this.numJudgeWeight.Name = "numJudgeWeight";
+ this.numJudgeWeight.Size = new System.Drawing.Size(50, 23);
+ this.numJudgeWeight.TabIndex = 931;
+ this.numJudgeWeight.Value = new decimal(new int[] {
+ 1000,
+ 0,
+ 0,
+ 0});
+ //
+ // numJudgeLen
+ //
+ this.numJudgeLen.Location = new System.Drawing.Point(737, 98);
+ this.numJudgeLen.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
+ this.numJudgeLen.Maximum = new decimal(new int[] {
+ 299,
+ 0,
+ 0,
+ 0});
+ this.numJudgeLen.Name = "numJudgeLen";
+ this.numJudgeLen.Size = new System.Drawing.Size(35, 23);
+ this.numJudgeLen.TabIndex = 929;
+ this.numJudgeLen.Value = new decimal(new int[] {
+ 45,
+ 0,
+ 0,
+ 0});
+ //
+ // label8
+ //
+ this.label8.AutoSize = true;
+ this.label8.Location = new System.Drawing.Point(711, 101);
+ this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+ this.label8.Name = "label8";
+ this.label8.Size = new System.Drawing.Size(29, 17);
+ this.label8.TabIndex = 928;
+ this.label8.Text = "长≥";
+ //
// btnRestoreSizeAndNumber
//
this.btnRestoreSizeAndNumber.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnRestoreSizeAndNumber.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnRestoreSizeAndNumber.DisabledBackColor = System.Drawing.Color.Empty;
this.btnRestoreSizeAndNumber.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnRestoreSizeAndNumber.Location = new System.Drawing.Point(861, 83);
+ this.btnRestoreSizeAndNumber.Location = new System.Drawing.Point(863, 70);
this.btnRestoreSizeAndNumber.Name = "btnRestoreSizeAndNumber";
this.btnRestoreSizeAndNumber.Size = new System.Drawing.Size(99, 23);
this.btnRestoreSizeAndNumber.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -388,10 +502,10 @@ namespace TemuKJD.KJDForms.AdminForms
//
// numWeight2
//
- this.numWeight2.Location = new System.Drawing.Point(789, 83);
+ this.numWeight2.Location = new System.Drawing.Point(789, 70);
this.numWeight2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
this.numWeight2.Maximum = new decimal(new int[] {
- 300,
+ 10000,
0,
0,
0});
@@ -406,7 +520,7 @@ namespace TemuKJD.KJDForms.AdminForms
//
// numHeight2
//
- this.numHeight2.Location = new System.Drawing.Point(928, 54);
+ this.numHeight2.Location = new System.Drawing.Point(928, 42);
this.numHeight2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
this.numHeight2.Maximum = new decimal(new int[] {
299,
@@ -424,7 +538,7 @@ namespace TemuKJD.KJDForms.AdminForms
//
// numWeight1
//
- this.numWeight1.Location = new System.Drawing.Point(737, 83);
+ this.numWeight1.Location = new System.Drawing.Point(737, 70);
this.numWeight1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
this.numWeight1.Maximum = new decimal(new int[] {
99999,
@@ -442,7 +556,7 @@ namespace TemuKJD.KJDForms.AdminForms
//
// numHeight1
//
- this.numHeight1.Location = new System.Drawing.Point(894, 54);
+ this.numHeight1.Location = new System.Drawing.Point(894, 42);
this.numHeight1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
this.numHeight1.Maximum = new decimal(new int[] {
299,
@@ -460,7 +574,7 @@ namespace TemuKJD.KJDForms.AdminForms
//
// numWidth1
//
- this.numWidth1.Location = new System.Drawing.Point(805, 53);
+ this.numWidth1.Location = new System.Drawing.Point(805, 42);
this.numWidth1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
this.numWidth1.Maximum = new decimal(new int[] {
299,
@@ -481,7 +595,7 @@ namespace TemuKJD.KJDForms.AdminForms
this.chkSearchTime.AutoSize = true;
this.chkSearchTime.Checked = true;
this.chkSearchTime.CheckState = System.Windows.Forms.CheckState.Checked;
- this.chkSearchTime.Location = new System.Drawing.Point(407, 57);
+ this.chkSearchTime.Location = new System.Drawing.Point(407, 62);
this.chkSearchTime.Name = "chkSearchTime";
this.chkSearchTime.Size = new System.Drawing.Size(15, 14);
this.chkSearchTime.TabIndex = 827;
@@ -489,14 +603,14 @@ namespace TemuKJD.KJDForms.AdminForms
//
// dtpEndTime
//
- this.dtpEndTime.Location = new System.Drawing.Point(561, 53);
+ this.dtpEndTime.Location = new System.Drawing.Point(561, 58);
this.dtpEndTime.Name = "dtpEndTime";
this.dtpEndTime.Size = new System.Drawing.Size(136, 23);
this.dtpEndTime.TabIndex = 826;
//
// numLen2
//
- this.numLen2.Location = new System.Drawing.Point(750, 53);
+ this.numLen2.Location = new System.Drawing.Point(750, 42);
this.numLen2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
this.numLen2.Maximum = new decimal(new int[] {
299,
@@ -514,14 +628,14 @@ namespace TemuKJD.KJDForms.AdminForms
//
// dtpStartTime
//
- this.dtpStartTime.Location = new System.Drawing.Point(423, 53);
+ this.dtpStartTime.Location = new System.Drawing.Point(423, 58);
this.dtpStartTime.Name = "dtpStartTime";
this.dtpStartTime.Size = new System.Drawing.Size(136, 23);
this.dtpStartTime.TabIndex = 825;
//
// numWidth2
//
- this.numWidth2.Location = new System.Drawing.Point(839, 53);
+ this.numWidth2.Location = new System.Drawing.Point(839, 42);
this.numWidth2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
this.numWidth2.Maximum = new decimal(new int[] {
299,
@@ -540,7 +654,7 @@ namespace TemuKJD.KJDForms.AdminForms
// label19
//
this.label19.AutoSize = true;
- this.label19.Location = new System.Drawing.Point(878, 57);
+ this.label19.Location = new System.Drawing.Point(878, 45);
this.label19.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.label19.Name = "label19";
this.label19.Size = new System.Drawing.Size(20, 17);
@@ -552,7 +666,7 @@ namespace TemuKJD.KJDForms.AdminForms
this.btnStop.CanvasColor = System.Drawing.SystemColors.Control;
this.btnStop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnStop.DisabledBackColor = System.Drawing.Color.Empty;
- this.btnStop.Location = new System.Drawing.Point(631, 83);
+ this.btnStop.Location = new System.Drawing.Point(631, 88);
this.btnStop.Name = "btnStop";
this.btnStop.Size = new System.Drawing.Size(66, 23);
this.btnStop.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -573,7 +687,7 @@ namespace TemuKJD.KJDForms.AdminForms
//
// numLen1
//
- this.numLen1.Location = new System.Drawing.Point(716, 53);
+ this.numLen1.Location = new System.Drawing.Point(716, 42);
this.numLen1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
this.numLen1.Maximum = new decimal(new int[] {
299,
@@ -595,7 +709,7 @@ namespace TemuKJD.KJDForms.AdminForms
this.btnSearchPrice2.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnSearchPrice2.DisabledBackColor = System.Drawing.Color.Empty;
this.btnSearchPrice2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnSearchPrice2.Location = new System.Drawing.Point(516, 83);
+ this.btnSearchPrice2.Location = new System.Drawing.Point(516, 88);
this.btnSearchPrice2.Name = "btnSearchPrice2";
this.btnSearchPrice2.Size = new System.Drawing.Size(112, 23);
this.btnSearchPrice2.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -616,7 +730,7 @@ namespace TemuKJD.KJDForms.AdminForms
// label15
//
this.label15.AutoSize = true;
- this.label15.Location = new System.Drawing.Point(700, 56);
+ this.label15.Location = new System.Drawing.Point(700, 45);
this.label15.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(20, 17);
@@ -629,7 +743,7 @@ namespace TemuKJD.KJDForms.AdminForms
this.btnRestoreProdName.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnRestoreProdName.DisabledBackColor = System.Drawing.Color.Empty;
this.btnRestoreProdName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnRestoreProdName.Location = new System.Drawing.Point(863, 22);
+ this.btnRestoreProdName.Location = new System.Drawing.Point(863, 14);
this.btnRestoreProdName.Name = "btnRestoreProdName";
this.btnRestoreProdName.Size = new System.Drawing.Size(99, 23);
this.btnRestoreProdName.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -649,7 +763,7 @@ namespace TemuKJD.KJDForms.AdminForms
//
// txtSkcId
//
- this.txtSkcId.Location = new System.Drawing.Point(446, 22);
+ this.txtSkcId.Location = new System.Drawing.Point(446, 27);
this.txtSkcId.Name = "txtSkcId";
this.txtSkcId.Size = new System.Drawing.Size(251, 23);
this.txtSkcId.TabIndex = 733;
@@ -657,7 +771,7 @@ namespace TemuKJD.KJDForms.AdminForms
// chkSearchAllShop
//
this.chkSearchAllShop.AutoSize = true;
- this.chkSearchAllShop.Location = new System.Drawing.Point(250, 58);
+ this.chkSearchAllShop.Location = new System.Drawing.Point(250, 63);
this.chkSearchAllShop.Name = "chkSearchAllShop";
this.chkSearchAllShop.Size = new System.Drawing.Size(147, 21);
this.chkSearchAllShop.TabIndex = 710;
@@ -669,7 +783,7 @@ namespace TemuKJD.KJDForms.AdminForms
this.btnEmpty.CanvasColor = System.Drawing.SystemColors.Control;
this.btnEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnEmpty.DisabledBackColor = System.Drawing.Color.Empty;
- this.btnEmpty.Location = new System.Drawing.Point(349, 83);
+ this.btnEmpty.Location = new System.Drawing.Point(349, 88);
this.btnEmpty.Name = "btnEmpty";
this.btnEmpty.Size = new System.Drawing.Size(40, 23);
this.btnEmpty.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -694,7 +808,7 @@ namespace TemuKJD.KJDForms.AdminForms
this.btnSearchPrice.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnSearchPrice.DisabledBackColor = System.Drawing.Color.Empty;
this.btnSearchPrice.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnSearchPrice.Location = new System.Drawing.Point(407, 83);
+ this.btnSearchPrice.Location = new System.Drawing.Point(407, 88);
this.btnSearchPrice.Name = "btnSearchPrice";
this.btnSearchPrice.Size = new System.Drawing.Size(106, 23);
this.btnSearchPrice.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -715,7 +829,7 @@ namespace TemuKJD.KJDForms.AdminForms
// label5
//
this.label5.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label5.Location = new System.Drawing.Point(247, 21);
+ this.label5.Location = new System.Drawing.Point(247, 26);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(142, 36);
this.label5.TabIndex = 685;
@@ -723,7 +837,7 @@ namespace TemuKJD.KJDForms.AdminForms
//
// txtNotes
//
- this.txtNotes.Location = new System.Drawing.Point(61, 83);
+ this.txtNotes.Location = new System.Drawing.Point(61, 88);
this.txtNotes.Name = "txtNotes";
this.txtNotes.Size = new System.Drawing.Size(183, 23);
this.txtNotes.TabIndex = 382;
@@ -731,7 +845,7 @@ namespace TemuKJD.KJDForms.AdminForms
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(4, 86);
+ this.label4.Location = new System.Drawing.Point(4, 91);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(68, 17);
this.label4.TabIndex = 383;
@@ -743,7 +857,7 @@ namespace TemuKJD.KJDForms.AdminForms
this.btnRefreshShop.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnRefreshShop.DisabledBackColor = System.Drawing.Color.Empty;
this.btnRefreshShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnRefreshShop.Location = new System.Drawing.Point(246, 83);
+ this.btnRefreshShop.Location = new System.Drawing.Point(246, 88);
this.btnRefreshShop.Name = "btnRefreshShop";
this.btnRefreshShop.Size = new System.Drawing.Size(100, 23);
this.btnRefreshShop.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -763,14 +877,14 @@ namespace TemuKJD.KJDForms.AdminForms
//
// txtShopName
//
- this.txtShopName.Location = new System.Drawing.Point(61, 53);
+ this.txtShopName.Location = new System.Drawing.Point(61, 58);
this.txtShopName.Name = "txtShopName";
this.txtShopName.Size = new System.Drawing.Size(183, 23);
this.txtShopName.TabIndex = 380;
//
// txtShopId
//
- this.txtShopId.Location = new System.Drawing.Point(61, 22);
+ this.txtShopId.Location = new System.Drawing.Point(61, 27);
this.txtShopId.Name = "txtShopId";
this.txtShopId.Size = new System.Drawing.Size(183, 23);
this.txtShopId.TabIndex = 378;
@@ -778,7 +892,7 @@ namespace TemuKJD.KJDForms.AdminForms
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(17, 25);
+ this.label2.Location = new System.Drawing.Point(17, 30);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(55, 17);
this.label2.TabIndex = 379;
@@ -787,7 +901,7 @@ namespace TemuKJD.KJDForms.AdminForms
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(16, 56);
+ this.label3.Location = new System.Drawing.Point(16, 61);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(56, 17);
this.label3.TabIndex = 381;
@@ -796,7 +910,7 @@ namespace TemuKJD.KJDForms.AdminForms
// label7
//
this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(404, 25);
+ this.label7.Location = new System.Drawing.Point(404, 30);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(52, 17);
this.label7.TabIndex = 734;
@@ -811,7 +925,7 @@ namespace TemuKJD.KJDForms.AdminForms
this.pnlDetailOperate1.Controls.Add(this.label6);
this.pnlDetailOperate1.Controls.Add(this.btnMutliCancel);
this.pnlDetailOperate1.Controls.Add(this.btnMutliOk);
- this.pnlDetailOperate1.Location = new System.Drawing.Point(972, 16);
+ this.pnlDetailOperate1.Location = new System.Drawing.Point(972, 21);
this.pnlDetailOperate1.Name = "pnlDetailOperate1";
this.pnlDetailOperate1.Size = new System.Drawing.Size(365, 76);
this.pnlDetailOperate1.TabIndex = 855;
@@ -928,7 +1042,7 @@ namespace TemuKJD.KJDForms.AdminForms
// pnlDetailOperate2
//
this.pnlDetailOperate2.Controls.Add(this.pnlMutliCancelWithTitleWrong);
- this.pnlDetailOperate2.Location = new System.Drawing.Point(972, 76);
+ this.pnlDetailOperate2.Location = new System.Drawing.Point(972, 81);
this.pnlDetailOperate2.Name = "pnlDetailOperate2";
this.pnlDetailOperate2.Size = new System.Drawing.Size(365, 75);
this.pnlDetailOperate2.TabIndex = 856;
@@ -961,7 +1075,7 @@ namespace TemuKJD.KJDForms.AdminForms
// chkFilter
//
this.chkFilter.AutoSize = true;
- this.chkFilter.Location = new System.Drawing.Point(711, 23);
+ this.chkFilter.Location = new System.Drawing.Point(711, 15);
this.chkFilter.Name = "chkFilter";
this.chkFilter.Size = new System.Drawing.Size(159, 21);
this.chkFilter.TabIndex = 857;
@@ -972,7 +1086,7 @@ namespace TemuKJD.KJDForms.AdminForms
// label18
//
this.label18.AutoSize = true;
- this.label18.Location = new System.Drawing.Point(789, 56);
+ this.label18.Location = new System.Drawing.Point(789, 45);
this.label18.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.label18.Name = "label18";
this.label18.Size = new System.Drawing.Size(20, 17);
@@ -982,13 +1096,33 @@ namespace TemuKJD.KJDForms.AdminForms
// label20
//
this.label20.AutoSize = true;
- this.label20.Location = new System.Drawing.Point(721, 86);
+ this.label20.Location = new System.Drawing.Point(721, 73);
this.label20.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.label20.Name = "label20";
this.label20.Size = new System.Drawing.Size(20, 17);
this.label20.TabIndex = 684;
this.label20.Text = "重";
//
+ // label9
+ //
+ this.label9.AutoSize = true;
+ this.label9.Location = new System.Drawing.Point(770, 101);
+ this.label9.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+ this.label9.Name = "label9";
+ this.label9.Size = new System.Drawing.Size(41, 17);
+ this.label9.TabIndex = 930;
+ this.label9.Text = "且重≥";
+ //
+ // label11
+ //
+ this.label11.AutoSize = true;
+ this.label11.Location = new System.Drawing.Point(857, 101);
+ this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+ this.label11.Name = "label11";
+ this.label11.Size = new System.Drawing.Size(92, 17);
+ this.label11.TabIndex = 932;
+ this.label11.Text = "需要还原并标红";
+ //
// dgvShop
//
this.dgvShop.AllowUserToAddRows = false;
@@ -1022,7 +1156,7 @@ namespace TemuKJD.KJDForms.AdminForms
this.dgvShop.ReadOnly = true;
this.dgvShop.RowHeadersWidth = 25;
this.dgvShop.RowTemplate.Height = 23;
- this.dgvShop.Size = new System.Drawing.Size(276, 457);
+ this.dgvShop.Size = new System.Drawing.Size(276, 447);
this.dgvShop.TabIndex = 6;
this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick);
//
@@ -1143,7 +1277,7 @@ namespace TemuKJD.KJDForms.AdminForms
this.dgvPriceCheck.ReadOnly = true;
this.dgvPriceCheck.RowHeadersWidth = 36;
this.dgvPriceCheck.RowTemplate.Height = 23;
- this.dgvPriceCheck.Size = new System.Drawing.Size(1062, 457);
+ this.dgvPriceCheck.Size = new System.Drawing.Size(1062, 447);
this.dgvPriceCheck.TabIndex = 187;
this.dgvPriceCheck.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvCheckPrice_CellContentClick);
this.dgvPriceCheck.CellMouseDown += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgvPriceCheck_CellMouseDown);
@@ -1237,7 +1371,7 @@ namespace TemuKJD.KJDForms.AdminForms
this.colProductId.ReadOnly = true;
this.colProductId.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.colProductId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
- this.colProductId.Width = 90;
+ this.colProductId.Width = 85;
//
// colProdSkc
//
@@ -1325,7 +1459,7 @@ namespace TemuKJD.KJDForms.AdminForms
this.colOk.ReadOnly = true;
this.colOk.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.colOk.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
- this.colOk.Width = 65;
+ this.colOk.Width = 48;
//
// colCancel
//
@@ -1334,7 +1468,7 @@ namespace TemuKJD.KJDForms.AdminForms
this.colCancel.ReadOnly = true;
this.colCancel.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.colCancel.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
- this.colCancel.Width = 65;
+ this.colCancel.Width = 48;
//
// colCancelWithTitleWrong
//
@@ -1378,6 +1512,8 @@ namespace TemuKJD.KJDForms.AdminForms
((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
this.splitContainer2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pbShopLoading)).EndInit();
+ this.panel1.ResumeLayout(false);
+ this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.pbLoading)).EndInit();
this.splitContainer4.Panel1.ResumeLayout(false);
this.splitContainer4.Panel2.ResumeLayout(false);
@@ -1385,6 +1521,8 @@ namespace TemuKJD.KJDForms.AdminForms
this.splitContainer4.ResumeLayout(false);
this.ucGroupBoxEx1.ResumeLayout(false);
this.ucGroupBoxEx1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.numJudgeWeight)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.numJudgeLen)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.numWeight2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.numHeight2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.numWeight1)).EndInit();
@@ -1469,6 +1607,14 @@ namespace TemuKJD.KJDForms.AdminForms
private System.Windows.Forms.NumericUpDown numWeight2;
private System.Windows.Forms.NumericUpDown numWeight1;
private System.Windows.Forms.Label label20;
+ private System.Windows.Forms.Label label11;
+ private System.Windows.Forms.NumericUpDown numJudgeWeight;
+ private System.Windows.Forms.Label label9;
+ private System.Windows.Forms.NumericUpDown numJudgeLen;
+ private System.Windows.Forms.Label label8;
+ private System.Windows.Forms.Panel panel1;
+ private DevComponents.DotNetBar.PanelEx btnClose;
+ private System.Windows.Forms.TextBox textBox1;
private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck;
private System.Windows.Forms.DataGridViewTextBoxColumn colProdIndex;
private System.Windows.Forms.DataGridViewTextBoxColumn colOrderId;
diff --git a/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.cs b/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.cs
index c1268c5..1fdcee7 100644
--- a/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.cs
+++ b/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.cs
@@ -37,6 +37,7 @@ namespace TemuKJD.KJDForms.AdminForms
{
this.dgvShop.AddSelectorColumn("colSelect");
this.dgvPriceCheck.AddSelectorColumn("colCheck");
+ this.dgvPriceCheck.MergeColumnHeader(new List() { "colOk", "colCancel" }, "同意/拒绝报价");
this.dtpEndTime.Value = DateTime.Now.Date.AddDays(1).AddMilliseconds(-1);
this.dtpStartTime.Value = DateTime.Now.Date.AddDays(-7);
@@ -273,6 +274,36 @@ namespace TemuKJD.KJDForms.AdminForms
switch (headerText)
{
+ case "规格名称":
+ {
+ var PriceInfo = lstCheckPriceInfo.FirstOrDefault(p => p.productId.ParseToString() == prodId);
+ if (PriceInfo != null)
+ {
+ this.panel1.Visible = true;
+
+ string skuName = "";
+ var prodSkuList = PriceInfo.skcList.FirstOrDefault().skuList;
+ if (prodSkuList != null)
+ {
+ foreach (var sku in prodSkuList)
+ {
+ foreach (var prop in sku.productPropertyList)
+ {
+ skuName += prop.value + ",";
+ }
+ skuName = skuName.TrimEnd(',') + ";";
+ skuName += " ";
+ skuName += " 长:" + sku.len.ParseToInt() * 0.1;
+ skuName += " 宽:" + sku.width.ParseToInt() * 0.1;
+ skuName += " 高:" + sku.height.ParseToInt() * 0.1;
+ skuName += " 重:" + sku.weight.ParseToInt() * 0.001;
+ skuName += "\r\n";
+ }
+ }
+ this.textBox1.Text = skuName;
+ }
+ }
+ break;
case "同意报价":
{
applyHighPrice(shop, orderId, dgvPriceCheck.Rows[e.RowIndex]);
@@ -1697,10 +1728,18 @@ namespace TemuKJD.KJDForms.AdminForms
//最短边：50 - 80 cm//生成时需转换为mm
//重量：80000 - 99999g //生成时需转换为mg
var skc = info.skcList.FirstOrDefault();
- if (skc.skuList.Any(s => (s.len >= 60 * 10 || s.width >= 60 * 10 || s.height >= 50 * 10) && s.weight >= 80000 * 1000))
+ //长宽高超50且重量大于1000克认为是有意改大了参数需要还原
+ //if (skc.skuList.Any(s => (s.len >= 45 * 10 || s.width >= 45 * 10 || s.height >= 45 * 10) && s.weight >= 1000 * 1000))
+ // return true;
+ if (skc.skuList.Any(s => (s.len >= numJudgeLen.Value * 10 || s.width >= numJudgeLen.Value * 10 || s.height >= numJudgeLen.Value * 10) && s.weight >= numJudgeWeight.Value * 1000))
return true;
return false;
}
+
+ private void btnClose_Click(object sender, EventArgs e)
+ {
+ this.panel1.Visible = false;
+ }
}
public class PriceCheckConfig
diff --git a/TEMUKJD/KJDForms/ShopForms/Statistics/LRBaseFrom.cs b/TEMUKJD/KJDForms/ShopForms/Statistics/LRBaseFrom.cs
deleted file mode 100644
index 2add82f..0000000
--- a/TEMUKJD/KJDForms/ShopForms/Statistics/LRBaseFrom.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace TemuKJD.KJDForms.ShopForms.Statistics
-{
- public class LRBaseFrom
- {
- }
-}
\ No newline at end of file
diff --git a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsDetailForm.Designer.cs b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsDetailForm.Designer.cs
index 482a799..f2090a4 100644
--- a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsDetailForm.Designer.cs
+++ b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsDetailForm.Designer.cs
@@ -41,11 +41,13 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
this.pbLoading = new System.Windows.Forms.PictureBox();
this.dgvOrder = new TemuKJD.UserComponent.DataGridViewEx();
+ this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.colSpu = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colSkc = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colImgUrl = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colProductSkcPic = new System.Windows.Forms.DataGridViewImageColumn();
+ this.colProductName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colSaleVolume = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colTodayProfit = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colSevenDaysSaleVolume = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -62,7 +64,6 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
this.colScore = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colNotes = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colOperate = new System.Windows.Forms.DataGridViewLinkColumn();
- this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@@ -237,6 +238,7 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
this.colSkc,
this.colImgUrl,
this.colProductSkcPic,
+ this.colProductName,
this.colSaleVolume,
this.colTodayProfit,
this.colSevenDaysSaleVolume,
@@ -266,6 +268,18 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
this.dgvOrder.Sorted += new System.EventHandler(this.dgvOrder_Sorted);
this.dgvOrder.Resize += new System.EventHandler(this.dgvShop_Resize);
//
+ // statusBar
+ //
+ this.statusBar.BackColor = System.Drawing.Color.White;
+ this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.statusBar.Location = new System.Drawing.Point(0, 0);
+ this.statusBar.Margin = new System.Windows.Forms.Padding(0);
+ this.statusBar.Name = "statusBar";
+ this.statusBar.Size = new System.Drawing.Size(1364, 25);
+ this.statusBar.TabIndex = 1;
+ this.statusBar.Visible = false;
+ //
// colSelect
//
this.colSelect.FillWeight = 28F;
@@ -301,13 +315,20 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
//
// colProductSkcPic
//
- this.colProductSkcPic.FillWeight = 20F;
+ this.colProductSkcPic.FillWeight = 25F;
this.colProductSkcPic.HeaderText = "图片";
this.colProductSkcPic.Name = "colProductSkcPic";
this.colProductSkcPic.ReadOnly = true;
this.colProductSkcPic.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.colProductSkcPic.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
//
+ // colProductName
+ //
+ this.colProductName.FillWeight = 120F;
+ this.colProductName.HeaderText = "商品名称";
+ this.colProductName.Name = "colProductName";
+ this.colProductName.ReadOnly = true;
+ //
// colSaleVolume
//
this.colSaleVolume.FillWeight = 75F;
@@ -338,34 +359,31 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
//
// colThirtyDaysSaleVolume
//
- this.colThirtyDaysSaleVolume.FillWeight = 75F;
+ this.colThirtyDaysSaleVolume.FillWeight = 85F;
this.colThirtyDaysSaleVolume.HeaderText = "近30日销量";
this.colThirtyDaysSaleVolume.Name = "colThirtyDaysSaleVolume";
this.colThirtyDaysSaleVolume.ReadOnly = true;
- this.colThirtyDaysSaleVolume.Visible = false;
//
// colThirtyDaysProfit
//
- this.colThirtyDaysProfit.FillWeight = 75F;
+ this.colThirtyDaysProfit.FillWeight = 85F;
this.colThirtyDaysProfit.HeaderText = "近30日利润";
this.colThirtyDaysProfit.Name = "colThirtyDaysProfit";
this.colThirtyDaysProfit.ReadOnly = true;
- this.colThirtyDaysProfit.Visible = false;
//
// colGoodsValue
//
this.colGoodsValue.FillWeight = 70F;
- this.colGoodsValue.HeaderText = "货值";
+ this.colGoodsValue.HeaderText = "销售货值";
this.colGoodsValue.Name = "colGoodsValue";
this.colGoodsValue.ReadOnly = true;
//
// colGoodsCost
//
this.colGoodsCost.FillWeight = 70F;
- this.colGoodsCost.HeaderText = "成本";
+ this.colGoodsCost.HeaderText = "成本货值";
this.colGoodsCost.Name = "colGoodsCost";
this.colGoodsCost.ReadOnly = true;
- this.colGoodsCost.Visible = false;
//
// colAddDays
//
@@ -375,34 +393,35 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
//
// colTotalSaleVolume
//
- this.colTotalSaleVolume.FillWeight = 75F;
+ this.colTotalSaleVolume.FillWeight = 65F;
this.colTotalSaleVolume.HeaderText = "总销量";
this.colTotalSaleVolume.Name = "colTotalSaleVolume";
this.colTotalSaleVolume.ReadOnly = true;
//
// colInCartVolume
//
+ this.colInCartVolume.FillWeight = 70F;
this.colInCartVolume.HeaderText = "加购数量";
this.colInCartVolume.Name = "colInCartVolume";
this.colInCartVolume.ReadOnly = true;
//
// colInventory
//
- this.colInventory.FillWeight = 40F;
+ this.colInventory.FillWeight = 45F;
this.colInventory.HeaderText = "库存";
this.colInventory.Name = "colInventory";
this.colInventory.ReadOnly = true;
//
// colDiscount
//
- this.colDiscount.FillWeight = 40F;
+ this.colDiscount.FillWeight = 45F;
this.colDiscount.HeaderText = "折扣";
this.colDiscount.Name = "colDiscount";
this.colDiscount.ReadOnly = true;
//
// colScore
//
- this.colScore.FillWeight = 70F;
+ this.colScore.FillWeight = 60F;
this.colScore.HeaderText = "品质分";
this.colScore.Name = "colScore";
this.colScore.ReadOnly = true;
@@ -415,24 +434,12 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
//
// colOperate
//
- this.colOperate.FillWeight = 50F;
+ this.colOperate.FillWeight = 70F;
this.colOperate.HeaderText = "操作";
this.colOperate.Name = "colOperate";
this.colOperate.ReadOnly = true;
this.colOperate.Resizable = System.Windows.Forms.DataGridViewTriState.True;
//
- // statusBar
- //
- this.statusBar.BackColor = System.Drawing.Color.White;
- this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill;
- this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.statusBar.Location = new System.Drawing.Point(0, 0);
- this.statusBar.Margin = new System.Windows.Forms.Padding(0);
- this.statusBar.Name = "statusBar";
- this.statusBar.Size = new System.Drawing.Size(1364, 25);
- this.statusBar.TabIndex = 1;
- this.statusBar.Visible = false;
- //
// ShopOrderStatisticsDetailForm
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -478,6 +485,7 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
private System.Windows.Forms.DataGridViewTextBoxColumn colSkc;
private System.Windows.Forms.DataGridViewTextBoxColumn colImgUrl;
private System.Windows.Forms.DataGridViewImageColumn colProductSkcPic;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colProductName;
private System.Windows.Forms.DataGridViewTextBoxColumn colSaleVolume;
private System.Windows.Forms.DataGridViewTextBoxColumn colTodayProfit;
private System.Windows.Forms.DataGridViewTextBoxColumn colSevenDaysSaleVolume;
diff --git a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsDetailForm.cs b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsDetailForm.cs
index 3b07978..3ee22f0 100644
--- a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsDetailForm.cs
+++ b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsDetailForm.cs
@@ -64,6 +64,8 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
fillWeight += column.FillWeight;
}
this.dgvOrder.Columns["colProductSkcPic"].FillWeight = 50f * fillWeight / (this.dgvOrder.Width - 50);
+
+ ShowDgvImg();
}
public void ShowOrderList()
@@ -76,6 +78,7 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
order.productSkcId,
order.productSkcPicture.Replace("https://", "http://"),
defaultBitmap,
+ order.productName,
order.skuQuantityTotalInfo.todaySaleVolume,
order.skuQuantityTotalInfo.todayProfit.Value.ToString("0.00"),
order.skuQuantityTotalInfo.lastSevenDaysSaleVolume,
diff --git a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsDetailForm.resx b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsDetailForm.resx
index 4368c2a..2dd8227 100644
--- a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsDetailForm.resx
+++ b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsDetailForm.resx
@@ -132,6 +132,9 @@
True
+
+ True
+
True
diff --git a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsForm.Designer.cs b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsForm.Designer.cs
index d20ee57..758a88a 100644
--- a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsForm.Designer.cs
+++ b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsForm.Designer.cs
@@ -34,28 +34,40 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
+ this.btnSetColumn = new DevComponents.DotNetBar.PanelEx();
this.btnGetNotGet = new DevComponents.DotNetBar.PanelEx();
this.btnGetSelect = new DevComponents.DotNetBar.PanelEx();
this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
- this.lblWithdrawCashAmount = new System.Windows.Forms.Label();
- this.lblAvailableBalance = new System.Windows.Forms.Label();
- this.lblMallDepositLimitAmount = new System.Windows.Forms.Label();
- this.lblLastMonthIncomeAmount = new System.Windows.Forms.Label();
- this.lblThisMonthIncomeAmount = new System.Windows.Forms.Label();
- this.lblYesterdayIncomeAmount = new System.Windows.Forms.Label();
+ this.lblThirtyDaysSaleVolume = new System.Windows.Forms.Label();
+ this.label12 = new System.Windows.Forms.Label();
this.lblSevenDaysSaleVolume = new System.Windows.Forms.Label();
- this.label8 = new System.Windows.Forms.Label();
- this.label7 = new System.Windows.Forms.Label();
- this.label6 = new System.Windows.Forms.Label();
- this.label5 = new System.Windows.Forms.Label();
- this.label4 = new System.Windows.Forms.Label();
- this.label3 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.lblSaleVolume = new System.Windows.Forms.Label();
+ this.label8 = new System.Windows.Forms.Label();
+ this.lblWithdrawCashAmount = new System.Windows.Forms.Label();
+ this.label7 = new System.Windows.Forms.Label();
+ this.lblAvailableBalance = new System.Windows.Forms.Label();
+ this.label6 = new System.Windows.Forms.Label();
+ this.lblMallDepositLimitAmount = new System.Windows.Forms.Label();
+ this.label5 = new System.Windows.Forms.Label();
+ this.lblLastMonthIncomeAmount = new System.Windows.Forms.Label();
+ this.label4 = new System.Windows.Forms.Label();
+ this.lblThisMonthIncomeAmount = new System.Windows.Forms.Label();
+ this.label3 = new System.Windows.Forms.Label();
+ this.lblYesterdayIncomeAmount = new System.Windows.Forms.Label();
+ this.lblThirtyDaysProfit = new System.Windows.Forms.Label();
+ this.label10 = new System.Windows.Forms.Label();
+ this.lblSevenDaysProfit = new System.Windows.Forms.Label();
+ this.label9 = new System.Windows.Forms.Label();
+ this.lblTodayProfit = new System.Windows.Forms.Label();
+ this.label11 = new System.Windows.Forms.Label();
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
this.pbLoading = new System.Windows.Forms.PictureBox();
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.btnClose = new DevComponents.DotNetBar.PanelEx();
+ this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx();
this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.colLoginStatus = new System.Windows.Forms.DataGridViewLinkColumn();
@@ -71,6 +83,8 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
this.colSevenDaysProfit = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colThirtyDaysSaleVolume = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colThirtyDaysProfit = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.colGoodsValue = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.colGoodsCost = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colHighPriceLimitNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colAboutToSellOutNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colAdvicePrepareSkcNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -81,10 +95,10 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
this.colMallDepositLimitAmount = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colWithdrawCashAmount = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
- this.lblTodayProfit = new System.Windows.Forms.Label();
- this.label10 = new System.Windows.Forms.Label();
- this.label9 = new System.Windows.Forms.Label();
- this.lblSevenDaysProfit = new System.Windows.Forms.Label();
+ this.label13 = new System.Windows.Forms.Label();
+ this.label14 = new System.Windows.Forms.Label();
+ this.lblGoodsValue = new System.Windows.Forms.Label();
+ this.lblGoodsCost = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@@ -97,6 +111,7 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
this.splitContainer2.Panel2.SuspendLayout();
this.splitContainer2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pbLoading)).BeginInit();
+ this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dgvShop)).BeginInit();
this.SuspendLayout();
//
@@ -128,6 +143,7 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
| System.Windows.Forms.AnchorStyles.Right)));
this.ucGroupBoxEx3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.ucGroupBoxEx3.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
+ this.ucGroupBoxEx3.Controls.Add(this.btnSetColumn);
this.ucGroupBoxEx3.Controls.Add(this.btnGetNotGet);
this.ucGroupBoxEx3.Controls.Add(this.btnGetSelect);
this.ucGroupBoxEx3.Location = new System.Drawing.Point(1210, 2);
@@ -137,6 +153,30 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
this.ucGroupBoxEx3.TabStop = false;
this.ucGroupBoxEx3.Text = "统计查询";
//
+ // btnSetColumn
+ //
+ this.btnSetColumn.CanvasColor = System.Drawing.SystemColors.Control;
+ this.btnSetColumn.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.btnSetColumn.DisabledBackColor = System.Drawing.Color.Empty;
+ this.btnSetColumn.Location = new System.Drawing.Point(32, 31);
+ this.btnSetColumn.Name = "btnSetColumn";
+ this.btnSetColumn.Size = new System.Drawing.Size(80, 23);
+ this.btnSetColumn.Style.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnSetColumn.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+ this.btnSetColumn.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+ this.btnSetColumn.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+ this.btnSetColumn.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnSetColumn.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+ this.btnSetColumn.Style.GradientAngle = 90;
+ this.btnSetColumn.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnSetColumn.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnSetColumn.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnSetColumn.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnSetColumn.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
+ this.btnSetColumn.TabIndex = 801;
+ this.btnSetColumn.Text = "设置表格列";
+ this.btnSetColumn.Click += new System.EventHandler(this.btnSetColumn_Click);
+ //
// btnGetNotGet
//
this.btnGetNotGet.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -144,7 +184,7 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
this.btnGetNotGet.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnGetNotGet.DisabledBackColor = System.Drawing.Color.Empty;
this.btnGetNotGet.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnGetNotGet.Location = new System.Drawing.Point(32, 42);
+ this.btnGetNotGet.Location = new System.Drawing.Point(32, 64);
this.btnGetNotGet.Name = "btnGetNotGet";
this.btnGetNotGet.Size = new System.Drawing.Size(80, 23);
this.btnGetNotGet.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -169,7 +209,7 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
this.btnGetSelect.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnGetSelect.DisabledBackColor = System.Drawing.Color.Empty;
this.btnGetSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnGetSelect.Location = new System.Drawing.Point(32, 80);
+ this.btnGetSelect.Location = new System.Drawing.Point(32, 97);
this.btnGetSelect.Name = "btnGetSelect";
this.btnGetSelect.Size = new System.Drawing.Size(80, 23);
this.btnGetSelect.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -208,34 +248,41 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.tableLayoutPanel1.ColumnCount = 7;
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 10F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 10F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
- this.tableLayoutPanel1.Controls.Add(this.lblSevenDaysProfit, 3, 1);
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 14.28531F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 14.28531F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 14.28531F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 14.28531F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 14.28531F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 14.28531F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 14.28816F));
+ this.tableLayoutPanel1.Controls.Add(this.lblGoodsCost, 0, 3);
+ this.tableLayoutPanel1.Controls.Add(this.lblThirtyDaysSaleVolume, 2, 1);
+ this.tableLayoutPanel1.Controls.Add(this.label12, 5, 0);
this.tableLayoutPanel1.Controls.Add(this.lblSevenDaysSaleVolume, 1, 1);
- this.tableLayoutPanel1.Controls.Add(this.label10, 3, 0);
this.tableLayoutPanel1.Controls.Add(this.label2, 1, 0);
this.tableLayoutPanel1.Controls.Add(this.label1, 0, 0);
this.tableLayoutPanel1.Controls.Add(this.lblSaleVolume, 0, 1);
- this.tableLayoutPanel1.Controls.Add(this.label8, 4, 2);
- this.tableLayoutPanel1.Controls.Add(this.lblWithdrawCashAmount, 4, 3);
- this.tableLayoutPanel1.Controls.Add(this.label7, 3, 2);
- this.tableLayoutPanel1.Controls.Add(this.lblAvailableBalance, 3, 3);
- this.tableLayoutPanel1.Controls.Add(this.label6, 2, 2);
- this.tableLayoutPanel1.Controls.Add(this.lblMallDepositLimitAmount, 2, 3);
- this.tableLayoutPanel1.Controls.Add(this.label5, 1, 2);
- this.tableLayoutPanel1.Controls.Add(this.lblLastMonthIncomeAmount, 1, 3);
- this.tableLayoutPanel1.Controls.Add(this.label4, 0, 2);
- this.tableLayoutPanel1.Controls.Add(this.lblThisMonthIncomeAmount, 0, 3);
- this.tableLayoutPanel1.Controls.Add(this.label3, 4, 0);
- this.tableLayoutPanel1.Controls.Add(this.lblYesterdayIncomeAmount, 4, 1);
- this.tableLayoutPanel1.Controls.Add(this.lblTodayProfit, 2, 1);
- this.tableLayoutPanel1.Controls.Add(this.label9, 2, 0);
+ this.tableLayoutPanel1.Controls.Add(this.lblThirtyDaysProfit, 5, 1);
+ this.tableLayoutPanel1.Controls.Add(this.label10, 4, 0);
+ this.tableLayoutPanel1.Controls.Add(this.lblSevenDaysProfit, 4, 1);
+ this.tableLayoutPanel1.Controls.Add(this.label9, 3, 0);
+ this.tableLayoutPanel1.Controls.Add(this.lblTodayProfit, 3, 1);
+ this.tableLayoutPanel1.Controls.Add(this.label11, 2, 0);
+ this.tableLayoutPanel1.Controls.Add(this.label8, 6, 2);
+ this.tableLayoutPanel1.Controls.Add(this.lblWithdrawCashAmount, 6, 3);
+ this.tableLayoutPanel1.Controls.Add(this.lblAvailableBalance, 5, 3);
+ this.tableLayoutPanel1.Controls.Add(this.label7, 5, 2);
+ this.tableLayoutPanel1.Controls.Add(this.label6, 4, 2);
+ this.tableLayoutPanel1.Controls.Add(this.lblMallDepositLimitAmount, 4, 3);
+ this.tableLayoutPanel1.Controls.Add(this.label5, 3, 2);
+ this.tableLayoutPanel1.Controls.Add(this.lblLastMonthIncomeAmount, 3, 3);
+ this.tableLayoutPanel1.Controls.Add(this.lblThisMonthIncomeAmount, 2, 3);
+ this.tableLayoutPanel1.Controls.Add(this.label4, 2, 2);
+ this.tableLayoutPanel1.Controls.Add(this.lblYesterdayIncomeAmount, 1, 3);
+ this.tableLayoutPanel1.Controls.Add(this.label3, 1, 2);
+ this.tableLayoutPanel1.Controls.Add(this.label13, 6, 0);
+ this.tableLayoutPanel1.Controls.Add(this.label14, 0, 2);
+ this.tableLayoutPanel1.Controls.Add(this.lblGoodsValue, 6, 1);
this.tableLayoutPanel1.Location = new System.Drawing.Point(31, 19);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 4;
@@ -246,155 +293,45 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
this.tableLayoutPanel1.Size = new System.Drawing.Size(1165, 115);
this.tableLayoutPanel1.TabIndex = 435;
//
- // lblWithdrawCashAmount
+ // lblThirtyDaysSaleVolume
//
- this.lblWithdrawCashAmount.Anchor = System.Windows.Forms.AnchorStyles.Left;
- this.lblWithdrawCashAmount.AutoSize = true;
- this.lblWithdrawCashAmount.Font = new System.Drawing.Font("微软雅黑", 11F);
- this.lblWithdrawCashAmount.Location = new System.Drawing.Point(919, 87);
- this.lblWithdrawCashAmount.Name = "lblWithdrawCashAmount";
- this.lblWithdrawCashAmount.Size = new System.Drawing.Size(18, 20);
- this.lblWithdrawCashAmount.TabIndex = 15;
- this.lblWithdrawCashAmount.Text = "0";
+ this.lblThirtyDaysSaleVolume.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.lblThirtyDaysSaleVolume.AutoSize = true;
+ this.lblThirtyDaysSaleVolume.Font = new System.Drawing.Font("微软雅黑", 11F);
+ this.lblThirtyDaysSaleVolume.Location = new System.Drawing.Point(335, 30);
+ this.lblThirtyDaysSaleVolume.Name = "lblThirtyDaysSaleVolume";
+ this.lblThirtyDaysSaleVolume.Size = new System.Drawing.Size(18, 20);
+ this.lblThirtyDaysSaleVolume.TabIndex = 16;
+ this.lblThirtyDaysSaleVolume.Text = "0";
//
- // lblAvailableBalance
+ // label12
//
- this.lblAvailableBalance.Anchor = System.Windows.Forms.AnchorStyles.Left;
- this.lblAvailableBalance.AutoSize = true;
- this.lblAvailableBalance.Font = new System.Drawing.Font("微软雅黑", 11F);
- this.lblAvailableBalance.Location = new System.Drawing.Point(690, 87);
- this.lblAvailableBalance.Name = "lblAvailableBalance";
- this.lblAvailableBalance.Size = new System.Drawing.Size(18, 20);
- this.lblAvailableBalance.TabIndex = 15;
- this.lblAvailableBalance.Text = "0";
- //
- // lblMallDepositLimitAmount
- //
- this.lblMallDepositLimitAmount.Anchor = System.Windows.Forms.AnchorStyles.Left;
- this.lblMallDepositLimitAmount.AutoSize = true;
- this.lblMallDepositLimitAmount.Font = new System.Drawing.Font("微软雅黑", 11F);
- this.lblMallDepositLimitAmount.Location = new System.Drawing.Point(461, 87);
- this.lblMallDepositLimitAmount.Name = "lblMallDepositLimitAmount";
- this.lblMallDepositLimitAmount.Size = new System.Drawing.Size(18, 20);
- this.lblMallDepositLimitAmount.TabIndex = 15;
- this.lblMallDepositLimitAmount.Text = "0";
- //
- // lblLastMonthIncomeAmount
- //
- this.lblLastMonthIncomeAmount.Anchor = System.Windows.Forms.AnchorStyles.Left;
- this.lblLastMonthIncomeAmount.AutoSize = true;
- this.lblLastMonthIncomeAmount.Font = new System.Drawing.Font("微软雅黑", 11F);
- this.lblLastMonthIncomeAmount.Location = new System.Drawing.Point(232, 87);
- this.lblLastMonthIncomeAmount.Name = "lblLastMonthIncomeAmount";
- this.lblLastMonthIncomeAmount.Size = new System.Drawing.Size(18, 20);
- this.lblLastMonthIncomeAmount.TabIndex = 15;
- this.lblLastMonthIncomeAmount.Text = "0";
- //
- // lblThisMonthIncomeAmount
- //
- this.lblThisMonthIncomeAmount.Anchor = System.Windows.Forms.AnchorStyles.Left;
- this.lblThisMonthIncomeAmount.AutoSize = true;
- this.lblThisMonthIncomeAmount.Font = new System.Drawing.Font("微软雅黑", 11F);
- this.lblThisMonthIncomeAmount.Location = new System.Drawing.Point(3, 87);
- this.lblThisMonthIncomeAmount.Name = "lblThisMonthIncomeAmount";
- this.lblThisMonthIncomeAmount.Size = new System.Drawing.Size(18, 20);
- this.lblThisMonthIncomeAmount.TabIndex = 15;
- this.lblThisMonthIncomeAmount.Text = "0";
- //
- // lblYesterdayIncomeAmount
- //
- this.lblYesterdayIncomeAmount.Anchor = System.Windows.Forms.AnchorStyles.Left;
- this.lblYesterdayIncomeAmount.AutoSize = true;
- this.lblYesterdayIncomeAmount.Font = new System.Drawing.Font("微软雅黑", 11F);
- this.lblYesterdayIncomeAmount.Location = new System.Drawing.Point(919, 30);
- this.lblYesterdayIncomeAmount.Name = "lblYesterdayIncomeAmount";
- this.lblYesterdayIncomeAmount.Size = new System.Drawing.Size(18, 20);
- this.lblYesterdayIncomeAmount.TabIndex = 15;
- this.lblYesterdayIncomeAmount.Text = "0";
+ this.label12.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.label12.AutoSize = true;
+ this.label12.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label12.Location = new System.Drawing.Point(833, 3);
+ this.label12.Name = "label12";
+ this.label12.Size = new System.Drawing.Size(70, 17);
+ this.label12.TabIndex = 8;
+ this.label12.Text = "近30日利润";
//
// lblSevenDaysSaleVolume
//
this.lblSevenDaysSaleVolume.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.lblSevenDaysSaleVolume.AutoSize = true;
this.lblSevenDaysSaleVolume.Font = new System.Drawing.Font("微软雅黑", 11F);
- this.lblSevenDaysSaleVolume.Location = new System.Drawing.Point(232, 30);
+ this.lblSevenDaysSaleVolume.Location = new System.Drawing.Point(169, 30);
this.lblSevenDaysSaleVolume.Name = "lblSevenDaysSaleVolume";
this.lblSevenDaysSaleVolume.Size = new System.Drawing.Size(18, 20);
this.lblSevenDaysSaleVolume.TabIndex = 15;
this.lblSevenDaysSaleVolume.Text = "0";
//
- // label8
- //
- this.label8.Anchor = System.Windows.Forms.AnchorStyles.Left;
- this.label8.AutoSize = true;
- this.label8.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label8.Location = new System.Drawing.Point(919, 60);
- this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(80, 17);
- this.label8.TabIndex = 13;
- this.label8.Text = "提现金额总和";
- //
- // label7
- //
- this.label7.Anchor = System.Windows.Forms.AnchorStyles.Left;
- this.label7.AutoSize = true;
- this.label7.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label7.Location = new System.Drawing.Point(690, 60);
- this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(92, 17);
- this.label7.TabIndex = 12;
- this.label7.Text = "可提现金额总和";
- //
- // label6
- //
- this.label6.Anchor = System.Windows.Forms.AnchorStyles.Left;
- this.label6.AutoSize = true;
- this.label6.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label6.Location = new System.Drawing.Point(461, 60);
- this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(92, 17);
- this.label6.TabIndex = 11;
- this.label6.Text = "保证金金额总和";
- //
- // label5
- //
- this.label5.Anchor = System.Windows.Forms.AnchorStyles.Left;
- this.label5.AutoSize = true;
- this.label5.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label5.Location = new System.Drawing.Point(232, 60);
- this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(104, 17);
- this.label5.TabIndex = 10;
- this.label5.Text = "上月到账金额总和";
- //
- // label4
- //
- this.label4.Anchor = System.Windows.Forms.AnchorStyles.Left;
- this.label4.AutoSize = true;
- this.label4.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label4.Location = new System.Drawing.Point(3, 60);
- this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(104, 17);
- this.label4.TabIndex = 9;
- this.label4.Text = "本月到账金额总和";
- //
- // label3
- //
- this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left;
- this.label3.AutoSize = true;
- this.label3.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label3.Location = new System.Drawing.Point(919, 3);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(104, 17);
- this.label3.TabIndex = 8;
- this.label3.Text = "昨日到账金额总和";
- //
// label2
//
this.label2.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.label2.AutoSize = true;
this.label2.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label2.Location = new System.Drawing.Point(232, 3);
+ this.label2.Location = new System.Drawing.Point(169, 3);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(63, 17);
this.label2.TabIndex = 7;
@@ -422,6 +359,204 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
this.lblSaleVolume.TabIndex = 14;
this.lblSaleVolume.Text = "0";
//
+ // label8
+ //
+ this.label8.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.label8.AutoSize = true;
+ this.label8.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label8.Location = new System.Drawing.Point(999, 60);
+ this.label8.Name = "label8";
+ this.label8.Size = new System.Drawing.Size(80, 17);
+ this.label8.TabIndex = 13;
+ this.label8.Text = "提现金额总和";
+ //
+ // lblWithdrawCashAmount
+ //
+ this.lblWithdrawCashAmount.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.lblWithdrawCashAmount.AutoSize = true;
+ this.lblWithdrawCashAmount.Font = new System.Drawing.Font("微软雅黑", 11F);
+ this.lblWithdrawCashAmount.Location = new System.Drawing.Point(999, 87);
+ this.lblWithdrawCashAmount.Name = "lblWithdrawCashAmount";
+ this.lblWithdrawCashAmount.Size = new System.Drawing.Size(18, 20);
+ this.lblWithdrawCashAmount.TabIndex = 15;
+ this.lblWithdrawCashAmount.Text = "0";
+ //
+ // label7
+ //
+ this.label7.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.label7.AutoSize = true;
+ this.label7.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label7.Location = new System.Drawing.Point(833, 60);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(92, 17);
+ this.label7.TabIndex = 12;
+ this.label7.Text = "可提现金额总和";
+ //
+ // lblAvailableBalance
+ //
+ this.lblAvailableBalance.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.lblAvailableBalance.AutoSize = true;
+ this.lblAvailableBalance.Font = new System.Drawing.Font("微软雅黑", 11F);
+ this.lblAvailableBalance.Location = new System.Drawing.Point(833, 87);
+ this.lblAvailableBalance.Name = "lblAvailableBalance";
+ this.lblAvailableBalance.Size = new System.Drawing.Size(18, 20);
+ this.lblAvailableBalance.TabIndex = 15;
+ this.lblAvailableBalance.Text = "0";
+ //
+ // label6
+ //
+ this.label6.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.label6.AutoSize = true;
+ this.label6.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label6.Location = new System.Drawing.Point(667, 60);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(92, 17);
+ this.label6.TabIndex = 11;
+ this.label6.Text = "保证金金额总和";
+ //
+ // lblMallDepositLimitAmount
+ //
+ this.lblMallDepositLimitAmount.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.lblMallDepositLimitAmount.AutoSize = true;
+ this.lblMallDepositLimitAmount.Font = new System.Drawing.Font("微软雅黑", 11F);
+ this.lblMallDepositLimitAmount.Location = new System.Drawing.Point(667, 87);
+ this.lblMallDepositLimitAmount.Name = "lblMallDepositLimitAmount";
+ this.lblMallDepositLimitAmount.Size = new System.Drawing.Size(18, 20);
+ this.lblMallDepositLimitAmount.TabIndex = 15;
+ this.lblMallDepositLimitAmount.Text = "0";
+ //
+ // label5
+ //
+ this.label5.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.label5.AutoSize = true;
+ this.label5.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label5.Location = new System.Drawing.Point(501, 60);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(104, 17);
+ this.label5.TabIndex = 10;
+ this.label5.Text = "上月到账金额总和";
+ //
+ // lblLastMonthIncomeAmount
+ //
+ this.lblLastMonthIncomeAmount.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.lblLastMonthIncomeAmount.AutoSize = true;
+ this.lblLastMonthIncomeAmount.Font = new System.Drawing.Font("微软雅黑", 11F);
+ this.lblLastMonthIncomeAmount.Location = new System.Drawing.Point(501, 87);
+ this.lblLastMonthIncomeAmount.Name = "lblLastMonthIncomeAmount";
+ this.lblLastMonthIncomeAmount.Size = new System.Drawing.Size(18, 20);
+ this.lblLastMonthIncomeAmount.TabIndex = 15;
+ this.lblLastMonthIncomeAmount.Text = "0";
+ //
+ // label4
+ //
+ this.label4.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.label4.AutoSize = true;
+ this.label4.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label4.Location = new System.Drawing.Point(335, 60);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(104, 17);
+ this.label4.TabIndex = 9;
+ this.label4.Text = "本月到账金额总和";
+ //
+ // lblThisMonthIncomeAmount
+ //
+ this.lblThisMonthIncomeAmount.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.lblThisMonthIncomeAmount.AutoSize = true;
+ this.lblThisMonthIncomeAmount.Font = new System.Drawing.Font("微软雅黑", 11F);
+ this.lblThisMonthIncomeAmount.Location = new System.Drawing.Point(335, 87);
+ this.lblThisMonthIncomeAmount.Name = "lblThisMonthIncomeAmount";
+ this.lblThisMonthIncomeAmount.Size = new System.Drawing.Size(18, 20);
+ this.lblThisMonthIncomeAmount.TabIndex = 15;
+ this.lblThisMonthIncomeAmount.Text = "0";
+ //
+ // label3
+ //
+ this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.label3.AutoSize = true;
+ this.label3.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label3.Location = new System.Drawing.Point(169, 60);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(104, 17);
+ this.label3.TabIndex = 8;
+ this.label3.Text = "昨日到账金额总和";
+ //
+ // lblYesterdayIncomeAmount
+ //
+ this.lblYesterdayIncomeAmount.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.lblYesterdayIncomeAmount.AutoSize = true;
+ this.lblYesterdayIncomeAmount.Font = new System.Drawing.Font("微软雅黑", 11F);
+ this.lblYesterdayIncomeAmount.Location = new System.Drawing.Point(169, 87);
+ this.lblYesterdayIncomeAmount.Name = "lblYesterdayIncomeAmount";
+ this.lblYesterdayIncomeAmount.Size = new System.Drawing.Size(18, 20);
+ this.lblYesterdayIncomeAmount.TabIndex = 15;
+ this.lblYesterdayIncomeAmount.Text = "0";
+ //
+ // lblThirtyDaysProfit
+ //
+ this.lblThirtyDaysProfit.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.lblThirtyDaysProfit.AutoSize = true;
+ this.lblThirtyDaysProfit.Font = new System.Drawing.Font("微软雅黑", 11F);
+ this.lblThirtyDaysProfit.Location = new System.Drawing.Point(833, 30);
+ this.lblThirtyDaysProfit.Name = "lblThirtyDaysProfit";
+ this.lblThirtyDaysProfit.Size = new System.Drawing.Size(18, 20);
+ this.lblThirtyDaysProfit.TabIndex = 18;
+ this.lblThirtyDaysProfit.Text = "0";
+ //
+ // label10
+ //
+ this.label10.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.label10.AutoSize = true;
+ this.label10.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label10.Location = new System.Drawing.Point(667, 3);
+ this.label10.Name = "label10";
+ this.label10.Size = new System.Drawing.Size(63, 17);
+ this.label10.TabIndex = 13;
+ this.label10.Text = "近7日利润";
+ //
+ // lblSevenDaysProfit
+ //
+ this.lblSevenDaysProfit.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.lblSevenDaysProfit.AutoSize = true;
+ this.lblSevenDaysProfit.Font = new System.Drawing.Font("微软雅黑", 11F);
+ this.lblSevenDaysProfit.Location = new System.Drawing.Point(667, 30);
+ this.lblSevenDaysProfit.Name = "lblSevenDaysProfit";
+ this.lblSevenDaysProfit.Size = new System.Drawing.Size(18, 20);
+ this.lblSevenDaysProfit.TabIndex = 17;
+ this.lblSevenDaysProfit.Text = "0";
+ //
+ // label9
+ //
+ this.label9.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.label9.AutoSize = true;
+ this.label9.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label9.Location = new System.Drawing.Point(501, 3);
+ this.label9.Name = "label9";
+ this.label9.Size = new System.Drawing.Size(56, 17);
+ this.label9.TabIndex = 14;
+ this.label9.Text = "今日利润";
+ //
+ // lblTodayProfit
+ //
+ this.lblTodayProfit.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.lblTodayProfit.AutoSize = true;
+ this.lblTodayProfit.Font = new System.Drawing.Font("微软雅黑", 11F);
+ this.lblTodayProfit.Location = new System.Drawing.Point(501, 30);
+ this.lblTodayProfit.Name = "lblTodayProfit";
+ this.lblTodayProfit.Size = new System.Drawing.Size(18, 20);
+ this.lblTodayProfit.TabIndex = 16;
+ this.lblTodayProfit.Text = "0";
+ //
+ // label11
+ //
+ this.label11.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.label11.AutoSize = true;
+ this.label11.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label11.Location = new System.Drawing.Point(335, 3);
+ this.label11.Name = "label11";
+ this.label11.Size = new System.Drawing.Size(70, 17);
+ this.label11.TabIndex = 14;
+ this.label11.Text = "近30日销量";
+ //
// splitContainer2
//
this.splitContainer2.BackColor = System.Drawing.Color.White;
@@ -435,6 +570,7 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
//
this.splitContainer2.Panel1.BackColor = System.Drawing.Color.White;
this.splitContainer2.Panel1.Controls.Add(this.pbLoading);
+ this.splitContainer2.Panel1.Controls.Add(this.panel1);
this.splitContainer2.Panel1.Controls.Add(this.dgvShop);
this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 4, 0);
//
@@ -457,6 +593,53 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
this.pbLoading.TabStop = false;
this.pbLoading.Visible = false;
//
+ // panel1
+ //
+ this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.panel1.Controls.Add(this.btnClose);
+ this.panel1.Controls.Add(this.flowLayoutPanel1);
+ this.panel1.Location = new System.Drawing.Point(98, 65);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(1154, 134);
+ this.panel1.TabIndex = 9;
+ this.panel1.Visible = false;
+ //
+ // btnClose
+ //
+ this.btnClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.btnClose.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.btnClose.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.btnClose.DisabledBackColor = System.Drawing.Color.Empty;
+ this.btnClose.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnClose.Location = new System.Drawing.Point(1065, 98);
+ this.btnClose.Name = "btnClose";
+ this.btnClose.Size = new System.Drawing.Size(58, 23);
+ this.btnClose.Style.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnClose.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnClose.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnClose.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+ this.btnClose.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+ this.btnClose.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+ this.btnClose.Style.ForeColor.Color = System.Drawing.Color.White;
+ this.btnClose.Style.GradientAngle = 90;
+ this.btnClose.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnClose.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnClose.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnClose.TabIndex = 435;
+ this.btnClose.Text = "关闭";
+ this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
+ //
+ // flowLayoutPanel1
+ //
+ this.flowLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.flowLayoutPanel1.Location = new System.Drawing.Point(24, 17);
+ this.flowLayoutPanel1.Name = "flowLayoutPanel1";
+ this.flowLayoutPanel1.Size = new System.Drawing.Size(1099, 75);
+ this.flowLayoutPanel1.TabIndex = 8;
+ //
// dgvShop
//
this.dgvShop.AllowUserToAddRows = false;
@@ -490,6 +673,8 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
this.colSevenDaysProfit,
this.colThirtyDaysSaleVolume,
this.colThirtyDaysProfit,
+ this.colGoodsValue,
+ this.colGoodsCost,
this.colHighPriceLimitNumber,
this.colAboutToSellOutNumber,
this.colAdvicePrepareSkcNumber,
@@ -520,7 +705,7 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
//
// colLoginStatus
//
- this.colLoginStatus.FillWeight = 35F;
+ this.colLoginStatus.FillWeight = 38F;
this.colLoginStatus.HeaderText = "状态";
this.colLoginStatus.Name = "colLoginStatus";
this.colLoginStatus.ReadOnly = true;
@@ -529,7 +714,7 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
//
// colDetail
//
- this.colDetail.FillWeight = 35F;
+ this.colDetail.FillWeight = 38F;
this.colDetail.HeaderText = "详情";
this.colDetail.Name = "colDetail";
this.colDetail.ReadOnly = true;
@@ -562,7 +747,7 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
//
// colOnSaleProductNumber
//
- this.colOnSaleProductNumber.FillWeight = 90F;
+ this.colOnSaleProductNumber.FillWeight = 85F;
this.colOnSaleProductNumber.HeaderText = "在售商品数";
this.colOnSaleProductNumber.Name = "colOnSaleProductNumber";
this.colOnSaleProductNumber.ReadOnly = true;
@@ -601,7 +786,6 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
this.colThirtyDaysSaleVolume.HeaderText = "近30日销量";
this.colThirtyDaysSaleVolume.Name = "colThirtyDaysSaleVolume";
this.colThirtyDaysSaleVolume.ReadOnly = true;
- this.colThirtyDaysSaleVolume.Visible = false;
//
// colThirtyDaysProfit
//
@@ -609,13 +793,27 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
this.colThirtyDaysProfit.HeaderText = "近30日利润";
this.colThirtyDaysProfit.Name = "colThirtyDaysProfit";
this.colThirtyDaysProfit.ReadOnly = true;
- this.colThirtyDaysProfit.Visible = false;
+ //
+ // colGoodsValue
+ //
+ this.colGoodsValue.FillWeight = 75F;
+ this.colGoodsValue.HeaderText = "销售货值";
+ this.colGoodsValue.Name = "colGoodsValue";
+ this.colGoodsValue.ReadOnly = true;
+ //
+ // colGoodsCost
+ //
+ this.colGoodsCost.FillWeight = 75F;
+ this.colGoodsCost.HeaderText = "成本货值";
+ this.colGoodsCost.Name = "colGoodsCost";
+ this.colGoodsCost.ReadOnly = true;
//
// colHighPriceLimitNumber
//
this.colHighPriceLimitNumber.HeaderText = "高价限流商品数";
this.colHighPriceLimitNumber.Name = "colHighPriceLimitNumber";
this.colHighPriceLimitNumber.ReadOnly = true;
+ this.colHighPriceLimitNumber.Visible = false;
//
// colAboutToSellOutNumber
//
@@ -635,18 +833,21 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
//
// colYesterdayIncomeAmount
//
+ this.colYesterdayIncomeAmount.FillWeight = 95F;
this.colYesterdayIncomeAmount.HeaderText = "昨日到账金额";
this.colYesterdayIncomeAmount.Name = "colYesterdayIncomeAmount";
this.colYesterdayIncomeAmount.ReadOnly = true;
//
// colThisMonthIncomeAmount
//
+ this.colThisMonthIncomeAmount.FillWeight = 95F;
this.colThisMonthIncomeAmount.HeaderText = "本月到账金额";
this.colThisMonthIncomeAmount.Name = "colThisMonthIncomeAmount";
this.colThisMonthIncomeAmount.ReadOnly = true;
//
// colLastMonthIncomeAmount
//
+ this.colLastMonthIncomeAmount.FillWeight = 95F;
this.colLastMonthIncomeAmount.HeaderText = "上月到账金额";
this.colLastMonthIncomeAmount.Name = "colLastMonthIncomeAmount";
this.colLastMonthIncomeAmount.ReadOnly = true;
@@ -660,6 +861,7 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
//
// colMallDepositLimitAmount
//
+ this.colMallDepositLimitAmount.FillWeight = 95F;
this.colMallDepositLimitAmount.HeaderText = "账户预留金额";
this.colMallDepositLimitAmount.Name = "colMallDepositLimitAmount";
this.colMallDepositLimitAmount.ReadOnly = true;
@@ -682,49 +884,49 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
this.statusBar.Size = new System.Drawing.Size(1350, 26);
this.statusBar.TabIndex = 1;
//
- // lblTodayProfit
+ // label13
//
- this.lblTodayProfit.Anchor = System.Windows.Forms.AnchorStyles.Left;
- this.lblTodayProfit.AutoSize = true;
- this.lblTodayProfit.Font = new System.Drawing.Font("微软雅黑", 11F);
- this.lblTodayProfit.Location = new System.Drawing.Point(461, 30);
- this.lblTodayProfit.Name = "lblTodayProfit";
- this.lblTodayProfit.Size = new System.Drawing.Size(18, 20);
- this.lblTodayProfit.TabIndex = 16;
- this.lblTodayProfit.Text = "0";
+ this.label13.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.label13.AutoSize = true;
+ this.label13.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label13.Location = new System.Drawing.Point(999, 3);
+ this.label13.Name = "label13";
+ this.label13.Size = new System.Drawing.Size(80, 17);
+ this.label13.TabIndex = 19;
+ this.label13.Text = "预估销售货值";
//
- // label10
+ // label14
//
- this.label10.Anchor = System.Windows.Forms.AnchorStyles.Left;
- this.label10.AutoSize = true;
- this.label10.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label10.Location = new System.Drawing.Point(690, 3);
- this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(63, 17);
- this.label10.TabIndex = 13;
- this.label10.Text = "近7日利润";
+ this.label14.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.label14.AutoSize = true;
+ this.label14.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label14.Location = new System.Drawing.Point(3, 60);
+ this.label14.Name = "label14";
+ this.label14.Size = new System.Drawing.Size(80, 17);
+ this.label14.TabIndex = 20;
+ this.label14.Text = "库存成本货值";
//
- // label9
+ // lblGoodsValue
//
- this.label9.Anchor = System.Windows.Forms.AnchorStyles.Left;
- this.label9.AutoSize = true;
- this.label9.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label9.Location = new System.Drawing.Point(461, 3);
- this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(56, 17);
- this.label9.TabIndex = 14;
- this.label9.Text = "今日利润";
+ this.lblGoodsValue.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.lblGoodsValue.AutoSize = true;
+ this.lblGoodsValue.Font = new System.Drawing.Font("微软雅黑", 11F);
+ this.lblGoodsValue.Location = new System.Drawing.Point(999, 30);
+ this.lblGoodsValue.Name = "lblGoodsValue";
+ this.lblGoodsValue.Size = new System.Drawing.Size(18, 20);
+ this.lblGoodsValue.TabIndex = 21;
+ this.lblGoodsValue.Text = "0";
//
- // lblSevenDaysProfit
+ // lblGoodsCost
//
- this.lblSevenDaysProfit.Anchor = System.Windows.Forms.AnchorStyles.Left;
- this.lblSevenDaysProfit.AutoSize = true;
- this.lblSevenDaysProfit.Font = new System.Drawing.Font("微软雅黑", 11F);
- this.lblSevenDaysProfit.Location = new System.Drawing.Point(690, 30);
- this.lblSevenDaysProfit.Name = "lblSevenDaysProfit";
- this.lblSevenDaysProfit.Size = new System.Drawing.Size(18, 20);
- this.lblSevenDaysProfit.TabIndex = 17;
- this.lblSevenDaysProfit.Text = "0";
+ this.lblGoodsCost.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.lblGoodsCost.AutoSize = true;
+ this.lblGoodsCost.Font = new System.Drawing.Font("微软雅黑", 11F);
+ this.lblGoodsCost.Location = new System.Drawing.Point(3, 87);
+ this.lblGoodsCost.Name = "lblGoodsCost";
+ this.lblGoodsCost.Size = new System.Drawing.Size(18, 20);
+ this.lblGoodsCost.TabIndex = 22;
+ this.lblGoodsCost.Text = "0";
//
// ShopOrderStatisticsForm
//
@@ -749,6 +951,7 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
this.splitContainer2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pbLoading)).EndInit();
+ this.panel1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.dgvShop)).EndInit();
this.ResumeLayout(false);
@@ -782,6 +985,18 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
private System.Windows.Forms.Label lblThisMonthIncomeAmount;
private System.Windows.Forms.Label lblYesterdayIncomeAmount;
private System.Windows.Forms.Label lblSevenDaysSaleVolume;
+ private System.Windows.Forms.Label lblTodayProfit;
+ private System.Windows.Forms.Label label10;
+ private System.Windows.Forms.Label lblSevenDaysProfit;
+ private System.Windows.Forms.Label label9;
+ private System.Windows.Forms.Label lblThirtyDaysSaleVolume;
+ private System.Windows.Forms.Label label12;
+ private System.Windows.Forms.Label lblThirtyDaysProfit;
+ private System.Windows.Forms.Label label11;
+ private DevComponents.DotNetBar.PanelEx btnSetColumn;
+ private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
+ private System.Windows.Forms.Panel panel1;
+ private DevComponents.DotNetBar.PanelEx btnClose;
private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect;
private System.Windows.Forms.DataGridViewLinkColumn colLoginStatus;
private System.Windows.Forms.DataGridViewLinkColumn colDetail;
@@ -796,6 +1011,8 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
private System.Windows.Forms.DataGridViewTextBoxColumn colSevenDaysProfit;
private System.Windows.Forms.DataGridViewTextBoxColumn colThirtyDaysSaleVolume;
private System.Windows.Forms.DataGridViewTextBoxColumn colThirtyDaysProfit;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colGoodsValue;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colGoodsCost;
private System.Windows.Forms.DataGridViewTextBoxColumn colHighPriceLimitNumber;
private System.Windows.Forms.DataGridViewTextBoxColumn colAboutToSellOutNumber;
private System.Windows.Forms.DataGridViewTextBoxColumn colAdvicePrepareSkcNumber;
@@ -805,9 +1022,9 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
private System.Windows.Forms.DataGridViewTextBoxColumn colAvailableBalance;
private System.Windows.Forms.DataGridViewTextBoxColumn colMallDepositLimitAmount;
private System.Windows.Forms.DataGridViewTextBoxColumn colWithdrawCashAmount;
- private System.Windows.Forms.Label lblTodayProfit;
- private System.Windows.Forms.Label label10;
- private System.Windows.Forms.Label lblSevenDaysProfit;
- private System.Windows.Forms.Label label9;
+ private System.Windows.Forms.Label lblGoodsCost;
+ private System.Windows.Forms.Label label13;
+ private System.Windows.Forms.Label label14;
+ private System.Windows.Forms.Label lblGoodsValue;
}
}
\ No newline at end of file
diff --git a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsForm.cs b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsForm.cs
index bf3824f..98ea8f8 100644
--- a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsForm.cs
+++ b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsForm.cs
@@ -15,17 +15,19 @@ using System.Threading.Tasks;
using System.Windows.Forms;
using TemuKJD.Extension;
using TemuKJD.KJDForms.BaseForms;
+using TemuKJD.UserComponent;
using Work;
namespace TemuKJD.KJDForms.ShopForms.Statistics
{
- public partial class ShopOrderStatisticsForm : Form
+ public partial class ShopOrderStatisticsForm : BaseForm
{
public static ShopOrderStatisticsForm OrderStatisticsInstance { get; set; }
public List lstShopStatisticsInfo = new List();
public List lstSubOrderInfo = new List();
public bool IsOperate = false;
public bool isFirstLoad = false;
+ public List LstHideColumnName = new List();
public ShopOrderStatisticsForm()
{
@@ -37,6 +39,25 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
private void ShopOrderStatisticsForm_Load(object sender, EventArgs e)
{
this.dgvShop.AddSelectorColumn("colSelect");
+
+ foreach(DataGridViewColumn column in dgvShop.Columns)
+ {
+ if (!string.IsNullOrEmpty(column.HeaderText))
+ {
+ var chk = new UcCheckBox() { Name = "chk" + column.Name, Tag = column.Name, Text = column.HeaderText, Checked = column.Visible, };
+ chk.CheckedChanged += Chk_CheckedChanged;
+ this.flowLayoutPanel1.Controls.Add(chk);
+ }
+ }
+ }
+
+ private void Chk_CheckedChanged(object sender, EventArgs e)
+ {
+ var chk = sender as UcCheckBox;
+ if (chk != null)
+ {
+ dgvShop.Columns[chk.Tag.ParseToString()].Visible = chk.Checked;
+ }
}
private void ShopOrderStatisticsForm_VisibleChanged(object sender, EventArgs e)
@@ -108,11 +129,15 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
{
this.lblSaleVolume.Text = this.lstShopStatisticsInfo.Sum(s => s.saleVolume).ToString();
this.lblSevenDaysSaleVolume.Text = this.lstShopStatisticsInfo.Sum(s => s.sevenDaysSaleVolume).ToString();
+ this.lblThirtyDaysSaleVolume.Text = this.lstShopStatisticsInfo.Sum(s => s.thirtyDaysSaleVolume).ToString();
this.lblTodayProfit.Text = this.lstShopStatisticsInfo.Sum(s => s.todayProfit).ParseToDecimal().ToString("f2");
this.lblSevenDaysProfit.Text = this.lstShopStatisticsInfo.Sum(s => s.sevenDaysProfit).ParseToDecimal().ToString("f2");
+ this.lblThirtyDaysProfit.Text = this.lstShopStatisticsInfo.Sum(s => s.thirtyDaysProfit).ParseToDecimal().ToString("f2");
this.lblYesterdayIncomeAmount.Text = this.lstShopStatisticsInfo.Sum(s => s.yesterdayIncomeAmount).ToString();
this.lblThisMonthIncomeAmount.Text = this.lstShopStatisticsInfo.Sum(s => s.thisMonthIncomeAmount).ToString();
this.lblLastMonthIncomeAmount.Text = this.lstShopStatisticsInfo.Sum(s => s.lastMonthIncomeAmount).ToString();
+ this.lblGoodsValue.Text = this.lstShopStatisticsInfo.Sum(s => s.goodsValue.ParseToDecimal() * 0.01m).ToString();
+ this.lblGoodsCost.Text = this.lstShopStatisticsInfo.Sum(s => s.goodsCost.ParseToDecimal() * 0.01m).ToString();
this.lblAvailableBalance.Text = this.lstShopStatisticsInfo.Sum(s => s.availableBalance).ToString();
this.lblMallDepositLimitAmount.Text = this.lstShopStatisticsInfo.Sum(s => s.mallDepositLimitAmount).ToString();
@@ -166,6 +191,8 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
statistics.sevenDaysProfit == null ? "-" : statistics.sevenDaysProfit.Value.ToString("0.00"), //7日利润
statistics.thirtyDaysSaleVolume == null ? "-" : statistics.thirtyDaysSaleVolume.ToString(), //30日销量
statistics.thirtyDaysProfit == null ? "-" : statistics.thirtyDaysProfit.Value.ToString("0.00"), //30日利润
+ statistics.goodsValue == null ? "-" : (statistics.goodsValue.Value * 0.01m).ToString("0.00"), //销售货值
+ statistics.goodsCost == null ? "-" : (statistics.goodsCost.Value * 0.01m).ToString("0.00"), //成本
statistics.highPriceLimitNumber == null ? "-" : statistics.highPriceLimitNumber.ToString(), //高价限流商品数
statistics.aboutToSellOutNumber == null ? "-" : statistics.aboutToSellOutNumber.ToString(), //即将售罄
statistics.advicePrepareSkcNumber == null ? "-" : statistics.advicePrepareSkcNumber.ToString(), //建议备货
@@ -202,6 +229,9 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
row.Cells["colSevenDaysProfit"].Value = statistics.sevenDaysProfit == null ? "-" : statistics.sevenDaysProfit.Value.ToString("0.00"); //7日利润
row.Cells["colThirtyDaysSaleVolume"].Value = statistics.thirtyDaysSaleVolume == null ? "-" : statistics.thirtyDaysSaleVolume.ToString(); //30日销量
row.Cells["colThirtyDaysProfit"].Value = statistics.thirtyDaysProfit == null ? "-" : statistics.thirtyDaysProfit.Value.ToString("0.00"); //30日利润
+ row.Cells["colGoodsValue"].Value = statistics.goodsValue == null ? "-" : (statistics.goodsCost.Value * 0.01m).ToString("0.00"); //销售货值
+ row.Cells["colGoodsCost"].Value = statistics.goodsCost == null ? "-" : (statistics.goodsCost.Value * 0.01m).ToString("0.00"); //成本
+
row.Cells["colHighPriceLimitNumber"].Value = statistics.highPriceLimitNumber == null ? "-" : statistics.highPriceLimitNumber.ToString(); //高价限流商品数
row.Cells["colAboutToSellOutNumber"].Value = statistics.aboutToSellOutNumber == null ? "-" : statistics.aboutToSellOutNumber.ToString(); //即将售罄
row.Cells["colAdvicePrepareSkcNumber"].Value = statistics.advicePrepareSkcNumber == null ? "-" : statistics.advicePrepareSkcNumber.ToString(); //建议备货
@@ -442,6 +472,8 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
statistics.todayProfit = 0;
statistics.sevenDaysProfit = 0;
statistics.thirtyDaysProfit = 0;
+ statistics.goodsValue = 0;
+ statistics.goodsCost = 0;
int num = 0;
int num7 = 0;
int num30 = 0;
@@ -474,6 +506,8 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
statistics.todayProfit += sku.todayProfit;
statistics.sevenDaysProfit += sku.sevenDaysProfit;
statistics.thirtyDaysProfit += sku.lastThirtyDaysSaleVolume;
+ statistics.goodsCost += sku.goodsCost;
+ statistics.goodsValue += sku.goodsValue;
}
}
}
@@ -773,9 +807,11 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
}
IsOperate = false;
break;
- default:
+ case "":
dgvShop.Rows[e.RowIndex].Cells["colSelect"].Value = !(bool)dgvShop.Rows[e.RowIndex].Cells["colSelect"].Value;
break;
+ default:
+ break;
}
}
@@ -839,5 +875,15 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
return JsonHelper.DeserializeJsonToList(jArr.ToString());
}
+
+ private void btnSetColumn_Click(object sender, EventArgs e)
+ {
+ this.panel1.Visible = true;
+ }
+
+ private void btnClose_Click(object sender, EventArgs e)
+ {
+ this.panel1.Visible = false;
+ }
}
}
diff --git a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsForm.resx b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsForm.resx
index fdcb625..0421780 100644
--- a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsForm.resx
+++ b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopOrderStatisticsForm.resx
@@ -159,6 +159,12 @@
True
+
+ True
+
+
+ True
+
True
diff --git a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopSetPurchasePriceForm.Designer.cs b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopSetPurchasePriceForm.Designer.cs
index c05b9b1..aaa4b14 100644
--- a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopSetPurchasePriceForm.Designer.cs
+++ b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopSetPurchasePriceForm.Designer.cs
@@ -35,6 +35,8 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ShopSetPurchasePriceForm));
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+ this.txtNotes = new System.Windows.Forms.TextBox();
+ this.label3 = new System.Windows.Forms.Label();
this.numDiscount = new System.Windows.Forms.NumericUpDown();
this.btnMultiChangePurchasePrice = new DevComponents.DotNetBar.PanelEx();
this.numPurchasePrice = new System.Windows.Forms.NumericUpDown();
@@ -47,17 +49,16 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
this.btnGetSelect = new DevComponents.DotNetBar.PanelEx();
this.btnGetNotGet = new DevComponents.DotNetBar.PanelEx();
this.dgvOrder = new TemuKJD.UserComponent.DataGridViewEx();
+ this.btnSave = new DevComponents.DotNetBar.PanelEx();
this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.colSpu = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colSkc = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colSkuId = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colSkuName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.colInventory = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colSkuPrice = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colSkuPurchasePrice = new DevComponents.DotNetBar.Controls.DataGridViewDoubleInputColumn();
this.colAvailableBalance = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.btnSave = new DevComponents.DotNetBar.PanelEx();
- this.label3 = new System.Windows.Forms.Label();
- this.txtNotes = new System.Windows.Forms.TextBox();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@@ -101,6 +102,22 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
this.splitContainer1.TabIndex = 36;
this.splitContainer1.TabStop = false;
//
+ // txtNotes
+ //
+ this.txtNotes.Location = new System.Drawing.Point(183, 21);
+ this.txtNotes.Name = "txtNotes";
+ this.txtNotes.Size = new System.Drawing.Size(161, 23);
+ this.txtNotes.TabIndex = 448;
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.Location = new System.Drawing.Point(151, 24);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(32, 17);
+ this.label3.TabIndex = 447;
+ this.label3.Text = "备注";
+ //
// numDiscount
//
this.numDiscount.DecimalPlaces = 2;
@@ -144,7 +161,7 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
this.btnMultiChangePurchasePrice.Text = "批量修改";
this.btnMultiChangePurchasePrice.Click += new System.EventHandler(this.btnMultiChangePurchasePrice_Click);
//
- // numericUpDown1
+ // numPurchasePrice
//
this.numPurchasePrice.DecimalPlaces = 2;
this.numPurchasePrice.Location = new System.Drawing.Point(425, 21);
@@ -153,7 +170,7 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
0,
0,
0});
- this.numPurchasePrice.Name = "numericUpDown1";
+ this.numPurchasePrice.Name = "numPurchasePrice";
this.numPurchasePrice.Size = new System.Drawing.Size(134, 23);
this.numPurchasePrice.TabIndex = 0;
//
@@ -315,6 +332,7 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
this.colSkc,
this.colSkuId,
this.colSkuName,
+ this.colInventory,
this.colSkuPrice,
this.colSkuPurchasePrice,
this.colAvailableBalance});
@@ -327,6 +345,32 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
this.dgvOrder.Size = new System.Drawing.Size(630, 434);
this.dgvOrder.TabIndex = 5;
//
+ // btnSave
+ //
+ this.btnSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.btnSave.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.btnSave.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.btnSave.DisabledBackColor = System.Drawing.Color.Empty;
+ this.btnSave.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnSave.Location = new System.Drawing.Point(562, 3);
+ this.btnSave.Name = "btnSave";
+ this.btnSave.Size = new System.Drawing.Size(80, 23);
+ this.btnSave.Style.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnSave.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnSave.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnSave.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+ this.btnSave.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+ this.btnSave.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+ this.btnSave.Style.ForeColor.Color = System.Drawing.Color.White;
+ this.btnSave.Style.GradientAngle = 90;
+ this.btnSave.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnSave.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnSave.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnSave.TabIndex = 435;
+ this.btnSave.TabStop = true;
+ this.btnSave.Text = "保存";
+ this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
+ //
// colSelect
//
this.colSelect.FillWeight = 28F;
@@ -363,11 +407,17 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
//
// colSkuName
//
- this.colSkuName.FillWeight = 75F;
this.colSkuName.HeaderText = "SKU名称";
this.colSkuName.Name = "colSkuName";
this.colSkuName.ReadOnly = true;
//
+ // colInventory
+ //
+ this.colInventory.FillWeight = 70F;
+ this.colInventory.HeaderText = "库存";
+ this.colInventory.Name = "colInventory";
+ this.colInventory.ReadOnly = true;
+ //
// colSkuPrice
//
this.colSkuPrice.FillWeight = 75F;
@@ -400,48 +450,6 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
this.colAvailableBalance.ReadOnly = true;
this.colAvailableBalance.Visible = false;
//
- // btnSave
- //
- this.btnSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.btnSave.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
- this.btnSave.Cursor = System.Windows.Forms.Cursors.Hand;
- this.btnSave.DisabledBackColor = System.Drawing.Color.Empty;
- this.btnSave.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnSave.Location = new System.Drawing.Point(562, 3);
- this.btnSave.Name = "btnSave";
- this.btnSave.Size = new System.Drawing.Size(80, 23);
- this.btnSave.Style.Alignment = System.Drawing.StringAlignment.Center;
- this.btnSave.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.btnSave.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.btnSave.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
- this.btnSave.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
- this.btnSave.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
- this.btnSave.Style.ForeColor.Color = System.Drawing.Color.White;
- this.btnSave.Style.GradientAngle = 90;
- this.btnSave.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
- this.btnSave.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
- this.btnSave.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
- this.btnSave.TabIndex = 435;
- this.btnSave.TabStop = true;
- this.btnSave.Text = "保存";
- this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
- //
- // label3
- //
- this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(151, 24);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(32, 17);
- this.label3.TabIndex = 447;
- this.label3.Text = "备注";
- //
- // textBox1
- //
- this.txtNotes.Location = new System.Drawing.Point(183, 21);
- this.txtNotes.Name = "textBox1";
- this.txtNotes.Size = new System.Drawing.Size(161, 23);
- this.txtNotes.TabIndex = 448;
- //
// ShopSetPurchasePriceForm
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -482,14 +490,6 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
private System.Windows.Forms.SplitContainer splitContainer2;
private System.Windows.Forms.PictureBox pbLoading;
private UserComponent.DataGridViewEx dgvOrder;
- private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect;
- private System.Windows.Forms.DataGridViewTextBoxColumn colSpu;
- private System.Windows.Forms.DataGridViewTextBoxColumn colSkc;
- private System.Windows.Forms.DataGridViewTextBoxColumn colSkuId;
- private System.Windows.Forms.DataGridViewTextBoxColumn colSkuName;
- private System.Windows.Forms.DataGridViewTextBoxColumn colSkuPrice;
- private DevComponents.DotNetBar.Controls.DataGridViewDoubleInputColumn colSkuPurchasePrice;
- private System.Windows.Forms.DataGridViewTextBoxColumn colAvailableBalance;
private DevComponents.DotNetBar.PanelEx btnMultiChangePurchasePrice;
private System.Windows.Forms.NumericUpDown numPurchasePrice;
private DevComponents.DotNetBar.PanelEx btnSave;
@@ -498,5 +498,14 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
private System.Windows.Forms.Label label2;
private System.Windows.Forms.TextBox txtNotes;
private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colSpu;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colSkc;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colSkuId;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colSkuName;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colInventory;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colSkuPrice;
+ private DevComponents.DotNetBar.Controls.DataGridViewDoubleInputColumn colSkuPurchasePrice;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colAvailableBalance;
}
}
\ No newline at end of file
diff --git a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopSetPurchasePriceForm.cs b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopSetPurchasePriceForm.cs
index d1a5ee3..6a09f73 100644
--- a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopSetPurchasePriceForm.cs
+++ b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopSetPurchasePriceForm.cs
@@ -47,6 +47,7 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
orderInfo.productSkcId,
sku.productSkuId,
sku.className,
+ sku.inventoryNumInfo.warehouseInventoryNum,
sku.supplierPrice * 0.01m,
sku.purchasePrice * 0.01m,
""
diff --git a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopSetPurchasePriceForm.resx b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopSetPurchasePriceForm.resx
index f5f9872..4d7338c 100644
--- a/TEMUKJD/KJDForms/ShopForms/Statistics/ShopSetPurchasePriceForm.resx
+++ b/TEMUKJD/KJDForms/ShopForms/Statistics/ShopSetPurchasePriceForm.resx
@@ -132,6 +132,9 @@
True
+
+ True
+
True
diff --git a/TEMUKJD/KJDForms/ToolForms/ShowImgForm.Designer.cs b/TEMUKJD/KJDForms/ToolForms/ShowImgForm.Designer.cs
index a9380a8..7ed4d78 100644
--- a/TEMUKJD/KJDForms/ToolForms/ShowImgForm.Designer.cs
+++ b/TEMUKJD/KJDForms/ToolForms/ShowImgForm.Designer.cs
@@ -32,6 +32,8 @@ namespace TemuKJD.KJDForms.ToolForms
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ShowImgForm));
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
+ this.btnCopy = new DevComponents.DotNetBar.PanelEx();
+ this.btnCopyUrl = new DevComponents.DotNetBar.PanelEx();
this.btnSave = new DevComponents.DotNetBar.PanelEx();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
@@ -55,6 +57,8 @@ namespace TemuKJD.KJDForms.ToolForms
//
// splitContainer1.Panel2
//
+ this.splitContainer1.Panel2.Controls.Add(this.btnCopy);
+ this.splitContainer1.Panel2.Controls.Add(this.btnCopyUrl);
this.splitContainer1.Panel2.Controls.Add(this.btnSave);
this.splitContainer1.Size = new System.Drawing.Size(648, 686);
this.splitContainer1.SplitterDistance = 648;
@@ -71,6 +75,56 @@ namespace TemuKJD.KJDForms.ToolForms
this.pictureBox1.TabIndex = 0;
this.pictureBox1.TabStop = false;
//
+ // btnCopy
+ //
+ this.btnCopy.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.btnCopy.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.btnCopy.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.btnCopy.DisabledBackColor = System.Drawing.Color.Empty;
+ this.btnCopy.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnCopy.Location = new System.Drawing.Point(338, 4);
+ this.btnCopy.Name = "btnCopy";
+ this.btnCopy.Size = new System.Drawing.Size(65, 26);
+ this.btnCopy.Style.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnCopy.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnCopy.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnCopy.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+ this.btnCopy.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+ this.btnCopy.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+ this.btnCopy.Style.ForeColor.Color = System.Drawing.Color.White;
+ this.btnCopy.Style.GradientAngle = 90;
+ this.btnCopy.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnCopy.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnCopy.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnCopy.TabIndex = 492;
+ this.btnCopy.Text = "复制图片";
+ this.btnCopy.Click += new System.EventHandler(this.btnCopy_Click);
+ //
+ // btnCopyUrl
+ //
+ this.btnCopyUrl.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.btnCopyUrl.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.btnCopyUrl.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.btnCopyUrl.DisabledBackColor = System.Drawing.Color.Empty;
+ this.btnCopyUrl.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnCopyUrl.Location = new System.Drawing.Point(237, 4);
+ this.btnCopyUrl.Name = "btnCopyUrl";
+ this.btnCopyUrl.Size = new System.Drawing.Size(94, 26);
+ this.btnCopyUrl.Style.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnCopyUrl.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnCopyUrl.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnCopyUrl.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+ this.btnCopyUrl.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+ this.btnCopyUrl.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+ this.btnCopyUrl.Style.ForeColor.Color = System.Drawing.Color.White;
+ this.btnCopyUrl.Style.GradientAngle = 90;
+ this.btnCopyUrl.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnCopyUrl.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnCopyUrl.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnCopyUrl.TabIndex = 488;
+ this.btnCopyUrl.Text = "复制图片地址";
+ this.btnCopyUrl.Click += new System.EventHandler(this.btnCopyUrl_Click);
+ //
// btnSave
//
this.btnSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
@@ -105,6 +159,7 @@ namespace TemuKJD.KJDForms.ToolForms
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.KeyPreview = true;
this.Name = "ShowImgForm";
+ this.ShowMaximizeBox = true;
this.Text = "图片查看";
this.TitleText = "图片查看";
this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ShowImgForm_KeyDown);
@@ -123,5 +178,7 @@ namespace TemuKJD.KJDForms.ToolForms
private System.Windows.Forms.SplitContainer splitContainer1;
private System.Windows.Forms.PictureBox pictureBox1;
private DevComponents.DotNetBar.PanelEx btnSave;
+ private DevComponents.DotNetBar.PanelEx btnCopy;
+ private DevComponents.DotNetBar.PanelEx btnCopyUrl;
}
}
\ No newline at end of file
diff --git a/TEMUKJD/KJDForms/ToolForms/ShowImgForm.cs b/TEMUKJD/KJDForms/ToolForms/ShowImgForm.cs
index 335d0dc..5996e4c 100644
--- a/TEMUKJD/KJDForms/ToolForms/ShowImgForm.cs
+++ b/TEMUKJD/KJDForms/ToolForms/ShowImgForm.cs
@@ -44,5 +44,31 @@ namespace TemuKJD.KJDForms.ToolForms
case Keys.Escape: this.Close(); break;
}
}
+
+ private void btnCopyUrl_Click(object sender, EventArgs e)
+ {
+ try
+ {
+ Clipboard.SetText(currentImgUrl); // 设置剪贴板内容
+ BaseMsgForm.ShowInfo("图片地址已复制到剪贴板");
+ }
+ catch (Exception ex)
+ {
+ BaseMsgForm.ShowError("复制图片地址到剪贴板失败: " + ex.Message);
+ }
+ }
+
+ private void btnCopy_Click(object sender, EventArgs e)
+ {
+ try
+ {
+ Clipboard.SetImage(this.pictureBox1.Image); // 设置剪贴板内容
+ BaseMsgForm.ShowInfo("图片已复制到剪贴板");
+ }
+ catch (Exception ex)
+ {
+ BaseMsgForm.ShowError("复制图片到剪贴板失败: " + ex.Message);
+ }
+ }
}
}