From 8b40a2b33c319a7444453e37da64e7fc4a792355 Mon Sep 17 00:00:00 2001 From: zhichao lei <442149704@qq.com> Date: Tue, 5 Jan 2021 15:48:22 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=91=E9=9A=85=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/Sys_ReceiveDocument/Index.js | 3 +++ .../Views/Sys_ReceiveFile/Form.js | 20 +++++++++++++------ .../Controllers/DTListController.cs | 2 +- .../Sys_ReceiveDocumentService.cs | 5 +++++ 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/Index.js index 6f642083a..22265e04f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/Index.js @@ -8,6 +8,7 @@ var refreshGirdData; var bootstrap = function ($, learun) { "use strict"; var processId = ''; + var loginInfo = top.learun.clientdata.get(['userinfo']); var page = { init: function () { page.initGird(); @@ -343,7 +344,9 @@ var bootstrap = function ($, learun) { page.search(); }, search: function (param) { + param = param || {}; + param.SenderId = loginInfo.userId; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.js index e51ecc630..6b659a9f4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.js @@ -8,6 +8,7 @@ var acceptClick; var keyValue = request('keyValue'); var bootstrap = function ($, learun) { "use strict"; + var loginInfo = top.learun.clientdata.get(['userinfo']); var selectedRow = learun.frameTab.currentIframe().selectedRow; var page = { init: function () { @@ -16,16 +17,25 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { + //如果是校长的话，审批需要做必填设置 + if (loginInfo.realName == "关亮") { + $('#SpecifyReceiver').prev().html('批示*'); + $('#SpecifyReceiver').attr('isvalid', 'yes').attr('checkexpession', 'NotNull'); + } $('#SenderId').lrformselect({ layerUrl: top.$.rootUrl + '/LR_OrganizationModule/User/SelectOnlyForm', layerUrlW: 400, layerUrlH: 300, dataUrl: top.$.rootUrl + '/LR_OrganizationModule/User/GetListByUserIds' - }); + }); - $('#RStatus').lrRadioCheckbox({data:[{text:'通知',value:0},{text:'不通知',value:1}],text:'text',value:'value' - }); + $('#RStatus').lrRadioCheckbox({ + data: [{ text: '通知', value: 0 }, { text: '不通知', value: 1 }], text: 'text', value: 'value' + }); + if ($('.lr-radio').find('input:radio:checked').length == 0) { + $('.lr-radio').find('input')[0].checked = true; + } $('#SendType').lrDataItemSelect({ code: 'FileSendType' }); if (selectedRow.ReadFlag == true) {//已读 @@ -56,9 +66,7 @@ var bootstrap = function ($, learun) { if (!$('body').lrValidform()) { return false; } - if ($('.lr-radio').find('input:radio:checked').length==0) { - $('.lr-radio').find('input')[0].checked = true; - } + var postData = { strEntity: JSON.stringify($('body').lrGetFormData()) }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/DTListController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/DTListController.cs index d4aa3188f..b1d8928c8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/DTListController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/DTListController.cs @@ -192,7 +192,7 @@ namespace Learun.Application.Web.Areas.LR_Desktop.Controllers if (dtListEntity.F_Name.Contains("公文接收")) { dtListEntity.F_Sql = - "SELECT Title as f_title,SendTime as f_time FROM dbo.Sys_ReceiveFile WHERE DelFlag=0 AND ReadFlag<>1 AND ReceiverId='" + + "SELECT Title as f_title,SendTime as f_time FROM dbo.Sys_ReceiveFile WHERE DelFlag=0 AND ReadFlag<>1 and STypeId=4 AND ReceiverId='" + loginUserInfo.userId + "'"; } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveDocument/Sys_ReceiveDocumentService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveDocument/Sys_ReceiveDocumentService.cs index 08998f8d9..4eceb999f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveDocument/Sys_ReceiveDocumentService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveDocument/Sys_ReceiveDocumentService.cs @@ -53,6 +53,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration var queryParam = queryJson.ToJObject(); // 虚拟参数 var dp = new DynamicParameters(new { }); + if (!queryParam["SenderId"].IsEmpty()) + { + dp.Add("SenderId", queryParam["SenderId"].ToString(), DbType.String); + strSql.Append(" AND t.SenderId = @SenderId "); + } if (!queryParam["RReceiveUnit"].IsEmpty()) { dp.Add("RReceiveUnit", queryParam["RReceiveUnit"].ToString(), DbType.String);