From fa0043f004f1c666d1873436a980e0c90ff09054 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 25 八月 2025 15:59:43 +0800
Subject: [PATCH] 修改请示批复的查询条件

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