Merge branch '金隅分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 金隅分支

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 {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_WorkFlowModule/Views/WfMyTask/Release.js

@@ -42,7 +42,7 @@ var bootstrap = function ($, learun) {
                 _cardbox += '    <div class="card-box-img" style="text-align:center;">';
                 if (item.imgUrl) {
 
-                    _cardbox += '        <img src="'+item.imgUrl+'" />';
+                    _cardbox += '        <img src="' + item.imgUrl + '" />';
                 } else {
 
                     _cardbox += '        <img src="' + top.$.rootUrl + '/Content/images/filetype/Scheme.png" />';
@@ -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);
+        })('');
 }