diff --git a/src/components/Common/CommonSubBillEvent.js b/src/components/Common/CommonSubBillEvent.js index c698131..5cdee9e 100644 --- a/src/components/Common/CommonSubBillEvent.js +++ b/src/components/Common/CommonSubBillEvent.js @@ -57,7 +57,7 @@ export default (ChildComponent) => { const BtnDesignFunctionConfig = commonUtils.isNotEmptyObject(masterConfig) ? masterConfig.gdsconfigformslave.filter(item => item.sControlName === 'BtnBsOperation.BtnDesignFunction') : {}; const reportDesign = commonFunc.showMessage(app.commonConst, 'reportDesign');/* 报表设计 */ if (commonUtils.isEmptyObject(BtnDesignFunctionConfig)) { - masterConfig.gdsconfigformslave.push({ + masterConfig?.gdsconfigformslave.push({ bCanInput: false, bEntireLine: false, bFilter: false, @@ -3237,6 +3237,12 @@ export default (ChildComponent) => { if (commonUtils.isNotEmptyObject(tableDataRow.sProcessMemo)) { tableDataRow.sProcessMemo = ''; } + if (commonUtils.isNotEmptyObject(tableDataRow.sDefineNo)) { + tableDataRow.sDefineNo = ''; + } + if (commonUtils.isNotEmptyObject(tableDataRow.sDefineNo2)) { + tableDataRow.sDefineNo2 = ''; + } if (sModelsType === 'sales/salesOrderPack' && isTree) { /* 树形 */ const sAllOldId = tableData[tableDataIndex].sAllId; const arr = sAllOldId.split(',');