From b45448f9cc3741e5791dcaf082b25a2a34e0f34b Mon Sep 17 00:00:00 2001 From: ndbs Date: Mon, 28 Nov 2022 11:16:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=9B=BE=E4=B9=A6=E5=80=9F=E9=98=85?= =?UTF-8?q?=E5=BD=92=E8=BF=98=20=E6=95=B0=E9=87=8F=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/BookBorrow/Form.cshtml | 4 ++-- .../EducationalAdministration/Views/BookBorrow/Form.js | 10 +++++----- .../Views/BookReturn/Form.cshtml | 4 ++-- .../EducationalAdministration/Views/BookReturn/Form.js | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookBorrow/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookBorrow/Form.cshtml index da41636e7..dc944d663 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookBorrow/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookBorrow/Form.cshtml @@ -17,8 +17,8 @@
-
数量
- +
数量*
+
借书证
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookBorrow/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookBorrow/Form.js index efba63287..7d266a7d3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookBorrow/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookBorrow/Form.js @@ -39,11 +39,11 @@ var bootstrap = function ($, learun) { if (!$('body').lrValidform()) { return false; } - var Amount = $('#Amount').val(); - if (Amount <= 0 || Math.floor(Amount) !== Amount) { - learun.alert.warning('数量请输入大于0的整数！'); - return false; - } + //var Amount = $('#Amount').val(); + //if (Amount <= 0 || Math.floor(Amount) !== Amount) { + // learun.alert.warning('数量请输入大于0的整数！'); + // return false; + //} var postData = { strEntity: JSON.stringify($('body').lrGetFormData()) }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookReturn/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookReturn/Form.cshtml index d1199254b..577e1a334 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookReturn/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookReturn/Form.cshtml @@ -17,8 +17,8 @@
-
数量
- +
数量*
+
借书证
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookReturn/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookReturn/Form.js index 9f274fd28..4753b231b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookReturn/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookReturn/Form.js @@ -40,11 +40,11 @@ var bootstrap = function ($, learun) { return false; } - var Amount = $('#Amount').val(); - if (Amount <= 0 || Math.floor(Amount) !== Amount) { - learun.alert.warning('数量请输入大于0的整数！'); - return false; - } + //var Amount = $('#Amount').val(); + //if (Amount <= 0 || Math.floor(Amount) !== Amount) { + // learun.alert.warning('数量请输入大于0的整数！'); + // return false; + //} var postData = { strEntity: JSON.stringify($('body').lrGetFormData()) }; From 74c4912f9488074d0f09f1c06908b43c60d26d65 Mon Sep 17 00:00:00 2001 From: lb01 Date: Mon, 28 Nov 2022 16:35:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=A6=E7=94=9F?= =?UTF-8?q?=E6=8C=89=E5=A4=A9=E8=AF=B7=E5=81=87=E9=A1=B5=E9=9D=A2=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E6=A0=BC=E5=BC=8F=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=88=91?= =?UTF-8?q?=E7=9A=84=E8=80=83=E5=8B=A4=E5=AD=A6=E7=94=9F=20=E8=AF=B7?= =?UTF-8?q?=E5=81=87=E9=A2=9C=E8=89=B2=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StuLeaveManagement/Check/list.vue | 8 ++++++-- .../StuLeaveManagement/Check/single.vue | 4 ++-- .../pages/studentCheck/list.vue | 20 +++++++++++++++++-- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/Check/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/Check/list.vue index e880eb91f..4c86865a2 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/Check/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/Check/list.vue @@ -43,12 +43,12 @@ 开始时间： - {{ displayListItem(item, "StartTime") }} + {{ itmeDel(displayListItem(item, "StartTime"))}} 结束时间： - {{ displayListItem(item, "EndTime") }} + {{ itmeDel(displayListItem(item, "EndTime")) }} @@ -485,6 +485,10 @@ LeaveTypeItem(data) { }, + itmeDel(data){ + var newDate = /\d{4}-\d{1,2}-\d{1,2}/g.exec(data) + return newDate[0] + } }, created() { this.user = this.GET_GLOBAL('loginUser'); diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/Check/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/Check/single.vue index 6e1c0e9ae..4ce7433c1 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/Check/single.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/Check/single.vue @@ -193,8 +193,8 @@ export default { CheckTime:{ type: 'text', title: '审核人' }, CheckUserNo: { type: 'select', title: '审核人',dataSource: '1' }, LeaveType: { type: 'select', title: '请假类型', dataSource: '0' }, - StartTime: { type: 'datetime', title: '开始时间', dateformat: '1' }, - EndTime: { type: 'datetime', title: '结束时间', dateformat: '1' }, + StartTime: { type: 'datetime', title: '开始时间', dateformat: '0' }, + EndTime: { type: 'datetime', title: '结束时间', dateformat: '0' }, LeaveDay: { type: 'number', title: '请假天数',verify:"NumOrNull" }, LeaveReason: { type: 'texteditor', title: '请假事由' }, CreateUserNo: { type: 'text', title: '学号' }, diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentCheck/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentCheck/list.vue index 50709ce63..af8cd70a1 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentCheck/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentCheck/list.vue @@ -45,7 +45,7 @@ {{ k.ClassRoomName }} + :class="k.Sort == '迟到'? 'studCheckStatue5' : k.Sort == '早退'? 'studCheckStatue2' : k.Sort == '病假'? 'studCheckStatue4' : k.Sort == '事假'? 'studCheckStatue6' : k.Sort == '准时'? 'studCheckStatue1' : 'studCheckStatue3' "> {{ k.Sort }} @@ -420,7 +420,23 @@ .studCheckStatue4 text { background: #29cf41; } - + + .studCheckStatue5 { + color: #ad5151; + } + + .studCheckStatue5 text { + background: #ad5151; + } + + .studCheckStatue6 { + color: #84f193; + } + + .studCheckStatue6 text { + background: #84f193; + } + .noHtml { height: 100%; line-height: 60px;