移动端选择审核人功能修改

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 } });
                             }
                         }
 

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 = '\
                 <div class="lr-form-header-cancel" style="display:block;" >取消</div>\
@@ -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('<div class="lr-form-row"><label>' + nodeMap[_id].name + '</label><div id="' + _id + '"  class="nodeId" ></div></div>');
+                                $des.before('<div class="lr-form-row"><label></label><div id="' + _id + '"  class="nodeId" ></div></div>');
                                 $page.find('#' + _id).lrpicker({ data: _list, itext: 'Name', ivalue: 'Id' });
+                                // $des.before('<div class="lr-form-row"><label>' + nodeMap[_id].name + '</label><div id="' + _id + '"  class="nodeId" ></div></div>');
+                                // $page.find('#' + _id).lrpicker({ data: _list, itext: 'Name', ivalue: 'Id' });
                             }
                         });
                     }

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<NWFTaskLogEntity>)nWFTaskIBLL.GetLogList(processId);
             nWFProcessDetailsModel.parentProcessId = nWFIEngine.GetConfig().ParentProcessId;
+            nWFProcessDetailsModel.SchemeCode = nWFIEngine.GetConfig().SchemeCode;
 
             if (string.IsNullOrEmpty(taskId))
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessDetailsModel.cs

@@ -36,5 +36,9 @@ namespace Learun.Application.WorkFlow
         /// 父流程进程主键
         /// </summary>
         public string parentProcessId { get; set; }
+        /// <summary>
+        /// 流程编码
+        /// </summary>
+        public string SchemeCode { get; set; }
     }
 }