diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.cshtml index 65d50ce89..f1c537fcd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.cshtml @@ -18,7 +18,9 @@ @Html.AppendCssFile("/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.css")
- 打印表单 + @*打印表单*@ + @*流程任务-打印表单*@ + 打印表单
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.js index 3181196a6..82eeb68ce 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.js @@ -8,6 +8,7 @@ var processId = request('processId'); // 流程实例主键 var nodeId = request('nodeId'); // 流程节点 var schemeObj2; +var nodeInfoList = []; //审核节点部分,流程任务-打印表单需要使用 var bootstrap = function ($, learun) { "use strict"; @@ -240,6 +241,36 @@ var bootstrap = function ($, learun) { $.print('.lr-layout-panel'); }); $('#print').show(); + // 流程任务-打印表单 + $('#print2').on('click', function () { + var $iframes = $('#form_list_iframes'); + var iframeId = $iframes.find('.form-list-iframe.active').attr('id'); + //表单部分 + let res = []; + if (iframeId) { + var $iframe = learun.iframe(iframeId, frames); + res = $iframe.$('body').lrGetFormShow(); + } else { + res = $iframes.lrGetFormShow(); + } + //审核部分 + let anodeinfoList = []; + for (var i = 0; i < nodeInfoList.length; i++) { + var nodeItem = nodeInfoList[i]; + if (nodeItem.title != "开始") { + var anodeinfo = { + type: 'anodeinfo', + title: nodeItem.title, + content: nodeItem.content, + date: nodeItem.time, + user: nodeItem.people, + }; + anodeinfoList.push(anodeinfo); + } + } + $.jqprintForm(res.concat(anodeinfoList)); + }); + $('#print2').show(); }, // iframe 加载 iframeLoad: function (iframeId, url, callback, formData) { @@ -256,7 +287,11 @@ var bootstrap = function ($, learun) { } if (!!iframeObj.$) { - callback(iframeObj, formData); + //callback(iframeObj, formData); + //优化系统表单中的数据无法回显问题; + setTimeout(function () { + callback(iframeObj, formData); + }, 10); } }; @@ -405,6 +440,7 @@ var bootstrap = function ($, learun) { nodelist.push(point); } + nodeInfoList = nodelist; $('#wf_timeline').lrtimelineEsc(nodelist); } }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.cshtml index beddb3d8f..fba3e170c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.cshtml @@ -74,8 +74,8 @@
-
审批意见*
- +
审批意见
+
创建流程 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js index 3318d2580..6e8d12e53 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js @@ -86,11 +86,11 @@ var bootstrap = function ($, learun) { nwflow.initAgainCreate(); break; case 'audit':// 审批 - $("#des").attr('isvalid', 'yes'); + //$("#des").attr('isvalid', 'yes'); nwflow.initAudit(); break; case 'signAudit':// 加签审批 - $("#des").attr('isvalid', 'yes'); + //$("#des").attr('isvalid', 'yes'); nwflow.initSignAudit(); break; case 'refer': // 查阅 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index 85a6c1fe6..becfc810e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -1650,6 +1650,10 @@ + + + + @@ -8289,6 +8293,9 @@ + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config index 190162288..ea0aaf173 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config @@ -168,6 +168,8 @@ + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj index c77251941..96b9f332c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj @@ -227,6 +227,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/BaseApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/BaseApi.cs index db158f172..7652dd528 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/BaseApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/BaseApi.cs @@ -191,7 +191,7 @@ namespace Learun.Application.WebApi ReqParameter req = this.Bind(); loginMark = req.loginMark; token = req.token; - if (path == "/learun/adms/user/login"|| path == "/learun/adms/user/loginbyIdCard" || path == "/" || path == "/bgimg" || path == "/learun/adms/user/img" || path == "/learun/adms/desktop/img"||path== "/learun/adms/user/imgfordc"||path== "/learun/adms/timetable/timeTableData"||path== "/quanjiang/sso/authorize") + if (path == "/learun/adms/user/login" || path == "/learun/adms/user/loginbyIdCard" || path == "/" || path == "/bgimg" || path == "/learun/adms/user/img" || path == "/learun/adms/desktop/img" || path == "/learun/adms/user/imgfordc" || path == "/learun/adms/timetable/timeTableData" || path == "/quanjiang/sso/authorize" || path == "/learun/adms/StampPersonal/img") {// 登录接口,默认页面接口不做权限验证处理 return null; } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/ioc.config b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/ioc.config index 10679c9f7..48e13fef7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/ioc.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/ioc.config @@ -11,6 +11,8 @@ + + @@ -29,6 +31,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config index 75541c535..8594bbdf1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config @@ -111,6 +111,8 @@ + + diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js index ee6e5e0b6..e0a1722cc 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js @@ -13,9 +13,9 @@ export default { // "webHost":"http://1.190.222.34:9000/", //本地: "apiHost": [ - "http://localhost:8088/" + "http://192.168.10.58:8003/" ], - "webHost":"http://localhost:8087/", + "webHost":"http://192.168.10.58:8004/", // 开发环境下自动填充登录账号密码,与接口地址一一对应,只在开发环境下显示 "devAccount": [ { username: "system", password: "www.qj.com" } diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue index 2c36ce387..bd1ba783e 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue @@ -47,7 +47,7 @@ 清空签章 - + @@ -314,10 +314,10 @@ return } - if (!this.remark) { - this.TOAST(`请签署审批意见`) - return false; - } + // if (!this.remark) { + // this.TOAST(`请签署审批意见`) + // return false; + // } this.submitDisable = true uni.showLoading({ diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/single.vue index eaa1a83ae..b7a87cb85 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/single.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/single.vue @@ -309,7 +309,9 @@ export default { processId: currentTask.F_ProcessId, taskId: currentTask.F_Id, formreq: postData.formreq, - taskName: this.currentTask.F_Title + taskName: this.currentTask.F_Title, + currentNode:this.currentNode, + schemeCode:this.code||'' } // 不是加签 if (action.code !== '__sign__') {