diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.js
index 1b0798622..2efc5f652 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.js	
@@ -134,7 +134,8 @@ var bootstrap = function ($, learun) {
                                     callback(_data.text);
                                 }
                             });
-                        } },
+                        }
+                    },
                     { label: "考勤时间", name: "ADTime", width: 150, align: "left" },
                     { label: "打卡时间", name: "ClockTime", width: 150, align: "left" },
                     {
@@ -146,19 +147,21 @@ var bootstrap = function ($, learun) {
                                     //callback(_data.text);
                                     if (_data.text) {
                                         if (_data.text == "正常") {
-                                            callback('<span class=\"label label-success\">'+_data.text+'</span>');
+                                            callback('<span class=\"label label-success\">' + _data.text + '</span>');
                                         } else {
-                                            callback('<span class=\"label label-warning\">'+_data.text+'</span>');
+                                            callback('<span class=\"label label-warning\">' + _data.text + '</span>');
                                         }
                                     }
-                                    
+
                                 }
                             });
-                        } },
+                        }
+                    },
                     { label: "打卡地点", name: "ClockPlace", width: 100, align: "left" },
                 ],
                 mainId: 'ID',
-                isPage: true
+                isPage: true,
+                sidx: "UserNo,ADYear,ADMonth,ADDay,ADTime",
             });
         },
         search: function (param) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ADR_Restriction/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ADR_Restriction/Form.cshtml
index a7cb5ac60..d8051cc11 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ADR_Restriction/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ADR_Restriction/Form.cshtml	
@@ -2,46 +2,53 @@
     ViewBag.Title = "考勤限制";
     Layout = "~/Views/Shared/_Form.cshtml";
 }
+<style>
+
+    .lr-form-item-title {
+        width: 117px;
+        padding-right: 21px;
+    }
+</style>
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-12 lr-form-item"  data-table="ADR_Restriction" >
-        <div class="lr-form-item-title">开始时间</div>
+    <div class="col-xs-12 lr-form-item" data-table="ADR_Restriction">
+        <div class="lr-form-item-title">上班时间</div>
         <input id="WorkTime" type="text" class="form-control" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="ADR_Restriction" >
-        <div class="lr-form-item-title">结束时间</div>
+    <div class="col-xs-12 lr-form-item" data-table="ADR_Restriction">
+        <div class="lr-form-item-title">下班时间</div>
         <input id="CloseTime" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="ADR_Restriction" >
-        <div class="lr-form-item-title">签到有效时间</div>
-        <input id="SignInStartTime" type="text" class="form-control "/>
-    </div>
-    <div class="col-xs-6 lr-form-item"  data-table="ADR_Restriction" >
-        <div class="lr-form-item-title">-</div>
-        <input id="SignInEndTime" type="text" class="form-control "/>
-    </div>
-    <div class="col-xs-6 lr-form-item"  data-table="ADR_Restriction" >
-        <div class="lr-form-item-title">签退有效时间</div>
-        <input id="SignOutStartTime" type="text" class="form-control "/>
-    </div>
-    <div class="col-xs-6 lr-form-item"  data-table="ADR_Restriction" >
-        <div class="lr-form-item-title">-</div>
-        <input id="SignOutEndTime" type="text" class="form-control "/>
-    </div>
-    <div class="col-xs-12 lr-form-item"  data-table="ADR_Restriction" >
-        <div class="lr-form-item-title">迟到超过时间</div>
-        <input id="LateOvertime" type="text" class="form-control"  />
-    </div>
-    <div class="col-xs-12 lr-form-item"  data-table="ADR_Restriction" >
-        <div class="lr-form-item-title">早退超过时间</div>
-        <input id="LeaveOverTime" type="text" class="form-control"  />
-    </div>
-    <div class="col-xs-12 lr-form-item"  data-table="ADR_Restriction" >
+    @*<div class="col-xs-6 lr-form-item"  data-table="ADR_Restriction" >
+            <div class="lr-form-item-title">签到有效时间</div>
+            <input id="SignInStartTime" type="text" class="form-control "/>
+        </div>
+        <div class="col-xs-6 lr-form-item"  data-table="ADR_Restriction" >
+            <div class="lr-form-item-title">-</div>
+            <input id="SignInEndTime" type="text" class="form-control "/>
+        </div>
+        <div class="col-xs-6 lr-form-item"  data-table="ADR_Restriction" >
+            <div class="lr-form-item-title">签退有效时间</div>
+            <input id="SignOutStartTime" type="text" class="form-control "/>
+        </div>
+        <div class="col-xs-6 lr-form-item"  data-table="ADR_Restriction" >
+            <div class="lr-form-item-title">-</div>
+            <input id="SignOutEndTime" type="text" class="form-control "/>
+        </div>*@
+    <div class="col-xs-12 lr-form-item" data-table="ADR_Restriction">
+        <div class="lr-form-item-title">允许迟到范围(分)</div>
+        <input id="LateOvertime" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ADR_Restriction">
+        <div class="lr-form-item-title">允许早退范围(分)</div>
+        <input id="LeaveOverTime" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ADR_Restriction">
         <div class="lr-form-item-title">未签到，记为</div>
