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.Model/OA/OA_WorkPlan.cs | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan.cs b/CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan.cs
index 16d9cdb..9cffe31 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan.cs
@@ -81,15 +81,15 @@
{
if (EvaluationStatus == 1)
{
- return "宸叉姤閿�";
+ return "宸蹭粯娆�";
}
else if (EvaluationStatus == 2)
{
- return "鏈姤閿�";
+ return "鏈粯娆�";
}
else
- return "鏈姤閿�";
+ return "鏈粯娆�";
}
else
{
@@ -367,7 +367,7 @@
{
if (ApprovalStatus == 0)
{
- return "鏈壒澶�";
+ return "鏈鎵�";
}
else if (ApprovalStatus == 1)
{
@@ -377,8 +377,12 @@
{
return "涓嶆壒鍑�";
}
+ else if (ApprovalStatus == 3)
+ {
+ return "鏈彁浜�";
+ }
else
- return "鏈壒澶�";
+ return "鏈鎵�";
}
else
{
@@ -501,7 +505,7 @@
}
}
/// <summary>
- /// 濂栧姳绫诲瀷/鏃�0,濂栧姳1,鎯╃綒2
+ /// 濂栧姳绫诲瀷/鏃�0,濂栧姳1,缃氭2
/// </summary>
public int? RewardType
{
--
Gitblit v1.9.1