审批拒绝的可以修改后再次提交 完成 报销单需要一个编号 EvaluationContent 报销单编号 完成 增加一个状态，保存状态 完成

username@email.com

2025-01-24 f820d227c54e7686d7b582fcd3c1ffcf885b5d31

 CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoList.aspx.cs

@@ -40,14 +40,15 @@
            }
            if (Request["delete"] != null)
            {
                var oA_WorkPlan_Shenpis = oA_WorkPlan_ShenpiBLL.GetModelByKaipiaoId(Request["delete"].ToInt32().Value).ToList();
                if (oA_WorkPlan_Shenpis.Count > 0 )
                //var oA_WorkPlan_Shenpis = oA_WorkPlan_ShenpiBLL.GetModelByKaipiaoId(Request["delete"].ToInt32().Value).ToList();
                OA_WorkPlan model = bll_OA_WorkPlanBll.GetModelByKeyid(Request["delete"].ToInt32());
                if (model.ApprovalStatus !=4 )
                {
                    JavaScript.MessageBox("已有审批信息，不能删除", this);
                    JavaScript.MessageBox("已提交信息，不能删除", this);
                    return;
                }

                OA_WorkPlan model = bll_OA_WorkPlanBll.GetModelByKeyid(Request["delete"].ToInt32());
               
                if (model != null && model.Keyid != null)
                {
                    bll_OA_WorkPlanBll.DeleteModel(model, CurrentUser.TrueName);
@@ -110,7 +111,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, CurrentUser.TrueMemberId, 3, 17, "", null, null, string.IsNullOrEmpty(this.txtRegTimeStart.Value) ? beginTime : Convert.ToDateTime(this.txtRegTimeStart.Value), string.IsNullOrEmpty(this.txtRegTimeEnd.Value) ? endTime : Convert.ToDateTime(this.txtRegTimeEnd.Value), "", -1, this.selApprovalStatus.Value.ToInt32(), null, null,this.TxtRewardContent.Value.Trim(), this.txtPlanContent.Value.Trim());
            var oA_WorkPlans = bll_OA_WorkPlanBll.SelectModelPage(pa, CurrentUser.MemberId, Guid.Empty, CurrentUser.TrueMemberId, 3, 17, "", null, null, string.IsNullOrEmpty(this.txtRegTimeStart.Value) ? beginTime : Convert.ToDateTime(this.txtRegTimeStart.Value), string.IsNullOrEmpty(this.txtRegTimeEnd.Value) ? endTime : Convert.ToDateTime(this.txtRegTimeEnd.Value), "", -1, this.selApprovalStatus.Value.ToInt32(), this.selEvaluationStatus.Value.ToInt32(), null,this.TxtRewardContent.Value.Trim(), this.txtPlanContent.Value.Trim());
            foreach (var oA_WorkPlan in oA_WorkPlans)
            {
                var sss = oA_WorkPlan_AttachmentBLL.GetModelByKaipiaoId(oA_WorkPlan.Keyid.Value);
@@ -146,23 +147,23 @@
                {
                    oA_WorkPlan.Nengfoushenpi = 1;
                }
                if( oA_WorkPlan.ApprovalStatus == 1 && oA_WorkPlan.HoubufapiaoStatus != 2)
                if((oA_WorkPlan.ApprovalStatus == 0 || oA_WorkPlan.ApprovalStatus == 1) && oA_WorkPlan.HoubufapiaoStatus != 2)
                {
                    oA_WorkPlan.Nengfoushenpi = 1;
                }
                var oA_WorkPlan_Shenpis = oA_WorkPlan_ShenpiBLL.GetModelByKaipiaoId(oA_WorkPlan.Keyid.Value).ToList();
                if (oA_WorkPlan_Shenpis.Count> 0 && oA_WorkPlan.HoubufapiaoStatus != 2)
                {
                    oA_WorkPlan.Nengfoushenpi = 1;
                }
                if (oA_WorkPlan.ApprovalStatus == 2 || oA_WorkPlan.ApprovalStatus == 1)
                {
                    oA_WorkPlan.Nengfoushanchu = 1; 
                }
                if (oA_WorkPlan_Shenpis.Count > 0 )
                {
                    oA_WorkPlan.Nengfoushanchu = 1;
                }
                //var oA_WorkPlan_Shenpis = oA_WorkPlan_ShenpiBLL.GetModelByKaipiaoId(oA_WorkPlan.Keyid.Value).ToList();
                //if (oA_WorkPlan_Shenpis.Count> 0 && oA_WorkPlan.HoubufapiaoStatus != 2)
                //{
                //    oA_WorkPlan.Nengfoushenpi = 1;
                //}
                //if (oA_WorkPlan.ApprovalStatus == 2 || oA_WorkPlan.ApprovalStatus == 1)
                //{
                //    oA_WorkPlan.Nengfoushanchu = 1; 
                //}
                //if (oA_WorkPlan_Shenpis.Count > 0 )
                //{
                //    oA_WorkPlan.Nengfoushanchu = 1;
                //}