From 40eacc41d6f70f64ffd8f1fd18a8e12bce3fd86d Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 16 十月 2025 12:10:34 +0800
Subject: [PATCH] 没有批准的就不显示在列表中
---
CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyAdd.aspx.cs | 39 ++++++++++++++++++++++++++++++---------
1 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyAdd.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyAdd.aspx.cs
index 0530a34..2f3ebaa 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyAdd.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyAdd.aspx.cs
@@ -14,6 +14,7 @@
using CY.Infrastructure.DESEncrypt;
using CY.Infrastructure.Query;
using System.Transactions;
+using CY.BLL.OA;
namespace CY.WebForm.Pages.work
{
@@ -31,6 +32,7 @@
OA_StaffBLL oA_StaffBLL = null;
OA_DepartmentBll oA_DepartmentBll = null;
public string planDataType = "";
+ OA_SubjectSetBLL _OA_SubjectSetBLL = null;
public BaoxiaoReplyAdd()
{
oA_WorkReminderBll = new OA_WorkPlanBll();
@@ -42,6 +44,7 @@
oA_WorkPlan_ShenpiBLL = new OA_WorkPlan_shenpiBLL();
oA_StaffBLL = new OA_StaffBLL();
oA_DepartmentBll = new OA_DepartmentBll();
+ _OA_SubjectSetBLL = new OA_SubjectSetBLL();
}
//椤甸潰鍔犺浇
@@ -56,6 +59,11 @@
//鏁版嵁鍔犺浇
public void InitData()
{
+ //绉戠洰鍚嶇О
+ this.selSubject.DataSource = _OA_SubjectSetBLL.getAllSubject(CurrentUser.MemberId, "璐�");
+ this.selSubject.DataBind();
+ // this.selSubject.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
OA_WorkPlan m_OA_WorkPlan = oA_WorkReminderBll.GetModelByKeyid(Request["keyid"].ToInt32());
if (m_OA_WorkPlan != null)
{
@@ -68,10 +76,10 @@
this.spanPlanPeople.InnerText = m_OA_WorkPlan.PlanPeople.ToString();
- this.spanPlanMoney.InnerText = m_OA_WorkPlan.PlanMoney.Value.ToString("0.00");
+ this.txtPlanMoney.Value = m_OA_WorkPlan.PlanMoney.Value.ToString("0.00");
- this.spanSubject.InnerText = m_OA_WorkPlan.RewardContent.ToString();
- this.spanPlanContent.InnerText = m_OA_WorkPlan.PlanContent.ToString();
+ this.selSubject.Value = m_OA_WorkPlan.RewardResult;
+ this.txtPlanContent.Value = m_OA_WorkPlan.PlanContent;
this.spanHoubufapiaoStatus.InnerText = m_OA_WorkPlan.HoubufapiaoStatusName;
var sss = oA_WorkPlan_AttachmentBLL.GetModelByKaipiaoId(Request["keyid"].ToInt32().Value);
@@ -126,6 +134,11 @@
JavaScript.MessageBox("璇ユ姤閿�宸茬粡瀹℃壒瀹屾垚", this);
return;
}
+ if (m_OA_WorkPlan.PlanMoney< this.txtPlanMoney.Value.ToDecimal2())
+ {
+ JavaScript.MessageBox("淇敼鍚庣殑鎶ラ攢閲戦涓嶈兘澶т簬鍘熸姤閿�閲戦", this);
+ return;
+ }
var oA_WorkPlan_Shenpis = oA_WorkPlan_ShenpiBLL.GetModelByKaipiaoId(Request["keyid"].ToInt32().Value).ToList();
@@ -156,10 +169,6 @@
string Messagejingli = null;
if (oA_Staff.BF_Isbaoxiaojingli)
{
- if (oA_WorkPlan_Shenpis.Count > 2)
- {
- Messagejingli = "璇ユ祦绋嬪凡缁忓鎵瑰畬鎴愶紒";
- }
if (oA_WorkPlan_Shenpis.Count < 2)
{
Messagejingli = "娌″埌缁忕悊瀹℃壒姝ラ锛�";
@@ -185,7 +194,15 @@
}
}
+ m_OA_WorkPlan.PlanMoney = this.txtPlanMoney.Value.ToDecimal2();
+ m_OA_WorkPlan.RewardResult = this.selSubject.Value;
+ m_OA_WorkPlan.PlanContent = this.txtPlanContent.Value;
+ var a_SubjectSet = _OA_SubjectSetBLL.getSingleSubject(this.selSubject.Value.ToInt32());
+ if (a_SubjectSet != null)
+ {
+ m_OA_WorkPlan.RewardContent = a_SubjectSet.SubjectName;
+ }
DateTime nowTime = DateTime.Now;
@@ -198,7 +215,7 @@
oA_WorkPlan_Shenpi.ApprovalContent = this.txtApprovalContent.Value.Trim();
oA_WorkPlan_Shenpi.CreateTime = nowTime;
oA_WorkPlan_Shenpi.Operator = CurrentUser.TrueName;
- if (oA_WorkPlan_Shenpis.Count == 2)
+ if (oA_WorkPlan_Shenpis.Count >= 2 && oA_Staff.BF_Isbaoxiaojingli)
{
oA_WorkPlan_Shenpi.Buzhou = 2;
}
@@ -209,7 +226,7 @@
res = oA_WorkPlan_ShenpiBLL.InsertModel(oA_WorkPlan_Shenpi);
- if (oA_WorkPlan_Shenpis.Count == 2 || this.selApprovalStatus.Value == "2")
+ if ((oA_WorkPlan_Shenpis.Count >= 2 && oA_Staff.BF_Isbaoxiaojingli ) || this.selApprovalStatus.Value == "2")
{
m_OA_WorkPlan.ApprovalContent = this.txtApprovalContent.Value.Trim();
@@ -222,6 +239,10 @@
m_OA_WorkPlan.LastUpdateTime = nowTime;
res = oA_WorkReminderBll.UpdateModel(m_OA_WorkPlan);
}
+ else
+ {
+ res = oA_WorkReminderBll.UpdateModel(m_OA_WorkPlan);
+ }
--
Gitblit v1.9.1