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 50e25d66f..5e230dbdd 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 @@ -4,36 +4,67 @@ } + /* .lr-form-item-title { + width: 117px; + padding-right: 21px; + } + */ +
上班时间*
+
+
上午签到有效时间*
+ +
+
+
-*
+ +
+
下班时间*
- @*
-
签到有效时间
- -
-
-
-
- -
-
-
签退有效时间
- -
-
-
-
- -
*@ +
+
下午签退有效时间*
+ +
+
+
-*
+ +
+
+
打卡次数*
+
+
+
+
中午下班时间*
+ +
+
+
中午签退有效时间*
+ +
+
+
-*
+ +
+
+
中午上班时间*
+ +
+
+
中午签到有效时间*
+ +
+
+
-*
+ +
+
允许迟到(分)*
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 48b7c34de..a4a33cc17 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 @@ -17,13 +17,50 @@ 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(); + $('#NoonWorkTime').parent('.lr-form-item').show(); + $('#NoonCloseTime').removeAttr('isvalid'); + $('#NoonWorkTime').removeAttr('isvalid'); + $('#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('二次打卡'); + }, 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]); 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 20f62d7cd..44bb72394 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 @@ -80,11 +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" }, { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/资产系统.PDM b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/资产系统.PDM index 9cb31d337..6737cbfa2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/资产系统.PDM +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/资产系统.PDM @@ -1,5 +1,5 @@ - + @@ -11927,7 +11927,7 @@ LABL 0 新宋体,8,N 1599114139 1599193158 -1 -((-118462,192473), (-106000,203795)) +((-119234,189585), (-105228,206683)) 12615680 16570034 12632256 @@ -47662,8 +47662,8 @@ B9AF ADR_Restriction 1599114139 edz -1599202395 -Administrator +1599712257 +edz 考勤限制 @@ -47806,9 +47806,93 @@ B9AF Administrator bit + +9205CACA-F511-43A8-9777-90F8D79B4565 +打卡次数 +ClockTime +1599707178 +edz +1599707290 +edz +打卡次数 +nvarchar(50) +50 + + +9C53906E-6A91-4D87-A09E-FDE7615D3864 +中午签到开始时间 +SignInStartTime2 +1599707178 +edz +1599712397 +edz +中午签到开始时间 +nvarchar(50) +50 + + +88BFCDBF-2690-43DD-A0A8-38A02A85AEE9 +中午签到结束时间 +SignInEndTime2 +1599707178 +edz +1599712397 +edz +中午签到结束时间 +nvarchar(50) +50 + + +5B272C5B-110F-4E45-B52D-5F429F82BDEC +中午签到时间 +NoonWorkTime +1599707292 +edz +1599707794 +edz +中午签到时间 +nvarchar(50) +50 + + +6FB178FE-9A22-4FE4-A2A1-251832744FB3 +中午签退时间 +NoonCloseTime +1599707292 +edz +1599712257 +edz +中午签退时间 +nvarchar(50) +50 + + +EBC87080-6CA9-4E68-B724-0A55B5417E3C +中午签退开始时间 +SignOutStartTime2 +1599712150 +edz +1599712257 +edz +中午签退开始时间 +nvarchar(50) +50 + + +48FB8D22-6CAE-4FFF-B8CB-2711D4003186 +中午签退结束时间 +SignOutEndTime2 +1599712150 +edz +1599712257 +edz +中午签退结束时间 +nvarchar(50) +50 + - + 8ADE1FCB-0EC0-4C87-833F-EF8E53656C24 Key_1 Key_1 @@ -47822,10 +47906,10 @@ B9AF - + - + @@ -47850,7 +47934,7 @@ B9AF - + 14D78C43-17A2-48F0-83B4-3DF757D5ABE8 1552635393 l @@ -47885,7 +47969,7 @@ B9AF - + FEAECB7B-8E2A-4492-A530-B0062E1511B8 1552635777 l @@ -47920,7 +48004,7 @@ B9AF - + 81527A47-E565-49C2-AAA7-F0555E81CE72 1553245426 l @@ -47955,7 +48039,7 @@ B9AF - + A3225D9D-069C-4A67-ABF0-43DC2FA55CF0 1553247802 l @@ -47989,7 +48073,7 @@ B9AF - + B458081F-CEE1-4251-9E7A-5E9CC93519D5 1553248376 l @@ -48024,7 +48108,7 @@ B9AF - + 8397C4F6-A728-4D3F-B2F8-FAC56886462B 1553248622 l @@ -48058,7 +48142,7 @@ B9AF - + 2F8BC700-F31E-41CC-9DA8-9505EAC5DA85 1553483161 l @@ -48092,7 +48176,7 @@ B9AF - + 0E2D2049-564F-4247-9F5B-B0AA82F9BE96 1555404296 admin @@ -48109,7 +48193,7 @@ B9AF - + 46EC3E2A-6CBF-421A-9DA8-6BCCEDEC7DF5 PUBLIC PUBLIC @@ -48372,7 +48456,7 @@ B9AF - + B1BAD530-6C69-4A9D-BD41-F62F564CA348 Microsoft SQL Server 2008 MSSQLSRV2008 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionEntity.cs index 0275ee094..1e3a0ea1c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionEntity.cs +++ b/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 /// 描 述：考勤限制 /// - public class ADR_RestrictionEntity + public class ADR_RestrictionEntity { #region 实体成员 /// @@ -74,6 +74,43 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement /// [Column("RENABLE")] public bool? REnable { get; set; } + + /// + /// 打卡次数 + /// + [Column("CLOCKTIME")] + public string ClockTime { get; set; } + + /// + /// 中午签到开始时间 + /// + [Column("SIGNINSTARTTIME2")] + public string SignInStartTime2 { get; set; } + /// + /// 中午签到结束时间 + /// + [Column("SIGNINENDTIME2")] + public string SignInEndTime2 { get; set; } + /// + /// 中午签到时间 + /// + [Column("NOONWORKTIME")] + public string NoonWorkTime { get; set; } + /// + /// 中午签退时间 + /// + [Column("NOONCLOSETIME")] + public string NoonCloseTime { get; set; } + /// + /// 中午签退开始时间 + /// + [Column("SIGNOUTSTARTTIME2")] + public string SignOutStartTime2 { get; set; } + /// + /// 中午签退结束时间 + /// + [Column("SIGNOUTENDTIME2")] + public string SignOutEndTime2 { get; set; } #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionService.cs index da393765d..e99a5596a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionService.cs @@ -43,6 +43,13 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement t.LeaveOverTime, t.NoSignIn, t.REnable, + t.ClockTime, + t.SignInStartTime2, + t.SignInEndTime2, + t.NoonWorkTime, + t.NoonCloseTime, + t.SignOutStartTime2, + t.SignOutEndTime2, t.NoSignOut "); strSql.Append(" FROM ADR_Restriction t ");