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

陈鑫涛
2 parents 3f283919 9463c85b
Showing 4 changed files with 39 additions and 16 deletions
src/components/Common/CommonBillEvent.js
src/components/Common/commonFunc.js
src/components/Manufacture/CommonPackEvent.js
src/components/Manufacture/WorkOrderPackTableTreeNew/index.js
@@ -9942,14 +9942,16 @@ export default (ChildComponent) =&gt; {
  
           }else if (type === 'before') {
             if(iIndex === 0 || iIndex > len -1) {
-              message.error('当前是首条');
+              const currentFirst = commonFunc.showMessage(props.app.commonConst, 'currentFirst') || '当前是首条';
+              message.error(currentFirst);
               return;
             }
             tableDataRow = filterData[iIndex - 1];
  
           }else if (type === 'next') {
             if(iIndex === len-1 || iIndex > len -1) {
-              message.error('当前是末条');
+              const currentLast = commonFunc.showMessage(props.app.commonConst, 'currentLast') || '当前是末条';
+              message.error(currentLast);
               return;
             }
             tableDataRow = filterData[iIndex + 1];
@@ -564,7 +564,16 @@ export function getFilterConditon(sAssignField, allTableData) {
   }
   return returnData;
 }
-
+export function showLocalMessage(props, sName, sChineseName) {
+  let sTitle = '';
+  if(commonUtils.isNotEmptyObject(props) && commonUtils.isNotEmptyObject(props.app) && commonUtils.isNotEmptyArr(props.app.gdsformconst)) {
+    const gdsformconst = props.app.gdsformconst;
+    sTitle =  this.showMessage(gdsformconst, sName)
+  } else {
+    sTitle = sChineseName;
+  }
+  return sTitle;
+}
 /** 获取常量数据 */
 export function showMessage(gdsformconst, sName) {
   const iIndex = gdsformconst.findIndex(item => item.sName === sName);
@@ -1376,7 +1376,7 @@ const ParamsChooseModal = props =&gt; {
 // 选择工艺参数弹窗（新）
 const ParamsChooseNewModal = props => {
   const modalName = "sWorkParamsModalVisible"; // commonParamVisible
-  const sProcessParams = "工单参数";
+  const sProcessParams = commonFunc.showMessage(props.app.commonConst, 'workParam') || '工单参数' ;
  
   const getTableBtnState = tableName => {
     let result = false;
@@ -1472,6 +1472,17 @@ const ParamsChooseNewModal = props =&gt; {
     }
   };
  
+
+  const BtnFirst= commonFunc.showMessage(props.app.commonConst, 'BtnFirst') || '首条' ;
+
+  const BtnLast= commonFunc.showMessage(props.app.commonConst, 'Btnlast') || '末条' ;
+
+  const BtnPrior= commonFunc.showMessage(props.app.commonConst, 'BtnPrior') || '上一条' ;
+
+  const BtnNext= commonFunc.showMessage(props.app.commonConst, 'BtnNext') || '下一条' ;
+
+  const BtnSure = commonFunc.showMessage(props.app.commonConst, 'BtnSure') || '确定' ;
+
   return props[modalName] ? (
     <AntdDraggableModal
       width="80%"
@@ -1489,7 +1500,7 @@ const ParamsChooseNewModal = props =&gt; {
             props.onSaveState({ [modalName]: false });
           }}
         >
-          确定
+          {BtnSure}
         </Button>
       }
     >
@@ -1501,7 +1512,7 @@ const ParamsChooseNewModal = props =&gt; {
               props.onBtnParamPage(props, props.processTableId, "first");
             }}
           >
-            首条
+            {BtnFirst}
           </Button>
           <Button
             type="primary"
@@ -1509,7 +1520,7 @@ const ParamsChooseNewModal = props =&gt; {
               props.onBtnParamPage(props, props.processTableId, "before");
             }}
           >
-            上一条
+            {BtnPrior}
           </Button>
           <Button
             type="primary"
