diff --git a/src/components/Common/CommonNewBillEvent.js b/src/components/Common/CommonNewBillEvent.js index 9de283d..2357fe6 100644 --- a/src/components/Common/CommonNewBillEvent.js +++ b/src/components/Common/CommonNewBillEvent.js @@ -1667,7 +1667,7 @@ export default ChildComponent => { // item.column?.forEach(col=>{ // if(col.isSettingFunctions) { // if(col.iOrder > 10 ) { - // const i = Math.floor(col.iOrder / 10) + // const i = Math.floor(col.iOrder / 10) // col.iOrder = this.props.slaveData[i - 1].iOrder // } else { // col.iOrder = 1; @@ -1702,7 +1702,7 @@ export default ChildComponent => { } } }) - + const returnData = await commonBusiness.saveData({ token, value: params, sModelsId }); if (commonUtils.isNotEmptyObject(returnData)) { if (commonUtils.isNotEmptyObject(copyTo)) { @@ -2489,7 +2489,11 @@ export default ChildComponent => { if (this.props.app.currentPane.refresh !== undefined) { this.props.app.currentPane.refresh(); } - this.handleDelDataSuccess(props); + if(location.pathname.includes(('commobilePadBill'))){ + this.handleDelDataSuccessPad(props); + } else { + this.handleDelDataSuccess(props); + } } else { /* 失败 */ this.props.getServiceError(data); @@ -2498,6 +2502,13 @@ export default ChildComponent => { /* 数据删除成功跳转到新路由即pane */ handleDelDataSuccess = props => { + if(location.pathname.includes(('commobilePadBill'))){ + window.history.back(-1); + setTimeout(() => { + this.props.dispatch({ type: "app/refreshPage" }); + }, 100); + return; + } const { app } = props; let { panes, currentPane } = app; /* 删除单据后退出当前路由后,标签panes变化后的集合 */ @@ -2507,6 +2518,14 @@ export default ChildComponent => { this.props.onRemovePane(panes, currentPane); }; + handleDelDataSuccessPad = props => { + window.history.back(-1); + setTimeout(() => { + this.props.dispatch({ type: "app/refreshPage" }); + // history.push(location.pathname); + }, 100); + }; + /** 添加表格空行 */ handleTableAdd = (name, isWait) => { /* 从CommonBase获取默认参数 */