From 7bcbbbd0459f00ebc3aa7d4f249cb9231a6b5d40 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 31 十月 2025 12:25:17 +0800
Subject: [PATCH] 这个销售绩效查询这个列表中的，你把这个到期类型和到期时间合并，现在到期类型就不要了， 到期时间里面，日期的就显示。时间，他是和金额执行完毕的，就在到期时间里头， 就填上金额执行完毕那个合同金额也是就有金额的显示。金额没得金额的，就先据实结算。好，合同类型这个就不要了。
---
CY_ECommercePlatform/CY.WebForm/Pages/business/XiaoshoujixiaoList.aspx | 20 +++++-----
CY_ECommercePlatform/CY.WebForm/Pages/business/XiaoshoujixiaoList.aspx.cs | 14 +++++++
CY_ECommercePlatform/CY.Model/OA/OA_Staff.cs | 14 +++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/XiaoshoujixiaoPrint.aspx | 16 ++++----
CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffList.aspx | 6 +-
CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffList.aspx.cs | 20 +++++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/XiaoshoujixiaoPrint.aspx.cs | 19 +++++++--
7 files changed, 83 insertions(+), 26 deletions(-)
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_Staff.cs b/CY_ECommercePlatform/CY.Model/OA/OA_Staff.cs
index 73e87c6..e07e3fb 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_Staff.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_Staff.cs
@@ -614,6 +614,20 @@
_sm_contractendtime = value;
}
}
+
+
+
+ /// <summary>
+ /// 鍚堝悓鍒版湡鏃堕棿
+ /// </summary>
+ public string SM_ContractEndTimeName
+ {
+ get;
+
+ set;
+
+ }
+
/// <summary>
/// 绂昏亴瀹℃壒/鍦ㄨ亴0,鐢宠涓�1,鍚屾剰绂昏亴2,鎷掔粷鐢宠3
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/XiaoshoujixiaoList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/XiaoshoujixiaoList.aspx
index cd76151..adda02a 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/XiaoshoujixiaoList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/XiaoshoujixiaoList.aspx
@@ -179,15 +179,15 @@
<th style="text-align: center;">
寤烘。鏃堕棿
</th>
- <th style="text-align: center;">
+ <%-- <th style="text-align: center;">
鍒版湡绫诲瀷
- </th>
+ </th>--%>
<th style="text-align: center;">
鍒版湡鏃堕棿
</th>
- <th style="text-align: center;">
+ <%-- <th style="text-align: center;">
鍚堝悓绫诲瀷
- </th>
+ </th>--%>
<th style="text-align: center;">
鍚堝悓閲戦
</th>
@@ -231,15 +231,15 @@
<td>
<%#Eval("ExpiretypeName")%>
</td>
- <td>
+ <%-- <td>
<%#Eval("ExpireTime", "{0:yyyy-MM-dd}")%>
- </td>
+ </td>--%>
<td>
<%#Eval("ContracttypeName")%>
</td>
- <td>
+ <%-- <td>
<%#Eval("Contractmoney", "{0:F2}")%>
- </td>
+ </td>--%>
<td>
<%#Eval("SumPrice", "{0:F2}")%>
@@ -257,7 +257,7 @@
</ItemTemplate>
<FooterTemplate>
<tr class="StatisticsMoney">
- <td colspan="8" class="ali03">
+ <td colspan="6" class="ali03">
褰撳墠椤电粺璁★細
</td>
<td class="ali01">
@@ -277,7 +277,7 @@
</td>
</tr>
<tr class="StatisticsMoney">
- <td colspan="8" class="ali03">
+ <td colspan="6" class="ali03">
鏌ヨ椤圭粺璁★細
</td>
<td class="ali01">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/XiaoshoujixiaoList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/XiaoshoujixiaoList.aspx.cs
index 10b0bf7..01b0e36 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/XiaoshoujixiaoList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/XiaoshoujixiaoList.aspx.cs
@@ -137,6 +137,20 @@
weishoukuanjineheji = pa.heji5.Value.ToString("0.00"); ;
+ foreach ( var oA_DeliverPlan in oA_DeliverPlans)
+ {
+ if(oA_DeliverPlan.ExpiretypeName == "鏃ユ湡")
+ {
+ oA_DeliverPlan.ExpiretypeName = oA_DeliverPlan.ExpireTime.HasValue ? oA_DeliverPlan.ExpireTime.Value.ToString("yyyy-MM-dd") : "";
+ }
+
+ if(oA_DeliverPlan.ContracttypeName == "閲戦")
+ {
+ oA_DeliverPlan.ContracttypeName = oA_DeliverPlan.Contractmoney.HasValue ? oA_DeliverPlan.Contractmoney.Value.ToString("F2") : "0.00";
+ }
+ }
+
+
this.RepClientList.DataSource = oA_DeliverPlans;
this.RepClientList.DataBind();
UCPager1.AspNetPager.RecordCount = pa.RecordCount;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/XiaoshoujixiaoPrint.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/XiaoshoujixiaoPrint.aspx
index 61e5654..90eb8ef 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/XiaoshoujixiaoPrint.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/XiaoshoujixiaoPrint.aspx
@@ -67,15 +67,15 @@
<th style="text-align: center;">
寤烘。鏃堕棿
</th>
- <th style="text-align: center;">
+ <%-- <th style="text-align: center;">
鍒版湡绫诲瀷
- </th>
+ </th>--%>
<th style="text-align: center;">
鍒版湡鏃堕棿
</th>
- <th style="text-align: center;">
+ <%-- <th style="text-align: center;">
鍚堝悓绫诲瀷
- </th>
+ </th>--%>
<th style="text-align: center;">
鍚堝悓閲戦
</th>
@@ -118,15 +118,15 @@
<td>
<%#Eval("ExpiretypeName")%>
</td>
- <td>
+ <%--<td>
<%#Eval("ExpireTime", "{0:yyyy-MM-dd}")%>
- </td>
+ </td>--%>
<td>
<%#Eval("ContracttypeName")%>
</td>
- <td>
+ <%-- <td>
<%#Eval("Contractmoney", "{0:F2}")%>
- </td>
+ </td>--%>
<td>
<%#Eval("SumPrice", "{0:F2}")%>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/XiaoshoujixiaoPrint.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/XiaoshoujixiaoPrint.aspx.cs
index e54a1d1..c0b6371 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/XiaoshoujixiaoPrint.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/XiaoshoujixiaoPrint.aspx.cs
@@ -87,10 +87,7 @@
PageSize = 1000,
PageIndex = 1
};
-
-
-
- this.rptOrder.DataSource = bll_EC_OrderBLL.GetxiaoshouchaxunList(pagination,
+ var oA_DeliverPlans = bll_EC_OrderBLL.GetxiaoshouchaxunList(pagination,
CurrentUser.MemberId,
selectProvince,
selectCity,
@@ -107,6 +104,20 @@
txtOrderMoney,
txtLastOrderTime
);
+
+ foreach (var oA_DeliverPlan in oA_DeliverPlans)
+ {
+ if (oA_DeliverPlan.ExpiretypeName == "鏃ユ湡")
+ {
+ oA_DeliverPlan.ExpiretypeName = oA_DeliverPlan.ExpireTime.HasValue ? oA_DeliverPlan.ExpireTime.Value.ToString("yyyy-MM-dd") : "";
+ }
+
+ if (oA_DeliverPlan.ContracttypeName == "閲戦")
+ {
+ oA_DeliverPlan.ContracttypeName = oA_DeliverPlan.Contractmoney.HasValue ? oA_DeliverPlan.Contractmoney.Value.ToString("F2") : "0.00";
+ }
+ }
+ this.rptOrder.DataSource = oA_DeliverPlans;
this.rptOrder.DataBind();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffList.aspx
index 32c09e6..fa734c4 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffList.aspx
@@ -136,7 +136,7 @@
Email
</th>--%>
<th>
- 鐘舵��
+ 鍚堝悓鍒版湡鏃堕棿
</th>
<th>
鏌ヨ鍖哄煙
@@ -205,8 +205,8 @@
<td>
<%#Eval("Email")%>
</td>--%>
- <td>
- <%#Eval("Status")%>
+ <td <%#Eval("SM_ContractEndTimeName") %> >
+ <%#Eval("SM_ContractEndTime","{0:yyyy-MM-dd}")%>
</td>
<td class="Operate">
<span menu_member_case_id="case_ManageAddress" menu_member_case_name="淇敼璐熻矗鍖哄煙" onclick="ManageAddress('<%#Eval("Keyid")%>')">淇敼</span>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffList.aspx.cs
index 6d15dc5..5f4aa80 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffList.aspx.cs
@@ -62,7 +62,25 @@
Pagination pa = new Pagination();
pa.PageSize = UCPager1.AspNetPager.PageSize;
pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
- this.RepClientList.DataSource = bll_OA_StaffBLL.SelectModelPage(pa,this.selDepartmentId.Value.ToInt32(), CurrentUser.MemberId, this.txtMemberName.Value.ToString2(), this.selStatus.Value.ToString2());
+ var oA_Staffs = bll_OA_StaffBLL.SelectModelPage(pa, this.selDepartmentId.Value.ToInt32(), CurrentUser.MemberId, this.txtMemberName.Value.ToString2(), this.selStatus.Value.ToString2());
+ foreach (var oA_Staff in oA_Staffs)
+ {
+ oA_Staff.SM_ContractEndTimeName = "";
+ if (oA_Staff.SM_ContractEndTime.HasValue)
+ {
+ if(oA_Staff.SM_ContractEndTime.Value < DateTime.Now.AddMonths(3))
+ {
+ oA_Staff.SM_ContractEndTimeName = "style=\"color:red;\"";
+ }
+ }
+
+ if (!(oA_Staff.SM_IsContract.HasValue && oA_Staff.SM_IsContract.Value==1))
+ {
+ oA_Staff.SM_ContractEndTime = null;
+ }
+ }
+
+ this.RepClientList.DataSource = oA_Staffs;
this.RepClientList.DataBind();
UCPager1.AspNetPager.RecordCount = pa.RecordCount;
}
--
Gitblit v1.9.1