username@email.com
2025-10-10 0dd76c2492f1afbe335b50a8ffb76e4af94271df
新增设备  人员增加模糊查询  完成
日期默认当天 完成

新增设备维修的时候 选人,然后筛选设备 完成

维修管理里边需要合计金额 完成

维修管理 查询条件增加设备责任人 完成

扣钱的话 在奖惩记录里边也要显示 完成

按类别查询 新增奖惩 完成

奖惩记录统计时间 需要时间跨度 没有奖励惩罚的不显示 完成

惩罚可以申诉 在请示批复里边批复 只能曹总批复 完成

ALTER TABLE [dbo].[OA_WageAwardPunish] ADD Shifoushensu [int] NULL DEFAULT (0) ;
GO

update [OA_WageAwardPunish] set Shifoushensu = 0;
GO
39个文件已修改
3个文件已添加
1206 ■■■■■ 已修改文件
CY_ECommercePlatform/CY.BLL/OA/OA_ShebeiWeixiuBLL.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.BLL/OA/OA_WageAwardPunishBLL.cs 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.BLL/OA/OA_WorkPlanBLL.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.IDAL/OA/IOA_ShebeiWeixiuDAL.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.IDAL/OA/IOA_WageAwardPunishDAL.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.IDAL/OA/IOA_WorkPlanDAL.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.Model/OA/OA_WageAwardPunish.cs 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiWeixiuDAL.cs 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.SQLDAL/OA/OA_WageAwardPunishDAL.cs 54 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlanDAL.cs 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuAdd.aspx 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuAdd.aspx.cs 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuAdd.aspx.designer.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuList.aspx 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuList.aspx.cs 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuList.aspx.designer.cs 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeimanageEdit.aspx 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeimanageEdit.aspx.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/wage/FakuanShensuAdd.aspx 256 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/wage/FakuanShensuAdd.aspx.cs 221 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/wage/FakuanShensuAdd.aspx.designer.cs 80 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/wage/OA_WageAwardPunishAdd.aspx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/wage/OA_WageAwardPunishAdd.aspx.designer.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/wage/StaffWageList.aspx 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/wage/StaffWageList.aspx.cs 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/wage/StaffWageList.aspx.designer.cs 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/wage/WorkScoreList.aspx 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/wage/WorkScoreList.aspx.designer.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx.cs 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx 54 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/work/WorkPlanDetail.aspx.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/work/WorkScoreAdd.aspx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/work/WorkScoreAdd.aspx.designer.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/work/WorkScoreAddList.aspx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/work/WorkScoreAddList.aspx.designer.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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);
        }
         
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);
        }
    }
}
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>
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>
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 = "");
    }
}
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>
        /// 删除工作安排
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;
        }
CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan.cs
@@ -505,7 +505,7 @@
            }
        }
        /// <summary>
        /// 奖励类型/无0,奖励1,惩罚2
        /// 奖励类型/无0,奖励1,罚款2
        /// </summary>        
        public int? RewardType
        {
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)
            {
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);
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)
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>
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuAdd.aspx
@@ -9,6 +9,16 @@
    <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>
@@ -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>
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>
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>
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>
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()
@@ -60,6 +65,15 @@
            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,7 +82,34 @@
            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());
            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)
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;
    }
}
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeimanageEdit.aspx
@@ -37,7 +37,57 @@
            return true;
        }
        //为Select新增过滤功能
        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>
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");
            }
        }
        //表单提交
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;
CY_ECommercePlatform/CY.WebForm/Pages/wage/FakuanShensuAdd.aspx
New file
@@ -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 });
        }
        //为Select新增过滤功能
        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>
CY_ECommercePlatform/CY.WebForm/Pages/wage/FakuanShensuAdd.aspx.cs
New file
@@ -0,0 +1,221 @@
using 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);
        }
    }
}
CY_ECommercePlatform/CY.WebForm/Pages/wage/FakuanShensuAdd.aspx.designer.cs
New file
@@ -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;
    }
}
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">
CY_ECommercePlatform/CY.WebForm/Pages/wage/OA_WageAwardPunishAdd.aspx.designer.cs
@@ -2,15 +2,17 @@
// <自动生成>
//     此代码由工具生成。
//
//     对此文件的更改可能会导致不正确的行为,并且如果
//     重新生成代码,这些更改将会丢失。
//     对此文件的更改可能导致不正确的行为,如果
//     重新生成代码,则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace CY.WebForm.Pages.wage {
namespace CY.WebForm.Pages.wage
{
    
    
    public partial class OA_WageAwardPunishAdd {
    public partial class OA_WageAwardPunishAdd
    {
        
