Merge branch '塔里木分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 塔里木分支

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" />

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">

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" },

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">

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" },