From 924f3729a1fb623b6aa48dc358100ee93d1a45f8 Mon Sep 17 00:00:00 2001 From: liangkun Date: Fri, 11 Sep 2020 11:09:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E8=80=83=E5=8B=A4?= =?UTF-8?q?=E8=A7=84=E5=88=99=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/ADR_Restriction/Form.cshtml | 16 +++++++-------- .../Views/ADR_Restriction/Index.js | 20 +++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) 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..465681881 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,38 @@ }
上班时间*
-
+ @*
上午签到有效时间*
-*
-
+
*@
下班时间*
-
+ @*
下午签退有效时间*
-*
-
+
*@
打卡次数*
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..a3c71f0c3 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: 600, 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: 600, 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" }, { From 748b8d3f4db8b4f5e6d9760f79219e621e389f9f Mon Sep 17 00:00:00 2001 From: liangkun Date: Fri, 11 Sep 2020 11:22:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=80=83=E5=8B=A4=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PersonnelManagement/Views/ADR_Restriction/Form.cshtml | 4 +++- .../Areas/PersonnelManagement/Views/ADR_Restriction/Index.js | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) 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 465681881..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 @@ -8,7 +8,9 @@ width: 120px; padding-right: 10px; } - + .lr-form-item { + padding: 5px 0 5px 120px; + }
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 a3c71f0c3..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: 600, + 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: 600, + height: 520, callBack: function (id) { return top[id].acceptClick(refreshGirdData); }