From 55748c657567792b30561b12be424dc0c974919c Mon Sep 17 00:00:00 2001 From: liangkun Date: Thu, 29 Jul 2021 14:40:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B5=B7=E6=B5=81=E7=A8=8B=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E8=B5=84=E4=BA=A7=E7=94=B3=E8=AF=B7=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/NWFProcess/ReleaseForm.js | 11 +++++++-- .../Views/WfMyTask/Release.js | 24 ++++++++++++------- 2 files changed, 25 insertions(+), 10 deletions(-) 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_WorkFlowModule/Views/WfMyTask/Release.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_WorkFlowModule/Views/WfMyTask/Release.js index ef016f01c..314ed9a9f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_WorkFlowModule/Views/WfMyTask/Release.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_WorkFlowModule/Views/WfMyTask/Release.js @@ -42,7 +42,7 @@ var bootstrap = function ($, learun) { _cardbox += '
'; if (item.imgUrl) { - _cardbox += ' '; + _cardbox += ' '; } else { _cardbox += ' '; @@ -57,7 +57,7 @@ var bootstrap = function ($, learun) { $cardbox[0].shceme = item; $warp.append($cardbox); - + } } $warp.find('.card-box').on('click', function () { @@ -74,8 +74,13 @@ var bootstrap = function ($, learun) { var $selected = $('#main_list').find('.card-box.active'); var shcemeCode = $selected.attr('data-value'); 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' }); + } @@ -95,6 +100,9 @@ var bootstrap = function ($, learun) { // 加载自定义流程列表 learun.httpAsync('GET', top.$.rootUrl + '/LR_NewWorkFlow/NWFScheme/GetMyInfoListHasImg', {}, 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(); }); @@ -143,8 +151,8 @@ var bootstrap = function ($, learun) { var getRandomColor = function () { return '#' + - (function (color) { - return (color += '0123456789abcdef'[Math.floor(Math.random() * 16)]) - && (color.length == 6) ? color : arguments.callee(color); - })(''); + (function (color) { + return (color += '0123456789abcdef'[Math.floor(Math.random() * 16)]) + && (color.length == 6) ? color : arguments.callee(color); + })(''); } \ No newline at end of file