From 5f2185198f36b6110055962a038ed19bb9c35d7b Mon Sep 17 00:00:00 2001 From: pengm <674192343@qq.com> Date: Fri, 20 Jun 2025 18:55:31 +0800 Subject: [PATCH] 1.完善英文翻译 --- src/components/Common/CommonBill/index.js | 3 ++- src/components/Common/CommonListEditEvent.js | 6 ++++-- src/components/Common/CommonListEvent.js | 6 ++++-- src/components/Common/CommonTable/index.js | 9 ++++++--- src/components/Manufacture/WorkOrderPack/WorkOrderPackTableTree.js | 3 ++- src/components/Manufacture/WorkOrderPack/WorkOrderResearchTableTree.js | 4 +++- src/components/Manufacture/WorkOrderPackTableTreeNew/index.js | 4 ++-- src/components/productionMainPlan/productionMainPlan.js | 3 ++- 8 files changed, 25 insertions(+), 13 deletions(-) diff --git a/src/components/Common/CommonBill/index.js b/src/components/Common/CommonBill/index.js index ead27fc..3b71b43 100644 --- a/src/components/Common/CommonBill/index.js +++ b/src/components/Common/CommonBill/index.js @@ -1708,7 +1708,8 @@ class CommonBill extends Component { if (Type === 'formSlave') { /* 根据从表勾选数据 生成从表数据 */ const { slaveSelectedRowKeys } = this.props; if (commonUtils.isEmptyObject(slaveSelectedRowKeys)) { - message.warn('请选择数据'); + message.error(commonFunc.showMessage(this.props.app.commonConst, 'pleaseChooseData'));/* 请选择一条数据 */ + return; } sId = slaveSelectedRowKeys; diff --git a/src/components/Common/CommonListEditEvent.js b/src/components/Common/CommonListEditEvent.js index cbee204..5e6bee0 100644 --- a/src/components/Common/CommonListEditEvent.js +++ b/src/components/Common/CommonListEditEvent.js @@ -430,8 +430,10 @@ export default (ChildComponent) => { // const masterConfig = formData.filter(item => !item.bGrd && item.sTbName === 'elemachine')[0]; // const masterColumn = commonFunc.getHeaderConfig(masterConfig); masterColumn, const importConfigTypes = []; - importConfigTypes.push({ ...commonFunc.getImitateGdsconfigTypes('计算时间', 'tCurrTime', 'tCurrTime', false, '', '', false), sDateFormat: 'YYYY-MM-DD' }); - importConfigTypes.push(commonFunc.getImitateGdsconfigTypes('计算', 'BtnCalculation', '', false, '', '', true)); + const CalculateTime= commonFunc.showMessage(this.props.app.commonConst, 'CalculateTime') || '计算时间' ; + const BtnCalculate= commonFunc.showMessage(this.props.app.commonConst, 'Calculate') || '计算' ; + importConfigTypes.push({ ...commonFunc.getImitateGdsconfigTypes(CalculateTime, 'tCurrTime', 'tCurrTime', false, '', '', false), sDateFormat: 'YYYY-MM-DD' }); + importConfigTypes.push(commonFunc.getImitateGdsconfigTypes(BtnCalculate, 'BtnCalculation', '', false, '', '', true)); const currConfig = {}; currConfig.rowGdsconfig = [{ gdsconfigformslave: importConfigTypes }]; diff --git a/src/components/Common/CommonListEvent.js b/src/components/Common/CommonListEvent.js index a361722..c5092cb 100644 --- a/src/components/Common/CommonListEvent.js +++ b/src/components/Common/CommonListEvent.js @@ -313,8 +313,10 @@ export default (ChildComponent) => { // const masterConfig = formData.filter(item => !item.bGrd && item.sTbName === 'elemachine')[0]; // const masterColumn = commonFunc.getHeaderConfig(masterConfig); masterColumn, const importConfigTypes = []; - importConfigTypes.push({ ...commonFunc.getImitateGdsconfigTypes('计算时间', 'tCurrTime', 'tCurrTime', false, '', '', false), sDateFormat: 'YYYY-MM-DD', bReadonly: true }); - importConfigTypes.push(commonFunc.getImitateGdsconfigTypes('计算', 'BtnCalculation', '', false, '', '', true)); + const CalculateTime= commonFunc.showMessage(this.props.app.commonConst, 'CalculateTime') || '计算时间' ; + const BtnCalculate= commonFunc.showMessage(this.props.app.commonConst, 'Calculate') || '计算' ; + importConfigTypes.push({ ...commonFunc.getImitateGdsconfigTypes(CalculateTime, 'tCurrTime', 'tCurrTime', false, '', '', false), sDateFormat: 'YYYY-MM-DD' }); + importConfigTypes.push(commonFunc.getImitateGdsconfigTypes(BtnCalculate, 'BtnCalculation', '', false, '', '', true)); const currConfig = {}; currConfig.rowGdsconfig = [{ gdsconfigformslave: importConfigTypes }]; diff --git a/src/components/Common/CommonTable/index.js b/src/components/Common/CommonTable/index.js index 3f99b62..a1d1083 100644 --- a/src/components/Common/CommonTable/index.js +++ b/src/components/Common/CommonTable/index.js @@ -4877,17 +4877,20 @@ class CommonTableRc extends React.Component { }; handleTreeDel = (index, record) => { if(this.props.name === 'control') { + const sureDel = commonUtils.isNotEmptyObject(this.props.app) ? commonFunc.showMessage(this.props.app.commonConst, 'SureDel') : '确认要删除吗？' ; + const BtnSure = commonUtils.isNotEmptyObject(this.props.app) ? commonFunc.showMessage(this.props.app.commonConst, 'BtnSure') : '确定？' ; + const BtnCancel = commonUtils.isNotEmptyObject(this.props.app) ? commonFunc.showMessage(this.props.app.commonConst, 'BtnCancel') : '确定？' ; const _this = this; confirm({ - title: '确认要删除吗？', + title: sureDel, onOk() { _this.handleTreeDelOk(index, record); }, onCancel() { return false; }, - okText: '确定', - cancelText: '取消' + okText: BtnSure, + cancelText: BtnCancel }); } else { this.handleTreeDelOk(index, record); diff --git a/src/components/Manufacture/WorkOrderPack/WorkOrderPackTableTree.js b/src/components/Manufacture/WorkOrderPack/WorkOrderPackTableTree.js index 9c55962..77db78a 100644 --- a/src/components/Manufacture/WorkOrderPack/WorkOrderPackTableTree.js +++ b/src/components/Manufacture/WorkOrderPack/WorkOrderPackTableTree.js @@ -8769,6 +8769,7 @@ const WorkOrderComponent = Form.create({ } const autoHeight = `calc( 100vh - 92px )`; const chooseCombinePartsName = commonFunc.showLocalMessage(props, 'chooseCombinePartsName', '选择合版部件名称'); + const DisplayComponentStructure = commonFunc.showLocalMessage(props, "DisplayComponentStructure", "展示部件结构"); return (
@@ -9182,7 +9183,7 @@ const WorkOrderComponent = Form.create({ props.showAllTreeVisible ? @@ -8834,7 +8836,7 @@ const WorkOrderComponent = Form.create({ props.showAllTreeVisible ? { const onCancel = () => { props.onSaveState({ showAllTreeVisible: false }); }; - + const DisplayComponentStructure = commonFunc.showLocalMessage(props, "DisplayComponentStructure", "展示部件结构"); return (
@@ -4261,7 +4261,7 @@ const ControlComponent = props => { {showAllTreeVisible && (