diff --git a/src/components/Common/CommonHooks/useCommonBase.js b/src/components/Common/CommonHooks/useCommonBase.js index 248a827..569d8cf 100644 --- a/src/components/Common/CommonHooks/useCommonBase.js +++ b/src/components/Common/CommonHooks/useCommonBase.js @@ -1950,7 +1950,9 @@ const useCommonBase = props => { } = params; const currentState = nextProps || state; - + const FriendlyReminder = commonFunc.showLocalMessage(props, 'FriendlyReminder', '温馨提示'); + const BtnSure = commonFunc.showLocalMessage(props, 'BtnSure', '确认'); + const BtnCancel = commonFunc.showLocalMessage(props, 'BtnCancel', '确认'); // 加入mes通用参数 const { app } = props; const { tableNameCompareJson = {} } = currentState; @@ -2129,10 +2131,10 @@ const useCommonBase = props => { onSuccess && onSuccess(true); } else if (code === -7) { Modal.confirm({ - title: "温馨提示:", + title: FriendlyReminder, content:
{handleGetMsg(msg)}
, - okText: "确认", - cancelText: "取消", + okText: BtnSure, + cancelText: BtnCancel, onOk() { handleProcedureCall(params, 1); }, diff --git a/src/components/Common/CommonTable/index.js b/src/components/Common/CommonTable/index.js index 93265fa..2460303 100644 --- a/src/components/Common/CommonTable/index.js +++ b/src/components/Common/CommonTable/index.js @@ -11878,6 +11878,11 @@ const useCommonTableEvent = props => { ); return decimalPlaces; } + const TotalReported = commonFunc.showLocalMessage(props, 'TotalReported', '已报合计'); + const Trayproduction = commonFunc.showLocalMessage(props, 'Trayproduction', '托盘产量'); + const Outputproduction = commonFunc.showLocalMessage(props, 'Outputproduction', '报工产量'); + const Workinghours = commonFunc.showLocalMessage(props, 'Workinghours', '计时工时'); + const pieceworkHours = commonFunc.showLocalMessage(props, 'pieceworkHours', '计件工时'); if ( (["12710101117087404588200", "12710101117260270570210"].includes( @@ -11912,14 +11917,14 @@ const useCommonTableEvent = props => { ); return (
-
已报合计
-
计件工时:
+
{TotalReported}
+
{pieceworkHours}:
{dWageHour}
-
计时工时:
+
{Workinghours}:
{dTimeHour}
-
报工产量:
+
{Outputproduction}:
{dProcessQty}
-
托盘产量:
+
{Trayproduction}
{dReportQtySum}
); diff --git a/src/mes/common/buttonComponent/index.js b/src/mes/common/buttonComponent/index.js index d7263d1..16cd59b 100644 --- a/src/mes/common/buttonComponent/index.js +++ b/src/mes/common/buttonComponent/index.js @@ -20,11 +20,11 @@ const ButtonComponent = props => { if ([3, 4, 5, 6].includes(iTeamType)) { const scheduledTasks = managementData.find( - item => item.sMenuName === "计划任务" + item => (item.sMenuName === "计划任务" || item.sMenuName?.trim() === "Scheduled Tasks") ); if (scheduledTasks && scheduledTasks.children) { const iIndex = scheduledTasks.children.findIndex( - child => child.sMenuName === "生产返工" + child => (child.sMenuName === "生产返工" || child.sMenuName?.trim() === "Production Rework") ); if (iIndex !== -1) { scheduledTasks.children.splice(iIndex, 1); @@ -32,23 +32,35 @@ const ButtonComponent = props => { } const restArr = []; - if (iTeamType === 3) { - restArr.push("研发工艺参数"); - } else if ([4, 5].includes(iTeamType)) { - restArr.push("研发工艺参数(烫金)"); - restArr.push("研发工艺参数(模切)"); - } else if (iTeamType === 6) { - restArr.push("研发工艺参数(丝印)"); + if(userinfo?.sLanguage ==='sEnglish') { + if (iTeamType === 3) { + restArr.push("研发工艺参数"); + } else if ([4, 5].includes(iTeamType)) { + restArr.push("研发工艺参数(烫金)"); + restArr.push("研发工艺参数(模切)"); + } else if (iTeamType === 6) { + restArr.push("研发工艺参数(丝印)"); + } + } else{ + if (iTeamType === 3) { + restArr.push("R&D Process Parameters"); + } else if ([4, 5].includes(iTeamType)) { + restArr.push("R&D Process Parameters (Hot Stampinging)"); + restArr.push("R&D Process Parameters (Die-Cutting)"); + } else if (iTeamType === 6) { + restArr.push("R&D Process Parameters (Screen Printing)"); + } } const productionExecMain = managementData.find( - item => item.sMenuName === "生产执行" + item => (item.sMenuName === "生产执行" || item.sMenuName === "Production Execution") ); - if (productionExecMain && productionExecMain.children) { + console.log('productionExecMain', productionExecMain); + if ( productionExecMain && productionExecMain.children) { const forLength = productionExecMain.children.length; for (let i = 0; i < forLength; i++) { const iIndex = productionExecMain.children.findIndex( child => - !["生产执行", "质量巡检", "研发改版记录", ...restArr].includes( + !["生产执行", "质量巡检", "研发改版记录", "Production Execution", "Quality Inspection", "R&D Revision Records", ...restArr].includes( child.sMenuName ) ); @@ -59,12 +71,12 @@ const ButtonComponent = props => { } } else { const productionExecMain = managementData.find( - item => item.sMenuName === "生产执行" + item => (item.sMenuName === "生产执行" || item.sMenuName === "Production Execution") ); if (productionExecMain && productionExecMain.children) { for (let i = 0; i < 4; i++) { const iIndex = productionExecMain.children.findIndex(child => - child.sMenuName.includes("研发工艺参数") + child.sMenuName.includes("研发工艺参数") || child.sMenuName.includes("R&D Process Parameters") ); if (iIndex !== -1) { productionExecMain.children.splice(iIndex, 1); @@ -75,12 +87,12 @@ const ButtonComponent = props => { if (sWorkshopId !== "20240511102738376607209385783909") { const productionExecMain = managementData.find( - item => item.sMenuName === "生产执行" + item => (item.sMenuName === "生产执行" || item.sMenuName === "Production Execution") ); if (productionExecMain && productionExecMain.children) { const iIndex = productionExecMain.children.findIndex(child => - child.sMenuName.includes("研发改版记录") - ); + (child.sMenuName.includes("研发改版记录") || child.sMenuName.includes("R&D Revision Records")) + ); if (iIndex !== -1) { productionExecMain.children.splice(iIndex, 1); } @@ -257,7 +269,7 @@ const ButtonComponent = props => { } menuList.push(result); }); - + console.log('menuList:', menuList); dataList.forEach(item => { if (!menuList.some(item1 => item1.name === item.name)) { const iIndex = menuList.findIndex(item1 => !item1); @@ -265,6 +277,8 @@ const ButtonComponent = props => { } }); + console.log('dataList:', dataList); + // 点击 const itemClick = e => { const { id, disabled, sName } = e; diff --git a/src/mes/common/commonOperationBarComponent/index.js b/src/mes/common/commonOperationBarComponent/index.js index a47bd9e..5cbc6da 100644 --- a/src/mes/common/commonOperationBarComponent/index.js +++ b/src/mes/common/commonOperationBarComponent/index.js @@ -1275,11 +1275,11 @@ const BarcodeComponent = props => { document.body.removeEventListener("keypress", keypressEvent); }; }, []); - + const clickScan = commonFunc.showLocalMessage(props, 'clickScan', '请鼠标点击后扫码'); return (
{ if (value && scanEventTime.current === -1) { diff --git a/src/mes/common/inputMultiModalComponent/index.js b/src/mes/common/inputMultiModalComponent/index.js index d79b771..5e8ed3e 100644 --- a/src/mes/common/inputMultiModalComponent/index.js +++ b/src/mes/common/inputMultiModalComponent/index.js @@ -13,12 +13,14 @@ const InputMultiModalComponent = props => { sId: commonUtils.createSid(), sMemo: value.replace(/；/g, ",") }); + const dpSelect = commonFunc.showLocalMessage(props, 'dpSelect', '下拉选择'); + const content = commonFunc.showLocalMessage(props, 'content', '内容'); const viewConfigs = [ { sId: showConfig.sId + "1", sName: "sMemo", - showName: "内容", + showName: content, sControlName: "", iRowValue: 6, iColValue: 24 @@ -26,7 +28,7 @@ const InputMultiModalComponent = props => { { ...showConfig, sName: "sSelect", - showName: "下拉选择", + showName: dpSelect, bCanInput: true, iColValue: 24 } diff --git a/src/mes/login/index.js b/src/mes/login/index.js index 7a86485..6c0e79b 100644 --- a/src/mes/login/index.js +++ b/src/mes/login/index.js @@ -261,6 +261,9 @@ const useLoginEvent = props => { bDelayedOvertime } = dataReturn.dataset.rows[0]; + + console.log('vvvv', managementData); + gdslogininfo.bDelayedOvertime = bDelayedOvertime; const userinfo = { ...teamInfo, ...gdslogininfo }; const { diff --git a/src/mes/operationGuide/index.less b/src/mes/operationGuide/index.less index 4784fea..d4d9c08 100644 --- a/src/mes/operationGuide/index.less +++ b/src/mes/operationGuide/index.less @@ -55,7 +55,7 @@ } .cellBox { - height: 40px; + height: 52px; } .colExpire { @@ -75,7 +75,7 @@ text-align: center; // color: #fff; font-size: 16px; - line-height: 1.4; + line-height: 1; } &.front .hasShow { @@ -245,4 +245,4 @@ } } } -} \ No newline at end of file +} diff --git a/src/mes/productionExec/productionExecMain/index.js b/src/mes/productionExec/productionExecMain/index.js index bd5c893..60b3624 100644 --- a/src/mes/productionExec/productionExecMain/index.js +++ b/src/mes/productionExec/productionExecMain/index.js @@ -536,7 +536,8 @@ const ProductionExecContentByType = props => { setPagesLoading, refreshCount = 0 } = props; - + const PRrevisionEnd = commonFunc.showLocalMessage(props, 'Proofreading/revisionEnd', '装校版结束'); + const PRrevisionStart = commonFunc.showLocalMessage(props, 'Proofreading/revisionStart', '装校版开始'); /** * 设备状态值 */ @@ -556,7 +557,7 @@ const ProductionExecContentByType = props => { const showValue = { stop: { - showName: "装校版结束", + showName: PRrevisionEnd, onClick: config => operationFetch(props, config, undefined, () => { props.onSaveState({ @@ -566,7 +567,7 @@ const ProductionExecContentByType = props => { }) }, again: { - showName: "装校版开始", + showName: PRrevisionStart, onClick: config => operationFetch(props, config, "again", () => { props.onSaveState({ @@ -758,7 +759,13 @@ const ProductionExecContent = props => { if (!oNavList) return; oNavList.childNodes[index].click(); }; - + const MCR = commonFunc.showLocalMessage(props, 'MCR', '物料消耗登记'); + const PMCR = commonFunc.showLocalMessage(props, 'PMCR', '版材消耗登记'); + const Blanking = commonFunc.showLocalMessage(props, 'finishConstruction', '下料'); + const product1 = commonFunc.showLocalMessage(props, 'product1', '产量①'); + const product2 = commonFunc.showLocalMessage(props, 'product2', '产品②'); + const revoke = commonFunc.showLocalMessage(props, 'revoke', '撤销'); + const abnormal3 = commonFunc.showLocalMessage(props, 'abnormal3', '异常③'); return (
@@ -775,7 +782,7 @@ const ProductionExecContent = props => { {...btnProps} {...getBtnConfigByControlName("BtnEventBlanking")} > - 下料 + {Blanking} @@ -783,13 +790,13 @@ const ProductionExecContent = props => { {...btnProps} {...getBtnConfigByControlName("BtnPrint1")} > - 产量① + {product1} {/* */} @@ -802,7 +809,7 @@ const ProductionExecContent = props => { {...btnProps} {...getBtnConfigByControlName("BtnCancel")} > - 撤销 + {revoke} @@ -810,7 +817,7 @@ const ProductionExecContent = props => { {...btnProps} {...getBtnConfigByControlName("BtnPrint3")} > - 异常③ + {abnormal3} {/* */} @@ -862,14 +869,14 @@ const ProductionExecContent = props => { size="large" onClick={changeTab.bind(this, 0)} > - 物料消耗登记 + {MCR}
@@ -1014,6 +1021,13 @@ const ProductionExecContent0 = props => { }, noGetData: !selectedRowKeys.length }; + const Blanking = commonFunc.showLocalMessage(props, 'finishConstruction', '下料'); + const product1 = commonFunc.showLocalMessage(props, 'product1', '产量①'); + const product2 = commonFunc.showLocalMessage(props, 'product2', '产品②'); + const Revoke = commonFunc.showLocalMessage(props, 'revoke', ' 撤销'); + const abnormal3 = commonFunc.showLocalMessage(props, 'abnormal3', '异常③'); + const MCR = commonFunc.showLocalMessage(props, 'MCR', '物料消耗登记'); + const PMCR = commonFunc.showLocalMessage(props, 'PMCR', '版材消耗登记'); const tabRef = useRef(); const changeTab = index => { @@ -1039,7 +1053,7 @@ const ProductionExecContent0 = props => { {...btnProps} {...getBtnConfigByControlName("BtnEventBlanking")} > - 下料 + {Blanking} @@ -1047,13 +1061,13 @@ const ProductionExecContent0 = props => { {...btnProps} {...getBtnConfigByControlName("BtnPrint1")} > - 产量① + {product1} {/* */} @@ -1066,7 +1080,7 @@ const ProductionExecContent0 = props => { {...btnProps} {...getBtnConfigByControlName("BtnCancel")} > - 撤销 + {Revoke} @@ -1074,7 +1088,7 @@ const ProductionExecContent0 = props => { {...btnProps} {...getBtnConfigByControlName("BtnPrint3")} > - 异常③ + {abnormal3} {/* */} @@ -1126,14 +1140,14 @@ const ProductionExecContent0 = props => { size="large" onClick={changeTab.bind(this, 0)} > - 物料消耗登记 + {MCR}
diff --git a/src/mes/scheduledTasks/machineTasks/index.js b/src/mes/scheduledTasks/machineTasks/index.js index 011353a..462c390 100644 --- a/src/mes/scheduledTasks/machineTasks/index.js +++ b/src/mes/scheduledTasks/machineTasks/index.js @@ -560,7 +560,7 @@ return [ { showName, btnBgColor, sDefault, startWorkConfig, pauseWorkConfig }, - { showName: "完工", btnBgColor: "#1890FF", sDefault } + { showName: finishConstruction, btnBgColor: "#1890FF", sDefault } ]; // return [ diff --git a/src/mes/teamInfo/index.js b/src/mes/teamInfo/index.js index 5e8deaf..9338024 100644 --- a/src/mes/teamInfo/index.js +++ b/src/mes/teamInfo/index.js @@ -555,8 +555,8 @@ const TeamInfo = baseProps => { const classGroup = commonFunc.showLocalMessage(props, 'classGroup', '班组'); const foreman = commonFunc.showLocalMessage(props, 'foreman', '领班'); - console.log('2222', teamInformation); + const ClearOut = commonFunc.showLocalMessage(props, 'ClearOut', '清空'); return (
@@ -622,7 +622,7 @@ const TeamInfo = baseProps => {
- + {/**/}