From 8ca9d136d69ac111a2b99d5e30dd3e83c3f0b1ed Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 01 十二月 2025 13:15:40 +0800
Subject: [PATCH] 查看送货情况中，把“已送”的数字变成灰色 完成
---
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs | 10 +++++-----
CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs | 16 +++++++++++++++-
CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancial.aspx.cs | 18 ++++++++++++++++++
CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancial.aspx | 2 +-
4 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs b/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs
index ed282cd..41bc903 100644
--- a/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs
+++ b/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs
@@ -340,6 +340,16 @@
get;
set;
}
+
+ /// <summary>
+ /// 寮�绁ㄧ敵璇�
+ /// </summary>
+ public Guid? KaipiaoshenqingId
+ {
+ get;
+ set;
+ }
+
/// <summary>
/// 寮�绁ㄧ敵璇�
/// </summary>
@@ -1437,8 +1447,12 @@
this.XiadanKeyid = isChange ? MyConvert.ConvertToInt32(value) : this.XiadanKeyid;
theValue = this.XiadanKeyid;
}
+ else if ("KaipiaoshenqingId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 143)
+ {
+ this.KaipiaoshenqingId = isChange ? MyConvert.ConvertToGuid(value) : this.KaipiaoshenqingId;
+ theValue = this.KaipiaoshenqingId;
+ }
-
#endregion
return theValue;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs
index 5cb53b7..a14f092 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs
@@ -136,11 +136,11 @@
{
if (cmsPlanOrderItem.nums - LessNumber - Number > 0)
{
- biaoge += " <td style=\"text-align:center\"> " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
+ biaoge += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
}
else
{
- biaoge += " <td style=\"text-align:center\"> " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:green;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
+ biaoge += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:green;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
}
}
else
@@ -249,7 +249,7 @@
- biaowei = " <td style=\"text-align:center\"> "+ PlanOrderid.Count +" </td><td style=\"text-align:center\"> </td> <td style=\"text-align:center\"> </td> ";
+ biaowei = " <td style=\"color: grey;text-align: center;\" > " + PlanOrderid.Count +" </td><td style=\"text-align:center\"> </td> <td style=\"text-align:center\"> </td> ";
foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
{
var nums = cmsPlanOrderItems.Where(x => x.name == inquiryWorkBookModel.WorkBookNameTxt && x.specification == inquiryWorkBookModel.WorkBookSizeTxt && PlanOrderid.Contains(x.orderId)).Sum(x => x.nums);
@@ -260,11 +260,11 @@
var LessNumber = coreDeliverOrderItems1.Sum(x => x.LessNumber);
if ((nums - LessNumber - Number) > 0)
{
- biaowei += " <td style=\"text-align:center\"> " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >" + (nums - LessNumber - Number) + " </span></td>";
+ biaowei += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >" + (nums - LessNumber - Number) + " </span></td>";
}
else
{
- biaowei += " <td style=\"text-align:center\"> " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:green;\" >" + (nums - LessNumber - Number) + " </span></td>";
+ biaowei += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:green;\" >" + (nums - LessNumber - Number) + " </span></td>";
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancial.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancial.aspx
index 8003c28..1938b2b 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancial.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancial.aspx
@@ -266,7 +266,7 @@
<%#double.Parse(Eval("UnPayedMoney", "{0:F}"))>0?Eval("UnPayedMoney", "{0:F}"):"0"%>
</td>
<td class='th_operate Operate'>
- <span menu_member_case_id="case_OrderRecive" menu_member_case_name="璁㈠崟鏀舵" style='display<%#1>(int)Eval("OrderTypeId")?"1": "1" %>:none;' onclick="top.Dialog.open({URL: '/Pages/financial/OrderMoneyReceive.aspx?id=<%#Eval("Keyid") %>' , Title: '鈥�<%#Eval("SellerOrderId")%>鈥濇敹娆�',Height:450 ,Width:600});">璁㈠崟鏀舵</span> <span menu_member_case_id="case_OutOrderPay" menu_member_case_name="澶栧崗浠樻" style='display<%#2<(int)Eval("OrderTypeId")?"1": "" %>:none;' onclick="top.Dialog.open({URL: '/Pages/financial/OrderMoneyReceive.aspx?isprepareway=none&outsourceType=1&id=<%#Eval("Keyid") %>' , Title: '鈥�<%#Eval("SellerOrderId")%>鈥濆鍗忎粯娆�',Height:450 ,Width:600});">澶栧崗浠樻</span>
+ <span menu_member_case_id="case_OrderRecive" menu_member_case_name="璁㈠崟鏀舵" style='display<%#1>(int)Eval("OrderTypeId")?"1": "1" %>:none;<%#Eval("KaipiaoshenqingId") == null ?"":"color: grey;" %>' onclick="top.Dialog.open({URL: '/Pages/financial/OrderMoneyReceive.aspx?id=<%#Eval("Keyid") %>' , Title: '鈥�<%#Eval("SellerOrderId")%>鈥濇敹娆�',Height:450 ,Width:600});">璁㈠崟鏀舵</span> <span menu_member_case_id="case_OutOrderPay" menu_member_case_name="澶栧崗浠樻" style='display<%#2<(int)Eval("OrderTypeId")?"1": "" %>:none;' onclick="top.Dialog.open({URL: '/Pages/financial/OrderMoneyReceive.aspx?isprepareway=none&outsourceType=1&id=<%#Eval("Keyid") %>' , Title: '鈥�<%#Eval("SellerOrderId")%>鈥濆鍗忎粯娆�',Height:450 ,Width:600});">澶栧崗浠樻</span>
<%--<span style='display<%#1>(int)Eval("OrderTypeId")?"1": "" %>:none;' onclick="OpenSmallWindowByUrlUseRation(
'/Pages/business/OrderRefund.aspx?id=<%#Eval("Keyid") %>&odrof=seller',0,4/5
)">閫�娆�</span>--%>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancial.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancial.aspx.cs
index c5570d6..16e7bf8 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancial.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancial.aspx.cs
@@ -32,6 +32,7 @@
EC_OrderBasicBLL _eC_OrderBasicBLL = null;
OA_StaffBLL bll_OA_StaffBLL = null;
+ OA_KaipiaoshenqingBLL bLL_OA_KaipiaoshenqingBLL = null;
/// <summary>
/// 鍒濆鍖栨瀯閫�
@@ -40,6 +41,7 @@
{
_eC_OrderBasicBLL = new EC_OrderBasicBLL();
bll_OA_StaffBLL = new OA_StaffBLL();
+ bLL_OA_KaipiaoshenqingBLL = new OA_KaipiaoshenqingBLL();
}
/// <summary>
@@ -204,6 +206,22 @@
PageIndex = UCPager1.AspNetPager.CurrentPageIndex
};
IEnumerable<EC_OrderBasic> result = _eC_OrderBasicBLL.SelectModelPage_Financial(pagination, SearchParam);
+ foreach (var eC_OrderBasic in result)
+ {
+ if(eC_OrderBasic.KaipiaoshenqingId.HasValue )
+ {
+ var oA_Kaipiaoshenqing = bLL_OA_KaipiaoshenqingBLL.GetModelByKeyid(eC_OrderBasic.KaipiaoshenqingId);
+ if (oA_Kaipiaoshenqing == null)
+ {
+ eC_OrderBasic.KaipiaoshenqingId = null;
+ }
+ else if (string.IsNullOrEmpty(oA_Kaipiaoshenqing.Fapiaohao))
+ {
+ eC_OrderBasic.KaipiaoshenqingId = null;
+ }
+ }
+ }
+
rptData.DataSource = result;
rptData.DataBind();
--
Gitblit v1.9.1