From 149b7dae9fe03c164986ec7de34ed79041d80b58 Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 11 Oct 2022 10:39:38 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=AF=BE=E5=A0=82=E5=B7=A1=E6=9F=A5=20?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=88=97=E8=A1=A8=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Areas/PersonnelManagement/Views/ClassPatrol/Index.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ClassPatrol/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ClassPatrol/Index.js index c14bfe9c6..dd231f67f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ClassPatrol/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ClassPatrol/Index.js @@ -70,7 +70,12 @@ var bootstrap = function ($, learun) { $('#gridtable').lrAuthorizeJfGrid({ url: top.$.rootUrl + '/PersonnelManagement/ClassPatrol/GetPageList', headData: [ - { label: "时间", name: "Time", width: 100, align: "left"}, + { + label: "时间", name: "Time", width: 100, align: "left", + formatter: function (cellvalue) { + return learun.formatDate(cellvalue, 'yyyy-MM-dd'); + } + }, { label: "课节", name: "Section", width: 100, align: "left"}, { label: "教师", name: "EmpNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op,$cell) { From d7d2859f9a861fd2f6241756103bc1da91ab2517 Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 11 Oct 2022 16:19:57 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=BD=91=E4=B8=8A=E5=8A=9E=E4=BA=8B?= =?UTF-8?q?=E5=A4=A7=E5=8E=85=20-=E6=95=99=E5=B8=88=E5=B9=B4=E9=BE=84?= =?UTF-8?q?=E6=AF=94=E4=BE=8B=20=E5=8F=AA=E7=BB=9F=E8=AE=A1=E5=B7=B2?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E8=BF=87=E5=BE=97=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EducationalAdministration/EmpInfo/EmpInfoService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs index 7a3e7c5c1..d6bb386f9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs @@ -376,7 +376,7 @@ sum(case when DATEDIFF(YYYY, t.Birthday, GETDATE()) > 50 and DATEDIFF(YYYY, t.Bi sum(case when DATEDIFF(YYYY, t.Birthday, GETDATE()) > 40 and DATEDIFF(YYYY, t.Birthday, GETDATE()) <= 50 then 1 else 0 end) as age3, sum(case when DATEDIFF(YYYY, t.Birthday, GETDATE()) > 30 and DATEDIFF(YYYY, t.Birthday, GETDATE()) <= 40 then 1 else 0 end) as age4, sum(case when DATEDIFF(YYYY, t.Birthday, GETDATE()) > 20 and DATEDIFF(YYYY, t.Birthday, GETDATE()) <= 30 then 1 else 0 end) as age5 - from empinfo t where t.Birthday is not null"); + from empinfo t where t.Birthday is not null and CheckMark = '1' "); return this.BaseRepository("CollegeMIS").FindEntity(strSql.ToString(), null); } catch (Exception ex) From bdc9403c81036736f01b04a9a05cd02c2eb2ea65 Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 11 Oct 2022 16:43:20 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=AD=A6=E5=B7=A5-=E5=AE=BF=E8=88=8D?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=BA=8A=E4=BD=8D=E4=BF=9D=E5=AD=98=E6=88=90?= =?UTF-8?q?=E5=8A=9F=E5=90=8E=20=E8=87=AA=E5=8A=A8=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E7=AA=97=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Areas/LogisticsManagement/Views/Accommodation/IndexBed.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexBed.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexBed.js index 0cb2af6f2..d1346879b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexBed.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexBed.js @@ -100,6 +100,7 @@ var bootstrap = function ($, learun) { }; // 保存数据 acceptClick = function (callBack) { + learun.layerClose('indexBed', ''); if (!!callBack) { callBack(); } From b327fc3c67db33f9db37f80be899bfe4b2f2e939 Mon Sep 17 00:00:00 2001 From: ndbs Date: Wed, 12 Oct 2022 18:17:50 +0800 Subject: [PATCH 4/4] 1 --- .../Views/StuInfoBasic/FormTran.cshtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.cshtml index ac6ccb25e..e3805f7cf 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.cshtml @@ -16,8 +16,8 @@
-
考生号*
- +
考生号
+
@*
通知书号*