Commit cdb8dc43cd065614db4bbce34ed3ff038d81ba30

Authored by Min
1 parent d6be516a

1.处理报表无数据时新增报错

2.处理单据审批不掉原来的审批弹窗
src/components/Common/CommonBillEvent.js
@@ -2176,7 +2176,7 @@ export default (ChildComponent) => { @@ -2176,7 +2176,7 @@ export default (ChildComponent) => {
2176 if (commonUtils.isNotEmptyObject(returnData.dataset)) { 2176 if (commonUtils.isNotEmptyObject(returnData.dataset)) {
2177 outData = returnData.dataset.rows[0].dataSet.outData; 2177 outData = returnData.dataset.rows[0].dataSet.outData;
2178 } 2178 }
2179 - if (commonUtils.isNotEmptyStr(outData[0].sReturn)) { 2179 + if (false && commonUtils.isNotEmptyStr(outData[0].sReturn)) {
2180 const sReturnArray = outData[0].sReturn.split('|'); 2180 const sReturnArray = outData[0].sReturn.split('|');
2181 if (outData[0].sReturn.split('-').length < 2) { 2181 if (outData[0].sReturn.split('-').length < 2) {
2182 // 正常业务提示,非审核模板 2182 // 正常业务提示,非审核模板
src/components/CommonElementEvent/StatementInfo.js
@@ -127,7 +127,7 @@ export default class StatementInfo extends Component { @@ -127,7 +127,7 @@ export default class StatementInfo extends Component {
127 }; 127 };
128 handleBtnAdd = async (name) => { 128 handleBtnAdd = async (name) => {
129 const { 129 const {
130 - sModelsId, [`${name}Data`]: tableData, 130 + sModelsId, [`${name}Data`]: tableData = [],
131 } = this.props; 131 } = this.props;
132 let tableDataRow = await this.props.onDataRowAdd(name, true); 132 let tableDataRow = await this.props.onDataRowAdd(name, true);
133 if (commonUtils.isEmptyObject(tableDataRow)) { 133 if (commonUtils.isEmptyObject(tableDataRow)) {