1.处理正在计算中的英文翻译

Min
1 parent 9cf326e1
Showing 6 changed files with 16 additions and 6 deletions
src/components/Manufacture/CommonPackEvent.js
src/components/Manufacture/WorkOrderPack/WorkOrderPack.js
src/components/Manufacture/WorkOrderPack/WorkOrderPackTableTree.js
src/components/Manufacture/WorkOrderPack/WorkOrderResearchTableTree.js
src/components/Manufacture/WorkOrderPackTableTreeNew/index.js
src/components/QuoQuotation/QuotationPackTableTree/QuotationPackTableTree.js
@@ -1484,6 +1484,7 @@ const ParamsChooseNewModal = props =&gt; {
   const BtnNext= commonFunc.showMessage(props.app.commonConst, 'BtnNext') || '下一条' ;
+  const BtnSure = commonFunc.showLocalMessage(props, 'BtnSure', '确定');
   return props[modalName] ? (
     <AntdDraggableModal
@@ -1199,8 +1199,10 @@ class WorkOrderPack extends Component {
             return;
           }
         }
+        const calculating = commonFunc.showLocalMessage(this.props, 'calculating', '自动计算中，请稍后再试。');
+
         if (['manufacture/workOrder'].includes(sModelsType) && !calculated) {
-          message.warning('自动计算中，请稍后再试。');
+          message.warning(calculating);
           await this.handleCalculation(true);
         } else {
           const data = [];
@@ -1648,8 +1648,10 @@ class WorkOrderPack extends Component {
         //     return;
         //   }
         // }
+        const calculating = commonFunc.showLocalMessage(this.props, 'calculating', '自动计算中，请稍后再试。');
+
         if (sModelsType.includes('manufacture/workOrder') && !calculated) {
-          message.warning('自动计算中，请稍后再试。');
+          message.warning(calculating);
           await this.handleCalculation(true);
         } else {
           const data = [];
@@ -1547,7 +1547,8 @@ class WorkOrderPack extends Component {
           });
           return;
         }
-        console.log('3332', 1111);
+        const calculating = commonFunc.showLocalMessage(this.props, 'calculating', '自动计算中，请稍后再试。');
+
         if (!commonBusiness.validateTable(slaveConfig, slaveData, this.props) || !commonBusiness.validateTable(controlConfig, controlData, this.props) ||
           (!commonBusiness.validateTable(materialsConfig, materialsData, this.props)) || !commonBusiness.validateTable(processConfig, processData, this.props) ||
           !commonBusiness.validateTable(colorConfig, colorData, this.props)) {
@@ -1582,7 +1583,7 @@ class WorkOrderPack extends Component {
           }
         }
         if (sModelsType.includes('manufacture/workOrder') && !calculated && bAutoCalculate) {
-          message.warning('自动计算中，请稍后再试。');
+          message.warning(calculating);
           await this.handleCalculation(true);
         } else {
           const data = [];
@@ -2752,8 +2752,10 @@ const WorkOrderPackTableTreeNewEvent = props =&gt; {
         });
         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 = [];
@@ -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