diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.css b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.css index a0606381a..addf09680 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.css +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.css @@ -236,13 +236,13 @@ .auditinfo-s { position: absolute; - top: 0; - right: 200px; - height: 100px; + top: 25px; + right: 225px; + height: 50px; } .auditinfo-s img { - height: 100px; + height: 50px; } .auditinfo-sg { 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 f7290b3e3..b62107dc2 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 @@ -674,6 +674,13 @@ var bootstrap = function ($, learun) { // } //}); + //需要填写审批意见时,验证审批意见的必填性 + var des = $('#des').val(); + if (btnData.isOpinion == '1' && !des) { + learun.alert.warning('请签署审批意见!'); + return false; + } + top.flowAuditfn = function (signUrl, stamp) { // 下个流程是否需要可以手动选择审核人 getNextUsers(btnData, nwflow.currentNode, '', nwflow.processId, nwflow.taskId, function (data) { @@ -702,10 +709,6 @@ var bootstrap = function ($, learun) { return top[id].acceptClick(function (auditers) { // 保存表单数据 custmerForm.save(nwflow.processId, nwflow.currentNode.wfForms, function () { - var des = $('#des').val(); - if (btnData.isOpinion == '1' && !des) { - return learun.alert.warning('请签署审批意见!'); - } // 审批流程 learun.loading(true, '审批流程...'); var postData = { @@ -734,11 +737,6 @@ var bootstrap = function ($, learun) { // 保存表单数据 custmerForm.save(nwflow.processId, nwflow.currentNode.wfForms, function () { // 审批流程 - var des = $('#des').val(); - if (btnData.isOpinion == '1' && !des) { - return learun.alert.warning('请签署审批意见!'); - } - learun.loading(true, '审批流程...'); var postData = { operationCode: btnData.code, diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/single.vue index b20619954..83ab40001 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/single.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/single.vue @@ -1,5 +1,17 @@