From db1b4e4ab540eb23cf6c93df9b9a11af2624cf8c Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Wed, 7 Dec 2022 17:53:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=AE=A1=E6=89=B9=E4=BF=A1=E6=81=AF=EF=BC=9A?= =?UTF-8?q?=E7=AD=BE=E7=AB=A0=E5=9B=BE=E7=89=87=E4=BD=8D=E7=BD=AE=E5=A4=A7?= =?UTF-8?q?=E5=B0=8F=E8=B0=83=E6=95=B4=EF=BC=9B=E7=82=B9=E5=87=BB=E5=90=8C?= =?UTF-8?q?=E6=84=8F/=E4=B8=8D=E5=90=8C=E6=84=8F=E6=97=B6=E5=87=BA?= =?UTF-8?q?=E7=8E=B0=E4=B8=A4=E6=AC=A1=E6=8F=90=E7=A4=BA=E6=96=87=E5=AD=97?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/NWFProcess/NWFContainerForm.css | 8 ++++---- .../Views/NWFProcess/NWFContainerForm.js | 16 +++++++--------- 2 files changed, 11 insertions(+), 13 deletions(-) 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, From 7d0ee6f1b7ca24b48eb5da98d564bfa7aa6ad2d8 Mon Sep 17 00:00:00 2001 From: lb01 Date: Thu, 8 Dec 2022 09:37:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=A1=E6=8A=A5=E5=8D=95=E5=92=8C?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=B7=BB=E5=8A=A0=E8=A1=A8=E5=A4=B4=EF=BC=8C?= =?UTF-8?q?=E7=BB=98=E5=88=B6=E7=AD=BE=E7=AB=A0=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FundsApply/single.vue | 12 ++++++++ .../pages/nworkflow/myflow/sign.vue | 28 +++++++++++++++---- 2 files changed, 35 insertions(+), 5 deletions(-) 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 @@