签到规则完善

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

@@ -4,48 +4,67 @@
 }
 <style>
 
-/*    .lr-form-item-title {
-        width: 117px;
-        padding-right: 21px;
-    }
-*/</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">上班时间<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="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 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="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 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>
+        <div id="ClockTime" 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="NoonCloseTime" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"  />
+        <input id="NoonCloseTime" 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="SignOutStartTime2" 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="SignOutEndTime2" type="text" class="form-control " isvalid="yes" checkexpession="NotNull"  />
     </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="NoonWorkTime" 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">签到有效时间</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-6 lr-form-item" data-table="ADR_Restriction">
+        <div class="lr-form-item-title">中午签到有效时间<font face="宋体">*</font></div>
+        <input id="SignInStartTime2" 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="SignInEndTime2" type="text" class="form-control " isvalid="yes" checkexpession="NotNull"  />
+    </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="LateOvertime" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />

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

@@ -25,15 +25,31 @@ var bootstrap = function ($, learun) {
                     function (val) {
                         if (val.value == "四次打卡") {
                             $('#NoonCloseTime').parent('.lr-form-item').show();
+                            $('#NoonWorkTime').parent('.lr-form-item').show();
                             $('#NoonCloseTime').removeAttr('isvalid');
                             $('#NoonWorkTime').removeAttr('isvalid');
-                            $('#NoonWorkTime').parent('.lr-form-item').show();
+                            $('#SignOutStartTime2').parent('.lr-form-item').show();
+                            $('#SignOutEndTime2').parent('.lr-form-item').show();
+                            $('#SignInStartTime2').parent('.lr-form-item').show();
+                            $('#SignInEndTime2').parent('.lr-form-item').show();
+                            $('#SignOutStartTime2').removeAttr('isvalid');
+                            $('#SignOutEndTime2').removeAttr('isvalid');
+                            $('#SignInStartTime2').removeAttr('isvalid');
+                            $('#SignInEndTime2').removeAttr('isvalid');
                         } else {
 
                             $('#NoonCloseTime').parent('.lr-form-item').hide();
                             $('#NoonWorkTime').parent('.lr-form-item').hide();
                             $('#NoonCloseTime').attr('isvalid','true');
                             $('#NoonWorkTime').attr('isvalid','true');
+                            $('#SignOutStartTime2').parent('.lr-form-item').hide();
+                            $('#SignOutEndTime2').parent('.lr-form-item').hide();
+                            $('#SignInStartTime2').parent('.lr-form-item').hide();
+                            $('#SignInEndTime2').parent('.lr-form-item').hide();
+                            $('#SignOutStartTime2').attr('isvalid', 'true');
+                            $('#SignOutEndTime2').attr('isvalid', 'true');
+                            $('#SignInStartTime2').attr('isvalid', 'true');
+                            $('#SignInEndTime2').attr('isvalid', 'true');
                         }
                     }
             }).lrselectSet('二次打卡');

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

