修复bug,优化店铺筛选选项
This commit is contained in:
1 parent
aa45b35145
commit
ad325eaec5
15 files changed
+596
-347
No files matched your search
+131
-42
@@ -36,6 +36,10 @@ namespace TemuKJD.WXForms.TalkForms
|
||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OtherBuyerOrderListForm));
|
||||
this.panel1 = new System.Windows.Forms.Panel();
|
||||
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
|
||||
this.label5 = new System.Windows.Forms.Label();
|
||||
this.btnClear = new DevComponents.DotNetBar.PanelEx();
|
||||
this.btnFilterOrder = new DevComponents.DotNetBar.PanelEx();
|
||||
this.txtFilter = new System.Windows.Forms.TextBox();
|
||||
this.cmbBuyerName = new System.Windows.Forms.ComboBox();
|
||||
this.txtOrderAmount = new System.Windows.Forms.TextBox();
|
||||
this.label4 = new System.Windows.Forms.Label();
|
||||
@@ -46,7 +50,7 @@ namespace TemuKJD.WXForms.TalkForms
|
||||
this.btnSendOrder = new DevComponents.DotNetBar.PanelEx();
|
||||
this.btnRestore = new DevComponents.DotNetBar.PanelEx();
|
||||
this.label2 = new System.Windows.Forms.Label();
|
||||
this.dgvPddBuyerOrder = new TemuKJD.UserComponent.DataGridViewEx();
|
||||
this.dgvBuyerOrder = new TemuKJD.UserComponent.DataGridViewEx();
|
||||
this.dataGridViewCheckBoxColumn1 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
|
||||
this.colOBuyerId = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colOBuyerName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
@@ -60,6 +64,7 @@ namespace TemuKJD.WXForms.TalkForms
|
||||
this.colOExpressName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colOExpressId = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colOMsg = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colOEdit = new System.Windows.Forms.DataGridViewLinkColumn();
|
||||
this.colSend = new System.Windows.Forms.DataGridViewLinkColumn();
|
||||
this.colAfterSale = new System.Windows.Forms.DataGridViewLinkColumn();
|
||||
this.panel1.SuspendLayout();
|
||||
@@ -67,7 +72,7 @@ namespace TemuKJD.WXForms.TalkForms
|
||||
this.splitContainer1.Panel1.SuspendLayout();
|
||||
this.splitContainer1.Panel2.SuspendLayout();
|
||||
this.splitContainer1.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.dgvPddBuyerOrder)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.dgvBuyerOrder)).BeginInit();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// panel1
|
||||
@@ -78,7 +83,7 @@ namespace TemuKJD.WXForms.TalkForms
|
||||
this.panel1.Location = new System.Drawing.Point(1, 33);
|
||||
this.panel1.Name = "panel1";
|
||||
this.panel1.Padding = new System.Windows.Forms.Padding(4);
|
||||
this.panel1.Size = new System.Drawing.Size(907, 483);
|
||||
this.panel1.Size = new System.Drawing.Size(1098, 516);
|
||||
this.panel1.TabIndex = 1;
|
||||
//
|
||||
// splitContainer1
|
||||
@@ -90,6 +95,10 @@ namespace TemuKJD.WXForms.TalkForms
|
||||
//
|
||||
// splitContainer1.Panel1
|
||||
//
|
||||
this.splitContainer1.Panel1.Controls.Add(this.label5);
|
||||
this.splitContainer1.Panel1.Controls.Add(this.btnClear);
|
||||
this.splitContainer1.Panel1.Controls.Add(this.btnFilterOrder);
|
||||
this.splitContainer1.Panel1.Controls.Add(this.txtFilter);
|
||||
this.splitContainer1.Panel1.Controls.Add(this.cmbBuyerName);
|
||||
this.splitContainer1.Panel1.Controls.Add(this.txtOrderAmount);
|
||||
this.splitContainer1.Panel1.Controls.Add(this.label4);
|
||||
@@ -103,16 +112,81 @@ namespace TemuKJD.WXForms.TalkForms
|
||||
//
|
||||
// splitContainer1.Panel2
|
||||
//
|
||||
this.splitContainer1.Panel2.Controls.Add(this.dgvPddBuyerOrder);
|
||||
this.splitContainer1.Size = new System.Drawing.Size(899, 475);
|
||||
this.splitContainer1.SplitterDistance = 77;
|
||||
this.splitContainer1.Panel2.Controls.Add(this.dgvBuyerOrder);
|
||||
this.splitContainer1.Size = new System.Drawing.Size(1090, 508);
|
||||
this.splitContainer1.SplitterDistance = 82;
|
||||
this.splitContainer1.TabIndex = 0;
|
||||
//
|
||||
// label5
|
||||
//
|
||||
this.label5.AutoSize = true;
|
||||
this.label5.Location = new System.Drawing.Point(14, 19);
|
||||
this.label5.Name = "label5";
|
||||
this.label5.Size = new System.Drawing.Size(126, 17);
|
||||
this.label5.TabIndex = 982;
|
||||
this.label5.Text = "买手/订单号/物流单号";
|
||||
//
|
||||
// btnClear
|
||||
//
|
||||
this.btnClear.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.btnClear.CanvasColor = System.Drawing.SystemColors.Control;
|
||||
this.btnClear.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnClear.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnClear.Location = new System.Drawing.Point(1011, 45);
|
||||
this.btnClear.Name = "btnClear";
|
||||
this.btnClear.Size = new System.Drawing.Size(57, 23);
|
||||
this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnClear.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
|
||||
this.btnClear.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
|
||||
this.btnClear.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
|
||||
this.btnClear.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnClear.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
|
||||
this.btnClear.Style.GradientAngle = 90;
|
||||
this.btnClear.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnClear.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnClear.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnClear.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnClear.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
|
||||
this.btnClear.TabIndex = 969;
|
||||
this.btnClear.Text = "置空";
|
||||
this.btnClear.Click += new System.EventHandler(this.btnClear_Click);
|
||||
//
|
||||
// btnFilterOrder
|
||||
//
|
||||
this.btnFilterOrder.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnFilterOrder.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnFilterOrder.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnFilterOrder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnFilterOrder.Location = new System.Drawing.Point(215, 45);
|
||||
this.btnFilterOrder.Name = "btnFilterOrder";
|
||||
this.btnFilterOrder.Size = new System.Drawing.Size(45, 23);
|
||||
this.btnFilterOrder.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnFilterOrder.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnFilterOrder.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnFilterOrder.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
|
||||
this.btnFilterOrder.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
|
||||
this.btnFilterOrder.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
|
||||
this.btnFilterOrder.Style.ForeColor.Color = System.Drawing.Color.White;
|
||||
this.btnFilterOrder.Style.GradientAngle = 90;
|
||||
this.btnFilterOrder.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnFilterOrder.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnFilterOrder.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnFilterOrder.TabIndex = 965;
|
||||
this.btnFilterOrder.Text = "过滤";
|
||||
this.btnFilterOrder.Click += new System.EventHandler(this.btnFilterOrder_Click);
|
||||
//
|
||||
// txtFilter
|
||||
//
|
||||
this.txtFilter.Location = new System.Drawing.Point(140, 16);
|
||||
this.txtFilter.Name = "txtFilter";
|
||||
this.txtFilter.Size = new System.Drawing.Size(169, 23);
|
||||
this.txtFilter.TabIndex = 961;
|
||||
//
|
||||
// cmbBuyerName
|
||||
//
|
||||
this.cmbBuyerName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.cmbBuyerName.FormattingEnabled = true;
|
||||
this.cmbBuyerName.Location = new System.Drawing.Point(430, 11);
|
||||
this.cmbBuyerName.Location = new System.Drawing.Point(618, 15);
|
||||
this.cmbBuyerName.Name = "cmbBuyerName";
|
||||
this.cmbBuyerName.Size = new System.Drawing.Size(160, 25);
|
||||
this.cmbBuyerName.TabIndex = 954;
|
||||
@@ -120,7 +194,7 @@ namespace TemuKJD.WXForms.TalkForms
|
||||
// txtOrderAmount
|
||||
//
|
||||
this.txtOrderAmount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.txtOrderAmount.Location = new System.Drawing.Point(657, 12);
|
||||
this.txtOrderAmount.Location = new System.Drawing.Point(845, 16);
|
||||
this.txtOrderAmount.Name = "txtOrderAmount";
|
||||
this.txtOrderAmount.Size = new System.Drawing.Size(160, 23);
|
||||
this.txtOrderAmount.TabIndex = 947;
|
||||
@@ -129,7 +203,7 @@ namespace TemuKJD.WXForms.TalkForms
|
||||
//
|
||||
this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.label4.AutoSize = true;
|
||||
this.label4.Location = new System.Drawing.Point(601, 15);
|
||||
this.label4.Location = new System.Drawing.Point(789, 19);
|
||||
this.label4.Name = "label4";
|
||||
this.label4.Size = new System.Drawing.Size(56, 17);
|
||||
this.label4.TabIndex = 946;
|
||||
@@ -138,7 +212,7 @@ namespace TemuKJD.WXForms.TalkForms
|
||||
// txtExpressSn
|
||||
//
|
||||
this.txtExpressSn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.txtExpressSn.Location = new System.Drawing.Point(657, 41);
|
||||
this.txtExpressSn.Location = new System.Drawing.Point(845, 45);
|
||||
this.txtExpressSn.Name = "txtExpressSn";
|
||||
this.txtExpressSn.Size = new System.Drawing.Size(160, 23);
|
||||
this.txtExpressSn.TabIndex = 945;
|
||||
@@ -147,7 +221,7 @@ namespace TemuKJD.WXForms.TalkForms
|
||||
//
|
||||
this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.label3.AutoSize = true;
|
||||
this.label3.Location = new System.Drawing.Point(601, 44);
|
||||
this.label3.Location = new System.Drawing.Point(789, 48);
|
||||
this.label3.Name = "label3";
|
||||
this.label3.Size = new System.Drawing.Size(56, 17);
|
||||
this.label3.TabIndex = 944;
|
||||
@@ -156,7 +230,7 @@ namespace TemuKJD.WXForms.TalkForms
|
||||
// txtBuyerOrderSn
|
||||
//
|
||||
this.txtBuyerOrderSn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.txtBuyerOrderSn.Location = new System.Drawing.Point(430, 41);
|
||||
this.txtBuyerOrderSn.Location = new System.Drawing.Point(618, 45);
|
||||
this.txtBuyerOrderSn.Name = "txtBuyerOrderSn";
|
||||
this.txtBuyerOrderSn.Size = new System.Drawing.Size(160, 23);
|
||||
this.txtBuyerOrderSn.TabIndex = 942;
|
||||
@@ -165,7 +239,7 @@ namespace TemuKJD.WXForms.TalkForms
|
||||
//
|
||||
this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.label1.AutoSize = true;
|
||||
this.label1.Location = new System.Drawing.Point(374, 15);
|
||||
this.label1.Location = new System.Drawing.Point(562, 19);
|
||||
this.label1.Name = "label1";
|
||||
this.label1.Size = new System.Drawing.Size(56, 17);
|
||||
this.label1.TabIndex = 941;
|
||||
@@ -178,7 +252,7 @@ namespace TemuKJD.WXForms.TalkForms
|
||||
this.btnSendOrder.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnSendOrder.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnSendOrder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnSendOrder.Location = new System.Drawing.Point(823, 12);
|
||||
this.btnSendOrder.Location = new System.Drawing.Point(1011, 16);
|
||||
this.btnSendOrder.Name = "btnSendOrder";
|
||||
this.btnSendOrder.Size = new System.Drawing.Size(57, 23);
|
||||
this.btnSendOrder.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
@@ -201,7 +275,7 @@ namespace TemuKJD.WXForms.TalkForms
|
||||
this.btnRestore.CanvasColor = System.Drawing.SystemColors.Control;
|
||||
this.btnRestore.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnRestore.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnRestore.Location = new System.Drawing.Point(3, 3);
|
||||
this.btnRestore.Location = new System.Drawing.Point(264, 45);
|
||||
this.btnRestore.Name = "btnRestore";
|
||||
this.btnRestore.Size = new System.Drawing.Size(45, 23);
|
||||
this.btnRestore.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
@@ -218,28 +292,28 @@ namespace TemuKJD.WXForms.TalkForms
|
||||
this.btnRestore.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
|
||||
this.btnRestore.TabIndex = 939;
|
||||
this.btnRestore.Text = "还原";
|
||||
this.btnRestore.Visible = false;
|
||||
this.btnRestore.Click += new System.EventHandler(this.btnRestore_Click);
|
||||
//
|
||||
// label2
|
||||
//
|
||||
this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.label2.AutoSize = true;
|
||||
this.label2.Location = new System.Drawing.Point(362, 44);
|
||||
this.label2.Location = new System.Drawing.Point(550, 48);
|
||||
this.label2.Name = "label2";
|
||||
this.label2.Size = new System.Drawing.Size(68, 17);
|
||||
this.label2.TabIndex = 943;
|
||||
this.label2.Text = "拍单订单号";
|
||||
//
|
||||
// dgvPddBuyerOrder
|
||||
// dgvBuyerOrder
|
||||
//
|
||||
this.dgvPddBuyerOrder.AllowUserToAddRows = false;
|
||||
this.dgvPddBuyerOrder.AllowUserToDeleteRows = false;
|
||||
this.dgvBuyerOrder.AllowUserToAddRows = false;
|
||||
this.dgvBuyerOrder.AllowUserToDeleteRows = false;
|
||||
dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
|
||||
this.dgvPddBuyerOrder.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
|
||||
this.dgvPddBuyerOrder.AutoRowNumber = true;
|
||||
this.dgvPddBuyerOrder.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
|
||||
this.dgvPddBuyerOrder.BackgroundColor = System.Drawing.Color.White;
|
||||
this.dgvPddBuyerOrder.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.dgvBuyerOrder.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
|
||||
this.dgvBuyerOrder.AutoRowNumber = true;
|
||||
this.dgvBuyerOrder.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
|
||||
this.dgvBuyerOrder.BackgroundColor = System.Drawing.Color.White;
|
||||
this.dgvBuyerOrder.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
||||
dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
|
||||
dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
@@ -247,9 +321,9 @@ namespace TemuKJD.WXForms.TalkForms
|
||||
dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
||||
dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
||||
dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
|
||||
this.dgvPddBuyerOrder.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
|
||||
this.dgvPddBuyerOrder.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
||||
this.dgvPddBuyerOrder.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
|
||||
this.dgvBuyerOrder.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
|
||||
this.dgvBuyerOrder.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
||||
this.dgvBuyerOrder.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
|
||||
this.dataGridViewCheckBoxColumn1,
|
||||
this.colOBuyerId,
|
||||
this.colOBuyerName,
|
||||
@@ -263,17 +337,18 @@ namespace TemuKJD.WXForms.TalkForms
|
||||
this.colOExpressName,
|
||||
this.colOExpressId,
|
||||
this.colOMsg,
|
||||
this.colOEdit,
|
||||
this.colSend,
|
||||
this.colAfterSale});
|
||||
this.dgvPddBuyerOrder.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.dgvPddBuyerOrder.Location = new System.Drawing.Point(0, 0);
|
||||
this.dgvPddBuyerOrder.MultiSelectCheckBox = true;
|
||||
this.dgvPddBuyerOrder.Name = "dgvPddBuyerOrder";
|
||||
this.dgvPddBuyerOrder.ReadOnly = true;
|
||||
this.dgvPddBuyerOrder.RowTemplate.Height = 23;
|
||||
this.dgvPddBuyerOrder.Size = new System.Drawing.Size(899, 394);
|
||||
this.dgvPddBuyerOrder.TabIndex = 887;
|
||||
this.dgvPddBuyerOrder.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvPddBuyerOrder_CellContentClick);
|
||||
this.dgvBuyerOrder.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.dgvBuyerOrder.Location = new System.Drawing.Point(0, 0);
|
||||
this.dgvBuyerOrder.MultiSelectCheckBox = true;
|
||||
this.dgvBuyerOrder.Name = "dgvBuyerOrder";
|
||||
this.dgvBuyerOrder.ReadOnly = true;
|
||||
this.dgvBuyerOrder.RowTemplate.Height = 23;
|
||||
this.dgvBuyerOrder.Size = new System.Drawing.Size(1090, 422);
|
||||
this.dgvBuyerOrder.TabIndex = 887;
|
||||
this.dgvBuyerOrder.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvPddBuyerOrder_CellContentClick);
|
||||
//
|
||||
// dataGridViewCheckBoxColumn1
|
||||
//
|
||||
@@ -375,9 +450,18 @@ namespace TemuKJD.WXForms.TalkForms
|
||||
this.colOMsg.Name = "colOMsg";
|
||||
this.colOMsg.ReadOnly = true;
|
||||
//
|
||||
// colOEdit
|
||||
//
|
||||
this.colOEdit.FillWeight = 40F;
|
||||
this.colOEdit.HeaderText = "编辑";
|
||||
this.colOEdit.Name = "colOEdit";
|
||||
this.colOEdit.ReadOnly = true;
|
||||
this.colOEdit.Resizable = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colOEdit.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
|
||||
//
|
||||
// colSend
|
||||
//
|
||||
this.colSend.FillWeight = 50F;
|
||||
this.colSend.FillWeight = 40F;
|
||||
this.colSend.HeaderText = "发送";
|
||||
this.colSend.Name = "colSend";
|
||||
this.colSend.ReadOnly = true;
|
||||
@@ -395,7 +479,7 @@ namespace TemuKJD.WXForms.TalkForms
|
||||
// OtherBuyerOrderListForm
|
||||
//
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
|
||||
this.ClientSize = new System.Drawing.Size(909, 517);
|
||||
this.ClientSize = new System.Drawing.Size(1100, 550);
|
||||
this.Controls.Add(this.panel1);
|
||||
this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
|
||||
@@ -412,7 +496,7 @@ namespace TemuKJD.WXForms.TalkForms
|
||||
this.splitContainer1.Panel2.ResumeLayout(false);
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
|
||||
this.splitContainer1.ResumeLayout(false);
|
||||
((System.ComponentModel.ISupportInitialize)(this.dgvPddBuyerOrder)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.dgvBuyerOrder)).EndInit();
|
||||
this.ResumeLayout(false);
|
||||
|
||||
}
|
||||
@@ -421,7 +505,7 @@ namespace TemuKJD.WXForms.TalkForms
|
||||
|
||||
private System.Windows.Forms.Panel panel1;
|
||||
private System.Windows.Forms.SplitContainer splitContainer1;
|
||||
private UserComponent.DataGridViewEx dgvPddBuyerOrder;
|
||||
private UserComponent.DataGridViewEx dgvBuyerOrder;
|
||||
private System.Windows.Forms.TextBox txtExpressSn;
|
||||
private System.Windows.Forms.Label label3;
|
||||
private System.Windows.Forms.TextBox txtBuyerOrderSn;
|
||||
@@ -431,6 +515,10 @@ namespace TemuKJD.WXForms.TalkForms
|
||||
private System.Windows.Forms.Label label2;
|
||||
private System.Windows.Forms.Label label4;
|
||||
private System.Windows.Forms.TextBox txtOrderAmount;
|
||||
private System.Windows.Forms.ComboBox cmbBuyerName;
|
||||
private System.Windows.Forms.TextBox txtFilter;
|
||||
private DevComponents.DotNetBar.PanelEx btnClear;
|
||||
private DevComponents.DotNetBar.PanelEx btnFilterOrder;
|
||||
private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn1;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colOBuyerId;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colOBuyerName;
|
||||
@@ -444,8 +532,9 @@ namespace TemuKJD.WXForms.TalkForms
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colOExpressName;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colOExpressId;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colOMsg;
|
||||
private System.Windows.Forms.DataGridViewLinkColumn colOEdit;
|
||||
private System.Windows.Forms.DataGridViewLinkColumn colSend;
|
||||
private System.Windows.Forms.DataGridViewLinkColumn colAfterSale;
|
||||
private System.Windows.Forms.ComboBox cmbBuyerName;
|
||||
private System.Windows.Forms.Label label5;
|
||||
}
|
||||
}
|
||||
@@ -70,10 +70,10 @@ namespace TemuKJD.WXForms.TalkForms
|
||||
if (order == null)
|
||||
return;
|
||||
|
||||
var row = dgvPddBuyerOrder.Rows.Cast<DataGridViewRow>().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colOOtherOrderSn").ParseToString() == order.order_sn);
|
||||
var row = dgvBuyerOrder.Rows.Cast<DataGridViewRow>().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colOOtherOrderSn").ParseToString() == order.order_sn);
|
||||
if (row == null)
|
||||
{
|
||||
var rowIndex = this.dgvPddBuyerOrder.Rows.Add(
|
||||
var rowIndex = this.dgvBuyerOrder.Rows.Add(
|
||||
false,
|
||||
order.buyerId,
|
||||
order.buyerName,
|
||||
@@ -87,10 +87,11 @@ namespace TemuKJD.WXForms.TalkForms
|
||||
order.outExpressCompanyName,
|
||||
order.tracking_number,
|
||||
order.sendStatus,
|
||||
"编辑",
|
||||
"发送",
|
||||
"退货"
|
||||
);
|
||||
row = dgvPddBuyerOrder.Rows[rowIndex];
|
||||
row = dgvBuyerOrder.Rows[rowIndex];
|
||||
row.Height = 40;
|
||||
|
||||
}
|
||||
@@ -170,7 +171,7 @@ namespace TemuKJD.WXForms.TalkForms
|
||||
order.order_time = BaseClass.DateTimeToTimestampSeconds(DateTime.Now);
|
||||
order.order_status_prompt = "";
|
||||
|
||||
if (order.buyerName.IsNullOrEmpty() || order.order_amount == 0 || order.order_sn.IsNullOrEmpty() || order.tracking_number.IsNullOrEmpty())
|
||||
if (order.buyerName.IsNullOrEmpty() || order.order_amount == 0 || order.order_sn.IsNullOrEmpty() /*|| order.tracking_number.IsNullOrEmpty()*/)
|
||||
{
|
||||
BaseMsgForm.ShowError("请完整填写拍单信息");
|
||||
return;
|
||||
@@ -181,8 +182,11 @@ namespace TemuKJD.WXForms.TalkForms
|
||||
lstOtherBuyerOrderInfoLite.Add(order);
|
||||
else
|
||||
{
|
||||
if (BaseMsgForm.ShowConfirm("已存在该买手订单,是否覆盖并重复发送?").DialogResult != DialogResult.OK)
|
||||
return;
|
||||
if (!orderExist.tracking_number.IsNullOrEmpty() || order.tracking_number.IsNullOrEmpty())
|
||||
{
|
||||
if (BaseMsgForm.ShowConfirm("已存在买手订单,是否覆盖并重复发送?").DialogResult != DialogResult.OK)
|
||||
return;
|
||||
}
|
||||
orderExist.order_amount = order.order_amount;
|
||||
orderExist.buyerName = order.buyerName;
|
||||
orderExist.outExpressCompanyMsg = order.outExpressCompanyMsg;
|
||||
@@ -216,7 +220,7 @@ namespace TemuKJD.WXForms.TalkForms
|
||||
return;
|
||||
if (resetSendStatus)
|
||||
order.sendStatus = "";
|
||||
var row = dgvPddBuyerOrder.Rows.Cast<DataGridViewRow>().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colOPddOrderSn").ParseToString() == order.order_sn);
|
||||
var row = dgvBuyerOrder.Rows.Cast<DataGridViewRow>().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colOPddOrderSn").ParseToString() == order.order_sn);
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
if (row != null)
|
||||
@@ -329,23 +333,26 @@ namespace TemuKJD.WXForms.TalkForms
|
||||
{
|
||||
if (e.ColumnIndex < 0 || e.RowIndex < 0)
|
||||
return;
|
||||
string headerText = dgvPddBuyerOrder.Columns[e.ColumnIndex].HeaderText;
|
||||
var orderSn = dgvPddBuyerOrder.Rows[e.RowIndex].Cells["colOOtherOrderSn"].Value.ParseToString();
|
||||
string headerText = dgvBuyerOrder.Columns[e.ColumnIndex].HeaderText;
|
||||
var orderSn = dgvBuyerOrder.Rows[e.RowIndex].Cells["colOOtherOrderSn"].Value.ParseToString();
|
||||
var order = lstOtherBuyerOrderInfoLite.FirstOrDefault(p => p.order_sn == orderSn);
|
||||
|
||||
var row = dgvBuyerOrder.Rows[e.RowIndex];
|
||||
|
||||
switch (headerText)
|
||||
{
|
||||
case "详情":
|
||||
case "编辑/详情":
|
||||
case "编辑":
|
||||
cmbBuyerName.Text = row.Cells["colOBuyerName"].Value.ParseToString();
|
||||
txtOrderAmount.Text = row.Cells["colOOrderAmount"].Value.ParseToString();
|
||||
txtBuyerOrderSn.Text = row.Cells["colOOtherOrderSn"].Value.ParseToString();
|
||||
txtExpressSn.Text = row.Cells["colOExpressId"].Value.ParseToString();
|
||||
break;
|
||||
case "图片":
|
||||
ShowImgForm imgFrom = new ShowImgForm(dgvPddBuyerOrder.Rows[e.RowIndex].Cells["colImgUrl"].Value.ParseToString().Replace("?imageView2/2/w/90/h/90", ""));
|
||||
ShowImgForm imgFrom = new ShowImgForm(dgvBuyerOrder.Rows[e.RowIndex].Cells["colImgUrl"].Value.ParseToString().Replace("?imageView2/2/w/90/h/90", ""));
|
||||
imgFrom.ShowDialog();
|
||||
break;
|
||||
case "":
|
||||
case "全选":
|
||||
dgvPddBuyerOrder.Rows[e.RowIndex].Cells["colCheck"].Value = !(bool)dgvPddBuyerOrder.Rows[e.RowIndex].Cells["colCheck"].Value;
|
||||
dgvBuyerOrder.Rows[e.RowIndex].Cells["colCheck"].Value = !(bool)dgvBuyerOrder.Rows[e.RowIndex].Cells["colCheck"].Value;
|
||||
break;
|
||||
case "发送":
|
||||
if (tempWaitOrderLst.Any(o => o.order_sn == order.order_sn))
|
||||
@@ -368,5 +375,42 @@ namespace TemuKJD.WXForms.TalkForms
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
private void btnClear_Click(object sender, EventArgs e)
|
||||
{
|
||||
cmbBuyerName.Text = "";
|
||||
txtBuyerOrderSn.Text = "";
|
||||
txtExpressSn.Text = "";
|
||||
txtOrderAmount.Text = "";
|
||||
}
|
||||
|
||||
private void btnFilterOrder_Click(object sender, EventArgs e)
|
||||
{
|
||||
foreach(DataGridViewRow row in dgvBuyerOrder.Rows)
|
||||
{
|
||||
if (row.Cells["colOBuyerName"].Value.ParseToString().Contains(txtFilter.Text.Trim()))
|
||||
{
|
||||
row.Visible = true;
|
||||
continue;
|
||||
}
|
||||
if (row.Cells["colOOtherOrderSn"].Value.ParseToString().Contains(txtFilter.Text.Trim()))
|
||||
{
|
||||
row.Visible = true;
|
||||
continue;
|
||||
}
|
||||
if (row.Cells["colOExpressId"].Value.ParseToString().Contains(txtFilter.Text.Trim()))
|
||||
{
|
||||
row.Visible = true;
|
||||
continue;
|
||||
}
|
||||
row.Visible = false;
|
||||
}
|
||||
}
|
||||
|
||||
private void btnRestore_Click(object sender, EventArgs e)
|
||||
{
|
||||
txtFilter.Text = "";
|
||||
btnFilterOrder_Click(null, null);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -156,6 +156,9 @@
|
||||
<metadata name="colOMsg.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="colOEdit.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="colSend.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
|
||||
@@ -881,10 +881,14 @@ namespace TemuKJD.WXForms.TalkForms
|
||||
|
||||
if (DateTime.Now > nextGetOrderTime)
|
||||
{
|
||||
nextGetOrderTime = DateTime.Now.AddMinutes(30);
|
||||
nextGetOrderTime = DateTime.Now.AddMinutes(25);
|
||||
GetPddOrder();
|
||||
MakeWxToPddAfterSales();
|
||||
}
|
||||
if (isReadOrder)
|
||||
{
|
||||
nextGetOrderTime = DateTime.Now.AddMinutes(25);
|
||||
}
|
||||
Thread.Sleep(1000);
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
@@ -1071,7 +1075,7 @@ namespace TemuKJD.WXForms.TalkForms
|
||||
|
||||
private void btnSearch_Click(object sender, EventArgs e)
|
||||
{
|
||||
nextGetOrderTime = DateTime.Now.AddMinutes(30);
|
||||
nextGetOrderTime = DateTime.Now.AddMinutes(25);
|
||||
GetPddOrder();
|
||||
MakeWxToPddAfterSales();
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user