From 8a3437c09fbc2888a901f2db79699d3fa8f718c9 Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Fri, 1 Jul 2022 15:26:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E8=AF=B7=E5=81=87-?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=AD=97=E6=AE=B5=E5=8F=98=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/StuLeaveManagement/CheckForm.cshtml                 | 4 ++--
 .../Views/StuLeaveManagement/CheckIndex.js                    | 4 ++--
 .../Views/StuLeaveManagement/Form.cshtml                      | 4 ++--
 .../Views/StuLeaveManagement/Index.js                         | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckForm.cshtml
index 3e466ce5d..a2ec26ea8 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckForm.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckForm.cshtml	
@@ -8,11 +8,11 @@
         <div id="LeaveType" readonly isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="StuLeaveManagement">
-        <div class="lr-form-item-title">开始时间<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">请假时间<font face="宋体">*</font></div>
         <input id="StartTime" readonly type="text" class="form-control lr-input-wdatepicker" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="StuLeaveManagement">
-        <div class="lr-form-item-title">结束时间<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">返校时间<font face="宋体">*</font></div>
         <input id="EndTime" readonly type="text" class="form-control lr-input-wdatepicker" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="StuLeaveManagement">
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckIndex.js
index a2cf48498..b3ebe58b7 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckIndex.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckIndex.js	
@@ -89,8 +89,8 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "开始时间", name: "StartTime", width: 100, align: "left" },
-                    { label: "结束时间", name: "EndTime", width: 100, align: "left" },
+                    { label: "请假时间", name: "StartTime", width: 100, align: "left" },
+                    { label: "返校时间", name: "EndTime", width: 100, align: "left" },
                     { label: "请假天数", name: "LeaveDay", width: 100, align: "left" },
                     { label: "请假事由", name: "LeaveReason", width: 100, align: "left" },
                     { label: "学号", name: "CreateUserNo", width: 100, align: "left" },
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Form.cshtml
index 2ecde1b38..4dad89d71 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Form.cshtml	
@@ -8,11 +8,11 @@
         <div id="LeaveType" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="StuLeaveManagement">
-        <div class="lr-form-item-title">开始时间<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">请假时间<font face="宋体">*</font></div>
         <input id="StartTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ maxDate:'#F{$dp.$D(\'EndTime\')}', dateFmt:'yyyy-MM-dd',onpicked: function () { $('#StartTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="StuLeaveManagement">
-        <div class="lr-form-item-title">结束时间<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">返校时间<font face="宋体">*</font></div>
         <input id="EndTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ minDate:'#F{$dp.$D(\'StartTime\')}',dateFmt:'yyyy-MM-dd',onpicked: function () { $('#EndTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="StuLeaveManagement">
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Index.js
index d0d41a159..ba1e8eec3 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Index.js	
@@ -119,8 +119,8 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "开始时间", name: "StartTime", width: 100, align: "left" },
-                    { label: "结束时间", name: "EndTime", width: 100, align: "left" },
+                    { label: "请假时间", name: "StartTime", width: 100, align: "left" },
+                    { label: "返校时间", name: "EndTime", width: 100, align: "left" },
                     { label: "请假天数", name: "LeaveDay", width: 100, align: "left" },
                     { label: "请假事由", name: "LeaveReason", width: 100, align: "left" },
                     { label: "学号", name: "CreateUserNo", width: 100, align: "left" },

From 3bbe94f39cd7866fd22e1673d831edd7b370d182 Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Fri, 1 Jul 2022 15:49:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E7=94=9F=E6=8A=A5=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/StuEnrollPhone/SearchResult.cshtml                   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/SearchResult.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/SearchResult.cshtml
index d5288f63c..1bf8c5658 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/SearchResult.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/SearchResult.cshtml	
@@ -1,5 +1,4 @@
 @{
-    ViewBag.Title = "数字化校园-查询结果";
     Layout = null;
 }
 
@@ -11,7 +10,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <meta name="format-detection" content="telephone=no" />
     <link rel="shortcut icon" href="" />
-    <title></title>
+    <title>查询结果</title>
     <meta name="keywords" content="" />
     <meta name="description" content="数字化校园-新生报名" />
     <link href="~/Content/css/font-awesome.css" rel="stylesheet" />