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/Waixiefukuanfukuan.aspx.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx.cs
index 468178e..81de6eb 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx.cs
@@ -463,8 +463,8 @@
- this.txtSQBeginDate.Value = DateTime.Now.AddDays(-14).ToString("yyyy-MM-dd");
- this.txtSQEndDate.Value = DateTime.Now.ToString("yyyy-MM-dd");
+ //this.txtSQBeginDate.Value = DateTime.Now.AddDays(-14).ToString("yyyy-MM-dd");
+ //this.txtSQEndDate.Value = DateTime.Now.ToString("yyyy-MM-dd");
this.selPayStates.Value = "1";
//鍒濇鏁版嵁鍔犺浇
btn_Search_Click(btn_Search, new EventArgs());
@@ -562,7 +562,7 @@
IEnumerable<OA_Fukuanshenqing> result = oA_FukuanshenqingBLL.SelectModelPage(pagination, CurrentUser.MemberId, this.txtSQBeginDate.Value, this.txtSQEndDate.Value, this.txtCreatorName.Value, this.txtCustormerName.Value,this.selPayStates.Value, this.selFukuanyongtu.Value);
foreach(var oA_Fukuanshenqing in result)
{
- if(oA_Fukuanshenqing.Fukuanyongtu == "澶栧崗鍔犲伐璐�" || oA_Fukuanshenqing.Fukuanyongtu == "閲囪喘浠樻")
+ if(oA_Fukuanshenqing.Fukuanyongtu == "澶栧崗鍔犲伐璐�" || oA_Fukuanshenqing.Fukuanyongtu == "閲囪喘浠樻" || oA_Fukuanshenqing.Fukuanyongtu == "璁惧缁翠慨璐�")
{
var workPlan = _WorkPlanBll.GetModelByFukuanshenqid(oA_Fukuanshenqing.Keyid.ToString(),"");
if (workPlan != null)
--
Gitblit v1.9.1