From caa71656521d75df4e8f5ac7e0390e9d5a146c1c Mon Sep 17 00:00:00 2001 From: weizhiqiang <598748873@qq.com> Date: Fri, 7 Oct 2022 16:08:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E6=95=B4=E6=94=B9?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dsFormPageSequenceDraftProcessAdd.js | 6 +- .../dsFormPageSequenceDraftProcessList.js | 2 - .../template/js/myActiviti/newProcess.js | 7 +- .../template/tpl/myActiviti/newProcess.html | 2 +- .../template/js/mainPage/mainPage.js | 7 +- .../template/tpl/mainPage/mainPage.html | 2 +- .../assets/lib/layui/customer/erpOrderUtil.js | 25 ++++--- .../template/json/activitiNameKey.json | 74 +++++++++---------- 8 files changed, 65 insertions(+), 60 deletions(-) diff --git a/activiti/src/main/resources/template/js/dsFormPageSequence/dsFormPageSequenceDraftProcessAdd.js b/activiti/src/main/resources/template/js/dsFormPageSequence/dsFormPageSequenceDraftProcessAdd.js index 504efd06a..51d76786c 100644 --- a/activiti/src/main/resources/template/js/dsFormPageSequence/dsFormPageSequenceDraftProcessAdd.js +++ b/activiti/src/main/resources/template/js/dsFormPageSequence/dsFormPageSequenceDraftProcessAdd.js @@ -12,7 +12,7 @@ layui.config({ layedit = layui.layedit, form = layui.form; - var actKey = parent.actKey; + var actFlowId = parent.actFlowId; // 加载动态表单页 AjaxPostUtil.request({url: flowableBasePath + "dsformpage004", params: {rowId: parent.dsFormId}, type: 'json', callback: function (json) { @@ -28,12 +28,12 @@ layui.config({ form.on('submit(formAddBean)', function (data) { if (winui.verifyForm(data.elem)) { activitiUtil.startProcess(parent.dsFormId, null, function (approvalId) { - if(isNull(actKey)){ + if(isNull(actFlowId)){ winui.window.msg('流程对象为空，无法启动.', {icon: 2, time: 2000}); return false; } var jStr = { - keyName: actKey, + keyName: actFlowId, jsonStr: JSON.stringify(dsFormUtil.getPageData($("#showForm"))), pageId: parent.dsFormId, approvalId: approvalId diff --git a/activiti/src/main/resources/template/js/dsFormPageSequence/dsFormPageSequenceDraftProcessList.js b/activiti/src/main/resources/template/js/dsFormPageSequence/dsFormPageSequenceDraftProcessList.js index 11b5aa71b..5793b5f86 100644 --- a/activiti/src/main/resources/template/js/dsFormPageSequence/dsFormPageSequenceDraftProcessList.js +++ b/activiti/src/main/resources/template/js/dsFormPageSequence/dsFormPageSequenceDraftProcessList.js @@ -30,7 +30,6 @@ layui.config({ cols: [[ { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, { field: 'title', title: '流程名称', width: 100 }, - { field: 'typeTitle', title: '流程类型', width: 100 }, { field: 'createTime', title: '申请时间', align: 'center', width: 140}, { field: 'state', title: '状态', align: 'center', width: 80, templet: function (d) { if(d.state == 1){ @@ -94,7 +93,6 @@ layui.config({ activitiUtil.startProcess(data.pageId, null, function (approvalId) { var params = { rowId: data.id, - pageId: data.pageId, approvalId: approvalId }; AjaxPostUtil.request({url: flowableBasePath + "pagesequence005", params: params, type: 'json', callback: function (json) { diff --git a/activiti/src/main/resources/template/js/myActiviti/newProcess.js b/activiti/src/main/resources/template/js/myActiviti/newProcess.js index 76f23f6ca..dbdc685ce 100644 --- a/activiti/src/main/resources/template/js/myActiviti/newProcess.js +++ b/activiti/src/main/resources/template/js/myActiviti/newProcess.js @@ -1,5 +1,5 @@ -var actKey = ""; +var actFlowId = ""; var dsFormId = ""; /** @@ -61,7 +61,10 @@ layui.config({ var title = $(this).attr("showTitle"); var url = $(this).attr("addPageUrl"); dsFormId = $(this).attr("dsFormId"); - actKey = $(this).attr("serviceClassName"); + if (!isNull(dsFormId)) { + // 只有动态表单类型的流程才要工作流模型的id + actFlowId = $(this).attr("actFlowId"); + } _openNewWindows({ url: url, title: title, diff --git a/activiti/src/main/resources/template/tpl/myActiviti/newProcess.html b/activiti/src/main/resources/template/tpl/myActiviti/newProcess.html index aae2cc9af..042a2aba6 100644 --- a/activiti/src/main/resources/template/tpl/myActiviti/newProcess.html +++ b/activiti/src/main/resources/template/tpl/myActiviti/newProcess.html @@ -18,7 +18,7 @@
{{title}}
{{#each child}} -
+
diff --git a/gateway/src/main/resources/template/js/mainPage/mainPage.js b/gateway/src/main/resources/template/js/mainPage/mainPage.js index 5ca38b12d..9a93e11d5 100644 --- a/gateway/src/main/resources/template/js/mainPage/mainPage.js +++ b/gateway/src/main/resources/template/js/mainPage/mainPage.js @@ -1,7 +1,7 @@ var rowId = ""; -var actKey = ""; +var actFlowId = ""; var dsFormId = ""; layui.config({ @@ -131,7 +131,10 @@ layui.config({ var title = $(this).attr("showTitle"); var url = $(this).attr("addPageUrl"); dsFormId = $(this).attr("dsFormId"); - actKey = $(this).attr("serviceClassName"); + if (!isNull(dsFormId)) { + // 只有动态表单类型的流程才要工作流模型的id + actFlowId = $(this).attr("actFlowId"); + } _openNewWindows({ url: url, title: title, diff --git a/gateway/src/main/resources/template/tpl/mainPage/mainPage.html b/gateway/src/main/resources/template/tpl/mainPage/mainPage.html index 6313ae7d3..7d7de4aa9 100644 --- a/gateway/src/main/resources/template/tpl/mainPage/mainPage.html +++ b/gateway/src/main/resources/template/tpl/mainPage/mainPage.html @@ -182,7 +182,7 @@