qiangmj / ebc-Mes

Commit 420d9b568217026a0832e470bc214e7ffb41e9f9

Authored by Min
1 parent 2857547d

1.AJT-MES 纸箱工单展示盒型，别的模块不展示 

2.增加排版的翻译
Inline Side-by-side
Showing 2 changed files with 11 additions and 3 deletions
src/components/Common/CommonTable/index.js
  View file @420d9b5
... ... @@ -9150,6 +9150,7 @@ class CommonTableRc extends React.Component {
9150 9150 linkStyle = "linksActiveIdStyle";
9151 9151 clickEvent = "onViewChoose";
9152 9152 if (sName === "sCombinedMemo") {
  9153 + linkStyle = "";
9153 9154 let JsonData = [];
9154 9155 if (commonUtils.isNotEmptyObject(sValue)) {
9155 9156 try {
... ... @@ -9158,11 +9159,18 @@ class CommonTableRc extends React.Component {
9158 9159 JsonData = [];
9159 9160 }
9160 9161 }
  9162 + const bEnglish = props.app.userinfo?.sLanguage !== 'sChinese';
  9163 + const arrange = commonFunc.showLocalMessage(props, 'arrange', '排');
  9164 + const an = commonFunc.showLocalMessage(props, 'an', '');
9161 9165 /* 将合版信息json解析成需要的字符串形式 */
9162 9166 let sCombinedMemo = "";
9163 9167 if (commonUtils.isNotEmptyArr(JsonData)) {
9164   - JsonData.forEach(item => {
9165   - sCombinedMemo += `${item.sProductNo}:排${item.dCombineQty}个,`;
  9168 + JsonData.forEach((item) => {
  9169 + if (bEnglish) {
  9170 + sCombinedMemo += `${item.sProductNo}:${item.dCombineQty}${arrange},`;
  9171 + } else {
  9172 + sCombinedMemo += `${item.sProductNo}:${arrange}${item.dCombineQty}${an},`;
  9173 + }
9166 9174 });
9167 9175 sCombinedMemo = commonUtils.isNotEmptyObject(sCombinedMemo)
9168 9176 ? sCombinedMemo.substr(0, sCombinedMemo.length - 1)
... ...
src/mes/common/commonModelComponent/index.js
  View file @420d9b5
... ... @@ -1906,7 +1906,7 @@ const CommonTableComponent = props => {
1906 1906 const sTabLocalName = sLanguage === 'sEnglish' ? sEnglishTabName : sTabName;
1907 1907  
1908 1908 const isPack = props.app.userinfo?.sBrandsId === '2222222222'; // 纸箱品牌
1909   - const bBoxShow = isPack && (sName === 'slave' || sName === 'control');
  1909 + const bBoxShow = isPack && (sName === 'slave' || sName === 'control') && props.sModelsId === '12710101117086786735350'; // 班组报工-产量上报界面显示箱型组件
1910 1910 const { slaveData = [], enabled, controlData = [], slaveSelectedRowKeys = [], controlSelectedRowKeys = [] } = props;
1911 1911 /* 计算imageBox */
1912 1912 return (
... ...