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 += '