Merge branch 'master' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ADR_Restriction/Form.cshtml

@@ -4,38 +4,40 @@
 }
 <style>
 
-        /*    .lr-form-item-title {
-            width: 117px;
-            padding-right: 21px;
+    .lr-form-item-title {
+            width: 120px;
+            padding-right: 10px;
         }
-    */
+    .lr-form-item {
+        padding: 5px 0 5px 120px;
+    }
 </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">上班时间<font face="宋体">*</font></div>
         <input id="WorkTime" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-6 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">上午签到有效时间<font face="宋体">*</font></div>
         <input id="SignInStartTime" type="text" class="form-control " isvalid="yes" checkexpession="NotNull"  />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="ADR_Restriction">
         <div class="lr-form-item-title">-<font face="宋体">*</font></div>
         <input id="SignInEndTime" type="text" class="form-control " isvalid="yes" checkexpession="NotNull"  />
-    </div>
+    </div>*@
 
     <div class="col-xs-12 lr-form-item" data-table="ADR_Restriction">
         <div class="lr-form-item-title">下班时间<font face="宋体">*</font></div>
         <input id="CloseTime" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-6 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">下午签退有效时间<font face="宋体">*</font></div>
         <input id="SignOutStartTime" type="text" class="form-control " isvalid="yes" checkexpession="NotNull"  />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="ADR_Restriction">
         <div class="lr-form-item-title">-<font face="宋体">*</font></div>
         <input id="SignOutEndTime" type="text" class="form-control "  isvalid="yes" checkexpession="NotNull" />
-    </div>
+    </div>*@
     <div class="col-xs-12 lr-form-item" data-table="ADR_Restriction">
         <div class="lr-form-item-title">打卡次数<font face="宋体">*</font></div>
         <div id="ClockTime" class="form-control" isvalid="yes" checkexpession="NotNull"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ADR_Restriction/Index.js

@@ -24,7 +24,7 @@ var bootstrap = function ($, learun) {
                     title: '新增',
                     url: top.$.rootUrl + '/PersonnelManagement/ADR_Restriction/Form',
                     width: 600,
-                    height: 400,
+                    height: 520,
                     callBack: function (id) {
                         return top[id].acceptClick(refreshGirdData);
                     }
@@ -39,7 +39,7 @@ var bootstrap = function ($, learun) {
                         title: '编辑',
                         url: top.$.rootUrl + '/PersonnelManagement/ADR_Restriction/Form?keyValue=' + keyValue,
                         width: 600,
-                        height: 400,
+                        height: 520,
                         callBack: function (id) {
                             return top[id].acceptClick(refreshGirdData);
                         }
@@ -80,18 +80,18 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/PersonnelManagement/ADR_Restriction/GetPageList',
                 headData: [
                     { label: "上班时间", name: "WorkTime", width: 100, align: "left" },
-                    { label: "签到开始时间", name: "SignInStartTime", width: 100, align: "left" },
-                    { label: "签到结束时间", name: "SignInEndTime", width: 100, align: "left" },
+                    //{ label: "签到开始时间", name: "SignInStartTime", width: 100, align: "left" },
+                    //{ label: "签到结束时间", name: "SignInEndTime", width: 100, align: "left" },
                     { label: "下班时间", name: "CloseTime", width: 100, align: "left" },
-                    { label: "签退开始时间", name: "SignOutStartTime", width: 100, align: "left" },
-                    { label: "签退结束时间", name: "SignOutEndTime", width: 100, align: "left" },
+                    //{ label: "签退开始时间", name: "SignOutStartTime", width: 100, align: "left" },
+                    //{ label: "签退结束时间", name: "SignOutEndTime", width: 100, align: "left" },
                     { label: "打卡次数", name: "ClockTime", width: 100, align: "left" },
                     { label: "中午签退时间", name: "NoonCloseTime", width: 100, align: "left" },
-                    { label: "中午签退开始时间", name: "SignOutStartTime2", width: 100, align: "left" },
-                    { label: "中午签退结束时间", name: "SignOutEndTime2", width: 100, align: "left" },
+                    { label: "中午签退开始时间", name: "SignOutStartTime2", width: 150, align: "left" },
+                    { label: "中午签退结束时间", name: "SignOutEndTime2", width: 150, align: "left" },
                     { label: "中午签到时间", name: "NoonWorkTime", width: 100, align: "left" },
-                    { label: "中午签到开始时间", name: "SignInStartTime2", width: 100, align: "left" },
-                    { label: "中午签到结束时间", name: "SignInEndTime2", width: 100, align: "left" },
+                    { label: "中午签到开始时间", name: "SignInStartTime2", width: 150, align: "left" },
+                    { label: "中午签到结束时间", name: "SignInEndTime2", width: 150, align: "left" },
                     { label: "允许迟到范围(分)", name: "LateOvertime", width: 100, align: "left" },
                     { label: "允许早退范围(分)", name: "LeaveOverTime", width: 100, align: "left" },
                     {