考勤规则增加中午打卡

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

@@ -18,6 +18,18 @@
         <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-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>
+    <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"  />
+    </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 "/>

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

@@ -17,13 +17,34 @@ var bootstrap = function ($, learun) {
         bind: function () {
             $('#NoSignIn').lrDataItemSelect({ code: 'ADStatus' });
             $('#NoSignOut').lrDataItemSelect({ code: 'ADStatus' });
+            $('#ClockTime').lrselect({
+                data: [{ 'value': '二次打卡', text: '二次打卡' }, { 'value': '四次打卡', text: '四次打卡' }],
+                value: "value",
+                text: "text",
+                select:
+                    function (val) {
+                        if (val.value == "四次打卡") {
+                            $('#NoonCloseTime').parent('.lr-form-item').show();
+                            $('#NoonCloseTime').removeAttr('isvalid');
+                            $('#NoonWorkTime').removeAttr('isvalid');
+                            $('#NoonWorkTime').parent('.lr-form-item').show();
+                        } else {
+
+                            $('#NoonCloseTime').parent('.lr-form-item').hide();
+                            $('#NoonWorkTime').parent('.lr-form-item').hide();
+                            $('#NoonCloseTime').attr('isvalid','true');
+                            $('#NoonWorkTime').attr('isvalid','true');
+                        }
+                    }
+            }).lrselectSet('二次打卡');
+
         },
         initData: function () {
             if (!!keyValue) {
                 $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/ADR_Restriction/GetFormData?keyValue=' + keyValue, function (data) {
                     for (var id in data) {
                         if (!!data[id].length && data[id].length > 0) {
-                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                            $('#' + id).jfGridSet('refreshdata', data[id]);
                         }
                         else {
                             $('[data-table="' + id + '"]').lrSetFormData(data[id]);

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

@@ -85,6 +85,9 @@ var bootstrap = function ($, learun) {
                     //{ label: "-", name: "SignInEndTime", 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: "NoonWorkTime", 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/PersonnelManagement/ADR_Restriction/ADR_RestrictionEntity.cs

@@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
     /// 日 期：2020-09-03 14:57
     /// 描 述：考勤限制
     /// </summary>
-    public class ADR_RestrictionEntity 
+    public class ADR_RestrictionEntity
     {
         #region 实体成员
         /// <summary>
@@ -74,6 +74,33 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// </summary>
         [Column("RENABLE")]
         public bool? REnable { get; set; }
+
+        /// <summary>
+        /// 打卡次数
+        /// </summary>
+        [Column("CLOCKTIME")]
+        public string ClockTime { get; set; }
+
+        /// <summary>
+        /// 中午规定签到时间
+        /// </summary>
+        [Column("SIGNINSTARTTIME2")]
+        public string SignInStartTime2 { get; set; }
+        /// <summary>
+        /// 中午规定签退时间
+        /// </summary>
+        [Column("SIGNINENDTIME2")]
+        public string SignInEndTime2 { get; set; }
+        /// <summary>
+        /// 中午签到时间
+        /// </summary>
+        [Column("NOONWORKTIME")]
+        public string NoonWorkTime { get; set; }
+        /// <summary>
+        /// 中午签退时间
+        /// </summary>
+        [Column("NOONCLOSETIME")]
+        public string NoonCloseTime { get; set; }
         #endregion
 
         #region 扩展操作

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

@@ -43,6 +43,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 t.LeaveOverTime,
                 t.NoSignIn,
                 t.REnable,
+                t.ClockTime,
+                t.SignInStartTime2,
+                t.SignInEndTime2,
+                t.NoonWorkTime,
+                t.NoonCloseTime,
                 t.NoSignOut
                 ");
                 strSql.Append("  FROM ADR_Restriction t ");