Merge branch 'release/2.18.1.2412.01' into release/2.18.1.2412.01-个税

# Conflicts:
#	pc4mobx/hrmSalary/pages/calculate/doCalc/index.js

pc4mobx/hrmSalary/apis/calculate.js

@@ -218,8 +218,9 @@ export const exportComparisonResult = (salaryAcctRecordId) => {
 };
 
 // 核算进度条
-export const getCalculateProgress = (id) => {
-  return WeaTools.callApi("/api/bs/hrmsalary/progress/getRate?cacheKey=ACCT_PROGRESS_" + id, "get", {});
+export const getCalculateProgress = (id = "", paymentOrganization = "") => {
+  const extra= paymentOrganization ? `_${paymentOrganization}` : paymentOrganization
+  return WeaTools.callApi(`/api/bs/hrmsalary/progress/getRate?cacheKey=ACCT_PROGRESS_${id}${extra}`, "get", {});
 };
 
 // 核算进度条

pc4mobx/hrmSalary/pages/calculate/doCalc/index.js

@@ -72,7 +72,8 @@ class Index extends Component {
           if (this.timer) clearInterval(this.timer);
           this.timer = setInterval(() => {
             API.getCalculateProgress(salaryAcctRecordId).then(({ data }) => {
-              if ((_.isNil(data) || data.progress === 1) && this.timer) {
+              let progress = data.progress;
+              if (progress === 1 && this.timer) {
                 clearInterval(this.timer);
                 this.timer = null;
                 this.setState({
@@ -90,7 +91,7 @@ class Index extends Component {
                 });
                 message.error(data.message);
               }
-              this.setState({ progress: Number(data.progress) * 100 });
+              this.setState({ progress: Number(progress) * 100 });
             });
           }, 1000);
         });

pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js

@@ -116,12 +116,15 @@ export default class LedgerSalaryItemAddModal extends React.Component {
       showQuickJumper: true,
       showSizeChanger: true,
       pageSizeOptions: ["10", "20", "50", "100"],
+      onShowSizeChange: (current, pageSize) => {
+        this.setState({
+          pageInfo: { ...pageInfo, current, pageSize }
+        }, () => this.listSalaryItem());
+      },
       onChange: current => {
         this.setState({
           pageInfo: { ...pageInfo, current }
-        }, () => {
-          this.listSalaryItem();
-        });
+        }, () => this.listSalaryItem());
       }
     };
     const rowSelection = {
@@ -134,7 +137,11 @@ export default class LedgerSalaryItemAddModal extends React.Component {
     return (
       <WeaDialog
         visible={visible} onCancel={onCancel} hasScroll
-        title="添加薪资项目" style={{ width: "80vw", height: 400 }}
+        title="添加薪资项目" style={{
+        width: "80vw", height: 606.6, minHeight: 200,
+        minWidth: 380, maxHeight: "80%", maxWidth: "80vw",
+        overflow: "hidden", transform: "translate(0px, 0px)"
+      }}
         buttons={[<Button type="primary" onClick={this.handleAdd} disabled={_.isEmpty(selectedRowKeys)}>添加</Button>]}
       >
         <div style={{ display: "flex", justifyContent: "flex-end", alignItems: "center", padding: 20 }}>

pc4mobx/hrmSalary/pages/mySalaryMobile/components/payrollList/index.js

@@ -28,7 +28,7 @@ class Index extends Component {
                 <span>{moment(it.sendTime).format("YYYY-MM")}</span>
               </div>
               <a
-                href={`/spa/hrmSalary/static/index.html#/main/hrmSalary/mobilepayroll?id=${it.id}&recipient=${it.employeeId}&type=phone`}
+                href={`/spa/hrmSalary/static/index.html#/main/hrmSalary/mobilepayroll?id=${it.id}&salaryCode=${it.salaryCode}&type=phone`}
                 target="_blank">
                 {`${getLabel(33564, "查看")}>`}
               </a>

pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/standingBook.js

@@ -60,7 +60,8 @@ class StandingBook extends Component {
         progressVisible: true
       }, () => {
         this.timer = setInterval(() => {
-          getCalculateProgress(moment(billMonth).format("YYYY-MM")).then(({ status, data }) => {
+          getCalculateProgress(moment(billMonth).format("YYYY-MM"), payload.paymentOrganization)
+            .then(({ status, data }) => {
               if (status) {
                 if (!data.status) {
                   clearInterval(this.timer);

pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js

@@ -359,7 +359,7 @@ export default class NormalIndex extends Component {
       progressVisible: true
     }, () => {
       this.timer = setInterval(() => {
-        getCalculateProgress(billMonth).then(({ status, data }) => {
+        getCalculateProgress(billMonth, paymentOrganization).then(({ status, data }) => {
           if (status) {
             if (!data.status) {
               clearInterval(this.timer);