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 5e230dbdd..146e25bce 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,38 +4,40 @@ }
上班时间*
-
+ @*
上午签到有效时间*
-*
-
+
*@
下班时间*
-
+ @*
下午签退有效时间*
-*
-
+
*@
打卡次数*
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 8e8953685..0fee97a93 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 @@ -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" }, {