From 8cbc10f23e1a0b173f46a80c89df70af7bcf4d66 Mon Sep 17 00:00:00 2001 From: lb01 Date: Wed, 9 Nov 2022 14:16:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E8=BE=93=E5=85=A5=E6=A1=86=E5=9B=BE=E8=A1=A8?= =?UTF-8?q?=E8=A2=AB=E9=81=AE=E6=8C=A1=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LearunApp-2.2.0/pages/login.vue | 622 ++++++++++-------- 1 file changed, 341 insertions(+), 281 deletions(-) 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 @@ From 5088fe91b0e4de80d4727fc6a464daf965e1ec62 Mon Sep 17 00:00:00 2001 From: ndbs Date: Wed, 9 Nov 2022 14:42:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E9=97=B4=E8=B7=9D;=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=82=AC=E5=8A=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/NWFProcess/NWFContainerForm.js | 13 +++++++++---- .../Content/jquery/plugin/jqprint/jqprint.css | 5 +++-- 2 files changed, 12 insertions(+), 6 deletions(-) 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; From 73925edd31c1823e90385e7ce91a5b26f3eeda9f Mon Sep 17 00:00:00 2001 From: ndbs Date: Wed, 9 Nov 2022 16:15:09 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B7=A5=E8=B5=84=E6=9D=A1=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Ououtsourcing/OuoutsourcingService.cs | 4 ++-- .../WageSchedule/WageScheduleService.cs | 4 ++-- .../WelfarePosition/WelfarePositionService.cs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) 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); }