diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js index 2d358bbf2..89007f238 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js @@ -1873,8 +1873,10 @@ var bootstrap = function ($, learun) { continue; } } - res.push(ainfo[i]); - } + if (ainfo[i].title != '开始') { + res.push(ainfo[i]); + } + } $.jqprintForm(res); } else { @@ -1894,8 +1896,11 @@ var bootstrap = function ($, learun) { continue; } } - res1.push(ainfo[i1]); - } + //res1.push(ainfo[i1]); + if (ainfo[i1].title != '开始') { + res1.push(ainfo[i1]); + } + } $.jqprintForm(res1); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/jquery/plugin/jqprint/jqprint.css b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/jquery/plugin/jqprint/jqprint.css index f9e836c8c..a1f03a905 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/jquery/plugin/jqprint/jqprint.css +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/jquery/plugin/jqprint/jqprint.css @@ -482,7 +482,7 @@ body { color: #333; background-color: #fff; -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; + -moz-osx-font-smoothing: grayscale; } body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, form, fieldset, legend, input, textarea, p, blockquote, th, td, hr, button, article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section { @@ -510,7 +510,7 @@ a { } body { - padding: 15px; + padding: 25mm; color: #333; } @@ -530,6 +530,7 @@ td,th { } .inputname { text-align: right; + width: 40mm; } .anodeinfod { position:relative; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Ououtsourcing/OuoutsourcingService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Ououtsourcing/OuoutsourcingService.cs index 9b21198c6..f2114c488 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Ououtsourcing/OuoutsourcingService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Ououtsourcing/OuoutsourcingService.cs @@ -82,12 +82,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration if (!queryParam["IssueMonth"].IsEmpty()) { dp.Add("IssueMonth", queryParam["IssueMonth"].ToString(), DbType.String); - strSql.Append(" AND t.IssueMonth = IssueMonth "); + strSql.Append(" AND t.IssueMonth = @IssueMonth "); } if (!queryParam["IssueYear"].IsEmpty()) { dp.Add("IssueYear", queryParam["IssueYear"].ToString(), DbType.String); - strSql.Append(" AND t.IssueYear = IssueYear "); + strSql.Append(" AND t.IssueYear = @IssueYear "); } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WageSchedule/WageScheduleService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WageSchedule/WageScheduleService.cs index 09236daf9..2820d64f8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WageSchedule/WageScheduleService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WageSchedule/WageScheduleService.cs @@ -86,12 +86,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration if (!queryParam["IssueMonth"].IsEmpty()) { dp.Add("IssueMonth", queryParam["IssueMonth"].ToString(), DbType.String); - strSql.Append(" AND t.IssueMonth = IssueMonth "); + strSql.Append(" AND t.IssueMonth = @IssueMonth "); } if (!queryParam["IssueYear"].IsEmpty()) { dp.Add("IssueYear", queryParam["IssueYear"].ToString(), DbType.String); - strSql.Append(" AND t.IssueYear = IssueYear "); + strSql.Append(" AND t.IssueYear = @IssueYear "); } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WelfarePosition/WelfarePositionService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WelfarePosition/WelfarePositionService.cs index 5cc4bb26c..77829762b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WelfarePosition/WelfarePositionService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WelfarePosition/WelfarePositionService.cs @@ -82,12 +82,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration if (!queryParam["IssueMonth"].IsEmpty()) { dp.Add("IssueMonth", queryParam["IssueMonth"].ToString(), DbType.String); - strSql.Append(" AND t.IssueMonth = IssueMonth "); + strSql.Append(" AND t.IssueMonth = @IssueMonth "); } if (!queryParam["IssueYear"].IsEmpty()) { dp.Add("IssueYear", queryParam["IssueYear"].ToString(), DbType.String); - strSql.Append(" AND t.IssueYear = IssueYear "); + strSql.Append(" AND t.IssueYear = @IssueYear "); } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); } diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/login.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/login.vue index ad16f0386..34154962f 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/login.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/login.vue @@ -1,308 +1,368 @@