From cd8b9428e5c075f2500a894f542ba57741e8a15e Mon Sep 17 00:00:00 2001 From: liangkun Date: Tue, 29 Aug 2023 15:44:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4=E6=89=93=E5=8D=A1=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/ADR_RecordController.cs | 6 +++ .../Views/ADR_Record/Form.cshtml | 16 ++++++- .../Views/ADR_Record/Form.js | 2 + .../Views/ADR_Record/FormView.cshtml | 46 ++++++++++++++++++ .../Views/ADR_Record/FormView.js | 48 +++++++++++++++++++ .../Views/ADR_Record/Index.cshtml | 5 +- .../Views/ADR_Record/Index.js | 24 ++++++++-- .../Learun.Application.Web.csproj | 2 + .../ADR_Record/ADR_RecordService.cs | 2 +- .../ADR_Restriction/ADR_RestrictionService.cs | 5 +- .../LearunApp-2.2.0/pages/login.vue | 4 +- 11 files changed, 150 insertions(+), 10 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/FormView.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/FormView.js diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/ADR_RecordController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/ADR_RecordController.cs index 0a4e65137..699f9c605 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/ADR_RecordController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/ADR_RecordController.cs @@ -42,6 +42,12 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers return View(); } + [HttpGet] + public ActionResult FormView() + { + return View(); + } + [HttpGet] public ActionResult AttendanceReportByWeek() { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Form.cshtml index 327d9852f..b63473ef5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Form.cshtml @@ -21,12 +21,26 @@
打卡状态
-
+
+
+
+
+
是否外勤
+
打卡地点
+
+
照片
+
+
+
+
+
备注
+ +
@Html.AppendJsFile("/Areas/LogisticsManagement/Views/ADR_Record/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Form.js index c8b67bb9f..ed8e4f021 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Form.js @@ -23,6 +23,8 @@ var bootstrap = function ($, learun) { }); $('#ADType').lrDataItemSelect({ code: 'ADType' }); $('#ClockStatus').lrDataItemSelect({ code: 'ADStatus' }); + $('#AIsOut').lrDataItemSelect({ code: 'YesOrNoBit' }); + $('#ADPhoto').lrUploader(); $('#UserNo').lrDataSourceSelect({ code: 'BaseUser', value: 'f_account', text: 'f_realname' }); }, initData: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/FormView.cshtml new file mode 100644 index 000000000..8e2d7cb9b --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/FormView.cshtml @@ -0,0 +1,46 @@ +@{ + ViewBag.Title = "考勤记录"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+
员工名字
+
+
+
+
考勤类型
+
+
+
+
考勤时间
+ +
+
+
打卡时间
+ +
+
+
打卡状态
+
+
+
+
+
是否外勤
+
+
+
+
+
打卡地点
+ +
+
+
照片
+
+
+
+
+
备注
+ +
+
+@Html.AppendJsFile("/Areas/LogisticsManagement/Views/ADR_Record/FormView.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/FormView.js new file mode 100644 index 000000000..fd182d4bf --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/FormView.js @@ -0,0 +1,48 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2020-08-28 18:09 + * 描 述：考勤记录 + */ +var acceptClick; +var keyValue = request('keyValue'); +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + page.initData(); + }, + bind: function () { + $('#Department').lrselect({ + type: 'tree', + allowSearch: true, + url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree', + param: {} + }); + $('#ADType').lrDataItemSelect({ code: 'ADType' }); + $('#ClockStatus').lrDataItemSelect({ code: 'ADStatus' }); + $('#AIsOut').lrDataItemSelect({ code: 'YesOrNoBit' }); + $('#ADPhoto').lrUploader({ isUpload: false}); + $('#UserNo').lrDataSourceSelect({ code: 'BaseUser', value: 'f_account', text: 'f_realname' }); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/LogisticsManagement/ADR_Record/GetFormData?keyValue=' + keyValue, function (data) { + for (var id in data) { + if (!!data[id].length && data[id].length > 0) { + $('#' + id ).jfGridSet('refreshdata', data[id]); + } + else { + $('[data-table="' + id + '"]').lrSetFormData(data[id]); + } + $("#ADTime").val(data[id].ADTime); + $("#ClockTime").val(data[id].ClockTime); + } + }); + } + } + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.cshtml index 637ed439b..25657abd9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.cshtml @@ -42,8 +42,9 @@
-  补卡 -  编辑 +  补卡 +  编辑 +  查看  删除
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.js index 41086592b..61e199c55 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.js @@ -47,7 +47,7 @@ var bootstrap = function ($, learun) { }, 250, 400); $('#Department').lrDepartmentSelect(); $('#ADR_Device').lrDataSourceSelect({ code: 'ADR_Device', value: 'dname', text: 'dname' }); - $('#ADStatus').lrDataItemSelect({ code: 'ADStatus'}); + $('#ADStatus').lrDataItemSelect({ code: 'ADStatus' }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); @@ -81,6 +81,19 @@ var bootstrap = function ($, learun) { }); } }); + $('#lr_view').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'form', + title: '查看', + url: top.$.rootUrl + '/LogisticsManagement/ADR_Record/FormView?keyValue=' + keyValue, + width: 600, + height: 400, + btn: null + }); + } + }); // 删除 $('#lr_delete').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ID'); @@ -97,7 +110,7 @@ var bootstrap = function ($, learun) { }, // 初始化列表 initGird: function () { - $('#gridtable').lrAuthorizeJfGrid({ + $('#gridtable').jfGrid({ url: top.$.rootUrl + '/LogisticsManagement/ADR_Record/GetPageList', headData: [ { @@ -157,7 +170,12 @@ var bootstrap = function ($, learun) { }); } }, - { label: "打卡地点", name: "ClockPlace", width: 100, align: "left" }, + { + label: "是否外勤", name: "AIsOut", width: 100, align: "left", formatter: function (value) { + return value == true ? "是" : "否"; + } + }, + { label: "打卡地点", name: "ClockPlace", width: 200, align: "left" }, { label: "考勤数据上传时间", name: "ADTime", width: 150, align: "left" } ], mainId: 'ID', diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index 05f11e728..b992ae750 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -1460,6 +1460,7 @@ + @@ -8273,6 +8274,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordService.cs index c5d041b73..e83993376 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordService.cs @@ -45,7 +45,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement t.ADYear, t.ADMonth, t.ADDay, - t.ADPhoto + t.ADPhoto,t.AIsOut,t.ARemark "); strSql.Append($" FROM ADR_Record t left JOIN {baseDataName}.dbo.LR_Base_User emp ON t.UserNo=emp.F_Account"); strSql.Append(" WHERE 1=1 "); 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 34f08891b..199ef0d29 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 @@ -429,7 +429,10 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement firstoffworkentity.ADTime = datetimenow; firstoffworkentity.ClockTime = devicetime; firstoffworkentity.ClockStatus = ClockStatus; - + firstoffworkentity.ARemark = ARemark; + firstoffworkentity.ClockPlace = ClockPlace; + firstoffworkentity.ADPhoto = ADPhoto; + firstoffworkentity.AIsOut = AIsOut; this.BaseRepository("CollegeMIS").ExecuteBySql("update ADR_Record set ADTime='" + firstoffworkentity.ADTime + "',ClockTime='" + firstoffworkentity.ClockTime + "',ClockStatus='" + firstoffworkentity.ClockStatus + "',ADPhoto='" + firstoffworkentity.ADPhoto + "' where ID='" + firstoffworkentity.ID + "'"); return true; } diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/login.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/login.vue index a731c6afc..d9db7b829 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/login.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/login.vue @@ -33,9 +33,9 @@ 登 录 微信登录 - +