Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

2024-04-29 09:30:38 +08:00
parent 1a2bcf6e3f ccce05d505
commit 711b2a2d59
57 changed files with 13834 additions and 927 deletions
@@ -2755,6 +2755,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
            Model.Report_WeekAndMonthReport_New report = new Model.Report_WeekAndMonthReport_New();
            report.Id = ReportId;
            report.ProjectId = this.CurrUser.LoginProjectId;
+            report.ReportType = "1";//1.月报，2-周报
            if (!string.IsNullOrEmpty(this.txtPeriod.Text.Trim()))
            {
                try