+
-
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 eb523302a..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
@@ -138,6 +138,51 @@ var bootstrap = function ($, learun) {
});
}
});
+
+ // 下发审批指定接收人
+ $('#lr_IssueSpecifyReceiver').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('SFileId');
+ if (learun.checkrow(keyValue)) {
+ learun.layerForm({
+ id: 'form',
+ title: '下发审批指定接收人',
+ url: top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/IssueForm?keyValue=' + keyValue,
+ width: 800,
+ height: 200,
+ callBack: function (id) {
+ var res = false;
+ // 验证数据
+ res = top[id].validForm();
+ // 保存数据
+ if (res) {
+ res = top[id].save('', function () {
+ page.search();
+ });
+ }
+ return res;
+ }
+ });
+ }
+ });
+ // 结束
+ $('#lr_OverIssue').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('SFileId');
+ if (learun.checkrow(keyValue)) {
+ var SendFlag = $('#gridtable').jfGridValue('SendFlag');
+ if (SendFlag !== 2) {
+ learun.alert.warning("当前公文未审批通过，请耐心等待审批！");
+ return;
+ }
+ learun.layerConfirm('是否结束下发！', function (res) {
+ if (res) {
+ processId = learun.newGuid();
+ learun.postForm(top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/OverIssue', { keyValue: keyValue, }, function (res) {
+ refreshGirdData(res, {});
+ });
+ }
+ });
+ }
+ });
},
// 初始化列表
initGird: function () {
@@ -145,34 +190,21 @@ var bootstrap = function ($, learun) {
url: top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/GetPageList',
headData: [
{ label: "主题", name: "Title", width: 300, align: "left" },
- {
- label: "接收对象", name: "SendType", width: 100, align: "left",
- formatterAsync: function (callback, value, row, op, $cell) {
- learun.clientdata.getAsync('dataItem', {
- key: value,
- code: 'FileSendType',
- callback: function (_data) {
- callback(_data.text);
- }
- });
- }
- },
- {
- label: "接收人", name: "Receiver", width: 300, align: "left"
- },
- {
- 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) {
if (cellvalue === 1) {
return '
审批中';
} else if (cellvalue === 2) {
- return '
已下发';
+ return '
审批通过';
+ } else if (cellvalue === 3) {
+ return '
审批失败';
+ } else if (cellvalue === 4) {
+ return '
下发完毕';
} else {
return '
草稿';
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IssueForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IssueForm.cshtml
new file mode 100644
index 000000000..4354f033a
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IssueForm.cshtml
@@ -0,0 +1,11 @@
+@{
+ ViewBag.Title = "公文发送";
+ Layout = "~/Views/Shared/_Form.cshtml";
+}
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_SendFile/IssueForm.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IssueForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IssueForm.js
new file mode 100644
index 000000000..885d83209
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IssueForm.js
@@ -0,0 +1,96 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn)
+ * Copyright (c) 2013-2018 北京泉江科技有限公司
+ * 创建人：超级管理员
+ * 日 期：2019-04-11 10:31
+ * 描 述：公文发送
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var rFileId = request('rFileId');
+var specifyReceiver = request('specifyReceiver');
+// 设置权限
+var setAuthorize;
+// 设置表单数据
+var setFormData;
+// 验证数据是否填写完整
+var validForm;
+// 保存数据
+var save;
+var bootstrap = function ($, learun) {
+ "use strict";
+ // 设置权限
+ setAuthorize = function (data) {
+ };
+ var page = {
+ init: function () {
+ $('.lr-form-wrap').lrscroll();
+ page.bind();
+ page.initData();
+ },
+ bind: function () {
+ $('#SpecifyReceiver').lrUserSelect({ type: '1' });
+ },
+ initData: function () {
+ if (!!keyValue) {
+ $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/GetFormData?keyValue=' + keyValue, function (data) {
+ for (var id in data) {
+ if (!!data[id].length && data[id].length > 0) {
+ $('#' + id).jfGridSet('refreshdata', data[id]);
+ }
+ else {
+ if (rFileId) {
+ $('#SpecifyReceiver').lrformselectSet(specifyReceiver);
+ } else {
+
+ $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+ }
+
+ }
+ }
+
+ });
+ }
+ }
+ };
+ // 设置表单数据
+ setFormData = function (processId) {
+ if (!!processId) {
+ $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/GetFormDataByProcessId?processId=' + processId, function (data) {
+ for (var id in data) {
+ if (!!data[id] && data[id].length > 0) {
+ $('#' + id).jfGridSet('refreshdata', data[id]);
+ }
+ else {
+ if (id == 'Sys_SendFile') {
+ keyValue = data[id].SFileId;
+ }
+ $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+ }
+ }
+ });
+ }
+ }
+ // 验证数据是否填写完整
+ validForm = function () {
+ if (!$('#form').lrValidform()) {
+ return false;
+ }
+ return true;
+ };
+ // 保存数据
+ save = function (processId, callBack, i) {
+ var formData = $('body').lrGetFormData();
+ formData.RFileId = rFileId;
+ formData.SFileId = keyValue;
+ var postData = {
+ strEntity: JSON.stringify(formData)
+ };
+ $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/Issue', postData, function (res) {
+ // 保存成功后才回调
+ if (!!callBack) {
+ callBack(res, formData, i);
+ }
+ });
+ };
+ page.init();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadList.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadList.cshtml
index 8442521e0..7321389a5 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadList.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadList.cshtml
@@ -17,6 +17,7 @@
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadList.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadList.js
index da100e6ee..4f2f9e528 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadList.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/ReadList.js
@@ -24,6 +24,40 @@ var bootstrap = function ($, learun) {
$('#lr_refresh').on('click', function () {
location.reload();
});
+
+ $('#lr_Issue').on('click',
+ function () {
+ var keyValue = $('#gridtable').jfGridValue('SFileId');
+ var rFileId = $('#gridtable').jfGridValue('RFileId');
+ var specifyReceiver = $('#gridtable').jfGridValue('SpecifyReceiver');
+ if (learun.checkrow(rFileId)) {
+ var SendStatus = $('#gridtable').jfGridValue('SendStatus');
+ if (SendStatus) {
+ learun.alert.warning("已下发！");
+ return;
+ }
+ learun.layerForm({
+ id: 'formIssue',
+ title: '下发',
+ url: top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/IssueForm?keyValue=' + keyValue + '&rFileId=' + rFileId + '&specifyReceiver=' + specifyReceiver,
+ width: 500,
+ height: 500,
+ callBack: function (id) {
+ var res = false;
+ // 验证数据
+ res = top[id].validForm();
+ // 保存数据
+ if (res) {
+ res = top[id].save('', function () {
+ page.search();
+ });
+ }
+ return res;
+ }
+ });
+ }
+
+ });
},
// 初始化列表
initGird: function () {
@@ -36,6 +70,30 @@ var bootstrap = function ($, learun) {
{
label: "查阅时间", name: "ReadTime", width: 150, 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: "ReadFlag", width: 100, align: "left",
formatter: function (cellvalue, row) {
@@ -45,6 +103,16 @@ var bootstrap = function ($, learun) {
return '
未读';
}
}
+ },
+ {
+ label: "下发状态", name: "SendStatus", width: 100, align: "left",
+ formatter: function (cellvalue, row) {
+ if (cellvalue === true) {
+ return '
已下发';
+ } else {
+ return '
未下发';
+ }
+ }
}
],
mainId: 'RFileId',
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Controllers/FormRelationController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Controllers/FormRelationController.cs
index 6a16f2c01..44bc08585 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Controllers/FormRelationController.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Controllers/FormRelationController.cs
@@ -66,7 +66,7 @@ namespace Learun.Application.Web.Areas.LR_FormModule.Controllers
public ActionResult PreviewIndex(string id)
{
string currentUrl = (string)WebHelper.GetHttpItems("currentUrl");
- currentUrl = currentUrl + "?id=" + id;
+ //currentUrl = currentUrl + "?id=" + id;
WebHelper.UpdateHttpItem("currentUrl", currentUrl);
return View();
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/PreviewIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/PreviewIndex.js
index 924298dfd..cd7d7920e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/PreviewIndex.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/PreviewIndex.js
@@ -294,7 +294,7 @@ var bootstrap = function ($, learun) {
girdurl = top.$.rootUrl + '/LR_FormModule/FormRelation/GetPreviewList?keyValue=' + id;
}
- $('#gridtable').lrAuthorizeJfGrid({
+ $('#gridtable').jfGrid({
url: girdurl,
headData: headData,
reloadSelected: true,
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/ContractFiling.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.cshtml
index cd1962dd3..6f1cffdf6 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.cshtml
@@ -2,7 +2,18 @@
ViewBag.Title = "流程监控";
Layout = "~/Views/Shared/_Index.cshtml";
}
-
+
+
+
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 555b364ec..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',
@@ -252,7 +253,7 @@ var bootstrap = function ($, learun) {
}
- if (categoryId == '3' && row.F_TaskType == 1 && row.F_IsFinished == 0) {// 已完成任务，添加一个撤销按钮
+ if (categoryId == '3' && row.F_TaskType == 1 && row.F_IsFinished == 0 && !row.NextNodeIsAudited) {// 已完成任务，添加一个撤销按钮
cellvalue = '
撤销审核' + cellvalue;
$cell.on('click', '.revoke2', function () {// 删除
@@ -324,12 +325,17 @@ var bootstrap = function ($, learun) {
return "
运行中";
} else if (cellvalue == 2) {
return "
草稿";
- } else {
+ }
+ else {
return "
作废";
}
}
else {
- return "
结束";
+ if (cellvalue == 4) {
+ return "
终止";
+ } else {
+ return "
结束";
+ }
}
}
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 @@
-
+
+
+ 
+ 
+ 
+ 
+ 
+