From e86e4871d80d6f19ad5078a7cc0f149cde208c21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 25 Jan 2024 15:11:35 +0800
Subject: [PATCH 1/2] release/2.10.1.2401.01

---
 .../hrmSalary/components/importDialog/components/impStep3.js  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pc4mobx/hrmSalary/components/importDialog/components/impStep3.js b/pc4mobx/hrmSalary/components/importDialog/components/impStep3.js
index 481813b4..df9575ef 100644
--- a/pc4mobx/hrmSalary/components/importDialog/components/impStep3.js
+++ b/pc4mobx/hrmSalary/components/importDialog/components/impStep3.js
@@ -31,7 +31,7 @@ class ImpStep3 extends Component {
             </div>
         }
         {
-          !_.isEmpty(importResult.errorData) &&
+          (!_.isEmpty(importResult.errorNotice) || !_.isEmpty(importResult.errorData)) &&
           <WeaTable
             columns={[
               {
@@ -39,7 +39,7 @@ class ImpStep3 extends Component {
                 dataIndex: "message"
               }
             ]}
-            dataSource={importResult.errorData} pagination={false}
+            dataSource={importResult.errorData || importResult.errorNotice} pagination={false}
             scroll={{ y: `calc(100vh - 387px)` }}
           />
         }

From 4242856f0eade2a9d99f1dfa5c01abe6bd2004ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 25 Jan 2024 16:11:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?release/2.10.1.2401.01=20=E8=96=AA=E8=B5=84?=
 =?UTF-8?q?=E6=A1=A3=E6=A1=88-=E9=9D=9E=E7=B3=BB=E7=BB=9F=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E8=B0=83=E8=96=AA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/payrollFiles/components/salaryFilesEditSlide/index.js | 2 +-
 pc4mobx/hrmSalary/pages/salaryFile/salaryItemChangeList.js      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFilesEditSlide/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFilesEditSlide/index.js
index 1eb1a76d..2cc7f785 100644
--- a/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFilesEditSlide/index.js
+++ b/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFilesEditSlide/index.js
@@ -152,7 +152,7 @@ class Index extends Component {
           }}>{getLabel(543310, "发起调薪")}</Button>
         }
         {
-          runStatuses === "fixed" && showOperateBtn &&
+          (runStatuses === "fixed" || runStatuses === "ext") && showOperateBtn &&
           <Button type="ghost" onClick={() => {
             this.setState({
               adjLogRecordDialog: {
diff --git a/pc4mobx/hrmSalary/pages/salaryFile/salaryItemChangeList.js b/pc4mobx/hrmSalary/pages/salaryFile/salaryItemChangeList.js
index de239ae8..13706751 100644
--- a/pc4mobx/hrmSalary/pages/salaryFile/salaryItemChangeList.js
+++ b/pc4mobx/hrmSalary/pages/salaryFile/salaryItemChangeList.js
@@ -83,7 +83,7 @@ export default class SalaryItemChangeList extends React.Component {
         }
         return { ...o, width, render: text => (<span title={text}>{text}</span>) };
       });
-      if (showOperateBtn && selectedKey === "fixed") {
+      if (showOperateBtn && (selectedKey === "fixed" || selectedKey === "ext")) {
         columns = [...columns, {
           dataIndex: "operate", fixed: "right", width: 120, title: "操作",
           render: (text, record) => {