@@ -80,14 +80,18 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/PersonnelManagement/ADR_Restriction/GetPageList',
                 headData: [
                     { label: "上班时间", name: "WorkTime", width: 100, align: "left" },
+                    { label: "签到开始u时间", name: "SignInStartTime", width: 100, align: "left" },
+                    { label: "签到结束时间", name: "SignInEndTime", 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: "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: "NoonWorkTime", width: 100, align: "left" },
+                    { label: "中午签到开始时间", name: "SignInStartTime2", width: 100, align: "left" },
+                    { label: "中午签到结束时间", name: "SignInEndTime2", width: 100, align: "left" },
                     { label: "允许迟到范围(分)", name: "LateOvertime", width: 100, align: "left" },
                     { label: "允许早退范围(分)", name: "LeaveOverTime", width: 100, align: "left" },
                     {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/资产系统.PDM

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{88086B01-C9E1-11D4-9552-0090277716A9}" Label="" LastModificationDate="1599211229" Name="Physical Data Model 1" Objects="3249" Symbols="378" Target="Microsoft SQL Server 2008" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{88086B01-C9E1-11D4-9552-0090277716A9}" Label="" LastModificationDate="1599707794" Name="Physical Data Model 1" Objects="3254" Symbols="378" Target="Microsoft SQL Server 2008" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -11927,7 +11927,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:CreationDate>1599114139</a:CreationDate>
 <a:ModificationDate>1599193158</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-118462,192473), (-106000,203795))</a:Rect>
+<a:Rect>((-119234,190410), (-105228,205858))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -47662,8 +47662,8 @@ B9AF
 <a:Code>ADR_Restriction</a:Code>
 <a:CreationDate>1599114139</a:CreationDate>
 <a:Creator>edz</a:Creator>
-<a:ModificationDate>1599202395</a:ModificationDate>
-<a:Modifier>Administrator</a:Modifier>
+<a:ModificationDate>1599707794</a:ModificationDate>
+<a:Modifier>edz</a:Modifier>
 <a:Comment>考勤限制</a:Comment>
 <a:TotalSavingCurrency/>
 <c:Columns>
@@ -47806,9 +47806,69 @@ B9AF
 <a:Modifier>Administrator</a:Modifier>
 <a:DataType>bit</a:DataType>
 </o:Column>
+<o:Column Id="o3182">
+<a:ObjectID>9205CACA-F511-43A8-9777-90F8D79B4565</a:ObjectID>
+<a:Name>打卡次数</a:Name>
+<a:Code>ClockTime</a:Code>
+<a:CreationDate>1599707178</a:CreationDate>
+<a:Creator>edz</a:Creator>
+<a:ModificationDate>1599707290</a:ModificationDate>
+<a:Modifier>edz</a:Modifier>
+<a:Comment>打卡次数</a:Comment>
+<a:DataType>nvarchar(50)</a:DataType>
+<a:Length>50</a:Length>
+</o:Column>
+<o:Column Id="o3183">
+<a:ObjectID>9C53906E-6A91-4D87-A09E-FDE7615D3864</a:ObjectID>
+<a:Name>中午规定签到时间</a:Name>
+<a:Code>SignInStartTime2</a:Code>
+<a:CreationDate>1599707178</a:CreationDate>
+<a:Creator>edz</a:Creator>
+<a:ModificationDate>1599707794</a:ModificationDate>
+<a:Modifier>edz</a:Modifier>
+<a:Comment>中午规定签到时间</a:Comment>
+<a:DataType>nvarchar(50)</a:DataType>
+<a:Length>50</a:Length>
+</o:Column>
+<o:Column Id="o3184">
+<a:ObjectID>88BFCDBF-2690-43DD-A0A8-38A02A85AEE9</a:ObjectID>
+<a:Name>中午规定签退时间</a:Name>
+<a:Code>SignInEndTime2</a:Code>
+<a:CreationDate>1599707178</a:CreationDate>
+<a:Creator>edz</a:Creator>
+<a:ModificationDate>1599707794</a:ModificationDate>
+<a:Modifier>edz</a:Modifier>
+<a:Comment>中午规定签退时间</a:Comment>
+<a:DataType>nvarchar(50)</a:DataType>
+<a:Length>50</a:Length>
+</o:Column>
+<o:Column Id="o3185">
+<a:ObjectID>5B272C5B-110F-4E45-B52D-5F429F82BDEC</a:ObjectID>
+<a:Name>中午签到时间</a:Name>
+<a:Code>NoonWorkTime</a:Code>
+<a:CreationDate>1599707292</a:CreationDate>
+<a:Creator>edz</a:Creator>
+<a:ModificationDate>1599707794</a:ModificationDate>
+<a:Modifier>edz</a:Modifier>
+<a:Comment>中午签到时间</a:Comment>
+<a:DataType>nvarchar(50)</a:DataType>
+<a:Length>50</a:Length>
+</o:Column>
+<o:Column Id="o3186">
+<a:ObjectID>6FB178FE-9A22-4FE4-A2A1-251832744FB3</a:ObjectID>
+<a:Name>中午签退时间</a:Name>
+<a:Code>NoonCloseTime</a:Code>
+<a:CreationDate>1599707292</a:CreationDate>
+<a:Creator>edz</a:Creator>
+<a:ModificationDate>1599707794</a:ModificationDate>
+<a:Modifier>edz</a:Modifier>
+<a:Comment>中午签退时间</a:Comment>
+<a:DataType>nvarchar(50)</a:DataType>
+<a:Length>50</a:Length>
+</o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o3182">
+<o:Key Id="o3187">
 <a:ObjectID>8ADE1FCB-0EC0-4C87-833F-EF8E53656C24</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -47822,10 +47882,10 @@ B9AF
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o3182"/>
+<o:Key Ref="o3187"/>
 </c:PrimaryKey>
 <c:ClusterObject>
-<o:Key Ref="o3182"/>
+<o:Key Ref="o3187"/>
 </c:ClusterObject>
 </o:Table>
 </c:Tables>
@@ -47850,7 +47910,7 @@ B9AF
 <o:Key Ref="o668"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o3183">
+<o:ReferenceJoin Id="o3188">
 <a:ObjectID>14D78C43-17A2-48F0-83B4-3DF757D5ABE8</a:ObjectID>
 <a:CreationDate>1552635393</a:CreationDate>
 <a:Creator>l</a:Creator>
@@ -47885,7 +47945,7 @@ B9AF
 <o:Key Ref="o763"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o3184">
+<o:ReferenceJoin Id="o3189">
 <a:ObjectID>FEAECB7B-8E2A-4492-A530-B0062E1511B8</a:ObjectID>
 <a:CreationDate>1552635777</a:CreationDate>
 <a:Creator>l</a:Creator>
@@ -47920,7 +47980,7 @@ B9AF
 <o:Key Ref="o791"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o3185">
+<o:ReferenceJoin Id="o3190">
 <a:ObjectID>81527A47-E565-49C2-AAA7-F0555E81CE72</a:ObjectID>
 <a:CreationDate>1553245426</a:CreationDate>
 <a:Creator>l</a:Creator>
@@ -47955,7 +48015,7 @@ B9AF
 <o:Key Ref="o802"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o3186">
+<o:ReferenceJoin Id="o3191">
 <a:ObjectID>A3225D9D-069C-4A67-ABF0-43DC2FA55CF0</a:ObjectID>
 <a:CreationDate>1553247802</a:CreationDate>
 <a:Creator>l</a:Creator>
@@ -47989,7 +48049,7 @@ B9AF
 <o:Key Ref="o700"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o3187">
+<o:ReferenceJoin Id="o3192">
 <a:ObjectID>B458081F-CEE1-4251-9E7A-5E9CC93519D5</a:ObjectID>
 <a:CreationDate>1553248376</a:CreationDate>
 <a:Creator>l</a:Creator>
@@ -48024,7 +48084,7 @@ B9AF
 <o:Key Ref="o780"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o3188">
+<o:ReferenceJoin Id="o3193">
 <a:ObjectID>8397C4F6-A728-4D3F-B2F8-FAC56886462B</a:ObjectID>
 <a:CreationDate>1553248622</a:CreationDate>
 <a:Creator>l</a:Creator>
@@ -48058,7 +48118,7 @@ B9AF
 <o:Key Ref="o840"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o3189">
+<o:ReferenceJoin Id="o3194">
 <a:ObjectID>2F8BC700-F31E-41CC-9DA8-9505EAC5DA85</a:ObjectID>
 <a:CreationDate>1553483161</a:CreationDate>
 <a:Creator>l</a:Creator>
@@ -48092,7 +48152,7 @@ B9AF
 <o:Key Ref="o873"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o3190">
+<o:ReferenceJoin Id="o3195">
 <a:ObjectID>0E2D2049-564F-4247-9F5B-B0AA82F9BE96</a:ObjectID>
 <a:CreationDate>1555404296</a:CreationDate>
 <a:Creator>admin</a:Creator>
@@ -48109,7 +48169,7 @@ B9AF
 </o:Reference>
 </c:References>
 <c:DefaultGroups>
-<o:Group Id="o3191">
+<o:Group Id="o3196">
 <a:ObjectID>46EC3E2A-6CBF-421A-9DA8-6BCCEDEC7DF5</a:ObjectID>
 <a:Name>PUBLIC</a:Name>
 <a:Code>PUBLIC</a:Code>
@@ -48372,7 +48432,7 @@ B9AF
 </o:ExtendedDependency>
 </c:ChildTraceabilityLinks>
 <c:TargetModels>
-<o:TargetModel Id="o3192">
+<o:TargetModel Id="o3197">
 <a:ObjectID>B1BAD530-6C69-4A9D-BD41-F62F564CA348</a:ObjectID>
 <a:Name>Microsoft SQL Server 2008</a:Name>
 <a:Code>MSSQLSRV2008</a:Code>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionEntity.cs

@@ -82,12 +82,12 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         public string ClockTime { get; set; }
 
         /// <summary>
-        /// 中午规定签到时间
+        /// 中午签到开始时间
         /// </summary>
         [Column("SIGNINSTARTTIME2")]
         public string SignInStartTime2 { get; set; }
         /// <summary>
-        /// 中午规定签退时间
+        /// 中午签到结束时间
         /// </summary>
         [Column("SIGNINENDTIME2")]
         public string SignInEndTime2 { get; set; }
@@ -101,6 +101,16 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// </summary>
         [Column("NOONCLOSETIME")]
         public string NoonCloseTime { get; set; }
+        /// <summary>
+        /// 中午签退开始时间
+        /// </summary>
+        [Column("SIGNOUTSTARTTIME2")]
+        public string SignOutStartTime2 { get; set; }
+        /// <summary>
+        /// 中午签退结束时间
+        /// </summary>
+        [Column("SIGNOUTENDTIME2")]
+        public string SignOutEndTime2 { get; set; }
         #endregion
 
         #region 扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionService.cs

@@ -48,6 +48,8 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 t.SignInEndTime2,
                 t.NoonWorkTime,
                 t.NoonCloseTime,
+                t.SignOutStartTime2,
+                t.SignOutEndTime2,
                 t.NoSignOut
                 ");
                 strSql.Append("  FROM ADR_Restriction t ");