Merge branch 'main' of http://git.xlyprint.cn/zhangz/xlyUmi into main

陈鑫涛
2 parents 7c225fe0 c9929a7a
Showing 2 changed files with 13 additions and 8 deletions
src/components/Common/CommonBillEvent.js
src/components/QuoQuotation/QuotationPackTableTree/QuotationPackTableTree.js
@@ -6830,6 +6830,7 @@ export default (ChildComponent) =&gt; {
         });
       } else if (name === 'process' && sName === 'sQuoParams') { // 产品工艺卡报价参数
         const { processConfig, enabled, sModelsType } = this.props;
+        const NoQuoParameters = commonFunc.showLocalMessage(this.props, 'NoQuoParameters', '无报价参数！');
         const slaveSelectOneData = record;
         let modalVisible = false;
         const sProcessParamsSelects = [];
@@ -6839,7 +6840,7 @@ export default (ChildComponent) =&gt; {
           paramType = slaveSelectOneData.sProcessParam;
         }
         if(commonUtils.isEmpty(paramType)) {
-          message.warn('无报价参数！');
+          message.warn(NoQuoParameters);
           return;
         }
         /* 工序参数以表格形式展示 列 */
@@ -6949,7 +6950,8 @@ export default (ChildComponent) =&gt; {
           paramType = slaveSelectOneData.sWorkOrderParam;
         }
         if(commonUtils.isEmpty(paramType)) {
-          message.warn('无工艺参数！');
+          const NoProcessParameters = commonFunc.showLocalMessage(this.props, 'NoProcessParameters', '无工艺参数！');
+          message.warn(NoProcessParameters);
           return;
         }
         /* 工序参数以表格形式展示 列 */
@@ -7313,6 +7315,7 @@ export default (ChildComponent) =&gt; {
     handleViewChoose= (name, sName, record) => {
       const { sId } = record; /* 控制表主键 */
       const { enabled, processSelectedRowKeys } = this.props;
+      const NoProcessParameters = commonFunc.showLocalMessage(this.props, 'NoProcessParameters', '无工艺参数！');
       const sisColorSelectedRowKeys = [];
       let jsonData = [];
       if (name === 'process' && sName === 'sColorSerialMemo') {
@@ -7378,7 +7381,7 @@ export default (ChildComponent) =&gt; {
           paramType = slaveSelectOneData.sReportParam; /* 上报参数 */
         }
         if (commonUtils.isEmpty(paramType)) {
-          message.warn('无工艺参数！');
+          message.warn(NoProcessParameters);
           return;
         }
         /* 工序参数以表格形式展示 列 */
@@ -1012,11 +1012,13 @@ class QuotationPackTableTree extends Component {
       const masterReturn = (await commonServices.postValueService(token, values, url)).data;
       if (masterReturn.code === 1) {
-        const sBackProcessDataValue = masterReturn.dataset.rows;
-        if (isWait) {
-          return { sBackProcessData: sBackProcessDataValue };
-        } else {
-          this.props.onSaveState({ sBackProcessData: sBackProcessDataValue });
+        if(commonUtils.isNotEmptyObject(masterReturn.dataset) && commonUtils.isNotEmptyArr(masterReturn.dataset.rows) ) {
+          const sBackProcessDataValue = masterReturn.dataset.rows;
+          if (isWait) {
+            return { sBackProcessData: sBackProcessDataValue };
+          } else {
+            this.props.onSaveState({ sBackProcessData: sBackProcessDataValue });
+          }
         }
       } else {
         message.warn(masterReturn.msg);