Commit 5f2185198f36b6110055962a038ed19bb9c35d7b

Authored by Min
1 parent b9bcaf6f

1.完善英文翻译

src/components/Common/CommonBill/index.js
@@ -1708,7 +1708,8 @@ class CommonBill extends Component { @@ -1708,7 +1708,8 @@ class CommonBill extends Component {
1708 if (Type === 'formSlave') { /* 根据从表勾选数据 生成从表数据 */ 1708 if (Type === 'formSlave') { /* 根据从表勾选数据 生成从表数据 */
1709 const { slaveSelectedRowKeys } = this.props; 1709 const { slaveSelectedRowKeys } = this.props;
1710 if (commonUtils.isEmptyObject(slaveSelectedRowKeys)) { 1710 if (commonUtils.isEmptyObject(slaveSelectedRowKeys)) {
1711 - message.warn('请选择数据'); 1711 + message.error(commonFunc.showMessage(this.props.app.commonConst, 'pleaseChooseData'));/* 请选择一条数据 */
  1712 +
1712 return; 1713 return;
1713 } 1714 }
1714 sId = slaveSelectedRowKeys; 1715 sId = slaveSelectedRowKeys;
src/components/Common/CommonListEditEvent.js
@@ -430,8 +430,10 @@ export default (ChildComponent) => { @@ -430,8 +430,10 @@ export default (ChildComponent) => {
430 // const masterConfig = formData.filter(item => !item.bGrd && item.sTbName === 'elemachine')[0]; 430 // const masterConfig = formData.filter(item => !item.bGrd && item.sTbName === 'elemachine')[0];
431 // const masterColumn = commonFunc.getHeaderConfig(masterConfig); masterColumn, 431 // const masterColumn = commonFunc.getHeaderConfig(masterConfig); masterColumn,
432 const importConfigTypes = []; 432 const importConfigTypes = [];
433 - importConfigTypes.push({ ...commonFunc.getImitateGdsconfigTypes('计算时间', 'tCurrTime', 'tCurrTime', false, '', '', false), sDateFormat: 'YYYY-MM-DD' });  
434 - importConfigTypes.push(commonFunc.getImitateGdsconfigTypes('计算', 'BtnCalculation', '', false, '', '', true)); 433 + const CalculateTime= commonFunc.showMessage(this.props.app.commonConst, 'CalculateTime') || '计算时间' ;
  434 + const BtnCalculate= commonFunc.showMessage(this.props.app.commonConst, 'Calculate') || '计算' ;
  435 + importConfigTypes.push({ ...commonFunc.getImitateGdsconfigTypes(CalculateTime, 'tCurrTime', 'tCurrTime', false, '', '', false), sDateFormat: 'YYYY-MM-DD' });
  436 + importConfigTypes.push(commonFunc.getImitateGdsconfigTypes(BtnCalculate, 'BtnCalculation', '', false, '', '', true));
435 437
436 const currConfig = {}; 438 const currConfig = {};
437 currConfig.rowGdsconfig = [{ gdsconfigformslave: importConfigTypes }]; 439 currConfig.rowGdsconfig = [{ gdsconfigformslave: importConfigTypes }];
src/components/Common/CommonListEvent.js
@@ -313,8 +313,10 @@ export default (ChildComponent) => { @@ -313,8 +313,10 @@ export default (ChildComponent) => {
313 // const masterConfig = formData.filter(item => !item.bGrd && item.sTbName === 'elemachine')[0]; 313 // const masterConfig = formData.filter(item => !item.bGrd && item.sTbName === 'elemachine')[0];
314 // const masterColumn = commonFunc.getHeaderConfig(masterConfig); masterColumn, 314 // const masterColumn = commonFunc.getHeaderConfig(masterConfig); masterColumn,
315 const importConfigTypes = []; 315 const importConfigTypes = [];
316 - importConfigTypes.push({ ...commonFunc.getImitateGdsconfigTypes('计算时间', 'tCurrTime', 'tCurrTime', false, '', '', false), sDateFormat: 'YYYY-MM-DD', bReadonly: true });  
317 - importConfigTypes.push(commonFunc.getImitateGdsconfigTypes('计算', 'BtnCalculation', '', false, '', '', true)); 316 + const CalculateTime= commonFunc.showMessage(this.props.app.commonConst, 'CalculateTime') || '计算时间' ;
  317 + const BtnCalculate= commonFunc.showMessage(this.props.app.commonConst, 'Calculate') || '计算' ;
  318 + importConfigTypes.push({ ...commonFunc.getImitateGdsconfigTypes(CalculateTime, 'tCurrTime', 'tCurrTime', false, '', '', false), sDateFormat: 'YYYY-MM-DD' });
  319 + importConfigTypes.push(commonFunc.getImitateGdsconfigTypes(BtnCalculate, 'BtnCalculation', '', false, '', '', true));
318 320
319 const currConfig = {}; 321 const currConfig = {};
320 currConfig.rowGdsconfig = [{ gdsconfigformslave: importConfigTypes }]; 322 currConfig.rowGdsconfig = [{ gdsconfigformslave: importConfigTypes }];
src/components/Common/CommonTable/index.js
@@ -4877,17 +4877,20 @@ class CommonTableRc extends React.Component { @@ -4877,17 +4877,20 @@ class CommonTableRc extends React.Component {
4877 }; 4877 };
4878 handleTreeDel = (index, record) => { 4878 handleTreeDel = (index, record) => {
4879 if(this.props.name === 'control') { 4879 if(this.props.name === 'control') {
  4880 + const sureDel = commonUtils.isNotEmptyObject(this.props.app) ? commonFunc.showMessage(this.props.app.commonConst, 'SureDel') : '确认要删除吗?' ;
  4881 + const BtnSure = commonUtils.isNotEmptyObject(this.props.app) ? commonFunc.showMessage(this.props.app.commonConst, 'BtnSure') : '确定?' ;
  4882 + const BtnCancel = commonUtils.isNotEmptyObject(this.props.app) ? commonFunc.showMessage(this.props.app.commonConst, 'BtnCancel') : '确定?' ;
4880 const _this = this; 4883 const _this = this;
4881 confirm({ 4884 confirm({
4882 - title: '确认要删除吗?', 4885 + title: sureDel,
4883 onOk() { 4886 onOk() {
4884 _this.handleTreeDelOk(index, record); 4887 _this.handleTreeDelOk(index, record);
4885 }, 4888 },
4886 onCancel() { 4889 onCancel() {
4887 return false; 4890 return false;
4888 }, 4891 },
4889 - okText: '确定',  
4890 - cancelText: '取消' 4892 + okText: BtnSure,
  4893 + cancelText: BtnCancel
4891 }); 4894 });
4892 } else { 4895 } else {
4893 this.handleTreeDelOk(index, record); 4896 this.handleTreeDelOk(index, record);
src/components/Manufacture/WorkOrderPack/WorkOrderPackTableTree.js
@@ -8769,6 +8769,7 @@ const WorkOrderComponent = Form.create({ @@ -8769,6 +8769,7 @@ const WorkOrderComponent = Form.create({
8769 } 8769 }
8770 const autoHeight = `calc( 100vh - 92px )`; 8770 const autoHeight = `calc( 100vh - 92px )`;
8771 const chooseCombinePartsName = commonFunc.showLocalMessage(props, 'chooseCombinePartsName', '选择合版部件名称'); 8771 const chooseCombinePartsName = commonFunc.showLocalMessage(props, 'chooseCombinePartsName', '选择合版部件名称');
  8772 + const DisplayComponentStructure = commonFunc.showLocalMessage(props, "DisplayComponentStructure", "展示部件结构");
8772 8773
8773 return ( 8774 return (
8774 <Form> 8775 <Form>
@@ -9182,7 +9183,7 @@ const WorkOrderComponent = Form.create({ @@ -9182,7 +9183,7 @@ const WorkOrderComponent = Form.create({
9182 props.showAllTreeVisible ? 9183 props.showAllTreeVisible ?
9183 <AntdDraggableModal 9184 <AntdDraggableModal
9184 width={1300} 9185 width={1300}
9185 - title='展示部件结构' 9186 + title={DisplayComponentStructure}
9186 visible={ props.showAllTreeVisible} 9187 visible={ props.showAllTreeVisible}
9187 onCancel={props.onCancelModal.bind(this, 'showAllTreeVisible')} 9188 onCancel={props.onCancelModal.bind(this, 'showAllTreeVisible')}
9188 bodyStyle={{ 9189 bodyStyle={{
src/components/Manufacture/WorkOrderPack/WorkOrderResearchTableTree.js
@@ -8404,6 +8404,8 @@ const WorkOrderComponent = Form.create({ @@ -8404,6 +8404,8 @@ const WorkOrderComponent = Form.create({
8404 } 8404 }
8405 } 8405 }
8406 const autoHeight = `calc( 100vh - 92px )`; 8406 const autoHeight = `calc( 100vh - 92px )`;
  8407 + const DisplayComponentStructure = commonFunc.showLocalMessage(props, "DisplayComponentStructure", "展示部件结构");
  8408 +
8407 8409
8408 return ( 8410 return (
8409 <Form> 8411 <Form>
@@ -8834,7 +8836,7 @@ const WorkOrderComponent = Form.create({ @@ -8834,7 +8836,7 @@ const WorkOrderComponent = Form.create({
8834 props.showAllTreeVisible ? 8836 props.showAllTreeVisible ?
8835 <AntdDraggableModal 8837 <AntdDraggableModal
8836 width={1300} 8838 width={1300}
8837 - title='展示部件结构' 8839 + title={DisplayComponentStructure}
8838 visible={ props.showAllTreeVisible} 8840 visible={ props.showAllTreeVisible}
8839 onCancel={props.onCancelModal.bind(this, 'showAllTreeVisible')} 8841 onCancel={props.onCancelModal.bind(this, 'showAllTreeVisible')}
8840 bodyStyle={{ 8842 bodyStyle={{
src/components/Manufacture/WorkOrderPackTableTreeNew/index.js
@@ -4253,7 +4253,7 @@ const ControlComponent = props =&gt; { @@ -4253,7 +4253,7 @@ const ControlComponent = props =&gt; {
4253 const onCancel = () => { 4253 const onCancel = () => {
4254 props.onSaveState({ showAllTreeVisible: false }); 4254 props.onSaveState({ showAllTreeVisible: false });
4255 }; 4255 };
4256 - 4256 + const DisplayComponentStructure = commonFunc.showLocalMessage(props, "DisplayComponentStructure", "展示部件结构");
4257 return ( 4257 return (
4258 <div className={styles.controlTable}> 4258 <div className={styles.controlTable}>
4259 <StaticEditTable {...controlPropsType} setOpterationColumn="Y" selfTableHeight={82} noVlist /> 4259 <StaticEditTable {...controlPropsType} setOpterationColumn="Y" selfTableHeight={82} noVlist />
@@ -4261,7 +4261,7 @@ const ControlComponent = props =&gt; { @@ -4261,7 +4261,7 @@ const ControlComponent = props =&gt; {
4261 {showAllTreeVisible && ( 4261 {showAllTreeVisible && (
4262 <AntdDraggableModal 4262 <AntdDraggableModal
4263 width={1300} 4263 width={1300}
4264 - title="展示部件结构" 4264 + title={DisplayComponentStructure}
4265 open={showAllTreeVisible} 4265 open={showAllTreeVisible}
4266 onCancel={onCancel} 4266 onCancel={onCancel}
4267 bodyStyle={{ 4267 bodyStyle={{
src/components/productionMainPlan/productionMainPlan.js
@@ -564,6 +564,7 @@ const ProductionPlanComponent = Form.create({ @@ -564,6 +564,7 @@ const ProductionPlanComponent = Form.create({
564 const WorkCenterMachinePlan = commonFunc.showLocalMessage(props, "WorkCenter&MachinePlan", "工作中心&机台计划"); 564 const WorkCenterMachinePlan = commonFunc.showLocalMessage(props, "WorkCenter&MachinePlan", "工作中心&机台计划");
565 565
566 const MPS = commonFunc.showLocalMessage(props, "MPS", "产品主计划"); 566 const MPS = commonFunc.showLocalMessage(props, "MPS", "产品主计划");
  567 + const UnifiedPlanning= commonFunc.showMessage(props.app.commonConst, 'UnifiedPlanning') || '统一规划' ;
567 568
568 const machineCharProps = commonBusiness.getCharTypes('machineChar', charConfigArr, charConfigAndDataArr, props); 569 const machineCharProps = commonBusiness.getCharTypes('machineChar', charConfigArr, charConfigAndDataArr, props);
569 const setUp = commonFunc.showMessage(app.commonConst, 'setUp');/* 上移 */ 570 const setUp = commonFunc.showMessage(app.commonConst, 'setUp');/* 上移 */
@@ -639,7 +640,7 @@ const ProductionPlanComponent = Form.create({ @@ -639,7 +640,7 @@ const ProductionPlanComponent = Form.create({
639 props.unifiedPlanningChooseVisible ? 640 props.unifiedPlanningChooseVisible ?
640 <AntdDraggableModal 641 <AntdDraggableModal
641 width={1100} 642 width={1100}
642 - title="统一规划" 643 + title={UnifiedPlanning}
643 visible={props.unifiedPlanningChooseVisible} 644 visible={props.unifiedPlanningChooseVisible}
644 onCancel={props.onCancelUnifiedPlanningChooseModal} 645 onCancel={props.onCancelUnifiedPlanningChooseModal}
645 footer={null} 646 footer={null}