From f4574570d95ea5560fe230457989fbeb76097db1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Wed, 15 Nov 2023 13:53:56 +0800
Subject: [PATCH] hotfix/2.9.42311.02

---
 .../pages/calculate/calcOc/components/salaryCalcOcList.js     | 2 +-
 .../calculate/doCalc/components/salaryEditCalc/baseInfo.js    | 4 ++--
 .../calculate/doCalc/components/salaryEditCalc/index.less     | 4 ++++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/calculate/calcOc/components/salaryCalcOcList.js b/pc4mobx/hrmSalary/pages/calculate/calcOc/components/salaryCalcOcList.js
index e3dda5fb..817a7b6d 100644
--- a/pc4mobx/hrmSalary/pages/calculate/calcOc/components/salaryCalcOcList.js
+++ b/pc4mobx/hrmSalary/pages/calculate/calcOc/components/salaryCalcOcList.js
@@ -84,7 +84,7 @@ class SalaryCalcOcList extends Component {
                   render: (__, record) => {
                     const formulaDesc = record["customParameters"][`${o["dataIndex"]}`];
                     const showDifference = record[`${o["dataIndex"]}_type`] === "number";
-                    const { acctResultValue, excelResultValue } = record[o["dataIndex"]];
+                    const { acctResultValue, excelResultValue } = record[o["dataIndex"]] || {};
                     return <div className="comparison-column-item-container"
                                 onClick={() => this.setState({ formulaDesc })}>
                       <div className="comparison-single-row">
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/baseInfo.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/baseInfo.js
index 3539ec72..129d9cb7 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/baseInfo.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/baseInfo.js
@@ -40,10 +40,10 @@ class EditSalaryBaseInfo extends Component {
                     "esf-form-last-item": (index === baseInfo.length - 1 && (index + 1) % 2 === 1)
                   })}>
                     <Col span={(index === baseInfo.length - 1 && (index + 1) % 2 === 1) ? 3 : 6}>
-                      <span className="label">{fieldName}</span>
+                      <span className="label" title={fieldName}>{fieldName}</span>
                     </Col>
                     <Col span={(index === baseInfo.length - 1 && (index + 1) % 2 === 1) ? 21 : 18}>
-                      <span className="value">{fieldValue}</span>
+                      <span className="value" title={fieldValue}>{fieldValue}</span>
                     </Col>
                   </Row>
                 </Col>
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less
index 831c2bd9..91797921 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less
@@ -168,6 +168,10 @@
           display: inline-block;
           line-height: 24px;
           padding: 8px 16px;
+          width: 100%;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
         }
       }