1.完善各类翻译

Min
1 parent 63e8972b
Showing 5 changed files with 45 additions and 22 deletions
src/components/Common/CommonComponent/index.js
src/components/Common/CommonTable/index.js
src/mes/common/commonModelComponent/index.js
src/mes/productionExec/productionExecMain/index.js
src/mes/productionExec/productionExecMain/index.less
@@ -749,10 +749,11 @@ export default class CommonComponent extends Component {
     }
   };
   getSelectTableOption = () => {
-    const { selectTableData } = this.state;
+    const { selectTableData, selectTableIndex = 0 } = this.state;
     const { showConfig, app } = this.props;
     const { userinfo } = app;
     let { sTableTitleSql } = showConfig;
+    console.log('222', sTableTitleSql);
     /* 根据用户配置语言 设置表格标题 */
     if (commonUtils.isJSON(sTableTitleSql) && sTableTitleSql.includes('Chinese')) {
       sTableTitleSql = this.getLocalizedString(sTableTitleSql, userinfo.sLanguage);
@@ -771,7 +772,7 @@ export default class CommonComponent extends Component {
         const totalStringLen = titleStr.length;
         const otherStrLen = titleStr.replace(/[^\x00-\xff]/g, '').length; // eslint-disable-line
         const chineseStrLen = totalStringLen - otherStrLen;
-        const defaultWidth = (chineseStrLen * 20) + (otherStrLen * 12);
+        const defaultWidth = (chineseStrLen * 12) + (otherStrLen * 8);
         const maxStrLen = selectTableData.reduce((res, pre) => {
           let tempValue = pre[value] !== undefined ? pre[value] : '';
           if (tempValue === '') {
@@ -781,7 +782,7 @@ export default class CommonComponent extends Component {
           const totalStringLen = tempValue.length;
           const otherStrLen = tempValue.replace(/[^\x00-\xff]/g, '').length; // eslint-disable-line
           const chineseStrLen = totalStringLen - otherStrLen;
-          const tempWidth = (chineseStrLen * 20) + (otherStrLen * 12);
+          const tempWidth = (chineseStrLen * 12) + (otherStrLen * 8);
           return Math.max(tempWidth, res);
         }, defaultWidth);
         width = Math.min(maxStrLen + 8, 300);
@@ -812,16 +813,25 @@ export default class CommonComponent extends Component {
  
     return (
       <Option key="" className="select-table-option">
-        <div style={{ width: scrollX + 8, maxWidth: 'calc(100vw - 16px)', minWidth: '100%' }}>
+        <div style={{ width: scrollX + 8, maxWidth: 'calc(100vw - 16px)', minWidth: '100%' }} ref={(ref) => { this.selectTableRef1 = ref; }}>
           <Table
             size="small"
             className="select-table"
+            rowClassName={(_, index) => {
+              return selectTableIndex === index ? 'selected-record-row' : '';
+            }}
             rowKey="sId"
-            onRow={(record) => {
+            onRow={(record, index) => {
               return {
+                index,
+                onMouseEnter: () => {
+                  this.setState({
+                    selectTableIndex: index,
+                  });
+                },
                 onClick: () => {
-                  this.setState({ tempCurrentPage: null });
-                  this.handleSelectOptionEvent(record.sId);
+                  this.setState({ tempCurrentPage: null, bDropDownOpen: false, bNotFirstEnter: true });
+                  this.handleSelectOptionEvent(record.sSlaveId || record.sId);
                 },
               };
             }}
@@ -9206,9 +9206,9 @@ class CommonTableRc extends React.Component {
           ? sName === "sCombinedMemo"
             ? "合版信息"
             : "请选择"
-          : sValue;
+          : 'Plese Select';
  
-        if (sValue === "请选择") {
+        if (sValue === "Plese Select") {
           linkStyle = "";
           clickEvent = "";
         }
@@ -2406,7 +2406,8 @@ const CommonViewChooseComponent = props =&gt; {
 // （定制功能）工单参数详情弹窗
 const CommonParamsModalComponent = props => {
   const modalName = "sWorkParamsModalVisible"; // commonParamVisible
-  const sProcessParams = "工单参数";
+  const workParam = commonFunc.showLocalMessage(props, "workParam", "工单参数");
+  const sProcessParams = workParam;
  
   const handleGetSelectedData = tableName => {
     const selectedRowKeys = props[`${tableName}SelectedRowKeys`] || [];
@@ -2479,7 +2480,6 @@ const CommonParamsModalComponent = props =&gt; {
   const BtnPrior = commonFunc.showLocalMessage(props, 'BtnPrior', '上一条');
   const BtnNext = commonFunc.showLocalMessage(props, 'BtnNext', '下一条');
   const BtnLast = commonFunc.showLocalMessage(props, 'BtnLast', '末条');
-  const workParam = commonFunc.showLocalMessage(props, "workParam", "工单参数");
  
   return props[modalName] ? (
     <Modal
@@ -2222,6 +2222,18 @@ const BllbModalComponent = props =&gt; {
     [refreshTime]
   );
   const defectcategory = commonFunc.showLocalMessage(props, 'defectcategory', '成品不良类别');
+
+  const majorCategory = commonFunc.showLocalMessage(props, 'majorCategory', '不良大类');
+  const defectiveSubcategory = commonFunc.showLocalMessage(props, 'defectiveSubcategory', '不良小类');
+
+  const btnCancel = commonFunc.showLocalMessage(props, 'BtnCancel', '取消');
+  const btnSure = commonFunc.showLocalMessage(props, 'BtnSure', '确定');
+  const qualified = commonFunc.showLocalMessage(props, 'qualified', '确定');
+  const OKQualified = commonFunc.showLocalMessage(props, 'OKQualified', '确定');
+  const piece = commonFunc.showLocalMessage(props, 'piece', 'Piece') || 'Piece';
+
+
+
   const onOk = () => {
     props.onExecInstructSet({
       btnConfig: {
@@ -2237,7 +2249,7 @@ const BllbModalComponent = props =&gt; {
             ]
           }
         ]),
-        showName: "确认˝"
+        showName: btnSure
       },
       nextProps: {
         bblbData: data.map(item => ({ ...item, dQty: Number(item.dQty) })),
@@ -2261,10 +2273,10 @@ const BllbModalComponent = props =&gt; {
       footer={
         <Space>
           <Button size="large" onClick={() => setBllbVisible(false)}>
-            取消
+            {btnCancel}
           </Button>
           <Button type="primary" size="large" onClick={onOk}>
-            确定
+            {btnSure}
           </Button>
         </Space>
       }
@@ -2274,12 +2286,12 @@ const BllbModalComponent = props =&gt; {
           <Col flex={"40px"}>
             <div className="redDot" />
           </Col>
-          <Col flex={"160px"}>OK合格</Col>
-          <Col flex={"160px"}>合格</Col>
+          <Col flex={"160px"}>{OKQualified}</Col>
+          <Col flex={"160px"}>{qualified}</Col>
           <Col flex={1}>
             <Input size="large" value={restQty} disabled />
           </Col>
-          <Col flex={"50px"}>张</Col>
+          <Col flex={"50px"}>Piece</Col>
         </Row>
         {data.map((rowData, index) => {
           const { sId: lineId } = rowData;
@@ -2325,7 +2337,7 @@ const BllbModalComponent = props =&gt; {
               <Col flex={"160px"} style={{ maxWidth: "160px" }}>
                 <Select
                   showSearch
-                  placeholder="不良大类"
+                  placeholder={majorCategory}
                   border={false}
                   size="large"
                   style={{ width: "100%" }}
@@ -2376,7 +2388,7 @@ const BllbModalComponent = props =&gt; {
               <Col flex={"160px"} style={{ maxWidth: "160px" }}>
                 <Select
                   showSearch
-                  placeholder="不良小类"
+                  placeholder={defectiveSubcategory}
                   border={false}
                   size="large"
                   style={{ width: "100%" }}
@@ -2456,7 +2468,7 @@ const BllbModalComponent = props =&gt; {
                   }}
                 />
               </Col>
-              <Col flex={"50px"}>张</Col>
+              <Col flex={"50px"}>Piece</Col>
             </Row>
           );
         })}
@@ -335,13 +335,14 @@
       top: 0;
       .size(120px, 100%);
       .flex(center);
-      font-size: 18px;
+      font-size: 14px;
       border-left: 1px solid #AAA;
       padding: 0 0 0 5px;
       cursor: default;
  
       span[role="img"] {
         color: #1890FF;
+
       }
  
       .ant-btn-icon-only[disabled] {
@@ -592,4 +593,4 @@
       .flex(center, center);
     }
   }
-}
 \ No newline at end of file
+}