From 5065301c1acf026c4a83b58fac2b7dbc57391342 Mon Sep 17 00:00:00 2001 From: zhichao lei <442149704@qq.com> Date: Wed, 23 Sep 2020 15:25:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A7=94=E6=89=98=E4=B9=A6=E7=AD=BE?= =?UTF-8?q?=E5=90=8D=E7=9B=96=E7=AB=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/Sys_SendFile/FormView.cshtml | 4 -- .../Views/Sys_SendFile/FormView.js | 1 - .../Views/Sys_SendFile/Index.js | 40 +++-------------- .../Controllers/NWFProcessController.cs | 43 +++++++++++++------ .../LR_NewWorkFlow/Views/NWFProcess/Index.js | 5 ++- .../Views/NWFProcess/MonitorForm.js | 2 + .../Views/NWFProcess/htPrint.cshtml | 35 ++++++++++++--- .../Views/NWFProcess/htPrint.css | 16 ++++++- .../Learun.Application.Web.csproj | 2 + .../Sys_SendFile/Sys_SendFileService.cs | 2 + .../NodeMethod/Sys_SendFileMethod.cs | 15 ++++++- .../Process/NWFProcessEntity.cs | 6 +++ .../Process/NWFProcessSerivce.cs | 12 ++++++ 13 files changed, 119 insertions(+), 64 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.cshtml index 26af0a108..0f8eb81cf 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.cshtml @@ -7,10 +7,6 @@
主题*
-
-
指定接收人*
-
-
文件
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.js index 4e116d05f..0ceb8014a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/FormView.js @@ -27,7 +27,6 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { - $('#SpecifyReceiver').lrUserSelect({ type: '1' }); $('#Url').lrUploader(); var ContentsUE = UE.getEditor('Contents'); $('#Contents')[0].ue = ContentsUE; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.js index 2a3ddd474..c2b347179 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.js @@ -142,12 +142,11 @@ var bootstrap = function ($, learun) { // 下发审批指定接收人 $('#lr_IssueSpecifyReceiver').on('click', function () { var keyValue = $('#gridtable').jfGridValue('SFileId'); - var specifyReceiver = $('#gridtable').jfGridValue('SpecifyReceiver'); if (learun.checkrow(keyValue)) { learun.layerForm({ id: 'form', title: '下发审批指定接收人', - url: top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/IssueForm?keyValue=' + keyValue + '&specifyReceiver=' + specifyReceiver, + url: top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/IssueForm?keyValue=' + keyValue, width: 800, height: 200, callBack: function (id) { @@ -191,39 +190,10 @@ var bootstrap = function ($, learun) { url: top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/GetPageList', headData: [ { label: "主题", name: "Title", width: 300, align: "left" }, - { - label: "已接收", name: "Receiver", width: 300, align: "left" - }, - { - label: "审批指定接收人", name: "SpecifyReceiver", width: 150, align: "left", formatterAsync: - function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('user', - { - key: value, - callback: function (_data) { - if (_data.length > 0) { - var text = ''; - $.each(_data, - function (i, item) { - if (item) { - text += item.name + ','; - } - }); - text = text.substring(0, text.lastIndexOf(',')); - callback(text); - } else { - callback(_data.name); - } - } - }); - } - }, - { - label: "下发人", name: "Sender", width: 100, align: "left" - }, - { - label: "下发时间", name: "SendTime", width: 150, align: "left" - }, + { label: "已接收", name: "Receiver", width: 300, align: "left" }, + { label: "审批意见", name: "SpecifyReceiver", width: 300, align: "left" }, + { label: "下发人", name: "Sender", width: 100, align: "left" }, + { label: "下发时间", name: "SendTime", width: 150, align: "left" }, { label: "状态", name: "SendFlag", width: 100, align: "left", formatter: function (cellvalue, row) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs index 4d2563731..544387f89 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs @@ -1,6 +1,7 @@ using Learun.Application.WorkFlow; using Learun.Util; using System.Collections.Generic; +using System.Linq; using System.Web.Mvc; using Learun.Application.Organization; using Learun.Application.Base.AuthorizeModule; @@ -20,6 +21,7 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers private NWFSchemeIBLL nWFSchemeIBLL = new NWFSchemeBLL(); private NWFTaskIBLL nWFTaskIBLL = new NWFTaskBLL(); + private UserIBLL userIbll = new UserBLL(); private UserRelationIBLL userRelationIBLL = new UserRelationBLL(); @@ -97,6 +99,7 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers { return View(); } + /// /// 合同打印 /// @@ -105,22 +108,36 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers public ActionResult htPrint(string keyValue) { + //获取校长的签名盖章 + var listTaskLog = nWFTaskIBLL.GetLogList(keyValue); + var nwfTaskLogEntity = listTaskLog.FirstOrDefault(a => a.F_TaskUserName == "关亮"); + if (nwfTaskLogEntity != null) + { + ViewBag.StampImg = nwfTaskLogEntity.F_StampImg; + ViewBag.SignImg = nwfTaskLogEntity.F_SignImg; + } + + var data = nWFProcessIBLL.GetHTInfo(keyValue); - var userInfo = userIbll.GetEntityByUserId(data.F_CreateUserName); - var beginTime = data.LC_htkssj.ToDate(); - var endTime = data.LC_htjssj.ToDate(); - var operationTime = data.OperationTime.ToDate(); + var userInfo = new UserEntity(); + if (data != null) + { + userInfo = userIbll.GetEntityByUserId(data.F_CreateUserName); + } + var beginTime = data?.LC_htkssj.ToDate(); + var endTime = data?.LC_htjssj.ToDate(); + var operationTime = data?.OperationTime.ToDate(); ViewBag.UserName = userInfo?.F_RealName; ViewBag.IDCard = userInfo?.F_IdentityCardNo; - ViewBag.BeginYear = beginTime.Year; - ViewBag.BeginMonth = beginTime.Month; - ViewBag.BeginDay = beginTime.Day; - ViewBag.EndYear = endTime.Year; - ViewBag.EndMonth = endTime.Month; - ViewBag.EndDay = endTime.Day; - ViewBag.OperationYear = operationTime.Year; - ViewBag.OperationMonth = operationTime.Month; - ViewBag.OperationDay = operationTime.Day; + ViewBag.BeginYear = beginTime?.Year; + ViewBag.BeginMonth = beginTime?.Month; + ViewBag.BeginDay = beginTime?.Day; + ViewBag.EndYear = endTime?.Year; + ViewBag.EndMonth = endTime?.Month; + ViewBag.EndDay = endTime?.Day; + ViewBag.OperationYear = operationTime?.Year; + ViewBag.OperationMonth = operationTime?.Month; + ViewBag.OperationDay = operationTime?.Day; return View(); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/Index.js index 1d42e49d2..97f12ff6a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/Index.js @@ -160,8 +160,9 @@ var bootstrap = function ($, learun) { var isaAain = false; if (categoryId == '1') { - if (row.F_IsFinished != 0 && row.F_SchemeCode == 'LC_Contract_') { - $cell.on('click', '.print', function () {// 催办审核 + //如果流程是合同审批 并且校长审批通过的话可以打印 + if (row.LeaderIsAgree && row.F_SchemeCode == 'LC_Contract_') { + $cell.on('click', '.print', function () { learun.layerForm({ id: 'print', diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.js index 39a72edd3..d91892af3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.js @@ -236,6 +236,8 @@ var bootstrap = function ($, learun) { }); // 打印表单 $('#print').on('click', function () { + //打印checkbox 选中效果打印不出来 + $("input[type='checkbox']:checked").attr('checked', 'checked'); var $iframes = $('#form_list_iframes'); var iframeId = $iframes.find('.form-list-iframe.active').attr('id'); if (iframeId) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/htPrint.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/htPrint.cshtml index 57fbf1666..bd37293b2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/htPrint.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/htPrint.cshtml @@ -33,11 +33,16 @@ 委托人：关亮(身份证号码：110111196506121035)
- (签字) + (签字) + ) +
+ @ViewBag.OperationYear 年@ViewBag.OperationMonth 月@ViewBag.OperationDay 日
+ + @@ -46,10 +51,28 @@ - + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/htPrint.css b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/htPrint.css index fa95af6b3..658d88d4b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/htPrint.css +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/htPrint.css @@ -84,6 +84,7 @@ table { text-indent: 32px; font-size: 14px; line-height: 30px; + position: relative; } .entrTxt span { @@ -97,13 +98,24 @@ table { text-indent: 0; text-align: center } - +#signImg { + position: absolute; + width: 250px; + top: 40px; + left: 100px; +} .entrTime { text-align: right; padding-right: 80px; margin-top: 120px; + position: relative; +} +#stampImg { + position: absolute; + width: 140px; + top: 60px; + left: 170px; } - .entrTime span { display: inline-block; width: 50px; 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 c8f398370..5f39f2e32 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 @@ -990,6 +990,7 @@ + @@ -6806,6 +6807,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileService.cs index 078ed25fa..0db9bf5ae 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileService.cs @@ -233,6 +233,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { var Sys_SendFile = db.FindEntity(m => m.SProcessId == processId); Sys_SendFile.SendFlag = status; + + //获取校长的审批意见 if (status == 2) { Sys_SendFile.SendTime = DateTime.Now; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/Sys_SendFileMethod.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/Sys_SendFileMethod.cs index 47c54edda..9ed676d9b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/Sys_SendFileMethod.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/Sys_SendFileMethod.cs @@ -10,9 +10,10 @@ namespace Learun.Application.WorkFlow public class Sys_SendFileMethod : IWorkFlowMethod { Sys_SendFileIBLL asset = new Sys_SendFileBLL(); + NWFTaskIBLL nWFTaskIBLL = new NWFTaskBLL(); public void Sucess(string processId) { - asset.ChangeStatusByProcessId(processId,2); + asset.ChangeStatusByProcessId(processId, 2); } public void Fail(string processId) @@ -25,6 +26,18 @@ namespace Learun.Application.WorkFlow if (parameter.code == "agree") { asset.ChangeStatusByProcessId(parameter.processId, 2); + var list = nWFTaskIBLL.GetLogList(parameter.processId); + var nwfTaskLogEntity = list.FirstOrDefault(a => a.F_TaskUserName == "关亮"); + Sys_SendFileEntity entity = asset.GetEntityByProcessId(parameter.processId); + if (nwfTaskLogEntity != null) + { + entity.SpecifyReceiver = nwfTaskLogEntity.F_Des; + } + else + { + entity.SpecifyReceiver = "测试信息"; + } + asset.SaveEntity(entity.SFileId, entity); } else { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessEntity.cs index 122e727ee..7074c7918 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessEntity.cs @@ -174,6 +174,12 @@ namespace Learun.Application.WorkFlow /// [NotMapped] public int? F_IsUrge { get; set; } + + /// + /// 合同流程专用， 校长是否同意 + /// + [NotMapped] + public bool? LeaderIsAgree { get; set; } #endregion } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessSerivce.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessSerivce.cs index 6fbead2d5..b37a2add6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessSerivce.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessSerivce.cs @@ -237,6 +237,18 @@ namespace Learun.Application.WorkFlow foreach (var item in aa) { item.F_TaskId = this.BaseRepository().FindEntity(x => x.F_ProcessId == item.F_Id)?.F_Id; + + //合同流程审批专用 如果第一步校长审批同意的话 可以打印授权委托书 + if (item.F_SchemeCode == "LC_Contract_") + { + var entity = this.BaseRepository().FindEntity(a => + a.F_ProcessId == item.F_Id && a.F_TaskUserId == "29add015-3638-415d-9f91-5024bd746fb5" && + a.F_OperationCode == "agree"); + if (null != entity) + { + item.LeaderIsAgree = true; + } + } } return aa; } From e8d58165a6b6b283e5c79277fab1d340d167a555 Mon Sep 17 00:00:00 2001 From: liangkun Date: Wed, 23 Sep 2020 15:30:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DataAuthorize/DataAuthorizeBLL.cs | 14 +++++++++++++- .../SystemModule/Interface/InterfaceBLL.cs | 5 ++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/DataAuthorize/DataAuthorizeBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/DataAuthorize/DataAuthorizeBLL.cs index 9cb0cf89d..4d9dec5ce 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/DataAuthorize/DataAuthorizeBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/DataAuthorize/DataAuthorizeBLL.cs @@ -257,7 +257,19 @@ namespace Learun.Application.Base.AuthorizeModule } else { - relationListId = url; + //liangkun 20200923޸ + //ԶҲҪȨ֤ + //relationListId = url; + InterfaceEntity interfaceEntity = interfaceIBLL.GetEntityByUrl("/LR_FormModule/FormRelation/PreviewIndex?id=" + url); + if (interfaceEntity == null) + { + // ӿûע + return true; + } + else + { + relationListId = interfaceEntity.F_Id; + } } List relationList = (List)GetRelationList(relationListId); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Interface/InterfaceBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Interface/InterfaceBLL.cs index 8eba7ed1d..373f32337 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Interface/InterfaceBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Interface/InterfaceBLL.cs @@ -148,7 +148,10 @@ namespace Learun.Application.Base.SystemModule { if (url.Contains("?")) { - url = url.Substring(0, url.IndexOf('?')); + if (!url.Contains("/LR_FormModule/FormRelation/PreviewIndex")) + { + url = url.Substring(0, url.IndexOf('?')); + } } List list = GetList(); return list.Find(t => t.F_Address == url);