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.Model/OA/OA_ShebeiWeixiu.cs | 18 ++++++++-
CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiWeixiuDAL.cs | 18 +++++----
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuList.aspx | 10 ++++-
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuAdd.aspx.cs | 8 ++-
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs | 3 +
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuFukuanAdd.aspx.cs | 12 ++++-
6 files changed, 50 insertions(+), 19 deletions(-)
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_ShebeiWeixiu.cs b/CY_ECommercePlatform/CY.Model/OA/OA_ShebeiWeixiu.cs
index d6b0e63..736bef2 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_ShebeiWeixiu.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_ShebeiWeixiu.cs
@@ -24,6 +24,7 @@
public decimal? WeixiuPrice { get; set; }
public int? Zerenren { get; set; }
public string ZerenrenName { get; set; }
+ public string ShebeiZerenrenName { get; set; }
public decimal? DanzePrice { get; set; }
public int? WeixiuShebeiId { get; set; }
@@ -34,7 +35,11 @@
//鏄惁浠樿垂 1鏄�2鍚�
public int? Shifoufufei { get; set; }
-
+
+
+ //缁翠慨瀹℃壒鏄惁閫氳繃 1鎵瑰噯2涓嶆壒鍑�
+ public int? ApprovalStatus { get; set; }
+
public DateTime? CreateTime { get; set; }
public string Creator{ get; set; }
@@ -287,8 +292,17 @@
this.CateName = isChange ? MyConvert.ConvertToString(value) : CateName;
theValue = this.CateName;
}
+ else if ("ShebeiZerenrenName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 22)
+ {
+ this.ShebeiZerenrenName = isChange ? MyConvert.ConvertToString(value) : ShebeiZerenrenName;
+ theValue = this.ShebeiZerenrenName;
+ }
+ else if ("ApprovalStatus".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 23)
+ {
+ this.ApprovalStatus = isChange ? MyConvert.ConvertToInt32(value) : ApprovalStatus;
+ theValue = this.ApprovalStatus;
+ }
-
return theValue;
}
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiWeixiuDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiWeixiuDAL.cs
index d54b0db..5981115 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiWeixiuDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiWeixiuDAL.cs
@@ -68,11 +68,12 @@
new SqlParameter("@CreateTime", trueModel.CreateTime) ,
new SqlParameter("@Creator", trueModel.Creator) ,
new SqlParameter("@LastUpdateTime", trueModel.LastUpdateTime) ,
- new SqlParameter("@Operator", trueModel.Operator) ,
-
- };
- string sql = "Insert Into OA_ShebeiWeixiu ([MemberId],[ShebeiId],[WeixiuTime],[CateId],[Name],[Anzhuangdidian],[Remark],[WeixiuPrice],[Zerenren],[ZerenrenName],[DanzePrice],[WeixiuShebeiId],[FukuanShebeiId],[FukuanshenqingId],[Shifoufufei],[CreateTime],[Creator],[LastUpdateTime],[Operator])"
- + " Values (@MemberId,@ShebeiId,@WeixiuTime,@CateId,@Name,@Anzhuangdidian,@Remark ,@WeixiuPrice,@Zerenren,@ZerenrenName,@DanzePrice,@WeixiuShebeiId,@FukuanShebeiId,@FukuanshenqingId,@Shifoufufei,@CreateTime,@Creator,@LastUpdateTime,@Operator)";
+ new SqlParameter("@Operator", trueModel.Operator) ,
+ new SqlParameter("@ApprovalStatus", trueModel.ApprovalStatus.HasValue?trueModel.ApprovalStatus.Value:0) ,
+
+ };
+ string sql = "Insert Into OA_ShebeiWeixiu ([MemberId],[ShebeiId],[WeixiuTime],[CateId],[Name],[Anzhuangdidian],[Remark],[WeixiuPrice],[Zerenren],[ZerenrenName],[DanzePrice],[WeixiuShebeiId],[FukuanShebeiId],[FukuanshenqingId],[Shifoufufei],[CreateTime],[Creator],[LastUpdateTime],[Operator],[ApprovalStatus])"
+ + " Values (@MemberId,@ShebeiId,@WeixiuTime,@CateId,@Name,@Anzhuangdidian,@Remark ,@WeixiuPrice,@Zerenren,@ZerenrenName,@DanzePrice,@WeixiuShebeiId,@FukuanShebeiId,@FukuanshenqingId,@Shifoufufei,@CreateTime,@Creator,@LastUpdateTime,@Operator,@ApprovalStatus)";
try
{
@@ -129,8 +130,9 @@
new SqlParameter("@LastUpdateTime", trueModel.LastUpdateTime) ,
new SqlParameter("@Operator", trueModel.Operator) ,
+ new SqlParameter("@ApprovalStatus", trueModel.ApprovalStatus.HasValue?trueModel.ApprovalStatus.Value:0) ,
};
- string sql = "Update OA_ShebeiWeixiu Set [MemberId]=@MemberId,[ShebeiId]=@ShebeiId,[WeixiuTime]=@WeixiuTime,[CateId]=@CateId,[Name]=@Name,[Anzhuangdidian]=@Anzhuangdidian,[Remark]=@Remark,[WeixiuPrice]=@WeixiuPrice,[Zerenren]=@Zerenren,[ZerenrenName]=@ZerenrenName,[DanzePrice]=@DanzePrice, [WeixiuShebeiId]=@WeixiuShebeiId,[FukuanShebeiId]=@FukuanShebeiId,[FukuanshenqingId]=@FukuanshenqingId,[Shifoufufei]=@Shifoufufei,[LastUpdateTime]=@LastUpdateTime, [Operator]=@Operator where [Keyid] =@Keyid ";
+ string sql = "Update OA_ShebeiWeixiu Set [MemberId]=@MemberId,[ShebeiId]=@ShebeiId,[WeixiuTime]=@WeixiuTime,[CateId]=@CateId,[Name]=@Name,[Anzhuangdidian]=@Anzhuangdidian,[Remark]=@Remark,[WeixiuPrice]=@WeixiuPrice,[Zerenren]=@Zerenren,[ZerenrenName]=@ZerenrenName,[DanzePrice]=@DanzePrice, [WeixiuShebeiId]=@WeixiuShebeiId,[FukuanShebeiId]=@FukuanShebeiId,[FukuanshenqingId]=@FukuanshenqingId,[Shifoufufei]=@Shifoufufei,[LastUpdateTime]=@LastUpdateTime, [Operator]=@Operator,ApprovalStatus=@ApprovalStatus where [Keyid] =@Keyid ";
try
{
@@ -291,7 +293,7 @@
{
try
{
- string condition = " 1=1 ";
+ string condition = " ApprovalStatus=1 ";
if (_MemberId != Guid.Empty)
condition += " and a.MemberId = '" + _MemberId + "'";
@@ -344,7 +346,7 @@
- return _dataBase.SelectModelPage<Model.OA_ShebeiWeixiu>(pagination, " a.*,b.Name as CateName ", " OA_ShebeiWeixiu as a left join OA_ShebeiCate as b on a.CateId = b.Keyid left join OA_ShebeiManage as c on a.ShebeiId = c.Keyid ", " a.WeixiuTime DESC", " Keyid desc ", condition);
+ return _dataBase.SelectModelPage<Model.OA_ShebeiWeixiu>(pagination, " a.*,b.Name as CateName, c.ZerenrenName as ShebeiZerenrenName ", " OA_ShebeiWeixiu as a left join OA_ShebeiCate as b on a.CateId = b.Keyid left join OA_ShebeiManage as c on a.ShebeiId = c.Keyid ", " a.WeixiuTime DESC", " Keyid desc ", condition);
}
catch (Exception ex)
{
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuAdd.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuAdd.aspx.cs
index 6b76c26..e9f2262 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuAdd.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuAdd.aspx.cs
@@ -186,11 +186,13 @@
oA_ShebeiWeixiu.ShebeiId = this.selShebei.Value.ToInt32();
oA_ShebeiWeixiu.WeixiuTime = this.txtWeixiuTime.Value.ToDateTime2();
var shebeiManage = oA_ShebeiManageBLL.GetModelByKeyid(oA_ShebeiWeixiu.ShebeiId);
+ var ShebeiZerenrenName = "";
if (shebeiManage != null)
{
oA_ShebeiWeixiu.CateId = shebeiManage.CateId;
oA_ShebeiWeixiu.Anzhuangdidian = shebeiManage.Anzhuangdidian;
oA_ShebeiWeixiu.Name = shebeiManage.Name;
+ ShebeiZerenrenName = shebeiManage.ZerenrenName;
}
oA_ShebeiWeixiu.Remark = this.txtPlanRemark.Value;
oA_ShebeiWeixiu.WeixiuPrice = this.txtWeixiuPrice.Value.ToDecimal2();
@@ -246,7 +248,7 @@
// _SupplierName = oA_Suppliers.Name;
//}
- var _SupplierName = oA_ShebeiWeixiu.Name + "缁翠慨";
+ var _SupplierName = oA_ShebeiWeixiu.Name + "(" + ShebeiZerenrenName + ")" + "缁翠慨";
oA_Fukuanshenqing.SupplierName = _SupplierName;
var id = _oA_FukuanshenqingBLL.InsertModel(oA_Fukuanshenqing);
@@ -291,13 +293,13 @@
m_OA_WorkPlan.Operator = CurrentUser.ShortName;
- m_OA_WorkPlan.PlanContent = oA_ShebeiWeixiu.Name+"缁翠慨鐢宠";
+ m_OA_WorkPlan.PlanTitle = oA_ShebeiWeixiu.Name + "(" + ShebeiZerenrenName + ")" + "缁翠慨鐢宠";
m_OA_WorkPlan.PlanDataType = 18;
m_OA_WorkPlan.PlanMoney = this.txtWeixiuPrice.Value.ToDecimal2();
m_OA_WorkPlan.RewardMoney = 0;
m_OA_WorkPlan.PlanRemark = "";
m_OA_WorkPlan.PlanRunTime = DateTime.Now;
- m_OA_WorkPlan.PlanTitle = this.txtPlanRemark.Value+ ".缁翠慨鏃ユ湡:"+ this.txtWeixiuTime.Value;
+ m_OA_WorkPlan.PlanContent = this.txtPlanRemark.Value+ ".缁翠慨鏃ユ湡:"+ this.txtWeixiuTime.Value;
m_OA_WorkPlan.PlanType = 3;
m_OA_WorkPlan.LastUpdateTime = nowTime;
var workid = oA_WorkReminderBll.InserModelAndGetId(m_OA_WorkPlan);
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuFukuanAdd.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuFukuanAdd.aspx.cs
index ff92834..604a60c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuFukuanAdd.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuFukuanAdd.aspx.cs
@@ -144,6 +144,12 @@
JavaScript.MessageBox("宸茬粡鐢宠浠樻锛�", this);
return;
}
+ var shebeiManage = oA_ShebeiManageBLL.GetModelByKeyid(oA_ShebeiWeixiu.ShebeiId);
+ var ShebeiZerenrenName = "";
+ if (shebeiManage != null)
+ {
+ ShebeiZerenrenName = shebeiManage.ZerenrenName;
+ }
using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
@@ -211,7 +217,7 @@
// _SupplierName = oA_Suppliers.Name;
//}
- var _SupplierName = oA_ShebeiWeixiu.Name + "缁翠慨";
+ var _SupplierName = oA_ShebeiWeixiu.Name + "(" + ShebeiZerenrenName + ")" + "缁翠慨";
oA_Fukuanshenqing.SupplierName = _SupplierName;
var id = _oA_FukuanshenqingBLL.InsertModel(oA_Fukuanshenqing);
@@ -252,13 +258,13 @@
m_OA_WorkPlan.Operator = CurrentUser.ShortName;
- m_OA_WorkPlan.PlanContent = oA_ShebeiWeixiu.Name+ "缁翠慨浠樻鐢宠";
+ m_OA_WorkPlan.PlanTitle = oA_ShebeiWeixiu.Name + "(" + ShebeiZerenrenName + ")" + "缁翠慨浠樻鐢宠";
m_OA_WorkPlan.PlanDataType = 19;
m_OA_WorkPlan.PlanMoney = this.txtWeixiuPrice.Value.ToDecimal2();
m_OA_WorkPlan.RewardMoney = 0;
m_OA_WorkPlan.PlanRemark = "";
m_OA_WorkPlan.PlanRunTime = DateTime.Now;
- m_OA_WorkPlan.PlanTitle = this.txtPlanRemark.Value+ ".缁翠慨鏃ユ湡:"+ this.txtWeixiuTime.Value;
+ m_OA_WorkPlan.PlanContent = this.txtPlanRemark.Value+ ".缁翠慨鏃ユ湡:"+ this.txtWeixiuTime.Value;
m_OA_WorkPlan.PlanType = 3;
m_OA_WorkPlan.LastUpdateTime = nowTime;
var workid = oA_WorkReminderBll.InserModelAndGetId(m_OA_WorkPlan);
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuList.aspx
index f111af4..3b119f8 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuList.aspx
@@ -182,6 +182,9 @@
<th style="text-align: center">
瀹夎鍦扮偣
</th>
+ <th style="text-align: center">
+ 璁惧璐ｄ换浜�
+ </th>
<th style="text-align: center">
缁存姢璐圭敤
</th>
@@ -218,6 +221,9 @@
<td style="text-align: center">
<%#Eval("Anzhuangdidian")%>
</td>
+ <td style="text-align: center">
+ <%#Eval("ShebeiZerenrenName")%>
+ </td>
<td style="text-align: center">
<%#Eval("WeixiuPrice","{0:F2}")%>
</td>
@@ -237,7 +243,7 @@
</ItemTemplate>
<FooterTemplate>
<tr class="StatisticsMoney">
- <td colspan="6" class="ali03">
+ <td colspan="7" class="ali03">
褰撳墠椤电粺璁★細
</td>
<td class="ali01">
@@ -254,7 +260,7 @@
</td>
</tr>
<tr class="StatisticsMoney">
- <td colspan="6" class="ali03">
+ <td colspan="7" class="ali03">
鏌ヨ椤圭粺璁★細
</td>
<td class="ali01">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs
index 958cc86..a3c62a5 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs
@@ -196,7 +196,7 @@
if (oA_ShebeiWeixiu != null)
{
oA_ShebeiWeixiu.Zerenren = this.selZerenren.Value.ToInt32();
-
+ oA_ShebeiWeixiu.ApprovalStatus = 1;
oA_ShebeiWeixiu.DanzePrice = this.txtDanzePrice.Value.ToDecimal2();
oA_ShebeiWeixiuBLL.UpdateModel(oA_ShebeiWeixiu);
}
@@ -210,6 +210,7 @@
}
+
if (m_OA_WorkPlan.ApprovalStatus == 1 && m_OA_WorkPlan.PlanDataType == 20)
{
var oA_WageAward = bll_OA_WageAwardPunishBLL.GetModelByKeyid(m_OA_WorkPlan.PlanComplany.ToInt32().Value);
--
Gitblit v1.9.1