Merge branch 'hotfix/V2-20230605' into release-2023-06-08

pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js

@@ -16,6 +16,7 @@ export default class SalaryDetail extends React.Component {
   constructor(props) {
     super(props);
     this.state = {
+      loading: false,
       progressVisible: false,
       progress: 0,
       columnIndex: "",
@@ -177,13 +178,12 @@ export default class SalaryDetail extends React.Component {
   }
 
   // 侧边栏保存
-  handleEditSlideSave() {
+  handleEditSlideSave = () => {
     const { calculateStore } = this.props;
     const { saveAcctResult } = calculateStore;
-    this.setState({
-      slideVisiable: false
-    });
+    this.setState({ loading: true });
     saveAcctResult(this.recordId).then(() => {
+      this.setState({ loading: false });
       const childFrameObj = document.getElementById("atdTable");
       const salaryAcctRecordId = getQueryString("id");
       const payload = {
@@ -198,11 +198,11 @@ export default class SalaryDetail extends React.Component {
       childFrameObj.contentWindow.postMessage(JSON.stringify(payload), "*");
       // acctResultList({ salaryAcctRecordId: this.id });
     });
-  }
+  };
 
 
   render() {
-    const { slideVisiable, columnIndex } = this.state;
+    const { slideVisiable, columnIndex, loading } = this.state;
     const { calculateStore, taxAgentStore: { showOperateBtn } } = this.props;
     const { baseSalarySobCycle, columnDescList } = calculateStore;
 
@@ -271,7 +271,8 @@ export default class SalaryDetail extends React.Component {
                 subtitle="编辑薪资"
                 editable={true}
                 showOperateBtn={showOperateBtn}
-                onSave={() => this.handleEditSlideSave()}
+                onSave={this.handleEditSlideSave}
+                loading={loading}
               />
             }
             content={<EditSalaryDetail id={this.recordId}/>}