优化部分食品类目上传
This commit is contained in:
1 parent
0d882571c1
commit
c8f586d8fc
6 files changed
+3544
-3499
No files matched your search
+11
-10
@@ -395,17 +395,18 @@ namespace Work._29Tools.Forms.UserForms
|
||||
//
|
||||
this.cmbType.FormattingEnabled = true;
|
||||
this.cmbType.Items.AddRange(new object[] {
|
||||
"",
|
||||
"充值",
|
||||
"管理员充值",
|
||||
"支付宝充值",
|
||||
"礼物单支出/礼物单退费",
|
||||
"拍单扣除/作废返还",
|
||||
"超重扣费支出",
|
||||
"退货包裹扣费支出",
|
||||
"云仓退货扣费支出",
|
||||
"",
|
||||
"充值",
|
||||
"管理员充值",
|
||||
"支付宝充值",
|
||||
"礼物单支出/礼物单退费",
|
||||
"拍单扣除/作废返还",
|
||||
"额外包裹扣费支出/返还",
|
||||
"退货包裹扣费支出/返还",
|
||||
"云仓退货扣费支出/返还",
|
||||
"超重扣费支出",
|
||||
"同步物流"});
|
||||
this.cmbType.Location = new System.Drawing.Point(55, 20);
|
||||
this.cmbType.Location = new System.Drawing.Point(55, 20);
|
||||
this.cmbType.Name = "cmbType";
|
||||
this.cmbType.Size = new System.Drawing.Size(121, 25);
|
||||
this.cmbType.TabIndex = 0;
|
||||
|
||||
@@ -135,22 +135,24 @@ namespace Work._29Tools.Forms.UserForms
|
||||
data3 += "&user_name_in=" + oemUserNames;
|
||||
data3 += "&create_time_begin=" + dtpTimeBegin.Value.ToString("yyyy-MM-dd HH:mm:ss");
|
||||
data3 += "&create_time_end=" + dtpTimeEnd.Value.ToString("yyyy-MM-dd HH:mm:ss");
|
||||
if (cmbType.Text == "充值")
|
||||
data3 += "&type_in=1,30";
|
||||
else if (cmbType.Text == "管理员充值")
|
||||
data3 += "&type_in=1";
|
||||
else if (cmbType.Text == "支付宝充值")
|
||||
data3 += "&type_in=30";
|
||||
else if (cmbType.Text == "礼物单支出/礼物单退费")
|
||||
data3 += "&type_in=16,34";
|
||||
else if (cmbType.Text == "拍单扣除/作废返还")
|
||||
data3 += "&type_in=20,23";
|
||||
else if (cmbType.Text == "超重扣费支出")
|
||||
data3 += "&type_in=24";
|
||||
else if(cmbType.Text == "退货包裹扣费支出")
|
||||
data3 += "&type_in=26";
|
||||
else if (cmbType.Text == "云仓退货扣费支出")
|
||||
data3 += "&type_in=31";
|
||||
if (cmbType.Text == "充值")
|
||||
data3 += "&type_in=1,30";
|
||||
else if (cmbType.Text == "管理员充值")
|
||||
data3 += "&type_in=1";
|
||||
else if (cmbType.Text == "支付宝充值")
|
||||
data3 += "&type_in=30";
|
||||
else if (cmbType.Text == "礼物单支出/礼物单退费")
|
||||
data3 += "&type_in=16,34";
|
||||
else if (cmbType.Text == "拍单扣除/作废返还")
|
||||
data3 += "&type_in=20,23";
|
||||
else if (cmbType.Text == "退货包裹扣费支出/返还")
|
||||
data3 += "&type_in=26,38";
|
||||
else if (cmbType.Text == "额外包裹扣费支出/返还")
|
||||
data3 += "&type_in=35,36";
|
||||
else if (cmbType.Text == "云仓退货扣费支出")
|
||||
data3 += "&type_in=31,32";
|
||||
else if (cmbType.Text == "超重扣费支出")
|
||||
data3 += "&type_in=24,28,33,37,41";
|
||||
else if (cmbType.Text == "同步物流")
|
||||
data3 += "&type_in=55";
|
||||
else if (!string.IsNullOrEmpty(cmbType.Text))
|
||||
@@ -229,29 +231,31 @@ namespace Work._29Tools.Forms.UserForms
|
||||
data3 += "&user_name_in=" + txtUserName.Text.Trim();
|
||||
data3 += "&create_time_begin=" + dtpTimeBegin.Value.ToString("yyyy-MM-dd HH:mm:ss");
|
||||
data3 += "&create_time_end=" + dtpTimeEnd.Value.ToString("yyyy-MM-dd HH:mm:ss");
|
||||
if (cmbType.Text == "充值")
|
||||
data3 += "&type_in=1,30";
|
||||
else if (cmbType.Text == "管理员充值")
|
||||
data3 += "&type_in=1";
|
||||
else if (cmbType.Text == "支付宝充值")
|
||||
data3 += "&type_in=30";
|
||||
else if (cmbType.Text == "礼物单支出/礼物单退费")
|
||||
data3 += "&type_in=16,34";
|
||||
else if (cmbType.Text == "拍单扣除/作废返还")
|
||||
data3 += "&type_in=20,23";
|
||||
else if (cmbType.Text == "超重扣费支出")
|
||||
data3 += "&type_in=24";
|
||||
else if (cmbType.Text == "退货包裹扣费支出")
|
||||
data3 += "&type_in=26";
|
||||
else if (cmbType.Text == "云仓退货扣费支出")
|
||||
data3 += "&type_in=31";
|
||||
else if (!string.IsNullOrEmpty(cmbType.Text))
|
||||
data3 += "&type_in=" + cmbType.Text;
|
||||
//if (!string.IsNullOrEmpty(txtOutOrderId.Text.Trim()))
|
||||
// data3 += "&order_id_in=" + txtOutOrderId.Text.Trim();
|
||||
//if (!string.IsNullOrEmpty(txtShopOrderNo.Text.Trim()))
|
||||
// data3 += "&remark_fulltext=" + txtShopOrderNo.Text.Trim();
|
||||
data3 += "&page=" + ucSplitPage1.CurrentPage;
|
||||
if (cmbType.Text == "充值")
|
||||
data3 += "&type_in=1,30";
|
||||
else if (cmbType.Text == "管理员充值")
|
||||
data3 += "&type_in=1";
|
||||
else if (cmbType.Text == "支付宝充值")
|
||||
data3 += "&type_in=30";
|
||||
else if (cmbType.Text == "礼物单支出/礼物单退费")
|
||||
data3 += "&type_in=16,34";
|
||||
else if (cmbType.Text == "拍单扣除/作废返还")
|
||||
data3 += "&type_in=20,23";
|
||||
else if (cmbType.Text == "退货包裹扣费支出/返还")
|
||||
data3 += "&type_in=26,38";
|
||||
else if (cmbType.Text == "额外包裹扣费支出/返还")
|
||||
data3 += "&type_in=35,36";
|
||||
else if (cmbType.Text == "云仓退货扣费支出")
|
||||
data3 += "&type_in=31,32";
|
||||
else if (cmbType.Text == "超重扣费支出")
|
||||
data3 += "&type_in=24,28,33,37,41";
|
||||
else if (cmbType.Text == "同步物流")
|
||||
data3 += "&type_in=55";
|
||||
//if (!string.IsNullOrEmpty(txtOutOrderId.Text.Trim()))
|
||||
// data3 += "&order_id_in=" + txtOutOrderId.Text.Trim();
|
||||
//if (!string.IsNullOrEmpty(txtShopOrderNo.Text.Trim()))
|
||||
// data3 += "&remark_fulltext=" + txtShopOrderNo.Text.Trim();
|
||||
data3 += "&page=" + ucSplitPage1.CurrentPage;
|
||||
data3 += "&page_size=" + ucSplitPage1.PageSize;
|
||||
pageSize = ucSplitPage1.PageSize;
|
||||
}));
|
||||
|
||||
Reference in new issue
Block a user