From 0dd76c2492f1afbe335b50a8ffb76e4af94271df Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 10 十月 2025 15:16:51 +0800
Subject: [PATCH] 新增设备 人员增加模糊查询 完成 日期默认当天 完成
---
CY_ECommercePlatform/CY.WebForm/Pages/work/WorkScoreAdd.aspx.designer.cs | 68 +-
CY_ECommercePlatform/CY.BLL/OA/OA_ShebeiWeixiuBLL.cs | 4
CY_ECommercePlatform/CY.WebForm/Pages/wage/StaffWageList.aspx.cs | 9
CY_ECommercePlatform/CY.WebForm/Pages/wage/OA_WageAwardPunishAdd.aspx | 2
CY_ECommercePlatform/CY.IDAL/OA/IOA_WorkPlanDAL.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/wage/StaffWageList.aspx.designer.cs | 50 +
CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlanDAL.cs | 15
CY_ECommercePlatform/CY.WebForm/Pages/work/WorkPlanDetail.aspx.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/wage/OA_WageAwardPunishAdd.aspx.designer.cs | 36
CY_ECommercePlatform/CY.Model/OA/OA_WageAwardPunish.cs | 38 +
CY_ECommercePlatform/CY.WebForm/Pages/wage/StaffWageList.aspx | 9
CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiWeixiuDAL.cs | 33 +
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuList.aspx | 49 ++
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx | 54 ++
CY_ECommercePlatform/CY.WebForm/Pages/wage/FakuanShensuAdd.aspx.designer.cs | 80 +++
CY_ECommercePlatform/CY.IDAL/OA/IOA_ShebeiWeixiuDAL.cs | 2
CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan.cs | 2
CY_ECommercePlatform/CY.SQLDAL/OA/OA_WageAwardPunishDAL.cs | 54 ++
CY_ECommercePlatform/CY.BLL/OA/OA_WorkPlanBLL.cs | 4
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuAdd.aspx.designer.cs | 9
CY_ECommercePlatform/CY.WebForm/Pages/wage/WorkScoreList.aspx.designer.cs | 32
CY_ECommercePlatform/CY.WebForm/Pages/wage/WorkScoreList.aspx | 12
CY_ECommercePlatform/CY.WebForm/Pages/wage/FakuanShensuAdd.aspx | 256 +++++++++++
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuList.aspx.cs | 45 +
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx.cs | 2
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj | 8
CY_ECommercePlatform/CY.BLL/OA/OA_WageAwardPunishBLL.cs | 15
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuAdd.aspx.cs | 26 +
CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx.cs | 21
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs | 42 +
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuList.aspx.designer.cs | 14
CY_ECommercePlatform/CY.WebForm/Pages/work/WorkScoreAddList.aspx.designer.cs | 34
CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs | 3
CY_ECommercePlatform/CY.WebForm/Pages/work/WorkScoreAddList.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx | 1
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuAdd.aspx | 39 +
CY_ECommercePlatform/CY.WebForm/Pages/work/WorkScoreAdd.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/wage/FakuanShensuAdd.aspx.cs | 221 +++++++++
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx | 1
CY_ECommercePlatform/CY.IDAL/OA/IOA_WageAwardPunishDAL.cs | 10
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeimanageEdit.aspx | 52 ++
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeimanageEdit.aspx.cs | 4
42 files changed, 1,209 insertions(+), 155 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_ShebeiWeixiuBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_ShebeiWeixiuBLL.cs
index 4344477..8ab4454 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_ShebeiWeixiuBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_ShebeiWeixiuBLL.cs
@@ -89,9 +89,9 @@
/// </summary>
/// <param name="pagination"></param>
/// <returns></returns>
- public IEnumerable<Model.OA_ShebeiWeixiu> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid _MemberId, int? _CateId, string _Name, int? _Status, string Anzhuangdidian, int? Zerenren,int? Shifouzhifu)
+ public IEnumerable<Model.OA_ShebeiWeixiu> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid _MemberId, int? _CateId, string _Name, int? _Status, string Anzhuangdidian, int? Zerenren,int? Shifouzhifu, int? guanliZerenren)
{
- return iOA_ShebeiWeixiuDAL.SelectModelPage(pagination, _MemberId, _CateId, _Name, _Status, Anzhuangdidian, Zerenren, Shifouzhifu);
+ return iOA_ShebeiWeixiuDAL.SelectModelPage(pagination, _MemberId, _CateId, _Name, _Status, Anzhuangdidian, Zerenren, Shifouzhifu, guanliZerenren);
}
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_WageAwardPunishBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_WageAwardPunishBLL.cs
index 647c9dc..1ab99db 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_WageAwardPunishBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_WageAwardPunishBLL.cs
@@ -42,6 +42,17 @@
}
/// <summary>
+ /// 鏇存柊鐘舵��
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool UpdateShifoushensu(Model.OA_WageAwardPunish model)
+ {
+
+ return iOA_WageAwardPunishDAL.UpdateShifoushensu(model);
+ }
+
+ /// <summary>
/// 鍒犻櫎
/// </summary>
/// <param name="model"></param>
@@ -80,9 +91,9 @@
/// <param name="PlanPeople"></param>
/// <param name="StatisticsTime"></param>
/// <returns></returns>
- public IEnumerable<Model.OA_WageAwardPunish> SelectModelPageByWage(Infrastructure.Query.Pagination pagination, Guid MemberId, int? DepartmentId, string PlanPeople, string StatisticsTime)
+ public IEnumerable<Model.OA_WageAwardPunish> SelectModelPageByWage(Infrastructure.Query.Pagination pagination, Guid MemberId, int? DepartmentId, string PlanPeople, string StatisticsTime, string EndisticsTime, string selStatus ="")
{
- return iOA_WageAwardPunishDAL.SelectModelPageByWage(pagination, MemberId, DepartmentId, PlanPeople, StatisticsTime);
+ return iOA_WageAwardPunishDAL.SelectModelPageByWage(pagination, MemberId, DepartmentId, PlanPeople, StatisticsTime, EndisticsTime, selStatus);
}
}
}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_WorkPlanBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_WorkPlanBLL.cs
index 10ed29d..0fb9fd4 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_WorkPlanBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_WorkPlanBLL.cs
@@ -101,9 +101,9 @@
/// <param name="EvaluationStatus"></param>
/// <param name="RewardType"></param>
/// <returns></returns>
- public IEnumerable<Model.OA_WorkPlan> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid MemberId, Guid SentStaffId, Guid ReciveStaffId, int? PlanType, int? PlanDataType, string PlanTitle, DateTime? BeginPlanStartTime, DateTime? EndPlanStartTime, DateTime? BeginPlanRunTime, DateTime? EndPlanRunTime, string PlanPeople, int? PlanStatus, int? ApprovalStatus, int? EvaluationStatus, int? RewardType, string RewardContent= null, string PlanContent = null, string BaocunStatus = null)
+ public IEnumerable<Model.OA_WorkPlan> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid MemberId, Guid SentStaffId, Guid ReciveStaffId, int? PlanType, int? PlanDataType, string PlanTitle, DateTime? BeginPlanStartTime, DateTime? EndPlanStartTime, DateTime? BeginPlanRunTime, DateTime? EndPlanRunTime, string PlanPeople, int? PlanStatus, int? ApprovalStatus, int? EvaluationStatus, int? RewardType, string RewardContent= null, string PlanContent = null, string BaocunStatus = null, Guid? TrueMemberId = null)
{
- return iOA_WorkPlanDAL.SelectModelPage(pagination, MemberId, SentStaffId, ReciveStaffId, PlanType, PlanDataType, PlanTitle, BeginPlanStartTime, EndPlanStartTime, BeginPlanRunTime, EndPlanRunTime, PlanPeople, PlanStatus, ApprovalStatus, EvaluationStatus, RewardType, RewardContent, PlanContent, BaocunStatus);
+ return iOA_WorkPlanDAL.SelectModelPage(pagination, MemberId, SentStaffId, ReciveStaffId, PlanType, PlanDataType, PlanTitle, BeginPlanStartTime, EndPlanStartTime, BeginPlanRunTime, EndPlanRunTime, PlanPeople, PlanStatus, ApprovalStatus, EvaluationStatus, RewardType, RewardContent, PlanContent, BaocunStatus, TrueMemberId);
}
/// <summary>
diff --git a/CY_ECommercePlatform/CY.IDAL/OA/IOA_ShebeiWeixiuDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/IOA_ShebeiWeixiuDAL.cs
index 1551439..6cbc8ce 100644
--- a/CY_ECommercePlatform/CY.IDAL/OA/IOA_ShebeiWeixiuDAL.cs
+++ b/CY_ECommercePlatform/CY.IDAL/OA/IOA_ShebeiWeixiuDAL.cs
@@ -24,7 +24,7 @@
/// </summary>
/// <param name="pagination"></param>
/// <returns></returns>
- IEnumerable<Model.OA_ShebeiWeixiu> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid _MemberId, int? _CateId, string _Name, int? _Status, string Anzhuangdidian, int? Zerenren,int? Shifoufufei);
+ IEnumerable<Model.OA_ShebeiWeixiu> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid _MemberId, int? _CateId, string _Name, int? _Status, string Anzhuangdidian, int? Zerenren,int? Shifoufufei, int? guanliZerenren);
/// <summary>
diff --git a/CY_ECommercePlatform/CY.IDAL/OA/IOA_WageAwardPunishDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/IOA_WageAwardPunishDAL.cs
index 94a465a..92ad929 100644
--- a/CY_ECommercePlatform/CY.IDAL/OA/IOA_WageAwardPunishDAL.cs
+++ b/CY_ECommercePlatform/CY.IDAL/OA/IOA_WageAwardPunishDAL.cs
@@ -19,6 +19,14 @@
/// <returns></returns>
OA_WageAwardPunish GetModelByKeyid(int? Keyid);
+
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ bool UpdateShifoushensu(Model.OA_WageAwardPunish model);
+
/// <summary>
/// 鍒嗛〉鏌ヨ
/// </summary>
@@ -34,7 +42,7 @@
/// <param name="PlanPeople"></param>
/// <param name="StatisticsTime"></param>
/// <returns></returns>
- IEnumerable<Model.OA_WageAwardPunish> SelectModelPageByWage(Infrastructure.Query.Pagination pagination, Guid MemberId, int? DepartmentId, string PlanPeople, string StatisticsTime);
+ IEnumerable<Model.OA_WageAwardPunish> SelectModelPageByWage(Infrastructure.Query.Pagination pagination, Guid MemberId, int? DepartmentId, string PlanPeople, string StatisticsTime, string EndisticsTime, string selStatus = "");
}
}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.IDAL/OA/IOA_WorkPlanDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/IOA_WorkPlanDAL.cs
index b162830..bc1a7f4 100644
--- a/CY_ECommercePlatform/CY.IDAL/OA/IOA_WorkPlanDAL.cs
+++ b/CY_ECommercePlatform/CY.IDAL/OA/IOA_WorkPlanDAL.cs
@@ -54,7 +54,7 @@
/// <param name="EvaluationStatus"></param>
/// <param name="RewardType"></param>
/// <returns></returns>
- IEnumerable<Model.OA_WorkPlan> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid MemberId, Guid SentStaffId, Guid ReciveStaffId, int? PlanType, int? PlanDataType, string PlanTitle, DateTime? BeginPlanStartTime, DateTime? EndPlanStartTime, DateTime? BeginPlanRunTime, DateTime? EndPlanRunTime, string PlanPeople, int? PlanStatus, int? ApprovalStatus, int? EvaluationStatus, int? RewardType, string RewardContent = null, string PlanContent = null, string BaocunStatus = null);
+ IEnumerable<Model.OA_WorkPlan> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid MemberId, Guid SentStaffId, Guid ReciveStaffId, int? PlanType, int? PlanDataType, string PlanTitle, DateTime? BeginPlanStartTime, DateTime? EndPlanStartTime, DateTime? BeginPlanRunTime, DateTime? EndPlanRunTime, string PlanPeople, int? PlanStatus, int? ApprovalStatus, int? EvaluationStatus, int? RewardType, string RewardContent = null, string PlanContent = null, string BaocunStatus = null, Guid? TrueMemberId = null);
/// <summary>
/// 鍒犻櫎宸ヤ綔瀹夋帓
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_WageAwardPunish.cs b/CY_ECommercePlatform/CY.Model/OA/OA_WageAwardPunish.cs
index 474638b..a19159f 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_WageAwardPunish.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_WageAwardPunish.cs
@@ -28,6 +28,39 @@
private string _operator;
/// <summary>
+ /// 缂栧彿 0 鏈敵璇� 1 宸茬敵璇� 2 鐢宠瘔鎴愬姛 3 鐢宠瘔澶辫触
+ /// </summary>
+ public int? Shifoushensu { get; set; }
+
+ public string ShifoushensuName
+ {
+ get
+ {
+ if(!Shifoushensu.HasValue || Shifoushensu.Value == 0)
+ {
+ return "鏈敵璇�";
+ }
+ else if ( Shifoushensu.Value == 1)
+ {
+ return "宸茬敵璇�";
+ }
+ else if (Shifoushensu.Value == 2)
+ {
+ return "鐢宠瘔鎴愬姛";
+ }
+ else if (Shifoushensu.Value == 3)
+ {
+ return "鐢宠瘔澶辫触";
+ }
+ else
+ {
+ return "鏈敵璇�";
+ }
+
+ }
+ }
+
+ /// <summary>
/// 缂栧彿
/// </summary>
public int? Keyid
@@ -344,6 +377,11 @@
this.PushMoney = isChange ? MyConvert.ConvertToDecimal(value) : PushMoney;
theValue = this.PushMoney;
}
+ else if ("Shifoushensu".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 19)
+ {
+ this.Shifoushensu = isChange ? MyConvert.ConvertToInt32(value) : Shifoushensu;
+ theValue = this.Shifoushensu;
+ }
return theValue;
}
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan.cs b/CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan.cs
index 43cb98a..9cffe31 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan.cs
@@ -505,7 +505,7 @@
}
}
/// <summary>
- /// 濂栧姳绫诲瀷/鏃�0,濂栧姳1,鎯╃綒2
+ /// 濂栧姳绫诲瀷/鏃�0,濂栧姳1,缃氭2
/// </summary>
public int? RewardType
{
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiWeixiuDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiWeixiuDAL.cs
index afa3815..d54b0db 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiWeixiuDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiWeixiuDAL.cs
@@ -287,7 +287,7 @@
/// </summary>
/// <param name="pagination"></param>
/// <returns></returns>
- public IEnumerable<Model.OA_ShebeiWeixiu> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid _MemberId, int? _CateId, string _Name, int? _Status, string Anzhuangdidian, int? Zerenren, int? Shifoufufei)
+ public IEnumerable<Model.OA_ShebeiWeixiu> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid _MemberId, int? _CateId, string _Name, int? _Status, string Anzhuangdidian, int? Zerenren, int? Shifoufufei, int? guanliZerenren)
{
try
{
@@ -311,11 +311,40 @@
if (Zerenren.HasValue)
condition += " and a.Zerenren = '" + Zerenren + "'";
+ if (guanliZerenren.HasValue)
+ condition += " and c.Zerenren = '" + guanliZerenren + "'";
+
+
+
if (Shifoufufei.HasValue)
condition += " and a.Shifoufufei = '" + Shifoufufei + "'";
- 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 ", " a.WeixiuTime DESC", " Keyid desc ", condition);
+
+ /// <summary>
+ /// 鏌ヨ鏉ユ簮
+ /// </summary>
+ string fromss = " 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 " +
+
+
+
+
+
+ " where " + condition;
+
+ var ssss = _dataBase.SelectModel<Model.OA_ShebeiWeixiu>(" sum(a.WeixiuPrice) as WeixiuPrice,sum(a.DanzePrice) as DanzePrice ", fromss);
+ if (ssss.Count > 0)
+ {
+ var aaaaa = ssss.First();
+ pagination.heji1 = aaaaa.WeixiuPrice;
+ pagination.heji3 = aaaaa.DanzePrice;
+ }
+
+
+
+
+
+ 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);
}
catch (Exception ex)
{
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WageAwardPunishDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WageAwardPunishDAL.cs
index 82e8df7..81f6763 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WageAwardPunishDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WageAwardPunishDAL.cs
@@ -97,6 +97,39 @@
return true;
}
+
+ /// <summary>
+ /// 淇敼
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool UpdateShifoushensu(Model.OA_WageAwardPunish model)
+ {
+ if (model == null)
+ {
+ return false;
+ }
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+ new SqlParameter("@Keyid", model.Keyid) ,
+
+ new SqlParameter("@Shifoushensu", model.Shifoushensu.HasValue?model.Shifoushensu.Value:0) ,
+
+ };
+ string sql = "Update OA_WageAwardPunish Set [Shifoushensu]=@Shifoushensu where [Keyid] =@Keyid ";
+
+ try
+ {
+ _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+
+
/// <summary>
/// 鍒犻櫎
/// </summary>
@@ -231,7 +264,7 @@
/// <param name="PlanPeople"></param>
/// <param name="StatisticsTime"></param>
/// <returns></returns>
- public IEnumerable<Model.OA_WageAwardPunish> SelectModelPageByWage(Infrastructure.Query.Pagination pagination, Guid MemberId, int? DepartmentId, string PlanPeople, string StatisticsTime)
+ public IEnumerable<Model.OA_WageAwardPunish> SelectModelPageByWage(Infrastructure.Query.Pagination pagination, Guid MemberId, int? DepartmentId, string PlanPeople, string StatisticsTime, string EndisticsTime, string selStatus = "")
{
try
{
@@ -245,6 +278,9 @@
if (DepartmentId.HasValue)
condition += " and a.DepartmentId = '" + DepartmentId + "' ";
+ if (!string.IsNullOrEmpty(selStatus))
+ condition += " and a.Status = '" + selStatus + "' ";
+
string condition1 = "";
string condition2 = "";
@@ -252,9 +288,19 @@
{
StatisticsTime = StatisticsTime.Replace("骞�", "-").Replace("鏈�", "-") + "1";
DateTime Time1 = DateTime.Parse(StatisticsTime);
- DateTime Time2 = DateTime.Parse(StatisticsTime).AddMonths(1);
- condition1 += " and ((b.RecTime >= '" + Time1 + "' and b.RecTime < '" + Time2 + "') or b.RecTime is null)";
- condition2 += " and ((c.RecTime >= '" + Time1 + "' and c.RecTime < '" + Time2 + "') or c.RecTime is null)";
+ //DateTime Time2 = DateTime.Parse(StatisticsTime).AddMonths(1);
+ condition1 += " and ((b.RecTime >= '" + Time1 + "' ) or b.RecTime is null)";//and b.RecTime < '" + Time2 + "'
+ condition2 += " and ((c.RecTime >= '" + Time1 + "' ) or c.RecTime is null)";// and c.RecTime < '" + Time2 + "'
+ }
+
+
+ if (!string.IsNullOrEmpty(EndisticsTime))
+ {
+ EndisticsTime = EndisticsTime.Replace("骞�", "-").Replace("鏈�", "-") + "1";
+ //DateTime Time1 = DateTime.Parse(StatisticsTime);
+ DateTime Time2 = DateTime.Parse(EndisticsTime).AddMonths(1);
+ condition1 += " and (( b.RecTime < '" + Time2 + "') or b.RecTime is null)";//b.RecTime >= '" + Time1 + "' and
+ condition2 += " and (( c.RecTime < '" + Time2 + "') or c.RecTime is null)";//c.RecTime >= '" + Time1 + "' and
}
//condition += string.Format(" and ( a.Status='鍦ㄨ亴' OR ( a.Status ='绂昏亴' AND CAST(a.SM_EndWorkTime AS DATE) >'{0}' )) ", DateTime.Now);
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlanDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlanDAL.cs
index bbe7292..9cc3137 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlanDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlanDAL.cs
@@ -329,13 +329,23 @@
/// <param name="EvaluationStatus"></param>
/// <param name="RewardType"></param>
/// <returns></returns>
- public IEnumerable<Model.OA_WorkPlan> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid MemberId, Guid SentStaffId, Guid ReciveStaffId, int? PlanType, int? PlanDataType, string PlanTitle, DateTime? BeginPlanStartTime, DateTime? EndPlanStartTime, DateTime? BeginPlanRunTime, DateTime? EndPlanRunTime, string PlanPeople, int? PlanStatus, int? ApprovalStatus, int? EvaluationStatus, int? RewardType, string RewardContent = null, string PlanContent = null, string BaocunStatus = null)
+ public IEnumerable<Model.OA_WorkPlan> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid MemberId, Guid SentStaffId, Guid ReciveStaffId, int? PlanType, int? PlanDataType, string PlanTitle, DateTime? BeginPlanStartTime, DateTime? EndPlanStartTime, DateTime? BeginPlanRunTime, DateTime? EndPlanRunTime, string PlanPeople, int? PlanStatus, int? ApprovalStatus, int? EvaluationStatus, int? RewardType, string RewardContent = null, string PlanContent = null, string BaocunStatus = null, Guid? TrueMemberId = null)
{
try
{
string condition = " 1=1 ";
if (MemberId != Guid.Empty)
condition += " and a.MemberId = '" + MemberId + "'";
+
+
+ if (TrueMemberId.HasValue)
+ {
+ if(TrueMemberId!=Guid.Parse("764152EE-1184-44DF-A8B2-316FAFF0D3E4") && TrueMemberId != Guid.Parse("FAAF2DCA-4739-409F-BF5A-6AABDE57AC12") && TrueMemberId != Guid.Parse("AE770137-A3F2-4C73-A4A8-9F1CC2AB5B81") && TrueMemberId != Guid.Parse("88B49967-D590-452C-93C6-0049A75FA5FF"))
+ {
+ condition += " and a.PlanDataType != 20 ";
+ }
+
+ }
if (SentStaffId != Guid.Empty)
condition += " and a.SentStaffId = '" + SentStaffId + "'";
@@ -381,6 +391,9 @@
{
condition += " and a.ApprovalStatus != '" + BaocunStatus + "'";
}
+
+
+
if (EvaluationStatus >= 0)
{
if (EvaluationStatus == 5)
diff --git a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
index d8eef7c..a22ba8b 100644
--- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
+++ b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
@@ -2345,6 +2345,7 @@
<Content Include="Pages\Templet\pingxuan\Shared\sM.js" />
<Content Include="Pages\Templet\pingxuan\TemplateIndex.css" />
<Content Include="Pages\wage\OA_WageAwardPunishAdd.aspx" />
+ <Content Include="Pages\wage\FakuanShensuAdd.aspx" />
<Content Include="Pages\wage\StaffWageList.aspx" />
<Content Include="Pages\wage\WorkScoreList.aspx" />
<Content Include="Pages\webmanage\CashHandle.aspx" />
@@ -6262,6 +6263,13 @@
<Compile Include="Pages\wage\OA_WageAwardPunishAdd.aspx.designer.cs">
<DependentUpon>OA_WageAwardPunishAdd.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\wage\FakuanShensuAdd.aspx.cs">
+ <DependentUpon>FakuanShensuAdd.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\wage\FakuanShensuAdd.aspx.designer.cs">
+ <DependentUpon>FakuanShensuAdd.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\wage\StaffWageList.aspx.cs">
<DependentUpon>StaffWageList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuAdd.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuAdd.aspx
index 5111511..729ad52 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuAdd.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuAdd.aspx
@@ -9,7 +9,17 @@
<body style="padding:10px">
<form runat="server">
<table class="tableStyle" >
-
+ <tr>
+ <td class="ali03">
+ 璐ｄ换浜猴細
+ </td>
+ <td >
+ <select id="selZerenren" runat="server" keepdefaultstyle="true" selinputhtml="True" style=" width:100px;" onchange="ChangeThisType(this);" >
+ <option value="">璇烽�夋嫨</option>
+ </select>
+ </td>
+ </tr>
+
<tr>
<td class="ali03">璁惧鍚嶇О锛�</td>
<td> <select keepdefaultstyle='true' id='selShebei' runat="server" datatextfield='Name' datavaluefield='Keyid' class='Sreq' sign="" selinputhtml="True" style=" width:183px;" >
@@ -225,5 +235,32 @@
$(obj).parent().parent().remove()
}
}
+
+
+
+ function ChangeThisType(obj) {
+ $("#selShebei").html("");
+ $.ajax({
+ url: "/Pages/Property/ShebeiWeixiuAdd.aspx",
+ type: "POST",
+ dataType: "html",
+ data: { TypeName: $(obj).val(), Target: "change" },
+ global: false,
+ cache: false,
+ success: function (data) {
+ var myobj = eval('(' + data + ')');
+ if (myobj != null && myobj.length > 0) {
+ for (var i = 0; i < myobj.length; i++) {
+ var city_keyid = myobj[i].Keyid;
+ var city_name = myobj[i].Name;
+ var option = "";
+ option = "<option value = '" + city_keyid + "'>" + city_name + "</option>";
+ $(option).appendTo($("#selShebei"));
+ }
+ }
+ }
+ });
+ }
+
</script>
</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuAdd.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuAdd.aspx.cs
index 6d12303..6b76c26 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuAdd.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuAdd.aspx.cs
@@ -52,6 +52,10 @@
{
switch (Request["Target"])
{
+
+ case "change":
+ Response.Write(reLoadAccountName(Request["TypeName"].ToString2()));
+ break;
case "GetSuplier":
LoadCommunication();
break;
@@ -85,12 +89,34 @@
this.selShebei.DataBind();
//this.selShebei.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+ this.selZerenren.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, null, null);
+ this.selZerenren.DataTextField = "Name";
+ this.selZerenren.DataValueField = "Keyid";
+ this.selZerenren.DataBind();
+ this.selZerenren.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+ this.selZerenren.Value = "";
+
this.txtWeixiuTime.Value = DateTime.Now.ToString("yyyy-MM-dd");
}
+ protected string reLoadAccountName(string selAcoountType)
+ {
+ var query = new Infrastructure.Query.Query();
+ if (!string.IsNullOrEmpty(selAcoountType))
+ {
+ return JsonHelper.GetJsonStringByObject(oA_ShebeiManageBLL.SelectAllModel(query).Where(x => x.Status != 1 && x.Zerenren == selAcoountType.ToInt32()));
+ }
+ else
+ {
+ return JsonHelper.GetJsonStringByObject(oA_ShebeiManageBLL.SelectAllModel(query).Where(x => x.Status != 1));
+ }
+
+
+ }
+
/// <summary>
/// 鍔犺浇渚涘簲鍟�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuAdd.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuAdd.aspx.designer.cs
index 3c9a54e..6e4a5c3 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuAdd.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuAdd.aspx.designer.cs
@@ -24,6 +24,15 @@
protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
/// <summary>
+ /// selZerenren 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selZerenren;
+
+ /// <summary>
/// selShebei 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuList.aspx
index b61d9a8..f111af4 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuList.aspx
@@ -86,14 +86,16 @@
<option value="鍏朵粬杞﹂棿">鍏朵粬杞﹂棿</option>
</select>
</td>
+
<td class="ali03">
- 鏁呴殰璐ｄ换浜猴細
+ 绠＄悊璐ｄ换浜猴細
</td>
<td>
- <select id="selZerenren" runat="server" keepdefaultstyle="true">
+ <select id="selGuanliZerenren" runat="server" keepdefaultstyle="true">
<option value="">鍏ㄩ儴</option>
</select>
</td>
+
<td class="ali03">
璁惧绫诲瀷锛�
</td>
@@ -107,6 +109,16 @@
</td>
<td>
<input type="text" id="txtName" runat="server" />
+ </td>
+
+
+ <td class="ali03">
+ 鏁呴殰璐ｄ换浜猴細
+ </td>
+ <td>
+ <select id="selZerenren" runat="server" keepdefaultstyle="true">
+ <option value="">鍏ㄩ儴</option>
+ </select>
</td>
<td class="ali03">
@@ -224,6 +236,39 @@
</tr>
</ItemTemplate>
<FooterTemplate>
+ <tr class="StatisticsMoney">
+ <td colspan="6" class="ali03">
+ 褰撳墠椤电粺璁★細
+ </td>
+ <td class="ali01">
+ <%=NowPageAllMoney %>
+ </td>
+ <td class="ali01">
+
+ </td>
+
+ <td class="ali01">
+ <%=NowPageHuiMoney %>
+ </td>
+ <td class="ali01" >
+ </td>
+ </tr>
+ <tr class="StatisticsMoney">
+ <td colspan="6" class="ali03">
+ 鏌ヨ椤圭粺璁★細
+ </td>
+ <td class="ali01">
+ <%=AllMoney %>
+ </td>
+ <td class="ali01">
+
+ </td>
+ <td class="ali01">
+ <%=HuiMoney %>
+ </td>
+ <td class="ali01" >
+ </td>
+ </tr>
</table>
</FooterTemplate>
</asp:Repeater>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuList.aspx.cs
index 44a9503..747b3f9 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuList.aspx.cs
@@ -20,6 +20,11 @@
OA_ShebeiWeixiuBLL bll_OA_ShebeiWeixiuBLL = null;
OA_ShebeiManageBLL bll_OA_ShebeiManageBLL = null;
OA_StaffBLL bll_OA_StaffBLL = null;
+ public string NowPageAllMoney = "";
+ public string NowPageHuiMoney = "";
+
+ public string AllMoney = "";
+ public string HuiMoney = "";
//鍒濆鍖�
public ShebeiWeixiuList()
@@ -59,7 +64,16 @@
this.selZerenren.DataBind();
this.selZerenren.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
this.selZerenren.Value = "";
+
+ this.selGuanliZerenren.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, null, null);
+ this.selGuanliZerenren.DataTextField = "Name";
+ this.selGuanliZerenren.DataValueField = "Keyid";
+ this.selGuanliZerenren.DataBind();
+ this.selGuanliZerenren.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+ this.selGuanliZerenren.Value = "";
+
+
}
//缁戝畾鏁版嵁
@@ -68,8 +82,35 @@
Pagination pa = new Pagination();
pa.PageSize = 50;
pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
- var shebeiWeixius = bll_OA_ShebeiWeixiuBLL.SelectModelPage(pa, CurrentUser.MemberId, this.selCateId.Value.ToInt32(), this.txtName.Value, null, this.selAnzhuangdidian.Value, this.selZerenren.Value.ToInt32(), this.selStatus.Value.ToInt32());
- foreach(var oA_ShebeiWeixiu in shebeiWeixius)
+ var shebeiWeixius = bll_OA_ShebeiWeixiuBLL.SelectModelPage(pa, CurrentUser.MemberId, this.selCateId.Value.ToInt32(), this.txtName.Value, null, this.selAnzhuangdidian.Value, this.selZerenren.Value.ToInt32(), this.selStatus.Value.ToInt32(), this.selGuanliZerenren.Value.ToInt32());
+ var WeixiuPrice = shebeiWeixius.Sum(x => x.WeixiuPrice);
+ var DanzePrice = shebeiWeixius.Sum(x => x.DanzePrice);
+
+
+ NowPageAllMoney = WeixiuPrice.HasValue? WeixiuPrice.Value.ToString("F2"):"0.00";
+ NowPageHuiMoney = DanzePrice.HasValue ? DanzePrice.Value.ToString("F2") : "0.00";
+
+ if (pa.heji1.HasValue)
+ {
+ AllMoney = pa.heji1.Value.ToString("0.00");
+ }
+ else
+ {
+ AllMoney = 0.ToString("0.00");
+ }
+
+
+
+ if (pa.heji3.HasValue)
+ {
+ HuiMoney = pa.heji3.Value.ToString("0.00");
+ }
+ else
+ {
+ HuiMoney = 0.ToString("0.00");
+ }
+
+ foreach (var oA_ShebeiWeixiu in shebeiWeixius)
{
if(oA_ShebeiWeixiu.FukuanShebeiId.HasValue && oA_ShebeiWeixiu.FukuanShebeiId.Value > 0)
{
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuList.aspx.designer.cs
index e48484e..5dfe332 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuList.aspx.designer.cs
@@ -51,13 +51,13 @@
protected global::System.Web.UI.HtmlControls.HtmlSelect selAnzhuangdidian;
/// <summary>
- /// selZerenren 鎺т欢銆�
+ /// selGuanliZerenren 鎺т欢銆�
/// </summary>
/// <remarks>
/// 鑷姩鐢熸垚鐨勫瓧娈点��
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
- protected global::System.Web.UI.HtmlControls.HtmlSelect selZerenren;
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selGuanliZerenren;
/// <summary>
/// selCateId 鎺т欢銆�
@@ -76,6 +76,15 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtName;
+
+ /// <summary>
+ /// selZerenren 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selZerenren;
/// <summary>
/// selStatus 鎺т欢銆�
@@ -112,5 +121,6 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::CY.WebForm.Pages.common.UCPager UCPager1;
+
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeimanageEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeimanageEdit.aspx
index ea07da2..24234f5 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeimanageEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeimanageEdit.aspx
@@ -37,7 +37,57 @@
return true;
}
+
+
+
+ //涓篠elect鏂板杩囨护鍔熻兘
+ function SelectAddSearch() {
+ $("select[SelInputHtml='True']").each(function (i, v) {
+ $(this).unbind("blur");
+ var old = $(this).html();
+ var oldObject = $(this).clone();
+ var sign = "selectS" + i;
+ $(v).attr("sign", sign);
+
+ var inputClass = "input_" + sign;
+ var html = "<span style='margin-left:10px'>杩囨护锛�</span><input type='text' class='" + inputClass + "' style='width:80px;height:18px;line-height:18px;'/>";
+ $(v).after(html);
+ $("." + inputClass).blur(function () {
+ var nowval = $(this).val().trim();
+ var output = "";
+ if (nowval == "" || nowval == null) {
+ output = old;
+ } else {
+ output += "<option value=''>璇烽�夋嫨</option>";
+ var valueArr = new Array();
+ oldObject.find("option").each(function (ii, vv) {
+
+ var value = $.trim($(vv).attr("value"));
+ var text = $.trim($(vv).text());
+
+ if (text.indexOf(nowval) >= 0)
+ valueArr.push(value + "|||" + text);
+ });
+ for (var ss in valueArr) {
+ var s = valueArr[ss];
+ if (s.split("|||").length == 2) {
+ var value1 = s.split("|||")[0];
+ var text1 = s.split("|||")[1];
+ output += "<option value='" + value1 + "'>" + text1 + "</option>";
+ }
+ }
+ }
+ $(v).html(output);
+ });
+ });
+ }
+
+
$(function () {
+
+ SelectAddSearch();
+
+
$("#txtCarNumber").blur(function () {
CheckStaff();
});
@@ -104,7 +154,7 @@
璐ｄ换浜猴細
</td>
<td >
- <select id="selZerenren" runat="server" keepdefaultstyle="true">
+ <select id="selZerenren" runat="server" keepdefaultstyle="true" selinputhtml="True" style=" width:100px;" >
<option value="">璇烽�夋嫨</option>
</select>
</td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeimanageEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeimanageEdit.aspx.cs
index e905a6b..6290063 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeimanageEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeimanageEdit.aspx.cs
@@ -68,6 +68,10 @@
this.txtQiyongTime.Value = m_OA_ShebeiManage.QiyongTime.HasValue? m_OA_ShebeiManage.QiyongTime.Value.ToString("yyyy-MM-dd"):"";
this.selZerenren.Value = m_OA_ShebeiManage.Zerenren.HasValue? m_OA_ShebeiManage.Zerenren.ToString():"";
}
+ else
+ {
+ this.txtQiyongTime.Value = DateTime.Now.ToString("yyyy-MM-dd");
+ }
}
//琛ㄥ崟鎻愪氦
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs
index 56a5aa1..77c263d 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs
@@ -1706,12 +1706,11 @@
OA_WageManage m_OA_WageManage = bll_OA_WageManageBLL.GetModelByMemberId(staffId);
DateTime? calculateTimeStart = (calculateTimeString.Replace("骞�", "-").Replace("鏈�", "-") + "1").ToDateTime2();
DateTime? calculateTimeEnd = calculateTimeStart.Value.AddMonths(1);
-
//濂栧姳鍜岀綒娆�
Pagination pa = new Pagination();
pa.PageSize = 500;
pa.PageIndex = 1;
- List<OA_WageAwardPunish> m_OA_WageAwardPunishList = bll_OA_WageAwardPunishBLL.SelectModelPageByWage(pa, CurrentUser.MemberId, null, m_OA_Staff.Name, calculateTimeString).ToList();
+ List<OA_WageAwardPunish> m_OA_WageAwardPunishList = bll_OA_WageAwardPunishBLL.SelectModelPageByWage(pa, CurrentUser.MemberId, null, m_OA_Staff.Name, calculateTimeString, calculateTimeString).ToList();
if (m_OA_WageAwardPunishList != null && m_OA_WageAwardPunishList.Count == 1)
{
m_OA_WagesRecord.RewardMoney = m_OA_WageAwardPunishList[0].RewardMoney ?? 0;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/wage/FakuanShensuAdd.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/wage/FakuanShensuAdd.aspx
new file mode 100644
index 0000000..c6ec2f0
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/wage/FakuanShensuAdd.aspx
@@ -0,0 +1,256 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="FakuanShensuAdd.aspx.cs" Inherits="CY.WebForm.Pages.wage.FakuanShensuAdd" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head runat="server">
+ <uc:CMSHead ID="CMSHead1" runat="server" />
+ </head>
+ <body style="padding:10px">
+ <form runat="server">
+ <table class="tableStyle" >
+
+ <tr>
+ <td class="ali03">
+ 浠诲姟涓婚锛�
+ </td>
+ <td >
+ <span id="spanPlanTitle" runat="server"></span>
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03">
+ 璇︾粏鍐呭锛�
+ </td>
+ <td >
+ <div id="spanPlanContent" runat="server" style="overflow: visible; word-break: break-all; word-wrap: normal; width: 470px;">
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03">
+ 閲戦锛�
+ </td>
+ <td >
+ <div id="spanPlanMoney" runat="server" >
+ </div>
+ </td>
+ </tr>
+
+ <tr>
+ <td class="ali03">
+ 鐢宠瘔鐞嗙敱锛�
+ </td>
+ <td >
+ <textarea id="txtPlanContent" runat="server" style="width: 390px; height: 50px;" class="req" msg="璇疯緭鍏ョ敵璇夌悊鐢�" MaxLength="200" ></textarea>
+ </td>
+ </tr>
+
+
+ <tr>
+ <td colspan="2"></td>
+ </tr>
+ <tr id="trbtn" runat="server">
+ <td class="ali02" colspan="2">
+ <asp:Button ID="btn_Submit" Text="鎻愪氦鐢宠" runat="server" OnClick="btn_Submit_form" />
+ <span style="margin-left:10px"></span>
+ <input type="button" value="鍙栨秷 " onclick="top.Dialog.close()" />
+ </td>
+ </tr>
+ </table>
+ </form>
+ </body>
+ <script type="text/javascript" language="javascript">
+ function custormerChange(sel) {
+
+
+
+
+ window.submitUrl = '/Pages/wage/FakuanShensuAdd.aspx';
+
+ CallServer({ Target: "GetSuplier", id: sel.value }, function (data, textStatus) {
+ var jobj = false;
+ try {
+ jobj = eval('[' + data + ']')[0];
+ } catch (ex) {
+ global.DealDataException(ex); return;
+ }
+ if (jobj != '-2') {
+ document.getElementById('txtBank').value = jobj.Bank;
+ document.getElementById('txtAccountID').value = jobj.AccountID;
+ if (jobj.Huming == "") {
+ document.getElementById('txtHuming').value = jobj.Name;
+ } else {
+ document.getElementById('txtHuming').value = jobj.Huming;
+ }
+
+ } else {
+ document.getElementById('txtBank').value = "";
+ document.getElementById('txtAccountID').value = "";
+ document.getElementById('txtHuming').value = "";
+ }
+
+
+
+ });
+ }
+
+ ///鏂板瀹㈡埛
+ function showCustomer() {
+ top.Dialog.open({ URL: "/Pages/procurement/SuppliersEdit.aspx?Keyid='0'&&flasss=ddfffff", Title: "鏂板渚涘簲鍟�", Width: 950, Height: 650 });
+ }
+
+
+ //涓篠elect鏂板杩囨护鍔熻兘
+ function SelectAddSearch() {
+ $("select[SelInputHtml='True']").each(function (i, v) {
+ $(this).unbind("blur");
+ var old = $(this).html();
+ var oldObject = $(this).clone();
+ var sign = "selectS" + i;
+ $(v).attr("sign", sign);
+
+ var inputClass = "input_" + sign;
+ var html = "<span style='margin-left:10px'>杩囨护锛�</span><input type='text' class='" + inputClass + "' style='width:80px;height:18px;line-height:18px;'/>";
+ $(v).after(html);
+ $("." + inputClass).blur(function () {
+ var nowval = $(this).val().trim();
+ var output = "";
+ if (nowval == "" || nowval == null) {
+ output = old;
+ } else {
+ output += "<option value=''>璇烽�夋嫨</option>";
+ var valueArr = new Array();
+ oldObject.find("option").each(function (ii, vv) {
+
+ var value = $.trim($(vv).attr("value"));
+ var text = $.trim($(vv).text());
+
+ if (text.indexOf(nowval) >= 0)
+ valueArr.push(value + "|||" + text);
+ });
+ for (var ss in valueArr) {
+ var s = valueArr[ss];
+ if (s.split("|||").length == 2) {
+ var value1 = s.split("|||")[0];
+ var text1 = s.split("|||")[1];
+ output += "<option value='" + value1 + "'>" + text1 + "</option>";
+ }
+ }
+ }
+ $(v).html(output);
+ });
+ });
+ }
+
+ $(function () {
+ SelectAddSearch();
+ });
+
+ function validateAmount(event) {
+ var input = event.target;
+ var value = input.value;
+ var regex = /^\d+(\.\d+)?$/;
+
+ if (!regex.test(value)) {
+ // 杈撳叆鏃犳晥锛岄噸缃�煎苟灏嗙劍鐐硅鍥炴枃鏈
+ input.value = '0';
+ input.focus();
+ alert('璇疯緭鍏ユ湁鏁堢殑姝ｈ礋閲戦锛屼緥濡� 45.67');
+ }
+ }
+
+
+
+ //鏌ョ湅
+ function checkSelFile() {
+
+ var oFile = document.getElementById('file1');
+ if (oFile.value == "") {
+ alertMsg('娌℃湁閫夋嫨鏂囦欢');
+ return;
+
+ }
+
+
+
+ var formData = new FormData();
+ formData.append('file', oFile.files[0]); // this.files[0]鏄枃浠跺璞�
+
+
+ $.ajax({
+ url: '/Pages/wage/FileUploadHandler.ashx', // 鏇挎崲涓轰綘鐨勬湇鍔″櫒绔偣
+ type: 'POST',
+ data: formData,
+ contentType: false,
+ processData: false,
+ async: false, // 璁剧疆涓哄悓姝�
+ success: function (response) {
+ console.log('File uploaded successfully:', response);
+ if (response.code == 1) {
+
+ $(".AddTab").last().after($(".AddTab").last().clone(true));
+ $(".AddTab").last().show();
+ $("input[name='HideKeyidFapiao']").last().val("");
+ $("input[name='HideAttachmentFapiao']").last().val(response.data);
+ $('a[name="HrefAttachmentFapiao"]').last().attr("href", response.data);
+ $('a[name="HrefAttachmentFapiao"]').last().html('<img src="' + response.data+'" width="20" height="20" />');
+ alertMsg('涓婁紶鎴愬姛');
+ } else {
+ alertMsg(response.message);
+ }
+
+
+ },
+ error: function (xhr, status, error) {
+ console.error('File upload failed:', status, error);
+ alertMsg('涓婁紶澶辫触');
+ }
+ });
+
+
+
+
+
+
+
+
+ }
+
+
+
+
+ function deletefujian(obj) {
+ if (confirm("鏄惁鍒犻櫎閫変腑鏁版嵁锛�")) {
+ $(obj).parent().parent().remove()
+ }
+ }
+
+
+
+ function ChangeThisType(obj) {
+ $("#selShebei").html("");
+ $.ajax({
+ url: "/Pages/wage/FakuanShensuAdd.aspx",
+ type: "POST",
+ dataType: "html",
+ data: { TypeName: $(obj).val(), Target: "change" },
+ global: false,
+ cache: false,
+ success: function (data) {
+ var myobj = eval('(' + data + ')');
+ if (myobj != null && myobj.length > 0) {
+ for (var i = 0; i < myobj.length; i++) {
+ var city_keyid = myobj[i].Keyid;
+ var city_name = myobj[i].Name;
+ var option = "";
+ option = "<option value = '" + city_keyid + "'>" + city_name + "</option>";
+ $(option).appendTo($("#selShebei"));
+ }
+ }
+ }
+ });
+ }
+
+ </script>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/wage/FakuanShensuAdd.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/wage/FakuanShensuAdd.aspx.cs
new file mode 100644
index 0000000..43edec8
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/wage/FakuanShensuAdd.aspx.cs
@@ -0,0 +1,221 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using CY.BLL.EC;
+using CY.Model;
+using CY.Infrastructure.Common;
+using CY.BLL.Integrity;
+using CY.BLL;
+using System.Threading.Tasks;
+using System.Transactions;
+using CY.BLL.OA;
+
+namespace CY.WebForm.Pages.wage
+{
+ //鍚磋緣
+ //鍗栧璇勪环
+ public partial class FakuanShensuAdd : BasePage
+ {
+
+
+ OA_StaffBLL bll_OA_StaffBLL = null;
+ OA_WageAwardPunishBLL bll_OA_WageAwardPunishBLL = null;
+
+ OA_WorkPlanBll oA_WorkReminderBll = null;
+
+
+
+ //鍒濆鍖�
+ public FakuanShensuAdd()
+ {
+
+ bll_OA_StaffBLL = new OA_StaffBLL();
+ bll_OA_WageAwardPunishBLL = new OA_WageAwardPunishBLL();
+ oA_WorkReminderBll = new OA_WorkPlanBll();
+
+
+
+
+ }
+
+ //椤甸潰鍔犺浇
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ try
+ {
+ switch (Request["Target"])
+ {
+
+ case "change":
+
+ break;
+ case "GetSuplier":
+
+ break;
+
+ default:
+ if (!IsPostBack)
+ {
+ InitData();
+ }
+ return;
+ }
+ }
+ catch (Exception ex)
+ {
+ PAGEHandleException(ex);
+ Response.Clear();
+ //Response.Write("-1");
+ Response.Write(ex.Message);
+ }
+ Response.End();
+
+ }
+
+ //缁戝畾鏁版嵁
+ public void InitData()
+ {
+
+
+ var oA_WageAward = bll_OA_WageAwardPunishBLL.GetModelByKeyid(Request["keyid"].ToInt32());
+ if (oA_WageAward != null)
+ {
+
+ this.spanPlanTitle.InnerText = oA_WageAward.RecTitle.ToString();
+ this.spanPlanContent.InnerText = oA_WageAward.RecContent.ToString();
+ this.spanPlanMoney.InnerText = oA_WageAward.RecMoney.ToString();
+ }
+
+
+
+
+
+
+ }
+
+
+
+
+
+
+ //鎻愪氦浜嬩欢
+ protected void btn_Submit_form(object sender, EventArgs e)
+ {
+ AcceptAll3();
+ }
+
+ /// <summary>
+ /// 鎵归噺寮�绁ㄧ敵璇�
+ /// </summary>
+ public void AcceptAll3()
+ {
+
+ if (string.IsNullOrEmpty(this.txtPlanContent.Value))
+ {
+ JavaScript.MessageBox("璇峰～鍐欑敵璇夌悊鐢憋紒", this);
+ return;
+ }
+
+
+
+
+
+
+ using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
+ new TransactionOptions
+ {
+ IsolationLevel = IsolationLevel.ReadCommitted,
+ Timeout = TransactionManager.MaximumTimeout
+ }
+ )
+ )
+ {
+
+ try
+ {
+ bool result = false;
+
+
+ DateTime nowTime = DateTime.Now;
+
+
+ var id = Request["keyid"];
+ var oA_WageAward = bll_OA_WageAwardPunishBLL.GetModelByKeyid(Request["keyid"].ToInt32());
+
+ OA_WorkPlan m_OA_WorkPlan = new OA_WorkPlan();
+ m_OA_WorkPlan.PlanComplany = id;
+ m_OA_WorkPlan.ApprovalContent = "";
+ m_OA_WorkPlan.ApprovalStaffId = Guid.Empty;
+ m_OA_WorkPlan.ApprovalStaffName = "";
+ m_OA_WorkPlan.ApprovalStatus = 0;
+ m_OA_WorkPlan.ApprovalTime = nowTime;
+ m_OA_WorkPlan.EvaluationContent = "";
+ m_OA_WorkPlan.EvaluationStaff = "";
+ m_OA_WorkPlan.EvaluationStaffId = Guid.Empty;
+ m_OA_WorkPlan.EvaluationStatus = 0;
+ m_OA_WorkPlan.EvaluationTime = nowTime;
+ m_OA_WorkPlan.RewardContent = "";
+ m_OA_WorkPlan.RewardMoney = 0;
+ m_OA_WorkPlan.RewardResult = "";
+ m_OA_WorkPlan.RewardType = 0;
+
+ m_OA_WorkPlan.PlanStartTime = nowTime;
+ m_OA_WorkPlan.PlanStatus = 1;
+ m_OA_WorkPlan.SentStaffId = CurrentUser.TrueMemberId;
+ m_OA_WorkPlan.MemberId = CurrentUser.MemberId;
+
+ OA_Staff m_OA_Staff = bll_OA_StaffBLL.GetModelByMemberId(CurrentUser.TrueMemberId);
+ if (m_OA_Staff != null)
+ m_OA_WorkPlan.DepartId = m_OA_Staff.DepartmentId;
+ else
+ m_OA_WorkPlan.DepartId = 0;
+
+ m_OA_WorkPlan.PlanPeople = CurrentUser.TrueName;
+ m_OA_WorkPlan.ReciveStaffId = CurrentUser.TrueMemberId;
+
+ m_OA_WorkPlan.Operator = CurrentUser.ShortName;
+
+ m_OA_WorkPlan.PlanContent = this.txtPlanContent.Value;
+ m_OA_WorkPlan.PlanDataType = 20;
+ m_OA_WorkPlan.PlanMoney = oA_WageAward.RecMoney;
+ m_OA_WorkPlan.RewardMoney = 0;
+ m_OA_WorkPlan.PlanRemark = "";
+ m_OA_WorkPlan.PlanRunTime = DateTime.Now;
+ m_OA_WorkPlan.PlanTitle = oA_WageAward.RecTitle + "缃氭鐢宠瘔";
+ m_OA_WorkPlan.PlanType = 3;
+ m_OA_WorkPlan.LastUpdateTime = nowTime;
+ var workid = oA_WorkReminderBll.InserModelAndGetId(m_OA_WorkPlan);
+ m_OA_WorkPlan.Keyid = workid;
+ if (workid > 0)
+ {
+ oA_WageAward.Shifoushensu = 1;
+ result = bll_OA_WageAwardPunishBLL.UpdateShifoushensu(oA_WageAward);
+ }
+ if (!result)
+ {
+ return;
+ }
+ //}
+ scope.Complete();
+ }
+ catch (Exception ex)
+ {
+ // 鍥炴粴浜嬪姟
+ }
+ finally
+ {
+ // 閲婃斁璧勬簮
+ scope.Dispose();
+ }
+ }
+ //JavaScript.MessageBox("鎻愪氦鎴愬姛", this);
+
+ //鎿嶄綔鎴愬姛
+ JavaScript.MessageBoxCloseAndRefreshFirst("鎻愪氦鎴愬姛", this);
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/wage/FakuanShensuAdd.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/wage/FakuanShensuAdd.aspx.designer.cs
new file mode 100644
index 0000000..39a1bb0
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/wage/FakuanShensuAdd.aspx.designer.cs
@@ -0,0 +1,80 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.wage
+{
+
+
+ public partial class FakuanShensuAdd
+ {
+
+ /// <summary>
+ /// CMSHead1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
+
+ /// <summary>
+ /// spanPlanTitle 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanTitle;
+
+ /// <summary>
+ /// spanPlanContent 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanContent;
+
+ /// <summary>
+ /// spanPlanMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanMoney;
+
+ /// <summary>
+ /// txtPlanContent 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlTextArea txtPlanContent;
+
+ /// <summary>
+ /// trbtn 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlTableRow trbtn;
+
+ /// <summary>
+ /// btn_Submit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btn_Submit;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/wage/OA_WageAwardPunishAdd.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/wage/OA_WageAwardPunishAdd.aspx
index accec85..948d7ee 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/wage/OA_WageAwardPunishAdd.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/wage/OA_WageAwardPunishAdd.aspx
@@ -51,7 +51,7 @@
<td>
<select keepdefaultstyle="true" runat="server" id="txtRecType" class="w100px">
<option value="1">濂栧姳</option>
- <option value="2">鎯╃綒</option>
+ <option value="2">缃氭</option>
</select>
</td>
<td class="ali03 w100px">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/wage/OA_WageAwardPunishAdd.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/wage/OA_WageAwardPunishAdd.aspx.designer.cs
index c8d2211..b0fe28b 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/wage/OA_WageAwardPunishAdd.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/wage/OA_WageAwardPunishAdd.aspx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.wage {
-
-
- public partial class OA_WageAwardPunishAdd {
-
+namespace CY.WebForm.Pages.wage
+{
+
+
+ public partial class OA_WageAwardPunishAdd
+ {
+
/// <summary>
/// Head1 鎺т欢銆�
/// </summary>
@@ -20,7 +22,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
-
+
/// <summary>
/// CMSHead1 鎺т欢銆�
/// </summary>
@@ -29,7 +31,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-
+
/// <summary>
/// form1 鎺т欢銆�
/// </summary>
@@ -38,7 +40,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+
/// <summary>
/// txtRegTimeStart 鎺т欢銆�
/// </summary>
@@ -47,7 +49,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtRegTimeStart;
-
+
/// <summary>
/// selDepartmentId 鎺т欢銆�
/// </summary>
@@ -56,7 +58,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList selDepartmentId;
-
+
/// <summary>
/// selStaff 鎺т欢銆�
/// </summary>
@@ -65,7 +67,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selStaff;
-
+
/// <summary>
/// txtRecTitle 鎺т欢銆�
/// </summary>
@@ -74,7 +76,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtRecTitle;
-
+
/// <summary>
/// txtRecType 鎺т欢銆�
/// </summary>
@@ -83,7 +85,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect txtRecType;
-
+
/// <summary>
/// txtRecMoney 鎺т欢銆�
/// </summary>
@@ -92,7 +94,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtRecMoney;
-
+
/// <summary>
/// txtRecContent 鎺т欢銆�
/// </summary>
@@ -101,7 +103,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlTextArea txtRecContent;
-
+
/// <summary>
/// btn_submit 鎺т欢銆�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/wage/StaffWageList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/wage/StaffWageList.aspx
index 70ce995..35e0e7f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/wage/StaffWageList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/wage/StaffWageList.aspx
@@ -26,7 +26,7 @@
缁熻鏃堕棿锛�
</td>
<td>
- <input id="txtRegTimeStart" type="text" class="date w90px" datefmt="yyyy骞碝M鏈�" runat="server" readonly="readonly" />
+ <input id="txtRegTimeStart" type="text" class="date w90px" datefmt="yyyy骞碝M鏈�" runat="server" readonly="readonly" /> -<input id="txtRegTimeEnd" type="text" class="date w90px" datefmt="yyyy骞碝M鏈�" runat="server" readonly="readonly" />
</td>
<td class="ali03">
閮ㄩ棬锛�
@@ -41,6 +41,13 @@
<td>
<input id="txtPlanPeople" type="text" class="w90px" runat="server" />
</td>
+ <td>
+ 鐘舵�侊細
+ </td>
+ <td>
+ <select id="selStatus" runat="server" keepdefaultstyle="true">
+ </select>
+ </td>
<td>
<asp:Button ID="btn_Submit" Text="鏌ヨ" runat="server" OnClick="btn_Search_Click" />
</td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/wage/StaffWageList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/wage/StaffWageList.aspx.cs
index e4f923b..08b7b35 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/wage/StaffWageList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/wage/StaffWageList.aspx.cs
@@ -43,6 +43,13 @@
this.txtSPS_Department.DataBind();
this.txtSPS_Department.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+ this.selStatus.DataSource = bll_Sys_DictionaryBLL.GetDataByType("鍛樺伐鍦ㄨ亴鐘舵��");
+ this.selStatus.DataTextField = "Name";
+ this.selStatus.DataValueField = "Name";
+ this.selStatus.DataBind();
+ this.selStatus.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+ this.selStatus.Value = "鍦ㄨ亴";
+
BindList();
}
}
@@ -53,7 +60,7 @@
Pagination pa = new Pagination();
pa.PageSize = UCPager1.AspNetPager.PageSize;
pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
- this.RepClientList.DataSource = bll_OA_WageAwardPunishBLL.SelectModelPageByWage(pa, CurrentUser.MemberId,this.txtSPS_Department.Value.ToInt32(),this.txtPlanPeople.Value.Trim(),this.txtRegTimeStart.Value);
+ this.RepClientList.DataSource = bll_OA_WageAwardPunishBLL.SelectModelPageByWage(pa, CurrentUser.MemberId,this.txtSPS_Department.Value.ToInt32(),this.txtPlanPeople.Value.Trim(),this.txtRegTimeStart.Value, this.txtRegTimeEnd.Value,this.selStatus.Value);
this.RepClientList.DataBind();
UCPager1.AspNetPager.RecordCount = pa.RecordCount;
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/wage/StaffWageList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/wage/StaffWageList.aspx.designer.cs
index 09c5827..d58bd13 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/wage/StaffWageList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/wage/StaffWageList.aspx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.wage {
-
-
- public partial class StaffWageList {
-
+namespace CY.WebForm.Pages.wage
+{
+
+
+ public partial class StaffWageList
+ {
+
/// <summary>
/// Head1 鎺т欢銆�
/// </summary>
@@ -20,7 +22,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
-
+
/// <summary>
/// CMSHead1 鎺т欢銆�
/// </summary>
@@ -29,7 +31,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-
+
/// <summary>
/// form1 鎺т欢銆�
/// </summary>
@@ -38,7 +40,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+
/// <summary>
/// txtRegTimeStart 鎺т欢銆�
/// </summary>
@@ -47,7 +49,16 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtRegTimeStart;
-
+
+ /// <summary>
+ /// txtRegTimeEnd 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtRegTimeEnd;
+
/// <summary>
/// txtSPS_Department 鎺т欢銆�
/// </summary>
@@ -56,7 +67,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect txtSPS_Department;
-
+
/// <summary>
/// txtPlanPeople 鎺т欢銆�
/// </summary>
@@ -65,7 +76,16 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtPlanPeople;
-
+
+ /// <summary>
+ /// selStatus 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selStatus;
+
/// <summary>
/// btn_Submit 鎺т欢銆�
/// </summary>
@@ -74,7 +94,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Button btn_Submit;
-
+
/// <summary>
/// RepClientList 鎺т欢銆�
/// </summary>
@@ -83,7 +103,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater RepClientList;
-
+
/// <summary>
/// UCPager1 鎺т欢銆�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/wage/WorkScoreList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/wage/WorkScoreList.aspx
index c20b45a..dbc92df 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/wage/WorkScoreList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/wage/WorkScoreList.aspx
@@ -10,6 +10,11 @@
function onView(keyid) {
top.Dialog.open({ URL: "/Pages/work/WorkPlanDetail.aspx?keyid=" + keyid, Title: "宸ヤ綔鏄庣粏", Width: 620, Height: 460 });
}
+ //鐢宠瘔
+ function shensu(keyid) {
+ top.Dialog.open({ URL: "/Pages/wage/FakuanShensuAdd.aspx?keyid=" + keyid, Title: "鐢宠瘔", Width: 620, Height: 460 });
+ }
+
$(function () {
$(".NoPlan").remove();
});
@@ -70,7 +75,7 @@
閲戦
</th>
<th style="text-align: center">
- 鏌ョ湅
+ 鎿嶄綔
</th>
</tr>
</HeaderTemplate>
@@ -96,7 +101,10 @@
<%#Eval("RecMoney", "{0:F2}")%>
</td>
<td class="Operate " style="text-align: center">
- <span class="<%#Eval("PlanId").ToString()=="0"?"NoPlan":""%>" menu_member_case_id="case_PlanView" menu_member_case_name="宸ヤ綔鏌ョ湅" onclick="onView('<%#Eval("Keyid")%>')">宸ヤ綔鏌ョ湅</span>
+ <span class="<%#Eval("PlanId").ToString()=="0"?"NoPlan":""%>" menu_member_case_id="case_PlanView" menu_member_case_name="宸ヤ綔鏌ョ湅" onclick="onView('<%#Eval("PlanId")%>')">宸ヤ綔鏌ョ湅</span>
+
+
+ <span class="<%#Eval("Shifoushensu").ToString()!="0"?"":""%>" menu_member_case_id="case_shensu" menu_member_case_name="鐢宠瘔" onclick="<%#Eval("Shifoushensu").ToString()=="0"?"shensu('"+Eval("Keyid")+"')":"#"%>"><%#Eval("ShifoushensuName")%></span>
</td>
</tr>
</ItemTemplate>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/wage/WorkScoreList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/wage/WorkScoreList.aspx.designer.cs
index bc98f5d..fa2f7da 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/wage/WorkScoreList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/wage/WorkScoreList.aspx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.wage {
-
-
- public partial class WorkScoreList {
-
+namespace CY.WebForm.Pages.wage
+{
+
+
+ public partial class WorkScoreList
+ {
+
/// <summary>
/// Head1 鎺т欢銆�
/// </summary>
@@ -20,7 +22,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
-
+
/// <summary>
/// CMSHead1 鎺т欢銆�
/// </summary>
@@ -29,7 +31,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-
+
/// <summary>
/// form1 鎺т欢銆�
/// </summary>
@@ -38,7 +40,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+
/// <summary>
/// txtRegTimeStart 鎺т欢銆�
/// </summary>
@@ -47,7 +49,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtRegTimeStart;
-
+
/// <summary>
/// txtRegTimeEnd 鎺т欢銆�
/// </summary>
@@ -56,7 +58,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtRegTimeEnd;
-
+
/// <summary>
/// selIsFinish 鎺т欢銆�
/// </summary>
@@ -65,7 +67,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selIsFinish;
-
+
/// <summary>
/// btn_Submit 鎺т欢銆�
/// </summary>
@@ -74,7 +76,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Button btn_Submit;
-
+
/// <summary>
/// RepClientList 鎺т欢銆�
/// </summary>
@@ -83,7 +85,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater RepClientList;
-
+
/// <summary>
/// UCPager1 鎺т欢銆�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx.cs
index 405b87d..e946980 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx.cs
@@ -182,31 +182,12 @@
}
else if (!oA_Staff.BF_IsBaoxiaozhuguan && oA_Staff.BF_Isbaoxiaojingli)
{
- if (oA_WorkPlan_Shenpis.Count > 2)
- {
- oA_WorkPlan.Nengfoushenpi = 1;
- }
if (oA_WorkPlan_Shenpis.Count < 2)
{
oA_WorkPlan.Nengfoushenpi = 1;
}
}
- else if (oA_Staff.BF_IsBaoxiaozhuguan && oA_Staff.BF_Isbaoxiaojingli)
- {
- var oA_WorkPlan_Shenpis1 = oA_WorkPlan_Shenpis.Where(x => x.Buzhou == 1).ToList();
-
-
- var shenpicount = oA_WorkPlan_Shenpis1.Count(x => x.ApprovalStaffId == CurrentUser.TrueMemberId);
-
-
-
- if(oA_WorkPlan_Shenpis.Count != 2 && ((oA_WorkPlan_Shenpis1.Count > 1) || shenpicount > 0))
- {
- oA_WorkPlan.Nengfoushenpi = 1;
- }
-
-
- }
+
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx
index 6e2f616..4f7450e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx
@@ -89,6 +89,7 @@
<option value="16">閲囪喘浠樻鐢宠</option>
<option value="18">璁惧缁翠慨鐢宠</option>
<option value="19">缁翠慨浠樻鐢宠</option>
+ <option value="20">缃氭鐢宠瘔</option>
<option value="12">鍏朵粬</option>
</select>
</td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx
index 29d025f..3c6d487 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx
@@ -102,12 +102,12 @@
<td colspan="6">
鏄惁鐢宠浠樻锛�
- <span id="spanShifoushenqingfukuan" runat="server"></span>
+ <span id="spanShifoushenqingfukuan" runat="server"></span>
- 鏁呴殰璐ｄ换浜猴細 <select keepDefaultStyle="true" runat="server" id="selZerenren" class="wx100px" >
+ 鏁呴殰璐ｄ换浜猴細 <select id="selZerenren" runat="server" keepdefaultstyle="true" selinputhtml="True" style=" width:100px;" >
</select>
- 鎷呰矗璐圭敤锛�<input id='txtDanzePrice' runat="server" maxlength='18' class="float" /></td>
+ 鎷呰矗璐圭敤锛�<input id='txtDanzePrice' runat="server" maxlength='18' class="float" style=" width:100px;" /></td>
</tr>
@@ -145,4 +145,52 @@
</div>
</form>
</body>
+ <script type="text/javascript" language="javascript">
+ //涓篠elect鏂板杩囨护鍔熻兘
+ function SelectAddSearch() {
+ $("select[SelInputHtml='True']").each(function (i, v) {
+ $(this).unbind("blur");
+ var old = $(this).html();
+ var oldObject = $(this).clone();
+ var sign = "selectS" + i;
+ $(v).attr("sign", sign);
+
+ var inputClass = "input_" + sign;
+ var html = "<span style='margin-left:10px'>杩囨护锛�</span><input type='text' class='" + inputClass + "' style='width:80px;height:18px;line-height:18px;'/>";
+ $(v).after(html);
+ $("." + inputClass).blur(function () {
+ var nowval = $(this).val().trim();
+ var output = "";
+ if (nowval == "" || nowval == null) {
+ output = old;
+ } else {
+ output += "<option value=''>璇烽�夋嫨</option>";
+ var valueArr = new Array();
+ oldObject.find("option").each(function (ii, vv) {
+
+ var value = $.trim($(vv).attr("value"));
+ var text = $.trim($(vv).text());
+
+ if (text.indexOf(nowval) >= 0)
+ valueArr.push(value + "|||" + text);
+ });
+ for (var ss in valueArr) {
+ var s = valueArr[ss];
+ if (s.split("|||").length == 2) {
+ var value1 = s.split("|||")[0];
+ var text1 = s.split("|||")[1];
+ output += "<option value='" + value1 + "'>" + text1 + "</option>";
+ }
+ }
+ }
+ $(v).html(output);
+ });
+ });
+ }
+
+ $(function () {
+ SelectAddSearch();
+ });
+
+ </script>
</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs
index 3bc6298..958cc86 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs
@@ -29,6 +29,7 @@
OA_WorkPlan_attachmentBLL oA_WorkPlan_AttachmentBLL = null;
OA_StaffBLL oA_StaffBLL = null;
OA_ShebeiWeixiuBLL oA_ShebeiWeixiuBLL = null;
+ OA_WageAwardPunishBLL bll_OA_WageAwardPunishBLL = null;
public RequestReplyAdd()
{
oA_WorkReminderBll = new OA_WorkPlanBll();
@@ -39,6 +40,7 @@
oA_WorkPlan_AttachmentBLL = new OA_WorkPlan_attachmentBLL();
oA_StaffBLL = new OA_StaffBLL();
oA_ShebeiWeixiuBLL = new OA_ShebeiWeixiuBLL();
+ bll_OA_WageAwardPunishBLL = new OA_WageAwardPunishBLL();
}
//椤甸潰鍔犺浇
@@ -168,7 +170,29 @@
m_OA_WorkPlan.RewardResult = staff.Name;
oA_ShebeiWeixiu.ZerenrenName = staff.Name;
}
+
+
+ if (!string.IsNullOrEmpty(this.selZerenren.Value) && !string.IsNullOrEmpty(this.txtDanzePrice.Value))
+ {
+ DateTime? RewardTime = nowTime;
+ OA_WageAwardPunish m_OA_WageAwardPunish = new OA_WageAwardPunish();
+
+ m_OA_WageAwardPunish.FirmId = CurrentUser.MemberId;
+ m_OA_WageAwardPunish.RecTitle = m_OA_WorkPlan.PlanTitle;
+ m_OA_WageAwardPunish.RecTime = nowTime;
+ m_OA_WageAwardPunish.RecType = 2;
+ m_OA_WageAwardPunish.RecContent = m_OA_WorkPlan.PlanContent;
+ m_OA_WageAwardPunish.RecMoney = this.txtDanzePrice.Value.ToDecimal2();
+ m_OA_WageAwardPunish.PlanId = 0;
+ m_OA_WageAwardPunish.LastUpdateTime = nowTime;
+ m_OA_WageAwardPunish.Operator = CurrentUser.ShortName;
+ m_OA_WageAwardPunish.MemberId = staff.MemberId;
+ m_OA_WageAwardPunish.PlanId = m_OA_WorkPlan.Keyid;
+ bll_OA_WageAwardPunishBLL.InsertModel(m_OA_WageAwardPunish);
+ }
}
+
+
if (oA_ShebeiWeixiu != null)
{
oA_ShebeiWeixiu.Zerenren = this.selZerenren.Value.ToInt32();
@@ -176,10 +200,28 @@
oA_ShebeiWeixiu.DanzePrice = this.txtDanzePrice.Value.ToDecimal2();
oA_ShebeiWeixiuBLL.UpdateModel(oA_ShebeiWeixiu);
}
+
+
+
+
+
+
}
}
+ if (m_OA_WorkPlan.ApprovalStatus == 1 && m_OA_WorkPlan.PlanDataType == 20)
+ {
+ var oA_WageAward = bll_OA_WageAwardPunishBLL.GetModelByKeyid(m_OA_WorkPlan.PlanComplany.ToInt32().Value);
+ oA_WageAward.Shifoushensu = 2;
+ bll_OA_WageAwardPunishBLL.DeleteModel(oA_WageAward);
+ }
+ if (m_OA_WorkPlan.ApprovalStatus == 2 && m_OA_WorkPlan.PlanDataType == 20)
+ {
+ var oA_WageAward = bll_OA_WageAwardPunishBLL.GetModelByKeyid(m_OA_WorkPlan.PlanComplany.ToInt32().Value);
+ oA_WageAward.Shifoushensu = 3;
+ bll_OA_WageAwardPunishBLL.UpdateShifoushensu(oA_WageAward);
+ }
if (m_OA_WorkPlan.ApprovalStatus == 1 && m_OA_WorkPlan.PlanDataType == 15)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx
index 837aae3..1f27199 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx
@@ -63,6 +63,7 @@
<option value="16">閲囪喘浠樻鐢宠</option>
<option value="18">璁惧缁翠慨鐢宠</option>
<option value="19">缁翠慨浠樻鐢宠</option>
+ <option value="20">缃氭鐢宠瘔</option>
<option value="12">鍏朵粬</option>
</select>
</td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx.cs
index 29beb8a..2f27992 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx.cs
@@ -47,7 +47,7 @@
DateTime? endTime = null;
pa.PageSize = UCPager1.AspNetPager.PageSize;
pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
- var oA_WorkPlans = bll_OA_WorkPlanBll.SelectModelPage(pa, CurrentUser.MemberId, Guid.Empty, Guid.Empty, 3, this.selRemenderType.Value.ToInt32(), "", null, null, string.IsNullOrEmpty(this.txtRegTimeStart.Value) ? beginTime : Convert.ToDateTime(this.txtRegTimeStart.Value), string.IsNullOrEmpty(this.txtRegTimeEnd.Value) ? endTime : Convert.ToDateTime(this.txtRegTimeEnd.Value), this.txtPlanPeople.Value.Trim(), this.selPlanStatus.Value.ToInt32(), this.selApprovalStatus.Value.ToInt32(), null, null);
+ var oA_WorkPlans = bll_OA_WorkPlanBll.SelectModelPage(pa, CurrentUser.MemberId, Guid.Empty, Guid.Empty, 3, this.selRemenderType.Value.ToInt32(), "", null, null, string.IsNullOrEmpty(this.txtRegTimeStart.Value) ? beginTime : Convert.ToDateTime(this.txtRegTimeStart.Value), string.IsNullOrEmpty(this.txtRegTimeEnd.Value) ? endTime : Convert.ToDateTime(this.txtRegTimeEnd.Value), this.txtPlanPeople.Value.Trim(), this.selPlanStatus.Value.ToInt32(), this.selApprovalStatus.Value.ToInt32(), null, null, null, null, null, CurrentUser.TrueMemberId);
AllMoney = pa.heji1.Value.ToString("0.00");
NowMoney = oA_WorkPlans.Sum(x => x.PlanMoney).Value.ToString("F2");
this.RepClientList.DataSource = oA_WorkPlans;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/WorkPlanDetail.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/WorkPlanDetail.aspx.cs
index f780d8d..73d8425 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/WorkPlanDetail.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/WorkPlanDetail.aspx.cs
@@ -84,7 +84,7 @@
this.spanEvaluationTime.InnerText = m_OA_WorkPlan.EvaluationTime.ToString();
this.spanEvaluationContent.InnerText = m_OA_WorkPlan.EvaluationContent.ToString();
- this.spanRewardType.InnerText = m_OA_WorkPlan.RewardType == 0 ? "鏃�" : (m_OA_WorkPlan.RewardType == 1 ? "濂栧姳" : "鎯╃綒");
+ this.spanRewardType.InnerText = m_OA_WorkPlan.RewardType == 0 ? "鏃�" : (m_OA_WorkPlan.RewardType == 1 ? "濂栧姳" : "缃氭");
this.spanRewardMoney.InnerText = m_OA_WorkPlan.RewardMoney.Value.ToString("0.00")+"鍏�";
this.spanRewardContent.InnerText = m_OA_WorkPlan.RewardContent.ToString();
this.spanRewardResult.InnerText = m_OA_WorkPlan.RewardResult.ToString();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/WorkScoreAdd.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/WorkScoreAdd.aspx
index 877ecfb..f133dce 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/WorkScoreAdd.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/WorkScoreAdd.aspx
@@ -171,7 +171,7 @@
<select keepdefaultstyle="true" runat="server" id="selRewardType" class="wx100px">
<option value="0">鏃�</option>
<option value="1">濂栧姳</option>
- <option value="2">鎯╃綒</option>
+ <option value="2">缃氭</option>
</select>
</td>
<td class="ali03">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/WorkScoreAdd.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/WorkScoreAdd.aspx.designer.cs
index 7428d8c..2b5019b 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/WorkScoreAdd.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/WorkScoreAdd.aspx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.work {
-
-
- public partial class WorkScoreAdd {
-
+namespace CY.WebForm.Pages.work
+{
+
+
+ public partial class WorkScoreAdd
+ {
+
/// <summary>
/// Head1 鎺т欢銆�
/// </summary>
@@ -20,7 +22,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
-
+
/// <summary>
/// CMSHead1 鎺т欢銆�
/// </summary>
@@ -29,7 +31,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-
+
/// <summary>
/// form1 鎺т欢銆�
/// </summary>
@@ -38,7 +40,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+
/// <summary>
/// spanPlanDataType 鎺т欢銆�
/// </summary>
@@ -47,7 +49,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanDataType;
-
+
/// <summary>
/// spanPlanRunTime 鎺т欢銆�
/// </summary>
@@ -56,7 +58,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanRunTime;
-
+
/// <summary>
/// spanDepartName 鎺т欢銆�
/// </summary>
@@ -65,7 +67,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanDepartName;
-
+
/// <summary>
/// spanPlanPeople 鎺т欢銆�
/// </summary>
@@ -74,7 +76,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanPeople;
-
+
/// <summary>
/// spanSentStaffName 鎺т欢銆�
/// </summary>
@@ -83,7 +85,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSentStaffName;
-
+
/// <summary>
/// spanPlanStartTime 鎺т欢銆�
/// </summary>
@@ -92,7 +94,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanStartTime;
-
+
/// <summary>
/// spanPlanComplany 鎺т欢銆�
/// </summary>
@@ -101,7 +103,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanComplany;
-
+
/// <summary>
/// spanPlanTitle 鎺т欢銆�
/// </summary>
@@ -110,7 +112,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanTitle;
-
+
/// <summary>
/// spanPlanContent 鎺т欢銆�
/// </summary>
@@ -119,7 +121,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanContent;
-
+
/// <summary>
/// panelApprovalNo 鎺т欢銆�
/// </summary>
@@ -128,7 +130,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl panelApprovalNo;
-
+
/// <summary>
/// spanPlanStatus 鎺т欢銆�
/// </summary>
@@ -137,7 +139,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanStatus;
-
+
/// <summary>
/// panelApprovalYes 鎺т欢銆�
/// </summary>
@@ -146,7 +148,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl panelApprovalYes;
-
+
/// <summary>
/// spanApprovalStaffName 鎺т欢銆�
/// </summary>
@@ -155,7 +157,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanApprovalStaffName;
-
+
/// <summary>
/// spanApprovalTime 鎺т欢銆�
/// </summary>
@@ -164,7 +166,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanApprovalTime;
-
+
/// <summary>
/// spanPlanStatus1 鎺т欢銆�
/// </summary>
@@ -173,7 +175,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanStatus1;
-
+
/// <summary>
/// spanApprovalStatus 鎺т欢銆�
/// </summary>
@@ -182,7 +184,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanApprovalStatus;
-
+
/// <summary>
/// spanApprovalContent 鎺т欢銆�
/// </summary>
@@ -191,7 +193,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanApprovalContent;
-
+
/// <summary>
/// selEvaluationStatus 鎺т欢銆�
/// </summary>
@@ -200,7 +202,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selEvaluationStatus;
-
+
/// <summary>
/// txtEvaluationContent 鎺т欢銆�
/// </summary>
@@ -209,7 +211,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlTextArea txtEvaluationContent;
-
+
/// <summary>
/// selRewardType 鎺т欢銆�
/// </summary>
@@ -218,7 +220,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selRewardType;
-
+
/// <summary>
/// txtRewardMoney 鎺т欢銆�
/// </summary>
@@ -227,7 +229,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtRewardMoney;
-
+
/// <summary>
/// txtRewardContent 鎺т欢銆�
/// </summary>
@@ -236,7 +238,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlTextArea txtRewardContent;
-
+
/// <summary>
/// txtRewardResult 鎺т欢銆�
/// </summary>
@@ -245,7 +247,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlTextArea txtRewardResult;
-
+
/// <summary>
/// btn_submit 鎺т欢銆�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/WorkScoreAddList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/WorkScoreAddList.aspx
index 67eb2f7..0001218 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/WorkScoreAddList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/WorkScoreAddList.aspx
@@ -46,7 +46,7 @@
<select keepDefaultStyle="true" runat="server" id="selRewardType" class="wx100px">
<option value="0">鏃�</option>
<option value="1">濂栧姳</option>
- <option value="2">鎯╃綒</option>
+ <option value="2">缃氭</option>
</select>
</td>
<td class="ali03">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/WorkScoreAddList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/WorkScoreAddList.aspx.designer.cs
index bf28f3b..cd5a25f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/WorkScoreAddList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/WorkScoreAddList.aspx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.work {
-
-
- public partial class WorkScoreAddList {
-
+namespace CY.WebForm.Pages.work
+{
+
+
+ public partial class WorkScoreAddList
+ {
+
/// <summary>
/// Head1 鎺т欢銆�
/// </summary>
@@ -20,7 +22,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
-
+
/// <summary>
/// CMSHead1 鎺т欢銆�
/// </summary>
@@ -29,7 +31,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-
+
/// <summary>
/// form1 鎺т欢銆�
/// </summary>
@@ -38,7 +40,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+
/// <summary>
/// selEvaluationStatus 鎺т欢銆�
/// </summary>
@@ -47,7 +49,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selEvaluationStatus;
-
+
/// <summary>
/// txtEvaluationContent 鎺т欢銆�
/// </summary>
@@ -56,7 +58,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlTextArea txtEvaluationContent;
-
+
/// <summary>
/// selRewardType 鎺т欢銆�
/// </summary>
@@ -65,7 +67,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selRewardType;
-
+
/// <summary>
/// txtRewardMoney 鎺т欢銆�
/// </summary>
@@ -74,7 +76,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtRewardMoney;
-
+
/// <summary>
/// txtRewardContent 鎺т欢銆�
/// </summary>
@@ -83,7 +85,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlTextArea txtRewardContent;
-
+
/// <summary>
/// txtRewardResult 鎺т欢銆�
/// </summary>
@@ -92,7 +94,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlTextArea txtRewardResult;
-
+
/// <summary>
/// btn_submit 鎺т欢銆�
/// </summary>
--
Gitblit v1.9.1