diff --git a/src/components/Manufacture/CommonPackEvent.js b/src/components/Manufacture/CommonPackEvent.js index 33caf1e..1f98f88 100644 --- a/src/components/Manufacture/CommonPackEvent.js +++ b/src/components/Manufacture/CommonPackEvent.js @@ -1484,6 +1484,7 @@ const ParamsChooseNewModal = props => { const BtnNext= commonFunc.showMessage(props.app.commonConst, 'BtnNext') || '下一条' ; + const BtnSure = commonFunc.showLocalMessage(props, 'BtnSure', '确定'); return props[modalName] ? ( { }); return; } + const calculating = commonFunc.showLocalMessage(props, 'calculating', '自动计算中,请稍后再试。'); + if (sModelsType.includes("manufacture/workOrder") && !calculated) { - message.warning("自动计算中,请稍后再试。"); + message.warning(calculating); await props.handleCalculation("workOrder", true); } else { const data = []; diff --git a/src/components/QuoQuotation/QuotationPackTableTree/QuotationPackTableTree.js b/src/components/QuoQuotation/QuotationPackTableTree/QuotationPackTableTree.js index f55582a..f2fa296 100644 --- a/src/components/QuoQuotation/QuotationPackTableTree/QuotationPackTableTree.js +++ b/src/components/QuoQuotation/QuotationPackTableTree/QuotationPackTableTree.js @@ -2348,9 +2348,11 @@ class QuotationPackTableTree extends Component { data.push(commonBusiness.mergeData('pack', `${packConfig.sTbName.toLowerCase()}_tmp`, packData, [], true)); const value = { data, sClientType: '1', sGuid: masterData.sId }; + const calculating = commonFunc.showLocalMessage(this.props, 'calculating', '自动计算中,请稍后再试。'); + const cacheIndex = dQuickQuoteProductQty === undefined ? -1 : manyDataCache.findIndex(item => item.dManyQty === dQuickQuoteProductQty); if (cacheIndex === -1) { - message.warning('自动计算中,请稍后再试。'); + message.warning(calculating); } const dataReturn = cacheIndex === -1 ? (await commonServices.postValueService(this.props.app.token, value, dataUrl)).data