From 8b4e00e0d28642b2d4a11b55260f82162cffa7a7 Mon Sep 17 00:00:00 2001 From: zhichao lei <442149704@qq.com> Date: Thu, 3 Dec 2020 16:24:15 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E4=BA=BA=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../www/pages/nworkflow/audit/audit.js | 2 +- .../pages/nworkflow/audit/verify/verify.js | 25 +++++++++++++++---- .../Process/NWFProcessBLL.cs | 1 + .../Process/NWFProcessDetailsModel.cs | 4 +++ 4 files changed, 26 insertions(+), 6 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/nworkflow/audit/audit.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/nworkflow/audit/audit.js index 782c58bd2..92c992ad2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/nworkflow/audit/audit.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/nworkflow/audit/audit.js @@ -84,7 +84,7 @@ if (!getFormData($page)) { return false; } - learun.nav.go({ path: 'nworkflow/audit/verify', title: headText + '【' + _item.name + '】', type: 'right', param: { processId: processId, taskId: taskId, verify: _item.code, name: _item.name, node: currentNode } }); + learun.nav.go({ path: 'nworkflow/audit/verify', title: headText + '【' + _item.name + '】', type: 'right', param: {btn:_item,schemeCode:info.SchemeCode, processId: processId, taskId: taskId, verify: _item.code, name: _item.name, node: currentNode } }); } } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/nworkflow/audit/verify/verify.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/nworkflow/audit/verify/verify.js index 791c6817f..934797a76 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/nworkflow/audit/verify/verify.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/nworkflow/audit/verify/verify.js @@ -3,6 +3,11 @@ var page = { isScroll: true, init: function ($page, param) { + console.log(param); + //如果是同意，判断是否选择下一审核人 + if(param.verify=='agree'){ + + } // 添加头部按钮列表 var _html = '\
取消
\ @@ -41,13 +46,20 @@ }); //加载下一节点审核者 - if (param.node.isNext == '1') { + var isNext=param.node.isNext; + if(param.btn.next=='2'){ + isNext='1'; + } + if (isNext == '1') { var nodeMap = {}; + console.log(11111); + console.log(param) // 节点信息 - $.each(param.nodelist, function (_index, _item) { - nodeMap[_item.id] = _item; - }); + // $.each(param.nodelist, function (_index, _item) { + // nodeMap[_item.id] = _item; + // }); var req = { + code:param.schemeCode, taskId: param.taskId, processId: param.processId, nodeId: param.node.id, @@ -55,12 +67,15 @@ }; learun.httpget(config.webapi + "learun/adms/newwf/auditer", req, function (data) { if (data) { + console.log(data); var $des = $page.find('.lr-form-row-multi'); var $item = $page.find('#F_Level').parent(); $.each(data, function (_id, _list) { if (_list.length > 1) { - $des.before('
'); + $des.before('
'); $page.find('#' + _id).lrpicker({ data: _list, itext: 'Name', ivalue: 'Id' }); + // $des.before('
'); + // $page.find('#' + _id).lrpicker({ data: _list, itext: 'Name', ivalue: 'Id' }); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessBLL.cs index 503b5dd51..b939a4ec8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessBLL.cs @@ -1487,6 +1487,7 @@ namespace Learun.Application.WorkFlow nWFProcessDetailsModel.CurrentNodeIds = nWFTaskIBLL.GetCurrentNodeIds(processId); nWFProcessDetailsModel.TaskLogList = (List)nWFTaskIBLL.GetLogList(processId); nWFProcessDetailsModel.parentProcessId = nWFIEngine.GetConfig().ParentProcessId; + nWFProcessDetailsModel.SchemeCode = nWFIEngine.GetConfig().SchemeCode; if (string.IsNullOrEmpty(taskId)) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessDetailsModel.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessDetailsModel.cs index 949729187..a4f86c1e6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessDetailsModel.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessDetailsModel.cs @@ -36,5 +36,9 @@ namespace Learun.Application.WorkFlow /// 父流程进程主键 /// public string parentProcessId { get; set; } + /// + /// 流程编码 + /// + public string SchemeCode { get; set; } } }