diff --git a/activiti/src/main/resources/template/js/dsFormPageSequence/dsFormPageSequenceDraftProcessAdd.js b/activiti/src/main/resources/template/js/dsFormPageSequence/dsFormPageSequenceDraftProcessAdd.js index 51d76786c3fe686d1cabac97336830dc752d921e..6c6dc705e5e36cfbfe19a81011d8196a58ee850f 100644 --- a/activiti/src/main/resources/template/js/dsFormPageSequence/dsFormPageSequenceDraftProcessAdd.js +++ b/activiti/src/main/resources/template/js/dsFormPageSequence/dsFormPageSequenceDraftProcessAdd.js @@ -27,13 +27,13 @@ layui.config({ form.on('submit(formAddBean)', function (data) { if (winui.verifyForm(data.elem)) { - activitiUtil.startProcess(parent.dsFormId, null, function (approvalId) { + activitiUtil.startProcess(actFlowId, null, function (approvalId) { if(isNull(actFlowId)){ winui.window.msg('流程对象为空,无法启动.', {icon: 2, time: 2000}); return false; } var jStr = { - keyName: actFlowId, + actFlowId: actFlowId, jsonStr: JSON.stringify(dsFormUtil.getPageData($("#showForm"))), pageId: parent.dsFormId, approvalId: approvalId diff --git a/activiti/src/main/resources/template/js/myActiviti/newProcess.js b/activiti/src/main/resources/template/js/myActiviti/newProcess.js index dbdc685ce863e5eb593a00062805d4ce3b795d37..ff2a56c2640a53afd2de6e96fc7e57b06b124760 100644 --- a/activiti/src/main/resources/template/js/myActiviti/newProcess.js +++ b/activiti/src/main/resources/template/js/myActiviti/newProcess.js @@ -29,7 +29,7 @@ layui.config({ var str = ""; if(v1 == 1){ // icon - str = ''; + str = ''; } else { str = ''; } diff --git a/web/src/main/resources/template/assets/lib/layui/customer/tableUtil/initTableSearchUtil.js b/web/src/main/resources/template/assets/lib/layui/customer/tableUtil/initTableSearchUtil.js index ffd063a9f6aab3177ad0641768858030575c29b2..b5278e3df265d7c2d94c3b1b3f63bcf4ab13c9d6 100644 --- a/web/src/main/resources/template/assets/lib/layui/customer/tableUtil/initTableSearchUtil.js +++ b/web/src/main/resources/template/assets/lib/layui/customer/tableUtil/initTableSearchUtil.js @@ -126,6 +126,13 @@ var initTableSearchUtil = { $(".winui-tool").append(jsCon); } } + // 监听搜索的回车按钮 + $("#" + tableId + "KeyWord").keypress(function (event) { + if (event.keyCode == 13) { + // 回车搜索 + $("#" + tableId + "SearchTable").click(); + } + }); }, /**