修复oem无法进行礼物单查询的bug
This commit is contained in:
1 parent
8eab94968e
commit
2dfec55b5f
5 files changed
+161
-129
No files matched your search
+34
-23
@@ -109,15 +109,16 @@ namespace TemuKJD.WXForms.AdminForms
|
||||
this.txtSearch = new System.Windows.Forms.TextBox();
|
||||
this.pictureBox2 = new System.Windows.Forms.PictureBox();
|
||||
this.dgvPayment = new TemuKJD.UserComponent.DataGridViewEx();
|
||||
this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage();
|
||||
this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn();
|
||||
this.colType = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colUserName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colOrderId = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colAmount = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colOemAmount = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colBalance = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colCreateTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colRemark = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage();
|
||||
this.panel1.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit();
|
||||
this.splitContainer2.Panel1.SuspendLayout();
|
||||
@@ -454,6 +455,7 @@ namespace TemuKJD.WXForms.AdminForms
|
||||
"充值",
|
||||
"管理员充值",
|
||||
"支付宝充值",
|
||||
"礼物单支出",
|
||||
"拍单扣除/作废返还",
|
||||
"超重扣费支出",
|
||||
"退货包裹扣费支出",
|
||||
@@ -967,6 +969,7 @@ namespace TemuKJD.WXForms.AdminForms
|
||||
this.colUserName,
|
||||
this.colOrderId,
|
||||
this.colAmount,
|
||||
this.colOemAmount,
|
||||
this.colBalance,
|
||||
this.colCreateTime,
|
||||
this.colRemark});
|
||||
@@ -981,6 +984,20 @@ namespace TemuKJD.WXForms.AdminForms
|
||||
this.dgvPayment.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvPayment_CellContentClick);
|
||||
this.dgvPayment.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvPayment_CellValueChanged);
|
||||
//
|
||||
// ucSplitPage1
|
||||
//
|
||||
this.ucSplitPage1.CurrentPage = 1;
|
||||
this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right;
|
||||
this.ucSplitPage1.IsShowPageSize = true;
|
||||
this.ucSplitPage1.Location = new System.Drawing.Point(903, 0);
|
||||
this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.ucSplitPage1.Name = "ucSplitPage1";
|
||||
this.ucSplitPage1.PageSize = 50;
|
||||
this.ucSplitPage1.Size = new System.Drawing.Size(459, 25);
|
||||
this.ucSplitPage1.TabIndex = 1163;
|
||||
this.ucSplitPage1.TotalPage = 1;
|
||||
this.ucSplitPage1.PageChange += new System.Action<object>(this.ucSplitPage1_PageChange);
|
||||
//
|
||||
// colCheck
|
||||
//
|
||||
this.colCheck.FillWeight = 20F;
|
||||
@@ -1018,6 +1035,13 @@ namespace TemuKJD.WXForms.AdminForms
|
||||
this.colAmount.Name = "colAmount";
|
||||
this.colAmount.ReadOnly = true;
|
||||
//
|
||||
// colOemAmount
|
||||
//
|
||||
this.colOemAmount.FillWeight = 60F;
|
||||
this.colOemAmount.HeaderText = "归属Oem的金额";
|
||||
this.colOemAmount.Name = "colOemAmount";
|
||||
this.colOemAmount.ReadOnly = true;
|
||||
//
|
||||
// colBalance
|
||||
//
|
||||
this.colBalance.FillWeight = 60F;
|
||||
@@ -1040,20 +1064,6 @@ namespace TemuKJD.WXForms.AdminForms
|
||||
this.colRemark.Resizable = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colRemark.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
|
||||
//
|
||||
// ucSplitPage1
|
||||
//
|
||||
this.ucSplitPage1.CurrentPage = 1;
|
||||
this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right;
|
||||
this.ucSplitPage1.IsShowPageSize = true;
|
||||
this.ucSplitPage1.Location = new System.Drawing.Point(903, 0);
|
||||
this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.ucSplitPage1.Name = "ucSplitPage1";
|
||||
this.ucSplitPage1.PageSize = 50;
|
||||
this.ucSplitPage1.Size = new System.Drawing.Size(459, 25);
|
||||
this.ucSplitPage1.TabIndex = 1163;
|
||||
this.ucSplitPage1.TotalPage = 1;
|
||||
this.ucSplitPage1.PageChange += new System.Action<object>(this.ucSplitPage1_PageChange);
|
||||
//
|
||||
// WXAdminAccountBalanceForm
|
||||
//
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
|
||||
@@ -1104,14 +1114,6 @@ namespace TemuKJD.WXForms.AdminForms
|
||||
private System.Windows.Forms.DateTimePicker dtpTimeEnd;
|
||||
private System.Windows.Forms.DateTimePicker dtpTimeBegin;
|
||||
private DevComponents.DotNetBar.PanelEx btnSearch;
|
||||
private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colType;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colUserName;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colOrderId;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colAmount;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colBalance;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colCreateTime;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colRemark;
|
||||
private System.Windows.Forms.Label label1;
|
||||
private System.Windows.Forms.TextBox txtUserName;
|
||||
private DevComponents.DotNetBar.PanelEx btnSearchShop;
|
||||
@@ -1166,5 +1168,14 @@ namespace TemuKJD.WXForms.AdminForms
|
||||
private System.Windows.Forms.TextBox txtOutOrderId;
|
||||
private System.Windows.Forms.TextBox txtShopOrderNo;
|
||||
private System.Windows.Forms.Label label9;
|
||||
private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colType;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colUserName;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colOrderId;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colAmount;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colOemAmount;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colBalance;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colCreateTime;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colRemark;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user