From c055ebb68f2e01466b7f8530c6e79d9f7cb88f20 Mon Sep 17 00:00:00 2001
From: libo <libo_at@163.com>
Date: Sat, 4 Feb 2023 16:47:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=91=E5=AD=A6=E5=A4=8D=E5=AD=A6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=BC=91=E5=AD=A6=E6=97=B6=E6=AE=B5=20=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=BC=80=E5=A7=8B=E5=92=8C=E7=BB=93=E6=9D=9F=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/StuTransferInfo/RestAgainIndex.cshtml     | 13 +++++++++----
 .../Views/StuTransferInfo/RestAgainIndex.js         | 13 +++++++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.cshtml
index 7db8c18e7..7a9bf07d6 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.cshtml	
@@ -124,17 +124,22 @@
                         <div class="lr-form-item-title">保留学籍<font face="宋体">*</font></div>
                         <div id="StuStatus" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
                     </div>
-                    <div class="col-xs-2 lr-form-item">
+                    <div class="col-xs-3 lr-form-item">
                         <div class="lr-form-item-title">离班日期<font face="宋体">*</font></div>
                         <input id="EnteDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#EnteDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
                     </div>
-                    <div class="col-xs-2 lr-form-item">
+                    <div class="col-xs-3 lr-form-item">
                         <div class="lr-form-item-title">休学年限<font face="宋体">*</font></div>
                         <input id="SuspensionPeriod" class="form-control" type="text" isvalid="yes" checkexpession="NotNull" />
                     </div>
-                    <div class="col-xs-2 lr-form-item" >
+                    <div class="col-xs-2 lr-form-item">
                         <div class="lr-form-item-title">休学时段<font face="宋体">*</font></div>
-                        <input id="SuspensionBeginTime" class="form-control" type="text" isvalid="yes" checkexpession="NotNull" />
+                        <input id="SuspensionBeginTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({maxDate:'#F{$dp.$D(\'SuspensionEndTime\',{d:-3});}', dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#SuspensionBeginTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
+
+                    </div>
+                    <div class="col-xs-2 lr-form-item" style="padding-left:25px;">
+                        <div class="lr-form-item-title" style="width:25px;" >至<font face="宋体">*</font></div>
+                        <input id="SuspensionEndTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({minDate:'#F{$dp.$D(\'SuspensionBeginTime\',{d:3})}', dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#SuspensionEndTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
 
                     </div>
                     <div class="col-xs-12 lr-form-item">
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.js
index 7b09fbff7..cfb8642af 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.js	
@@ -19,10 +19,23 @@ var bootstrap = function ($, learun) {
                 } 
             })
             $('#SubmitBtn').on('click', function () {
+                
                 if (!$('body').lrValidform()) {
                     return false;
                 }
                 var entity = $('body').lrGetFormData();
+                let starttime = new Date(entity.SuspensionBeginTime).getTime();
+                let endtime = new Date(entity.SuspensionEndTime).getTime();
+                if (endtime < starttime) {
+                    learun.alert.warning("起始日期不能大于终止日期！");
+                    return false;
+                }
+
+                if (parseInt(Math.abs(endtime - starttime) / 1000 / 60 / 60 / 24) < 183) {
+                    learun.alert.warning("起始时间与终止时间不能小于半年！");
+                    return false;
+                }
+                
                 var selgridtab = $('#selgridtab').jfGridGet('rowdatas');
                 $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/SaveForm', { entity: entity, strStuEntity: JSON.stringify(selgridtab) },
                     function (res) {