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 | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs
index cd6a5bc..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;
@@ -783,7 +789,7 @@
{
if (opType == "鎾ゅ崟")
{
- if (orderState == 4 || orderState == 5)
+ if (orderState == 3 || orderState == 4 || orderState == 5)
{
isCan = false;
}
@@ -882,6 +888,7 @@
headerRow.CreateCell(12).SetCellValue("閲戦");
headerRow.CreateCell(13).SetCellValue("宸叉敹娆�");
headerRow.CreateCell(14).SetCellValue("鏈粯娆�");
+ headerRow.CreateCell(15).SetCellValue("閫佽揣閲戦");
// 娣诲姞鏁版嵁
int rowIndex = 1;
@@ -903,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