From f510059ce771e533143fcf48b68e2b20340545e4 Mon Sep 17 00:00:00 2001 From: edy Date: Sat, 9 Oct 2021 15:43:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/Dispatch/Index.js | 8 +- .../Views/Dispatch/IndexXF.js | 8 +- .../Views/Dispatch/ReadIndex.js | 3 - .../Views/Dispatch/SelectForm.js | 1 - .../Controllers/NWFProcessController.cs | 38 ++- .../Controllers/NWFSchemeController.cs | 13 + .../Views/NWFProcess/ContractFiling.cshtml | 17 +- .../Views/NWFProcess/ContractFiling.js | 31 ++- .../NWFProcess/ContractFilingMonitor.cshtml | 8 +- .../Views/NWFProcess/ContractFilingMonitor.js | 98 ++++++- .../NWFProcess/MonitorDetailsIndex.cshtml | 4 +- .../Views/NWFProcess/NWFContainerForm.js | 38 ++- .../Views/NWFProcess/ReleaseForm.js | 11 +- .../Views/NWFProcess/htPrint.cshtml | 16 +- .../Views/NWFScheme/ButtonForm.cshtml | 4 + .../Views/NWFScheme/ButtonForm.js | 7 +- .../LR_NewWorkFlow/Views/NWFScheme/Form.js | 2 + .../Views/NWFScheme/NodeForm.js | 243 +++++++++--------- .../Views/StampInfo/StampDetailIndex.js | 4 + .../Process/NWFProcessBLL.cs | 9 + .../Process/NWFProcessDetailsModel.cs | 4 + .../Process/NWFProcessIBLL.cs | 6 + .../Process/NWFProcessSerivce.cs | 37 +++ .../Scheme/NWFSchemeInfoEntity.cs | 8 + .../Scheme/NWFSchemeService.cs | 14 +- 25 files changed, 452 insertions(+), 180 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Index.js index 97e76ccf8..8c0be7315 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Index.js @@ -133,7 +133,6 @@ var bootstrap = function ($, learun) { $('#lr_setread').on('click', function () { var keyValue = $('#gridtable').jfGridValue('Id'); var loginInfo = learun.clientdata.get(['userinfo']); - console.log(loginInfo); if (learun.checkrow(keyValue)) { learun.layerForm({ id: 'form', @@ -180,7 +179,6 @@ var bootstrap = function ($, learun) { { label: "来文单位", name: "DisFrom", width: 400, align: "center" }, { label: "字", name: "DisWork", width: 150, align: "center" }, { label: "号", name: "DisMark", width: 150, align: "center" }, - //{ label: "份数", name: "Copies", width: 100, align: "center" }, { label: "年", name: "DisYear", width: 100, align: "center" }, { label: "月", name: "DisMonth", width: 100, align: "center" }, { label: "日", name: "DisDay", width: 100, align: "center" }, @@ -194,7 +192,6 @@ var bootstrap = function ($, learun) { async: false, cache: false, success: function (res) { - console.log(res); var bb = ''; $.each(res.data, function (i, item) { bb += item.F_FileName.substring(0, item.F_FileName.indexOf(".")) @@ -238,8 +235,8 @@ var bootstrap = function ($, learun) { if (res.code == 200) { // 发起流程 var postData = { - //schemeCode: 'Dispatch',// 本地 - schemeCode: 'DBSW',//线上 + schemeCode: 'Dispatch',// 本地 + //schemeCode: 'DBSW',//线上 processId: processId, level: '1', }; @@ -252,7 +249,6 @@ var bootstrap = function ($, learun) { page.init(); } function downLoad(fileId, fileTwo) { - console.log(222); if (fileTwo) { top.learun.postFormSilence(top.$.rootUrl + '/PersonnelManagement/MP_QualityObjectives/AddRecord', { fileId: fileTwo }, function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.js index d2a3d462d..4cc48b06b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.js @@ -157,7 +157,6 @@ var bootstrap = function ($, learun) { $('#lr_setread').on('click', function () { var keyValue = $('#gridtable').jfGridValue('Id'); var loginInfo = learun.clientdata.get(['userinfo']); - console.log(loginInfo); if (learun.checkrow(keyValue)) { learun.layerForm({ id: 'form', @@ -195,7 +194,6 @@ var bootstrap = function ($, learun) { async: false, cache: false, success: function (res) { - console.log(res); var bb = ''; $.each(res.data, function (i, item) { bb += item.F_FileName.substring(0, item.F_FileName.indexOf(".")) @@ -229,7 +227,6 @@ var bootstrap = function ($, learun) { $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); }, downLoad: function (fileId) { - console.log(111); top.learun.download({ url: top.$.rootUrl + '/LR_SystemModule/Annexes/DownAnnexesFile', param: { fileId: fileId, __RequestVerificationToken: top.$.lrToken }, method: 'POST' }); } }; @@ -237,8 +234,8 @@ var bootstrap = function ($, learun) { if (res.code == 200) { // 发起流程 var postData = { - //schemeCode: 'Dispatch',// 本地 - schemeCode: 'XBSW',// 线上 + schemeCode: 'Dispatch',// 本地 + //schemeCode: 'XBSW',// 线上 processId: processId, level: '1', }; @@ -251,7 +248,6 @@ var bootstrap = function ($, learun) { page.init(); } function downLoad(fileId, fileTwo) { - console.log(222); if (fileTwo) { top.learun.postFormSilence(top.$.rootUrl + '/PersonnelManagement/MP_QualityObjectives/AddRecord', { fileId: fileTwo }, function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/ReadIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/ReadIndex.js index 2bf0cabe0..851e1c028 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/ReadIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/ReadIndex.js @@ -82,7 +82,6 @@ var bootstrap = function ($, learun) { async: false, cache: false, success: function (res) { - console.log(res); var bb = ''; $.each(res.data, function (i, item) { bb += item.F_FileName.substring(0, item.F_FileName.indexOf(".")) @@ -120,7 +119,6 @@ var bootstrap = function ($, learun) { $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); }, downLoad: function (fileId) { - console.log(111); top.learun.download({ url: top.$.rootUrl + '/LR_SystemModule/Annexes/DownAnnexesFile', param: { fileId: fileId, __RequestVerificationToken: top.$.lrToken }, method: 'POST' }); } }; @@ -142,7 +140,6 @@ var bootstrap = function ($, learun) { page.init(); } function downLoad(fileId, fileTwo) { - console.log(222); if (fileTwo) { top.learun.postFormSilence(top.$.rootUrl + '/PersonnelManagement/MP_QualityObjectives/AddRecord', { fileId: fileTwo }, function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/SelectForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/SelectForm.js index 13325169a..1dbd21e7b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/SelectForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/SelectForm.js @@ -168,7 +168,6 @@ var bootstrap = function ($, learun) { }) // 选中人员按钮点击事件 $('#selected_user_list').on('click', function (e) { - console.log(11); var et = e.target || e.srcElement; var $et = $(et); if ($et.hasClass('user-reomve')) { 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 1467522a3..7cd4026fe 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 @@ -5,7 +5,6 @@ using System.Linq; using System.Web.Mvc; using Learun.Application.Organization; using Learun.Application.Base.AuthorizeModule; -using System; using Learun.Application.TwoDevelopment.LR_LGManager; namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers @@ -20,6 +19,7 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers public class NWFProcessController : MvcControllerBase { private NWFProcessIBLL nWFProcessIBLL = new NWFProcessBLL(); + //LC_hetongIBLL lcHetongIbll=new LC_hetongBLL(); private NWFSchemeIBLL nWFSchemeIBLL = new NWFSchemeBLL(); private NWFTaskIBLL nWFTaskIBLL = new NWFTaskBLL(); @@ -130,9 +130,10 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers } var beginTime = data?.LC_htkssj.ToDate(); var endTime = data?.LC_htjssj.ToDate(); - var operationTime = data?.OperationTime.ToDate(); + var operationTime = nwfTaskLogEntity?.F_CreateDate; ViewBag.UserName = userInfo?.F_RealName; ViewBag.IDCard = userInfo?.F_IdentityCardNo; + ViewBag.Htmc = data?.LC_htmc; ViewBag.BeginYear = beginTime?.Year; ViewBag.BeginMonth = beginTime?.Month; ViewBag.BeginDay = beginTime?.Day; @@ -278,6 +279,7 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers { return View(); } + /// /// 普通教师请假归档 /// @@ -364,6 +366,23 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers }; return Success(jsonData); } + + //[HttpGet] + //[AjaxOnly] + //public ActionResult GetContractList(string pagination, string queryJson) + //{ + // Pagination paginationobj = pagination.ToObject(); + // var list = lcHetongIbll.GetPageList(paginationobj, queryJson); + // var jsonData = new + // { + // rows = list, + // total = paginationobj.total, + // page = paginationobj.page, + // records = paginationobj.records, + // }; + // return Success(jsonData); + //} + /// /// 获取我的流程信息列表 /// @@ -437,6 +456,7 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers var data = nWFTaskIBLL.GetEntity(taskId); return Success(data); } + /// /// 获取普通教师请假归档列表 /// @@ -458,6 +478,7 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers }; return Success(jsonData); } + /// /// 获取中层领导请假归档列表 /// @@ -493,6 +514,18 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers nWFProcessIBLL.DeleteEntity(processId); return Success("删除成功"); } + /// + /// 流程合同监控--作废 + /// + /// 流程进程主键 + [HttpPost] + [AjaxOnly] + public ActionResult UpdateEnabledMark(string processId,string EnabledMark) + { + nWFProcessIBLL.UpdateEnabledMark(processId, EnabledMark); + return Success("操作成功"); + } + /// /// 普通教师请假归档 /// @@ -516,6 +549,7 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers studentLeave_ZcIBLL.DoFile(keyValue); return Success("归档成功"); } + #endregion #region 流程API diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFSchemeController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFSchemeController.cs index 9f6d42418..fb4ef0133 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFSchemeController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFSchemeController.cs @@ -251,6 +251,19 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers { item.imgUrl = null; } + + if (item.F_Id == "3a9e9db8-a928-435b-a9d2-4a4660b4cdeb") + { + item.F_Name = "采购申请(普通)"; + item.F_CodeUrl = "/AssetManagementSystem/Ass_AssetsInfoApply/IndexJY"; + item.F_Code = "caigoupt"; + } + else if (item.F_Id == "307b2c75-174f-424d-84d8-e0f8374ec6d1") + { + item.F_Name = "采购申请(耗材)"; + item.F_CodeUrl = "/AssetManagementSystem/Ass_AssetsInfoApply/IndexJYHC"; + item.F_Code = "caigouhc"; + } } return Success(data); } 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 6f1cffdf6..57d390d29 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,20 +2,9 @@ ViewBag.Title = "流程监控"; Layout = "~/Views/Shared/_Index.cshtml"; } -
-
-
-
-
    -
  • 未完成
    • -
  • 已完成
    • -
-
-
-
- +
-
+
@@ -34,8 +23,6 @@
 查看 -  指派审核人 -  作废
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.js index 0fb5e7356..69b68691c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.js @@ -111,10 +111,36 @@ var bootstrap = function ($, learun) { $('#gridtable').jfGrid({ url: top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/GetContractList', headData: [ - { label: '合同编号', name: 'LC_htbh', width: 150, align: "left" }, + { label: '申报日期', name: 'F_ModifyDate', width: 200, align: "left" }, + //{ label: '合同编号', name: 'LC_htbh', width: 150, align: "left" }, { label: '合同名称', name: 'LC_htmc', width: 200, align: "left" }, { label: '合同额(万元)', name: 'LC_htzje', width: 200, align: "left" }, - { label: '申报人', name: 'F_ModifyUserName', width: 100, align: "left" }, + { + label: '申报人', name: 'F_CreateUserName', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser', + key: value, + keyId: 'f_userid', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + }, + { + label: '授权委托人', name: 'LC_sqwtr', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser', + key: value, + keyId: 'f_userid', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + }, { label: '对方单位名称', name: 'LC_dfdw', width: 200, align: "left" }, { label: '联系人', name: 'LC_dflxr', width: 100, align: "left" }, { label: '联系方式', name: 'LC_dfdh', width: 120, align: "left" }, @@ -129,7 +155,6 @@ var bootstrap = function ($, learun) { } }, { label: '文本盖章份数', name: 'LC_gzfs', width: 80, align: "left" }, - { label: '申报日期', name: 'F_ModifyDate', width: 200, align: "left" } ], mainId: 'F_Id', isPage: true, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFilingMonitor.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFilingMonitor.cshtml index 62ebf7269..04bec8efc 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFilingMonitor.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFilingMonitor.cshtml @@ -7,14 +7,14 @@
    -
  • 未完成
    • -
  • 已完成
    • +
  • 运行中
    • +
  • 作废
-
+
@@ -33,6 +33,7 @@
 查看 +  作废
@@ -42,6 +43,7 @@
+ @Html.AppendJsFile("/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFilingMonitor.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFilingMonitor.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFilingMonitor.js index f5075048a..a1370627d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFilingMonitor.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFilingMonitor.js @@ -7,9 +7,10 @@ */ var bootstrap = function ($, learun) { "use strict"; - var categoryId = '0'; + //var categoryId = '0'; var logbegin = ''; var logend = ''; + var F_EnabledMark1 = ''; var page = { init: function () { @@ -56,7 +57,30 @@ var bootstrap = function ($, learun) { $('#lr_eye').on('click', function () { page.eye(); }); - + // 作废 + $('#lr_del').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ProcessId'); + var F_EnabledMark1 = $('#gridtable').jfGridValue('F_EnabledMark1'); + var F_IsFinished = $('#gridtable').jfGridValue('F_IsFinished'); + if (learun.checkrow(keyValue)) { + if (F_IsFinished == 1) { + return learun.alert.warning("选中项已结束！"); + } else if (F_IsFinished == 0 && (F_EnabledMark1 == 4 || F_EnabledMark1 == 3)) { + return learun.alert.warning("选中项已作废！"); + } + learun.layerConfirm('是否确认作废该项！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/UpdateEnabledMark', { processId: keyValue, F_EnabledMark: 4 }, function (res) { + if (res.code == 200) { + page.refreshGirdData(); + } + }); + } + }); + } + }); + + }, initleft: function () { $('#lr_left_list li').on('click', function () { @@ -64,7 +88,7 @@ var bootstrap = function ($, learun) { var $parent = $this.parent(); $parent.find('.active').removeClass('active'); $this.addClass('active'); - categoryId = $this.attr('data-value'); + F_EnabledMark1 = $this.attr('data-value'); page.search(); }); }, @@ -72,10 +96,36 @@ var bootstrap = function ($, learun) { $('#gridtable').jfGrid({ url: top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/GetContractList', headData: [ - { label: '合同编号', name: 'LC_htbh', width: 150, align: "left" }, + { label: '申报日期', name: 'F_ModifyDate', width: 200, align: "left" }, + //{ label: '合同编号', name: 'LC_htbh', width: 150, align: "left" }, { label: '合同名称', name: 'LC_htmc', width: 200, align: "left" }, { label: '合同额(万元)', name: 'LC_htzje', width: 200, align: "left" }, - { label: '申报人', name: 'F_ModifyUserName', width: 100, align: "left" }, + { + label: '申报人', name: 'F_CreateUserName', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser', + key: value, + keyId: 'f_userid', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + }, + { + label: '授权委托人', name: 'LC_sqwtr', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser', + key: value, + keyId: 'f_userid', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + }, { label: '对方单位名称', name: 'LC_dfdw', width: 200, align: "left" }, { label: '联系人', name: 'LC_dflxr', width: 100, align: "left" }, { label: '联系方式', name: 'LC_dfdh', width: 120, align: "left" }, @@ -90,7 +140,33 @@ var bootstrap = function ($, learun) { } }, { label: '文本盖章份数', name: 'LC_gzfs', width: 80, align: "left" }, - { label: '申报日期', name: 'F_ModifyDate', width: 200, align: "left" } + { + label: '状态', name: 'F_EnabledMark1', width: 100, align: "left", + formatter: function (cellvalue, row) { + if (row.F_IsFinished == 0) { + if (cellvalue == 1) { + //if (row.F_IsUrge == "1" && categoryId == '2') { + // return "催办加急"; + //} + return "运行中"; + } else if (cellvalue == 2) { + return "草稿"; + } + else { + //4 + return "作废"; + } + } + else { + if (cellvalue == 4) { + return "终止"; + } else { + return "结束"; + } + } + + } + }, ], mainId: 'F_Id', isPage: true, @@ -105,7 +181,12 @@ var bootstrap = function ($, learun) { param = param || {}; param.StartTime = logbegin; param.EndTime = logend; - param.F_IsFinished = categoryId; + param.F_IsFinished = 0; + if (F_EnabledMark1 == 1) { + param.SqlParameter = " and b.F_EnabledMark=1"; + } else if (F_EnabledMark1 == 4) { + param.SqlParameter = " and (b.F_EnabledMark<>1 and b.F_EnabledMark<>2)"; + } $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); }, eye: function () { @@ -115,6 +196,9 @@ var bootstrap = function ($, learun) { if (learun.checkrow(processId)) { learun.frameTab.open({ F_ModuleId: 'monitor' + processId, F_FullName: '查看-' + title, F_UrlAddress: '/LR_NewWorkFlow/NWFProcess/MonitorDetailsIndex?processId=' + processId }); } + }, + refreshGirdData: function () { + page.search(); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorDetailsIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorDetailsIndex.cshtml index a755cca1a..178caea77 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorDetailsIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorDetailsIndex.cshtml @@ -15,9 +15,9 @@
  • 流程信息
    • -
    +
    -
    +
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js index 441be0fae..07ac5e6e3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js @@ -39,7 +39,7 @@ var bootstrap = function ($, learun) { if (btn.next == '2') { isNext = '1'; } - + console.log(isNext,111111); if (isNext == '1') {// 获取下一节点数据 var param = { code: shcemeCode, @@ -309,6 +309,11 @@ var bootstrap = function ($, learun) { //$('#savedraft').show(); $('#savedraft').showBtn(); $('#savedraft').on('click', function () { + // 验证表单数据完整性 + if (!custmerForm.validForm('create'))// create创建流程 + { + return false; + } tabProcessId = nwflow.processId; // 保存表单数据 custmerForm.save(nwflow.processId, nwflow.currentNode.wfForms, function () { @@ -490,6 +495,11 @@ var bootstrap = function ($, learun) { //$('#savedraft').show(); $('#savedraft').showBtn(); $('#savedraft').on('click', function () { + // 验证表单数据完整性 + if (!custmerForm.validForm('create'))// create创建流程 + { + return false; + } tabProcessId = nwflow.processId; // 保存表单数据 custmerForm.save(nwflow.processId, nwflow.currentNode.wfForms, function () { @@ -670,7 +680,7 @@ var bootstrap = function ($, learun) { _nodeMap[_item.id] = _item; }); $.each(data, function (_id, _list) { - if (_list.length > 1) { + if (_list.length > 1) { _flag = true; return false; } @@ -689,6 +699,7 @@ var bootstrap = function ($, learun) { return top[id].acceptClick(function (auditers) { // 保存表单数据 custmerForm.save(nwflow.processId, nwflow.currentNode.wfForms, function () { + // 审批流程 learun.loading(true, '审批流程...'); var postData = { @@ -800,7 +811,7 @@ var bootstrap = function ($, learun) { }); } - + //if (data.parentProcessId) { // nwflow.pProcessId = data.parentProcessId; @@ -1828,13 +1839,24 @@ var bootstrap = function ($, learun) { html = $('.tab-flow-audit').html(); } + var isContract = false; + + var $iframes = $('#form_list_iframes'); var iframeId = $iframes.find('.form-list-iframe.active').attr('id'); if (iframeId) { var $iframe = learun.iframe(iframeId, frames); //$iframe.$('.lr-form-wrap:visible').jqprint(); var res = $iframe.$('body').lrGetFormShow(); + if (res[0].text.indexOf('合同审批流程单') > -1) { + isContract = true; + } for (var len = ainfo.length, i = ainfo.length - 1; i >= 0; i--) { + if (isContract) { + if (ainfo[i].user.indexOf('关亮') > -1) { + continue; + } + } res.push(ainfo[i]); } $.jqprintForm(res); @@ -1844,8 +1866,18 @@ var bootstrap = function ($, learun) { //$iframes.find(".lr-scroll-box")[0].style.top = 0; //$iframes.find(".lr-formselect i").removeClass(); //$iframes.find('.form-list-container.active').find('.lr-form-wrap:visible').jqprint(null,html); + var res1 = $iframes.lrGetFormShow(); + if (res1[0].text.indexOf('合同审批流程单') > -1) { + isContract = true; + } + for (var len1 = ainfo.length, i1 = ainfo.length - 1; i1 >= 0; i1--) { + if (isContract) { + if (ainfo[i1].user.indexOf('关亮') > -1) { + continue; + } + } res1.push(ainfo[i1]); } $.jqprintForm(res1); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ReleaseForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ReleaseForm.js index e65b043cb..06af73f83 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ReleaseForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ReleaseForm.js @@ -74,6 +74,9 @@ var bootstrap = function ($, learun) { // 加载自定义流程列表 learun.httpAsync('GET', top.$.rootUrl + '/LR_NewWorkFlow/NWFScheme/GetMyInfoList', {}, function (data) { schemeList = data; + //增加资产申请项目 + schemeList.push({ F_Id: 'f1414358-cb9b-4eaf-927f-66f6d60e9280', F_Name: '采购申请(普通)', F_Code: 'caigoupt', F_Category: '资产类', F_CodeUrl: '/AssetManagementSystem/Ass_AssetsInfoApply/IndexJY' }); + schemeList.push({ F_Id: '74701b0e-ad01-4836-9304-bb39222d3bcd', F_Name: '采购申请(耗材)', F_Code: 'caigouhc', F_Category: '资产类', F_CodeUrl: '/AssetManagementSystem/Ass_AssetsInfoApply/IndexJYHC' }); render(); }); @@ -103,8 +106,12 @@ var bootstrap = function ($, learun) { var shcemeCode = $selected.attr('data-value'); if (!!shcemeCode) { var id = $selected[0].shceme.F_Id; - // 发起流程 - learun.frameTab.open({ F_ModuleId: id, F_Icon: 'fa magic', F_FullName: '发起流程【' + $selected[0].shceme.F_Name + '】', F_UrlAddress: '/LR_NewWorkFlow/NWFProcess/NWFContainerForm?shcemeCode=' + shcemeCode + '&tabIframeId=' + id + '&type=create' }); + if (!!$selected[0].shceme.F_CodeUrl) { + //代码开发调用 + learun.frameTab.open({ F_ModuleId: id, F_Icon: 'fa magic', F_FullName: $selected[0].shceme.F_Name, F_UrlAddress: $selected[0].shceme.F_CodeUrl }); + } else { // 发起流程 + learun.frameTab.open({ F_ModuleId: id, F_Icon: 'fa magic', F_FullName: '发起流程【' + $selected[0].shceme.F_Name + '】', F_UrlAddress: '/LR_NewWorkFlow/NWFProcess/NWFContainerForm?shcemeCode=' + shcemeCode + '&tabIframeId=' + id + '&type=create' }); + } return true; } else { 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 25dd1b7c4..618227a63 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 @@ -15,7 +15,13 @@
    授权委托书
    - 兹委托@ViewBag.UserName(身份证号码：@ViewBag.IDCard)负责联系办理业务并签订合同或协议等事宜，请予以配合，由此产生的一切责任和后果由我本人或单位承担。 + 兹委托@ViewBag.UserName(身份证号码：@ViewBag.IDCard)负责联系办理业务并签订合同，合同名称： +
    +
    + @ViewBag.Htmc +
    +
    + 或协议等事宜，请予以配合，由此产生的一切责任和后果由我本人或单位承担。
    特此授权！ @@ -33,13 +39,15 @@
    (签字) - + )
    + @ViewBag.OperationYear 年@ViewBag.OperationMonth 月@ViewBag.OperationDay 日
    +
    @@ -53,12 +61,16 @@