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

陈鑫涛
2 parents ab64028a 4124d5eb
Showing 13 changed files with 42 additions and 23 deletions
src/components/Common/CommonBill/index.js
src/components/Common/CommonListEditEvent.js
src/components/Common/CommonListEvent.js
src/components/Common/CommonTable/colorInfo.jsx
src/components/Common/CommonTable/index.js
src/components/Common/PersonCenter/MenuSearchPopovor.js
src/components/Common/PersonCenter/PersonCenter.js
src/components/CommonElementEvent/SftLoginInfo.js
src/components/Manufacture/CommonPackEvent.js
src/components/Manufacture/WorkOrderPack/WorkOrderPackTableTree.js
src/components/Manufacture/WorkOrderPack/WorkOrderResearchTableTree.js
src/components/Manufacture/WorkOrderPackTableTreeNew/index.js
src/components/productionMainPlan/productionMainPlan.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;
@@ -430,8 +430,10 @@ export default (ChildComponent) =&gt; {
         // 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 }];
@@ -313,8 +313,10 @@ export default (ChildComponent) =&gt; {
         // 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 }];
@@ -5,7 +5,7 @@ import styles from &quot;./index.less&quot;;
 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 (
       <>
@@ -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);
@@ -6,6 +6,7 @@ import { Modal, message } from &#39;antd-v4&#39;;
 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 =&gt; {
     return [...commonlyUsedOption, ...options];
   }, [menuPanel.panelMenus]);
  
+  const searchTitle = commonFunc.showMessage(app.commonConst, 'btnSearch') || '搜索122';
+
   return (
     <div ref={popovorRef}>
       <AutoComplete
@@ -177,7 +180,7 @@ const MenuSearchPopovor = props =&gt; {
           onSetMenuSearchPopoverVisible(false);
         }}
       >
-        <Input.Search size="large" placeholder="搜索" />
+        <Input.Search size="large" placeholder={searchTitle} />
       </AutoComplete>
     </div>
   );
@@ -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);
     }
   }
  
@@ -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 (
@@ -1182,10 +1182,13 @@ const PartsInfoModal = props =&gt; {
   };
  
   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 [
         <Button type="primary" onClick={onCancel}>
-          确定
+          {BtnSure}
         </Button>,
       ];
     }
@@ -1196,7 +1199,7 @@ const PartsInfoModal = props =&gt; {
           setEnabledNew(true);
         }}
       >
-        修改
+        {BtnUpd}
       </Button>,
       <Button
         type="primary"
@@ -1205,7 +1208,7 @@ const PartsInfoModal = props =&gt; {
           onCancel();
         }}
       >
-        保存
+        {BtnSave}
       </Button>,
     ];
   };
@@ -1475,13 +1478,12 @@ const ParamsChooseNewModal = props =&gt; {
  
   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] ? (
     <AntdDraggableModal
@@ -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 (
     <Form>
@@ -9182,7 +9183,7 @@ const WorkOrderComponent = Form.create({
           props.showAllTreeVisible ?
             <AntdDraggableModal
               width={1300}
-              title='展示部件结构'
+              title={DisplayComponentStructure}
               visible={ props.showAllTreeVisible}
               onCancel={props.onCancelModal.bind(this, 'showAllTreeVisible')}
               bodyStyle={{
@@ -9352,7 +9353,7 @@ const ModalComponent = props =&gt; {
   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') || '上一条' ;
  
@@ -8404,6 +8404,8 @@ const WorkOrderComponent = Form.create({
     }
   }
   const autoHeight = `calc( 100vh - 92px )`;
+  const DisplayComponentStructure = commonFunc.showLocalMessage(props, "DisplayComponentStructure", "展示部件结构");
+
  
   return (
     <Form>
@@ -8834,7 +8836,7 @@ const WorkOrderComponent = Form.create({
           props.showAllTreeVisible ?
             <AntdDraggableModal
               width={1300}
-              title='展示部件结构'
+              title={DisplayComponentStructure}
               visible={ props.showAllTreeVisible}
               onCancel={props.onCancelModal.bind(this, 'showAllTreeVisible')}
               bodyStyle={{
@@ -4253,7 +4253,7 @@ const ControlComponent = props =&gt; {
   const onCancel = () => {
     props.onSaveState({ showAllTreeVisible: false });
   };
-
+  const DisplayComponentStructure = commonFunc.showLocalMessage(props, "DisplayComponentStructure", "展示部件结构");
   return (
     <div className={styles.controlTable}>
       <StaticEditTable {...controlPropsType} setOpterationColumn="Y" selfTableHeight={82} noVlist />
@@ -4261,7 +4261,7 @@ const ControlComponent = props =&gt; {
       {showAllTreeVisible && (
         <AntdDraggableModal
           width={1300}
-          title="展示部件结构"
+          title={DisplayComponentStructure}
           open={showAllTreeVisible}
           onCancel={onCancel}
           bodyStyle={{
@@ -564,6 +564,7 @@ const ProductionPlanComponent = Form.create({
   const WorkCenterMachinePlan = commonFunc.showLocalMessage(props, "WorkCenter&MachinePlan", "工作中心&机台计划");
  
   const MPS = commonFunc.showLocalMessage(props, "MPS", "产品主计划");
+  const UnifiedPlanning= commonFunc.showMessage(props.app.commonConst, 'UnifiedPlanning') || '统一规划' ;
  
   const machineCharProps = commonBusiness.getCharTypes('machineChar', charConfigArr, charConfigAndDataArr, props);
   const setUp = commonFunc.showMessage(app.commonConst, 'setUp');/* 上移 */
@@ -639,7 +640,7 @@ const ProductionPlanComponent = Form.create({
           props.unifiedPlanningChooseVisible ?
             <AntdDraggableModal
               width={1100}
-              title="统一规划"
+              title={UnifiedPlanning}
               visible={props.unifiedPlanningChooseVisible}
               onCancel={props.onCancelUnifiedPlanningChooseModal}
               footer={null}