Merge branch 'release/2.10.1.2401.01' into feature/2.10.1.2401.01-工资单查看与调薪记录分开展示

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)` }}
           />
         }

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: {

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) => {