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/colorInfo.jsx b/src/components/Common/CommonTable/colorInfo.jsx index 4cf7f95..e55f6fa 100644 --- a/src/components/Common/CommonTable/colorInfo.jsx +++ b/src/components/Common/CommonTable/colorInfo.jsx @@ -5,7 +5,7 @@ import styles from "./index.less"; export default class ColorInfo extends PureComponent { colorContentItem = (item,language) => { - const title = item?.sName; + const title =language ==='sEnglish'? item?.sEnglishName : language === 'sBig5'? item?.sBig5Name: item?.sName; const info = Array.isArray(item?.sColor) ? item.sColor.filter(Boolean) : []; return ( <> 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/Common/PersonCenter/MenuSearchPopovor.js b/src/components/Common/PersonCenter/MenuSearchPopovor.js index 2d9d234..6934232 100644 --- a/src/components/Common/PersonCenter/MenuSearchPopovor.js +++ b/src/components/Common/PersonCenter/MenuSearchPopovor.js @@ -6,6 +6,7 @@ import { Modal, message } from 'antd-v4'; import { AutoComplete, Input } from "antd-v4"; import * as commonUtils from "@/utils/utils"; /* 通用方法 */ import config from '@/utils/config'; +import * as commonFunc from "@/components/Common/commonFunc"; const MenuSearchPopovor = props => { const { menuPanel, onSetMenuSearchPopoverVisible, onAddPane, app, dispatch, updateMenuPanel } = useMemo( @@ -141,6 +142,8 @@ const MenuSearchPopovor = props => { return [...commonlyUsedOption, ...options]; }, [menuPanel.panelMenus]); + const searchTitle = commonFunc.showMessage(app.commonConst, 'btnSearch') || '搜索122'; + return (
{ onSetMenuSearchPopoverVisible(false); }} > - +
); diff --git a/src/components/Common/PersonCenter/PersonCenter.js b/src/components/Common/PersonCenter/PersonCenter.js index 92ee6a1..64f132c 100644 --- a/src/components/Common/PersonCenter/PersonCenter.js +++ b/src/components/Common/PersonCenter/PersonCenter.js @@ -63,7 +63,9 @@ class PersonCenter extends Component { } componentDidMount() { if (this.changePwd) { - message.warn('系统判断密码为初始密码，请修改密码后再操作！', 10); + const changePwd = commonFunc.showLocalMessage(this.props, 'changePwd', '系统判断密码为初始密码，2请修改密码后再操作！'); + + message.warn(changePwd, 10); } } diff --git a/src/components/CommonElementEvent/SftLoginInfo.js b/src/components/CommonElementEvent/SftLoginInfo.js index f4c5eb1..2536560 100644 --- a/src/components/CommonElementEvent/SftLoginInfo.js +++ b/src/components/CommonElementEvent/SftLoginInfo.js @@ -59,7 +59,7 @@ const SftLoginComponent = Form.create({ const tabDrivergroup = commonFunc.showMessage(app.commonConst, 'tabDrivergroup');/* 司机查看权限 */ const tabDepartgroup = commonFunc.showMessage(app.commonConst, 'tabDepartgroup');/* 部门查看权限 */ const tabApproveGroup = commonFunc.showMessage(app.commonConst, 'sftlogininfoCheck');/* 审核组权限 */ - const tabCompanyAuthority = commonFunc.showLocalMessage(this.props, 'tabCompanyAuthority', '分管公司权限'); + const tabCompanyAuthority = commonFunc.showLocalMessage(props, 'tabCompanyAuthority', '分管公司权限'); const tabBrandgroup = tabCompanyAuthority; return ( diff --git a/src/components/Manufacture/CommonPackEvent.js b/src/components/Manufacture/CommonPackEvent.js index 0e99fad..33caf1e 100644 --- a/src/components/Manufacture/CommonPackEvent.js +++ b/src/components/Manufacture/CommonPackEvent.js @@ -1182,10 +1182,13 @@ const PartsInfoModal = props => { }; const handleFooter = () => { + const BtnSure = commonFunc.showLocalMessage(props, "BtnSure", "确定"); + const BtnSave = commonFunc.showLocalMessage(props, "BtnSave", "确定"); + const BtnUpd= commonFunc.showLocalMessage(props, "BtnUpd", "修改"); if (props.enabled || props.masterData?.partsInfoLock) { return [ , ]; } @@ -1196,7 +1199,7 @@ const PartsInfoModal = props => { setEnabledNew(true); }} > - 修改 + {BtnUpd} , , ]; }; @@ -1475,13 +1478,12 @@ const ParamsChooseNewModal = props => { const BtnFirst= commonFunc.showMessage(props.app.commonConst, 'BtnFirst') || '首条' ; - const BtnLast= commonFunc.showMessage(props.app.commonConst, 'Btnlast') || '末条' ; + 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] ? ( @@ -9182,7 +9183,7 @@ const WorkOrderComponent = Form.create({ props.showAllTreeVisible ? { const sProcessParams = commonFunc.showMessage(props.app.commonConst, 'workParam') || '工单参数' ; const BtnFirst= commonFunc.showMessage(props.app.commonConst, 'BtnFirst') || '首条' ; - const BtnLast= commonFunc.showMessage(props.app.commonConst, 'Btnlast') || '末条' ; + const BtnLast= commonFunc.showMessage(props.app.commonConst, 'BtnLast') || '末条' ; const BtnPrior= commonFunc.showMessage(props.app.commonConst, 'BtnPrior') || '上一条' ; diff --git a/src/components/Manufacture/WorkOrderPack/WorkOrderResearchTableTree.js b/src/components/Manufacture/WorkOrderPack/WorkOrderResearchTableTree.js index 704d217..c4bfb75 100644 --- a/src/components/Manufacture/WorkOrderPack/WorkOrderResearchTableTree.js +++ b/src/components/Manufacture/WorkOrderPack/WorkOrderResearchTableTree.js @@ -8404,6 +8404,8 @@ const WorkOrderComponent = Form.create({ } } const autoHeight = `calc( 100vh - 92px )`; + const DisplayComponentStructure = commonFunc.showLocalMessage(props, "DisplayComponentStructure", "展示部件结构"); + return (
@@ -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 && (