@@ -7,10 +7,6 @@ | |||||
<div class="lr-form-item-title">主题<font face="宋体">*</font></div> | <div class="lr-form-item-title">主题<font face="宋体">*</font></div> | ||||
<input id="Title" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" /> | <input id="Title" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" /> | ||||
</div> | </div> | ||||
<div class="col-xs-12 lr-form-item" data-table="Sys_SendFile" id="ReceiverIddiv"> | |||||
<div class="lr-form-item-title">指定接收人<font face="宋体">*</font></div> | |||||
<div id="SpecifyReceiver" isvalid="yes" checkexpession="NotNull"></div> | |||||
</div> | |||||
<div class="col-xs-12 lr-form-item" data-table="Sys_SendFile"> | <div class="col-xs-12 lr-form-item" data-table="Sys_SendFile"> | ||||
<div class="lr-form-item-title">文件</div> | <div class="lr-form-item-title">文件</div> | ||||
<div id="Url" readonly="readonly" style="padding-right: 60px;"></div> | <div id="Url" readonly="readonly" style="padding-right: 60px;"></div> | ||||
@@ -27,7 +27,6 @@ var bootstrap = function ($, learun) { | |||||
page.initData(); | page.initData(); | ||||
}, | }, | ||||
bind: function () { | bind: function () { | ||||
$('#SpecifyReceiver').lrUserSelect({ type: '1' }); | |||||
$('#Url').lrUploader(); | $('#Url').lrUploader(); | ||||
var ContentsUE = UE.getEditor('Contents'); | var ContentsUE = UE.getEditor('Contents'); | ||||
$('#Contents')[0].ue = ContentsUE; | $('#Contents')[0].ue = ContentsUE; | ||||
@@ -142,12 +142,11 @@ var bootstrap = function ($, learun) { | |||||
// 下发审批指定接收人 | // 下发审批指定接收人 | ||||
$('#lr_IssueSpecifyReceiver').on('click', function () { | $('#lr_IssueSpecifyReceiver').on('click', function () { | ||||
var keyValue = $('#gridtable').jfGridValue('SFileId'); | var keyValue = $('#gridtable').jfGridValue('SFileId'); | ||||
var specifyReceiver = $('#gridtable').jfGridValue('SpecifyReceiver'); | |||||
if (learun.checkrow(keyValue)) { | if (learun.checkrow(keyValue)) { | ||||
learun.layerForm({ | learun.layerForm({ | ||||
id: 'form', | id: 'form', | ||||
title: '下发审批指定接收人', | title: '下发审批指定接收人', | ||||
url: top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/IssueForm?keyValue=' + keyValue + '&specifyReceiver=' + specifyReceiver, | |||||
url: top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/IssueForm?keyValue=' + keyValue, | |||||
width: 800, | width: 800, | ||||
height: 200, | height: 200, | ||||
callBack: function (id) { | callBack: function (id) { | ||||
@@ -191,39 +190,10 @@ var bootstrap = function ($, learun) { | |||||
url: top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/GetPageList', | url: top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/GetPageList', | ||||
headData: [ | headData: [ | ||||
{ label: "主题", name: "Title", width: 300, align: "left" }, | { 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", | label: "状态", name: "SendFlag", width: 100, align: "left", | ||||
formatter: function (cellvalue, row) { | formatter: function (cellvalue, row) { | ||||
@@ -1,6 +1,7 @@ | |||||
using Learun.Application.WorkFlow; | using Learun.Application.WorkFlow; | ||||
using Learun.Util; | using Learun.Util; | ||||
using System.Collections.Generic; | using System.Collections.Generic; | ||||
using System.Linq; | |||||
using System.Web.Mvc; | using System.Web.Mvc; | ||||
using Learun.Application.Organization; | using Learun.Application.Organization; | ||||
using Learun.Application.Base.AuthorizeModule; | using Learun.Application.Base.AuthorizeModule; | ||||
@@ -20,6 +21,7 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers | |||||
private NWFSchemeIBLL nWFSchemeIBLL = new NWFSchemeBLL(); | private NWFSchemeIBLL nWFSchemeIBLL = new NWFSchemeBLL(); | ||||
private NWFTaskIBLL nWFTaskIBLL = new NWFTaskBLL(); | private NWFTaskIBLL nWFTaskIBLL = new NWFTaskBLL(); | ||||
private UserIBLL userIbll = new UserBLL(); | private UserIBLL userIbll = new UserBLL(); | ||||
private UserRelationIBLL userRelationIBLL = new UserRelationBLL(); | private UserRelationIBLL userRelationIBLL = new UserRelationBLL(); | ||||
@@ -97,6 +99,7 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers | |||||
{ | { | ||||
return View(); | return View(); | ||||
} | } | ||||
/// <summary> | /// <summary> | ||||
/// 合同打印 | /// 合同打印 | ||||
/// </summary> | /// </summary> | ||||
@@ -105,22 +108,36 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers | |||||
public ActionResult htPrint(string keyValue) | 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 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.UserName = userInfo?.F_RealName; | ||||
ViewBag.IDCard = userInfo?.F_IdentityCardNo; | 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(); | return View(); | ||||
} | } | ||||
@@ -160,8 +160,9 @@ var bootstrap = function ($, learun) { | |||||
var isaAain = false; | var isaAain = false; | ||||
if (categoryId == '1') { | 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({ | learun.layerForm({ | ||||
id: 'print', | id: 'print', | ||||
@@ -236,6 +236,8 @@ var bootstrap = function ($, learun) { | |||||
}); | }); | ||||
// 打印表单 | // 打印表单 | ||||
$('#print').on('click', function () { | $('#print').on('click', function () { | ||||
//打印checkbox 选中效果打印不出来 | |||||
$("input[type='checkbox']:checked").attr('checked', 'checked'); | |||||
var $iframes = $('#form_list_iframes'); | var $iframes = $('#form_list_iframes'); | ||||
var iframeId = $iframes.find('.form-list-iframe.active').attr('id'); | var iframeId = $iframes.find('.form-list-iframe.active').attr('id'); | ||||
if (iframeId) { | if (iframeId) { | ||||
@@ -33,11 +33,16 @@ | |||||
委托人:<span>关亮</span>(身份证号码:<span style="width: 237px;">110111196506121035</span>) | 委托人:<span>关亮</span>(身份证号码:<span style="width: 237px;">110111196506121035</span>) | ||||
</div> | </div> | ||||
<div class="entrTxt"> | <div class="entrTxt"> | ||||
(签字) | |||||
(签字) | |||||
<img id="signImg" hidden="hidden">) | |||||
<img id="stampImg" hidden="hidden"> | |||||
</div> | </div> | ||||
<div class="entrTime"> | <div class="entrTime"> | ||||
@ViewBag.OperationYear 年<span></span>@ViewBag.OperationMonth 月<span></span>@ViewBag.OperationDay 日 | @ViewBag.OperationYear 年<span></span>@ViewBag.OperationMonth 月<span></span>@ViewBag.OperationDay 日 | ||||
</div> | </div> | ||||
</div> | </div> | ||||
</div> | </div> | ||||
@@ -46,10 +51,28 @@ | |||||
<script src="~/Content/jquery/plugin/fullcalendar/js/jquery-1.7.2.min.js"></script> | <script src="~/Content/jquery/plugin/fullcalendar/js/jquery-1.7.2.min.js"></script> | ||||
<script src="~/Content/jquery/plugin/jqprint/jquery.jqprint-0.3.js"></script> | <script src="~/Content/jquery/plugin/jqprint/jquery.jqprint-0.3.js"></script> | ||||
<script> | |||||
$('.btn').click(function () { | |||||
$('.tableBox').jqprint(); | |||||
}) | |||||
</script> | |||||
</body> | </body> | ||||
</html> | </html> | ||||
<script> | |||||
//盖章图片 | |||||
var stampUrl = '/LR_NewWorkFlow/StampInfo/GetImg?keyValue=00324dc8-e0db-457f-b078-ebd1aac46463';// + @ViewBag.StampImg; | |||||
var signUrl = '/LR_SystemModule/Img/GetImg?keyValue=90ddf143-ba5a-4900-b9c5-96fb3336d4a7';// + @ViewBag.SignImg; | |||||
$('#signImg').attr('src', signUrl); | |||||
$('#stampImg').attr('src', stampUrl); | |||||
var signImg = new Image(); | |||||
var stampImg = new Image(); | |||||
signImg.src = $('#signImg')[0].src; | |||||
stampImg.src = $('#stampImg')[0].src; | |||||
signImg.onload=function() { | |||||
$('#signImg').show(); | |||||
} | |||||
stampImg.onload=function() { | |||||
$('#stampImg').show(); | |||||
} | |||||
$('.btn').click(function () { | |||||
$('.tableBox').jqprint(); | |||||
}); | |||||
</script> |
@@ -84,6 +84,7 @@ table { | |||||
text-indent: 32px; | text-indent: 32px; | ||||
font-size: 14px; | font-size: 14px; | ||||
line-height: 30px; | line-height: 30px; | ||||
position: relative; | |||||
} | } | ||||
.entrTxt span { | .entrTxt span { | ||||
@@ -97,13 +98,24 @@ table { | |||||
text-indent: 0; | text-indent: 0; | ||||
text-align: center | text-align: center | ||||
} | } | ||||
#signImg { | |||||
position: absolute; | |||||
width: 250px; | |||||
top: 40px; | |||||
left: 100px; | |||||
} | |||||
.entrTime { | .entrTime { | ||||
text-align: right; | text-align: right; | ||||
padding-right: 80px; | padding-right: 80px; | ||||
margin-top: 120px; | margin-top: 120px; | ||||
position: relative; | |||||
} | |||||
#stampImg { | |||||
position: absolute; | |||||
width: 140px; | |||||
top: 60px; | |||||
left: 170px; | |||||
} | } | ||||
.entrTime span { | .entrTime span { | ||||
display: inline-block; | display: inline-block; | ||||
width: 50px; | width: 50px; | ||||
@@ -990,6 +990,7 @@ | |||||
<Content Include="Areas\EducationalAdministration\Views\Sys_SendFile\FormPartyView.js" /> | <Content Include="Areas\EducationalAdministration\Views\Sys_SendFile\FormPartyView.js" /> | ||||
<Content Include="Areas\EducationalAdministration\Views\Sys_SendFile\IndexParty.js" /> | <Content Include="Areas\EducationalAdministration\Views\Sys_SendFile\IndexParty.js" /> | ||||
<Content Include="Areas\EducationalAdministration\Views\Sys_SendFile\IndexDocument.js" /> | <Content Include="Areas\EducationalAdministration\Views\Sys_SendFile\IndexDocument.js" /> | ||||
<Content Include="Areas\EducationalAdministration\Views\Sys_SendFile\IssueForm.js" /> | |||||
<Content Include="Areas\EducationalAdministration\Views\Sys_SendFile\ReadListParty.js" /> | <Content Include="Areas\EducationalAdministration\Views\Sys_SendFile\ReadListParty.js" /> | ||||
<Content Include="Areas\EducationalAdministration\Views\Sys_SendFile\ReadListDocument.js" /> | <Content Include="Areas\EducationalAdministration\Views\Sys_SendFile\ReadListDocument.js" /> | ||||
<Content Include="Areas\EducationalAdministration\Views\Thermography\StatisticIndex.js" /> | <Content Include="Areas\EducationalAdministration\Views\Thermography\StatisticIndex.js" /> | ||||
@@ -6806,6 +6807,7 @@ | |||||
<Content Include="Areas\AdmissionsPlatform\Views\AP_OnlineUserInfo\ReportIndex.cshtml" /> | <Content Include="Areas\AdmissionsPlatform\Views\AP_OnlineUserInfo\ReportIndex.cshtml" /> | ||||
<Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\LoanForm.cshtml" /> | <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\LoanForm.cshtml" /> | ||||
<Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\OnsitePayForm.cshtml" /> | <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\OnsitePayForm.cshtml" /> | ||||
<Content Include="Areas\EducationalAdministration\Views\Sys_SendFile\IssueForm.cshtml" /> | |||||
<None Include="Properties\PublishProfiles\FolderProfile.pubxml" /> | <None Include="Properties\PublishProfiles\FolderProfile.pubxml" /> | ||||
<Content Include="Views\Login\Default-beifen.cshtml" /> | <Content Include="Views\Login\Default-beifen.cshtml" /> | ||||
<None Include="Properties\PublishProfiles\FolderProfile1.pubxml" /> | <None Include="Properties\PublishProfiles\FolderProfile1.pubxml" /> | ||||
@@ -233,6 +233,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration | |||||
{ | { | ||||
var Sys_SendFile = db.FindEntity<Sys_SendFileEntity>(m => m.SProcessId == processId); | var Sys_SendFile = db.FindEntity<Sys_SendFileEntity>(m => m.SProcessId == processId); | ||||
Sys_SendFile.SendFlag = status; | Sys_SendFile.SendFlag = status; | ||||
//获取校长的审批意见 | |||||
if (status == 2) | if (status == 2) | ||||
{ | { | ||||
Sys_SendFile.SendTime = DateTime.Now; | Sys_SendFile.SendTime = DateTime.Now; | ||||
@@ -10,9 +10,10 @@ namespace Learun.Application.WorkFlow | |||||
public class Sys_SendFileMethod : IWorkFlowMethod | public class Sys_SendFileMethod : IWorkFlowMethod | ||||
{ | { | ||||
Sys_SendFileIBLL asset = new Sys_SendFileBLL(); | Sys_SendFileIBLL asset = new Sys_SendFileBLL(); | ||||
NWFTaskIBLL nWFTaskIBLL = new NWFTaskBLL(); | |||||
public void Sucess(string processId) | public void Sucess(string processId) | ||||
{ | { | ||||
asset.ChangeStatusByProcessId(processId,2); | |||||
asset.ChangeStatusByProcessId(processId, 2); | |||||
} | } | ||||
public void Fail(string processId) | public void Fail(string processId) | ||||
@@ -25,6 +26,18 @@ namespace Learun.Application.WorkFlow | |||||
if (parameter.code == "agree") | if (parameter.code == "agree") | ||||
{ | { | ||||
asset.ChangeStatusByProcessId(parameter.processId, 2); | 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 | else | ||||
{ | { | ||||
@@ -174,6 +174,12 @@ namespace Learun.Application.WorkFlow | |||||
/// <returns></returns> | /// <returns></returns> | ||||
[NotMapped] | [NotMapped] | ||||
public int? F_IsUrge { get; set; } | public int? F_IsUrge { get; set; } | ||||
/// <summary> | |||||
/// 合同流程专用, 校长是否同意 | |||||
/// </summary> | |||||
[NotMapped] | |||||
public bool? LeaderIsAgree { get; set; } | |||||
#endregion | #endregion | ||||
} | } | ||||
} | } |
@@ -237,6 +237,18 @@ namespace Learun.Application.WorkFlow | |||||
foreach (var item in aa) | foreach (var item in aa) | ||||
{ | { | ||||
item.F_TaskId = this.BaseRepository().FindEntity<NWFTaskEntity>(x => x.F_ProcessId == item.F_Id)?.F_Id; | item.F_TaskId = this.BaseRepository().FindEntity<NWFTaskEntity>(x => x.F_ProcessId == item.F_Id)?.F_Id; | ||||
//合同流程审批专用 如果第一步校长审批同意的话 可以打印授权委托书 | |||||
if (item.F_SchemeCode == "LC_Contract_") | |||||
{ | |||||
var entity = this.BaseRepository().FindEntity<NWFTaskLogEntity>(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; | return aa; | ||||
} | } | ||||