diff --git a/PEIS/View/Enrollment/EnrollmentOrgForm.cs b/PEIS/View/Enrollment/EnrollmentOrgForm.cs index 6a1dc24..55f18d0 100644 --- a/PEIS/View/Enrollment/EnrollmentOrgForm.cs +++ b/PEIS/View/Enrollment/EnrollmentOrgForm.cs @@ -1414,17 +1414,17 @@ namespace PEIS.View.Enrollment if (!DgvEnrollmentFeeItem.GetSelectedRows().Any()) return; if (DgvEnrollment.GetRowCellValue(DgvEnrollment.GetSelectedRows()[0], "ID") == null && _chooseRegItem == null) return; - //if (_lstEnrollmentFeeItem.Where(w => w.OrderNo == null).Count() == 0) - //{ - // Global.Msg("info", "没有要处理的收费项目!"); - // return; - //} + if (_lstEnrollmentFeeItem.Where(w => w.OrderNo == null).Count() == 0) + { + Global.Msg("info", "没有要处理的收费项目!"); + return; + } - //if (_lstEnrollmentFeeItem.Where(w => w.OEID == null && w.OrderNo == null).Count() == _lstEnrollmentFeeItem.Where(w => w.OrderNo == null).Count()) - //{ - // Global.Msg("info", "未处理体检项目无团体项目,请选择个人收费!"); - // return; - //} + if (_lstEnrollmentFeeItem.Where(w => w.OEID == null && w.OrderNo == null).Count() == _lstEnrollmentFeeItem.Where(w => w.OrderNo == null).Count()) + { + Global.Msg("info", "未处理体检项目无团体项目,请选择个人收费!"); + return; + } if (Global.Msg("warn", "确定生成缴费订单吗?") == System.Windows.Forms.DialogResult.No) return; CheckCostForm checkCostForm = new CheckCostForm(Convert.ToInt64(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "ID").ToString()), 0);