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)