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
this.setState({ formulaDesc })}>
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)
})}>
- {fieldName}
+ {fieldName}
- {fieldValue}
+ {fieldValue}
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;
}
}