        /// <summary>
        /// Head1 控件。
CY_ECommercePlatform/CY.WebForm/Pages/wage/StaffWageList.aspx
@@ -26,7 +26,7 @@
                        统计时间:
                    </td>
                    <td>
                        <input id="txtRegTimeStart" type="text" class="date w90px" datefmt="yyyy年MM月" runat="server" readonly="readonly" />
                        <input id="txtRegTimeStart" type="text" class="date w90px" datefmt="yyyy年MM月" runat="server" readonly="readonly" /> -<input id="txtRegTimeEnd" type="text" class="date w90px"  datefmt="yyyy年MM月"  runat="server" readonly="readonly" />
                    </td>
                    <td class="ali03">
                        部门:
@@ -42,6 +42,13 @@
                        <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>
                </tr>
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;
        }
CY_ECommercePlatform/CY.WebForm/Pages/wage/StaffWageList.aspx.designer.cs
@@ -2,15 +2,17 @@
// <自动生成>
//     此代码由工具生成。
//
//     对此文件的更改可能会导致不正确的行为,并且如果
//     重新生成代码,这些更改将会丢失。
//     对此文件的更改可能导致不正确的行为,如果
//     重新生成代码,则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace CY.WebForm.Pages.wage {
namespace CY.WebForm.Pages.wage
{
    
    
    public partial class StaffWageList {
    public partial class StaffWageList
    {
        
        /// <summary>
        /// Head1 控件。
@@ -49,6 +51,15 @@
        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>
        /// <remarks>
@@ -67,6 +78,15 @@
        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>
        /// <remarks>
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>
CY_ECommercePlatform/CY.WebForm/Pages/wage/WorkScoreList.aspx.designer.cs
@@ -2,15 +2,17 @@
// <自动生成>
//     此代码由工具生成。
//
//     对此文件的更改可能会导致不正确的行为,并且如果
//     重新生成代码,这些更改将会丢失。
//     对此文件的更改可能导致不正确的行为,如果
//     重新生成代码,则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace CY.WebForm.Pages.wage {
namespace CY.WebForm.Pages.wage
{
    
    
    public partial class WorkScoreList {
    public partial class WorkScoreList
    {
        
        /// <summary>
        /// Head1 控件。
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;
                        }
                    }
                }
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>
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx
@@ -102,12 +102,12 @@
                <td   colspan="6">
                   是否申请付款:
                 
                    <span id="spanShifoushenqingfukuan" runat="server"></span>&nbsp;&nbsp;&nbsp;&nbsp;
                    <span id="spanShifoushenqingfukuan" runat="server"></span>&nbsp;&nbsp;
               
                        故障责任人: <select keepDefaultStyle="true" runat="server" id="selZerenren" class="wx100px" >
                        故障责任人: <select  id="selZerenren"  runat="server" keepdefaultstyle="true" selinputhtml="True"  style=" width:100px;"  >
                       
                    </select>
                     &nbsp;&nbsp;&nbsp;&nbsp;担责费用:<input id='txtDanzePrice' runat="server" maxlength='18'  class="float"   /></td>
                     &nbsp;&nbsp;担责费用:<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">
         //为Select新增过滤功能
         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>
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)
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>
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;
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();
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">
CY_ECommercePlatform/CY.WebForm/Pages/work/WorkScoreAdd.aspx.designer.cs
@@ -2,15 +2,17 @@
// <自动生成>
//     此代码由工具生成。
//
//     对此文件的更改可能会导致不正确的行为,并且如果
//     重新生成代码,这些更改将会丢失。
//     对此文件的更改可能导致不正确的行为,如果
//     重新生成代码,则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace CY.WebForm.Pages.work {
namespace CY.WebForm.Pages.work
{
    
    
    public partial class WorkScoreAdd {
    public partial class WorkScoreAdd
    {
        
        /// <summary>
        /// Head1 控件。
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">
CY_ECommercePlatform/CY.WebForm/Pages/work/WorkScoreAddList.aspx.designer.cs
@@ -2,15 +2,17 @@
// <自动生成>
//     此代码由工具生成。
//
//     对此文件的更改可能会导致不正确的行为,并且如果
//     重新生成代码,这些更改将会丢失。
//     对此文件的更改可能导致不正确的行为,如果
//     重新生成代码,则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace CY.WebForm.Pages.work {
namespace CY.WebForm.Pages.work
{
    
    
    public partial class WorkScoreAddList {
    public partial class WorkScoreAddList
    {
        
        /// <summary>
        /// Head1 控件。