diff --git a/OpenAuth.Mvc/Areas/FlowManage/Views/FlowDesign/FlowSchemeBuider.cshtml b/OpenAuth.Mvc/Areas/FlowManage/Views/FlowDesign/FlowSchemeBuider.cshtml index 0bb5c2e7..84ff805d 100644 --- a/OpenAuth.Mvc/Areas/FlowManage/Views/FlowDesign/FlowSchemeBuider.cshtml +++ b/OpenAuth.Mvc/Areas/FlowManage/Views/FlowDesign/FlowSchemeBuider.cshtml @@ -111,12 +111,13 @@ flowData["SchemeContent"] = JSON.stringify({ "Frm": frmData, "Flow": FlowDesignPanel.exportData() }); postData = $.extend(postData, _data); postData["EnabledMark"] = 3; + var index = parent.layer.getFrameIndex(window.name); //获取窗口索引 $.SaveForm({ url: "../../FlowManage/FlowDesign/SaveForm?keyValue=" + keyValue, param: { "InfoEntity": JSON.stringify(postData), "ContentEntity": JSON.stringify(flowData), "shcemeAuthorizeData": shcemeAuthorizeData }, loading: "正在保存数据...", success: function () { - $.currentIframe().$("#gridTable").trigger("reloadGrid"); + parent.layer.close(index); } }) }); @@ -339,12 +340,13 @@ /*=========创建完成(begin)==================================================================*/ function finishbtn() { postData["EnabledMark"] = 1; + var index = parent.layer.getFrameIndex(window.name); //获取窗口索引 $.SaveForm({ url: "../../FlowManage/FlowDesign/SaveForm?keyValue=" + keyValue, param: { "InfoEntity": JSON.stringify(postData), "ContentEntity": JSON.stringify(flowData), "shcemeAuthorizeData": shcemeAuthorizeData }, loading: "正在保存数据...", success: function () { - $.currentIframe().$("#gridTable").trigger("reloadGrid"); + parent.layer.close(index); } }) } diff --git a/OpenAuth.Mvc/Areas/FlowManage/Views/FlowInstances/FlowProcessNewForm.cshtml b/OpenAuth.Mvc/Areas/FlowManage/Views/FlowInstances/FlowProcessNewForm.cshtml index 7498404f..31c087ea 100644 --- a/OpenAuth.Mvc/Areas/FlowManage/Views/FlowInstances/FlowProcessNewForm.cshtml +++ b/OpenAuth.Mvc/Areas/FlowManage/Views/FlowInstances/FlowProcessNewForm.cshtml @@ -26,11 +26,14 @@ _postData["EnabledMark"] = 3; _postData["wfLevel"] = $('input[name="wfLevel"]:checked').val(); var _data = $("#frmpreview").frmGetData(); + var index = parent.layer.getFrameIndex(window.name); //获取窗口索引 $.SaveForm({ url: "../../FlowManage/FlowInstances/CreateProcess", param: { "wfSchemeInfoId": keyValue, "frmData": JSON.stringify(_data), "wfProcessInstanceJson": JSON.stringify(_postData) }, loading: "正在保存数据...", - success: function () { } + success: function() { + parent.layer.close(index); + } }) } //提交表单 @@ -42,11 +45,14 @@ _postData["EnabledMark"] = 1; _postData["wfLevel"] = $('input[name="wfLevel"]:checked').val(); var _data = $("#frmpreview").frmGetData(); + var index = parent.layer.getFrameIndex(window.name); //获取窗口索引 $.SaveForm({ url: "../../FlowManage/FlowInstances/CreateProcess", param: { "wfSchemeInfoId": keyValue, "frmData": JSON.stringify(_data), "wfProcessInstanceJson": JSON.stringify(_postData) }, loading: "正在保存数据...", - success: function () { } + success: function() { + parent.layer.close(index); + } }) } diff --git a/OpenAuth.Mvc/Areas/FlowManage/Views/FlowInstances/VerificationForm.cshtml b/OpenAuth.Mvc/Areas/FlowManage/Views/FlowInstances/VerificationForm.cshtml index 46ae4bd7..45c5e98c 100644 --- a/OpenAuth.Mvc/Areas/FlowManage/Views/FlowInstances/VerificationForm.cshtml +++ b/OpenAuth.Mvc/Areas/FlowManage/Views/FlowInstances/VerificationForm.cshtml @@ -208,13 +208,13 @@ delete _postdata["VerificationFinally3"]; _postdata["VerificationFinally"] = _verificationFinally; + var index = parent.layer.getFrameIndex(window.name); //获取窗口索引 $.ConfirmAjax({ msg: "请确认是否要【提交审核】流程?", url: "../../FlowManage/FlowInstances/VerificationProcess", param: { processId: processInstanceId, verificationData: JSON.stringify(_postdata) }, success: function (data) { - $.currentIframe().callBack(); - dialogClose(); + parent.layer.close(index); } }) diff --git a/OpenAuth.Mvc/Areas/FlowManage/Views/FormDesign/FrmBuider.cshtml b/OpenAuth.Mvc/Areas/FlowManage/Views/FormDesign/FrmBuider.cshtml index 30af3462..c0b0062c 100644 --- a/OpenAuth.Mvc/Areas/FlowManage/Views/FormDesign/FrmBuider.cshtml +++ b/OpenAuth.Mvc/Areas/FlowManage/Views/FormDesign/FrmBuider.cshtml @@ -81,6 +81,7 @@ if (!$('#step-1').Validform()) { return false; } + var index = parent.layer.getFrameIndex(window.name); //获取窗口索引 var _data = $("#step-1").GetWebControls(keyValue); postData = $.extend(postData, _data); postData["EnabledMark"] = 3; @@ -91,7 +92,7 @@ param: postData, loading: "正在保存数据...", success: function () { - $.currentIframe().$("#gridTable").trigger("reloadGrid"); + parent.layer.close(index); } }) }); diff --git a/OpenAuth.Mvc/BllScripts/flowDesign.js b/OpenAuth.Mvc/BllScripts/flowDesign.js index 625b59dd..84a3204a 100644 --- a/OpenAuth.Mvc/BllScripts/flowDesign.js +++ b/OpenAuth.Mvc/BllScripts/flowDesign.js @@ -80,7 +80,10 @@ function edit() { skin: 'layui-layer-rim', //加上边框 area: ['1200px', '700px'], //宽高 maxmin: true, //开启最大化最小化按钮 - content: '/FlowManage/FlowDesign/FlowSchemeBuider?keyValue=' + selected.Id + content: '/FlowManage/FlowDesign/FlowSchemeBuider?keyValue=' + selected.Id, + end: function () { + list.reload(); + } }); }