From 420d9b568217026a0832e470bc214e7ffb41e9f9 Mon Sep 17 00:00:00 2001
From: pengm <674192343@qq.com>
Date: Wed, 20 May 2026 15:33:15 +0800
Subject: [PATCH] 1.AJT-MES 纸箱工单展示盒型，别的模块不展示 2.增加排版的翻译

---
 src/components/Common/CommonTable/index.js   | 12 ++++++++++--
 src/mes/common/commonModelComponent/index.js |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/components/Common/CommonTable/index.js b/src/components/Common/CommonTable/index.js
index 5c84fcb..8575531 100644
--- a/src/components/Common/CommonTable/index.js
+++ b/src/components/Common/CommonTable/index.js
@@ -9150,6 +9150,7 @@ class CommonTableRc extends React.Component {
         linkStyle = "linksActiveIdStyle";
         clickEvent = "onViewChoose";
         if (sName === "sCombinedMemo") {
+          linkStyle = "";
           let JsonData = [];
           if (commonUtils.isNotEmptyObject(sValue)) {
             try {
@@ -9158,11 +9159,18 @@ class CommonTableRc extends React.Component {
               JsonData = [];
             }
           }
+          const bEnglish = props.app.userinfo?.sLanguage !== 'sChinese';
+          const arrange =  commonFunc.showLocalMessage(props, 'arrange', '排');
+          const an =  commonFunc.showLocalMessage(props, 'an', '');
           /* 将合版信息json解析成需要的字符串形式 */
           let sCombinedMemo = "";
           if (commonUtils.isNotEmptyArr(JsonData)) {
-            JsonData.forEach(item => {
-              sCombinedMemo += `${item.sProductNo}:排${item.dCombineQty}个,`;
+            JsonData.forEach((item) => {
+              if (bEnglish) {
+                sCombinedMemo += `${item.sProductNo}:${item.dCombineQty}${arrange},`;
+              } else {
+                sCombinedMemo += `${item.sProductNo}:${arrange}${item.dCombineQty}${an},`;
+              }
             });
             sCombinedMemo = commonUtils.isNotEmptyObject(sCombinedMemo)
               ? sCombinedMemo.substr(0, sCombinedMemo.length - 1)
diff --git a/src/mes/common/commonModelComponent/index.js b/src/mes/common/commonModelComponent/index.js
index 0a76493..07e26db 100644
--- a/src/mes/common/commonModelComponent/index.js
+++ b/src/mes/common/commonModelComponent/index.js
@@ -1906,7 +1906,7 @@ const CommonTableComponent = props => {
   const sTabLocalName = sLanguage === 'sEnglish' ? sEnglishTabName : sTabName;
 
   const isPack = props.app.userinfo?.sBrandsId === '2222222222'; // 纸箱品牌
-  const bBoxShow = isPack && (sName === 'slave' ||  sName === 'control');
+  const bBoxShow = isPack && (sName === 'slave' ||  sName === 'control') && props.sModelsId === '12710101117086786735350'; // 班组报工-产量上报界面显示箱型组件
   const { slaveData = [], enabled, controlData = [], slaveSelectedRowKeys = [], controlSelectedRowKeys = [] } = props;
   /* 计算imageBox */
   return (
--
libgit2 0.22.2