-        <div id="NoSignIn"  ></div>
+        <div id="NoSignIn"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="ADR_Restriction" >
+    <div class="col-xs-12 lr-form-item" data-table="ADR_Restriction">
         <div class="lr-form-item-title">未签退，记为</div>
-        <div id="NoSignOut"  ></div>
+        <div id="NoSignOut"></div>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/PersonnelManagement/Views/ADR_Restriction/Form.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ADR_Restriction/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ADR_Restriction/Form.js
index 2dc4b02ec..48b7c34de 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ADR_Restriction/Form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ADR_Restriction/Form.js	
@@ -15,8 +15,8 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $('#NoSignIn').lrDataItemSelect({ code: 'ADR_Status' });
-            $('#NoSignOut').lrDataItemSelect({ code: 'ADR_Status' });
+            $('#NoSignIn').lrDataItemSelect({ code: 'ADStatus' });
+            $('#NoSignOut').lrDataItemSelect({ code: 'ADStatus' });
         },
         initData: function () {
             if (!!keyValue) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ADR_Restriction/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ADR_Restriction/Index.js
index c07fa16d5..2105d76c0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ADR_Restriction/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ADR_Restriction/Index.js	
@@ -65,19 +65,19 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/PersonnelManagement/ADR_Restriction/GetPageList',
                 headData: [
-                    { label: "开始时间", name: "WorkTime", width: 100, align: "left"},
-                    { label: "结束时间", name: "CloseTime", width: 100, align: "left"},
-                    { label: "签到有效时间", name: "SignInStartTime", width: 100, align: "left"},
-                    { label: "-", name: "SignInEndTime", width: 100, align: "left"},
-                    { label: "签退有效时间", name: "SignOutStartTime", width: 100, align: "left"},
-                    { label: "-", name: "SignOutEndTime", width: 100, align: "left"},
-                    { label: "迟到超过时间", name: "LateOvertime", width: 100, align: "left"},
-                    { label: "早退超过时间", name: "LeaveOverTime", width: 100, align: "left"},
+                    { label: "上班时间", name: "WorkTime", width: 100, align: "left"},
+                    { label: "下班时间", name: "CloseTime", width: 100, align: "left"},
+                    //{ label: "签到有效时间", name: "SignInStartTime", width: 100, align: "left"},
+                    //{ label: "-", name: "SignInEndTime", width: 100, align: "left"},
+                    //{ label: "签退有效时间", name: "SignOutStartTime", width: 100, align: "left"},
+                    //{ label: "-", name: "SignOutEndTime", width: 100, align: "left"},
+                    { label: "允许迟到范围(分)", name: "LateOvertime", width: 100, align: "left"},
+                    { label: "允许早退范围(分)", name: "LeaveOverTime", width: 100, align: "left"},
                     { label: "未签到，记为", name: "NoSignIn", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op,$cell) {
                              learun.clientdata.getAsync('dataItem', {
                                  key: value,
-                                 code: 'ADR_Status',
+                                 code: 'ADStatus',
                                  callback: function (_data) {
                                      callback(_data.text);
                                  }
@@ -87,7 +87,7 @@ var bootstrap = function ($, learun) {
                         formatterAsync: function (callback, value, row, op,$cell) {
                              learun.clientdata.getAsync('dataItem', {
                                  key: value,
-                                 code: 'ADR_Status',
+                                 code: 'ADStatus',
                                  callback: function (_data) {
                                      callback(_data.text);
                                  }
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordService.cs
index e5248474d..226e1d428 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordService.cs	
@@ -68,6 +68,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                 }
 
 
+
                 return this.BaseRepository("CollegeMIS").FindList<ADR_RecordEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json
index db1d81965..cf65c06a9 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json	
@@ -137,11 +137,11 @@
 
   // 全局样式
   "globalStyle": {
-    "navigationBarTextStyle": "black",
-    "enablePullDownRefresh": false,
-    "navigationBarBackgroundColor": "#FFF",
-    "backgroundColor": "#f3f3f3",
-    "navigationBarTitleText": "力软敏捷开发框架",
+    "navigationBarTextStyle": "black",//导航栏标题颜色及状态栏前景颜色
+    "enablePullDownRefresh": false,//是否开启下拉刷新
+    "navigationBarBackgroundColor": "#FFF",//导航栏背景颜色
+    "backgroundColor": "#f3f3f3",//窗口背景色
+    "navigationBarTitleText": "数字化校园",//导航栏标题文字内容
     "mp-alipay": { "allowsBounceVertical": "NO" }
   },