From f6cb981322bc4c2a27921ad0480dce7fb483a4d8 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 10 四月 2026 13:23:54 +0800
Subject: [PATCH] 先提交一部分
---
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs
index 0a891b2..9921f91 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs
@@ -44,6 +44,7 @@
EC_OrderBasicBLL _eC_OrderBasicBLL = null;
OA_StaffBLL bll_OA_StaffBLL = null;
LF_OrderFileBLL _lF_OrderFileBLL = null;
+ public bool bianji = false;
/// <summary>
/// 鍒濆鍖栨瀯閫�
@@ -469,6 +470,11 @@
/// </summary>
private void Page_Load_Default()
{
+ if(CurrentUser.TrueLoginId == "00001")
+ {
+ bianji = true;
+ }
+
UCPager1.AspNetPager.PageChanged += AspNetPager_PageChanged;
btn_Search.Click += btn_Search_Click;
txtCommission.Value = CY.Config.WebInfo.Instance.FirmOrderAgencyFee;
@@ -561,6 +567,8 @@
SetParamValue(searchParam, 20, CurrentUser.StaffId);
SetParamValue(searchParam, 21, CurrentUser.TrueName);
SetParamValue(searchParam, 28, this.txtSearchyjname.Value);
+ SetParamValue(searchParam, 30, this.selWorkStates.Value);
+ SetParamValue(searchParam, 31, this.selDeleverStates.Value);
if (!IsPostBack && !IsCallback)
{
if (Session["OrderList"] != null)
@@ -609,6 +617,10 @@
this.selAppraise.SelectedValue = searchParam[index].ToString();
if (index == 28)
this.txtSearchyjname.Value = searchParam[index].ToString();
+ if (index == 30)
+ this.selWorkStates.Value = searchParam[index].ToString();
+ if (index == 31)
+ this.selDeleverStates.Value = searchParam[index].ToString();
}
@@ -620,7 +632,6 @@
SetParamValue(searchParam, 19, CurrentUser.TrueMemberId);
SetParamValue(searchParam, 20, CurrentUser.StaffId);
SetParamValue(searchParam, 21, CurrentUser.TrueName);
- SetParamValue(searchParam, 28, this.txtSearchyjname.Value);
}
}
else
@@ -674,6 +685,20 @@
PageIndex = UCPager1.AspNetPager.CurrentPageIndex
};
IEnumerable<EC_OrderBasic> result = _eC_OrderBasicBLL.SelectModelPage_Seller(pagination, SearchParam);
+
+ foreach (var eC_OrderBasic in result)
+ {
+ if(eC_OrderBasic.DeliveryTime.HasValue && eC_OrderBasic.DeliveryTime.Value < DateTime.Now.Date)
+ {
+ eC_OrderBasic.Shifoubiaohongwangong = "<p style=\"color:red;\">瀹屽伐</p>";
+ eC_OrderBasic.Shifoubiaohongsonghuo = "<p style=\"color:red;\">閫佽揣</p>";
+ }
+ else
+ {
+ eC_OrderBasic.Shifoubiaohongwangong = "瀹屽伐";
+ eC_OrderBasic.Shifoubiaohongsonghuo = "閫佽揣";
+ }
+ }
rptData.DataSource = result;
rptData.DataBind();
@@ -764,7 +789,7 @@
{
if (opType == "鎾ゅ崟")
{
- if (orderState == 4 || orderState == 5)
+ if (orderState == 3 || orderState == 4 || orderState == 5)
{
isCan = false;
}
@@ -863,6 +888,7 @@
headerRow.CreateCell(12).SetCellValue("閲戦");
headerRow.CreateCell(13).SetCellValue("宸叉敹娆�");
headerRow.CreateCell(14).SetCellValue("鏈粯娆�");
+ headerRow.CreateCell(15).SetCellValue("閫佽揣閲戦");
// 娣诲姞鏁版嵁
int rowIndex = 1;
@@ -884,6 +910,7 @@
row.CreateCell(12).SetCellValue(order.SumPrice.HasValue? order.SumPrice.Value.ToDouble2().Value:0);
row.CreateCell(13).SetCellValue(order.TradingSingle.PayedMoney.HasValue ? order.TradingSingle.PayedMoney.Value.ToDouble2().Value : 0);
row.CreateCell(14).SetCellValue(order.UnPayedMoney.ToDouble2().Value);
+ row.CreateCell(15).SetCellValue(order.SonghuoJine.HasValue ? order.SonghuoJine.Value.ToDouble2().Value : 0);
}
--
Gitblit v1.9.1