@@ -1517,7 +1528,7 @@ const ParamsChooseNewModal = props =&gt; {
               props.onBtnParamPage(props, props.processTableId, "next");
             }}
           >
-            下一条
+            {BtnNext}
           </Button>
           <Button
             type="primary"
@@ -1525,7 +1536,7 @@ const ParamsChooseNewModal = props =&gt; {
               props.onBtnParamPage(props, props.processTableId, "last");
             }}
           >
-            末条
+            {BtnLast}
           </Button>
         </div>
         {[""].map(() => {
@@ -1690,9 +1701,10 @@ const CombinePartsChooseModal = props =&gt; {
     content: props.content,
     id: new Date().getTime().toString(),
   };
+  const chooseCombinePartsName = commonFunc.showLocalMessage(props, 'chooseCombinePartsName', '选择合版部件名称');
  
   return (
-    <AntdDraggableModal width={1150} title="选择合版部件名称" visible={combinePartsChooseVisible} onCancel={onCancel} footer={null}>
+    <AntdDraggableModal width={1150} title={chooseCombinePartsName} visible={combinePartsChooseVisible} onCancel={onCancel} footer={null}>
       <CommonListSelect {...combinePartsTableProps} />
     </AntdDraggableModal>
   );
@@ -4288,8 +4288,8 @@ const OtherComponent = props =&gt; {
   // const colorInfo = "工艺颜色";
   const visionInfo =  commonUtils.isNotEmptyObject(commonFunc.showMessage(commonConst, "visionInfo"))  ?
     commonFunc.showMessage(commonConst, "visionInfo") : '改版记录';
-  const colorInfo = commonUtils.isNotEmptyObject(colorConfig) && commonUtils.isNotEmptyObject(colorConfig.sChinese ) ?
-    colorConfig.sChinese :
+  const colorInfo = commonUtils.isNotEmptyObject(colorConfig) && commonUtils.isNotEmptyObject(colorConfig.showName ) ?
+    colorConfig.showName :
     commonUtils.isNotEmptyObject(commonFunc.showMessage(commonConst, "colorInfo"))  ?
       commonFunc.showMessage(commonConst, "colorInfo") : '工艺颜色'; //  "工艺颜色";
  
@@ -4390,13 +4390,13 @@ const OtherComponent = props =&gt; {
         <MaterialsComponent {...props} materialsTabValue={materialsTabValue} />
       </Panel>
       {materialsChildInfoListFilter.map(tablename => {
-        const { sChinese } = props[`${tablename}Config`];
+        const { showName } = props[`${tablename}Config`];
         return (
           <Panel
             collapsible="header"
             header={getHeaderIcon(tablename)}
             showArrow={false}
-            extra={panelExtra("", { selfName: sChinese, selfId: tablename })}
+            extra={panelExtra("", { selfName: showName, selfId: tablename })}
             key={tablename}
           >
             <MaterialsChildComponent {...props} materialsChildName={tablename} />
@@ -4467,7 +4467,7 @@ const ProcessComponent = props =&gt; {
   const showLeftConfig = processConfig.gdsconfigformslave.find(item => item.sControlName === "bShowLeft");
  
   if (showLeftConfig) {
-    const { iColValue, sChinese: processShowTitle } = showLeftConfig;
+    const { iColValue, showName: processShowTitle } = showLeftConfig;
  
     const processTitleWidth = processConfig.gdsconfigformslave.find(item => item.sControlName === "titleWidth")?.sDefault;
     const commonViewDragableProps = {
@@ -4571,7 +4571,7 @@ const MaterialsComponent = props =&gt; {
         materialsChildTableProps = materialsChildTablePropsList[`${item}ChildTableProps`];
         sWidth = "58.5%";
         sRightWidth = "42%";
-        materialsChildTableTitle = materialsChildTableProps.config.sChinese || "";
+        materialsChildTableTitle = materialsChildTableProps.config.showName || "";
       }
     } else {
       sWidth = "100%";