From f707f7be43f0ede98a9a5594d96345759150ddfc Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 30 Aug 2022 16:20:58 +0800 Subject: [PATCH] =?UTF-8?q?pc=20=E6=88=91=E7=9A=84=E4=BC=9A=E8=AE=AE?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E7=AD=BE=E5=88=B0=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/MeetingManagement/IndexOfMyApply.cshtml | 1 + .../Views/MeetingManagement/IndexOfMyApply.js | 14 ++++++++++++++ .../Views/MeetingManagement/IndexOfMyJoin.cshtml | 1 + .../Views/MeetingManagement/IndexOfMyJoin.js | 14 ++++++++++++++ .../Views/MeetingSignInRecord/Index.js | 2 ++ .../MeetingSignInRecordService.cs | 5 +++++ 6 files changed, 37 insertions(+) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyApply.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyApply.cshtml index bfa3910b4..374909d61 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyApply.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyApply.cshtml @@ -43,6 +43,7 @@ @* 考勤*@  纪要  通知 +  签到情况 @* 审核通过  审核不通过*@ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyApply.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyApply.js index feb9eba1a..566c29a2e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyApply.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyApply.js @@ -201,6 +201,20 @@ var bootstrap = function ($, learun) { }); } }); + // 会议签到情况 + $('#lr_case').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'viewform', + title: '签到情况', + url: top.$.rootUrl + '/PersonnelManagement/MeetingSignInRecord/Index?MeetID=' + keyValue, + width: 1000, + height: 800, + btn: null + }); + } + }); }, // 初始化列表 initGird: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyJoin.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyJoin.cshtml index 5ea78d88c..00e6f0a8d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyJoin.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyJoin.cshtml @@ -34,6 +34,7 @@
 查看 +  签到情况
@* 考勤*@ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyJoin.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyJoin.js index 61269160b..ab540e8ed 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyJoin.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyJoin.js @@ -201,6 +201,20 @@ var bootstrap = function ($, learun) { }); } }); + // 会议签到情况 + $('#lr_case').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'viewform', + title: '签到情况', + url: top.$.rootUrl + '/PersonnelManagement/MeetingSignInRecord/Index?MeetID=' + keyValue, + width: 1000, + height: 800, + btn: null + }); + } + }); }, // 初始化列表 initGird: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingSignInRecord/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingSignInRecord/Index.js index 22d437003..71293cb87 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingSignInRecord/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingSignInRecord/Index.js @@ -5,6 +5,7 @@ * 描 述：会议签到记录 */ var refreshGirdData; +var MeetID = request('MeetID');//会议ID var bootstrap = function ($, learun) { "use strict"; var page = { @@ -126,6 +127,7 @@ var bootstrap = function ($, learun) { }, search: function (param) { param = param || {}; + param.MeetID = MeetID; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordService.cs index 5a7f35d06..c591eebf1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordService.cs @@ -36,6 +36,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement var queryParam = queryJson.ToJObject(); // 虚拟参数 var dp = new DynamicParameters(new { }); + if (!queryParam["MeetID"].IsEmpty()) + { + dp.Add("MeetID", queryParam["MeetID"].ToString(), DbType.String); + strSql.Append(" AND t.MeetID = @MeetID "); + } if (!queryParam["MeetingTitle"].IsEmpty()) { dp.Add("MeetingTitle", "%" + queryParam["MeetingTitle"].ToString() + "%", DbType.String);