From 39d526d59e64c4f97cf0aed8a5c680390904d46a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Wed, 15 Mar 2023 10:18:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E4=BF=9D=E7=A6=8F=E5=88=A9=E6=A1=A3?=
 =?UTF-8?q?=E6=A1=88bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../socialSecurityBenefits/archives/accumulationFundForm.js | 2 +-
 .../pages/socialSecurityBenefits/archives/otherForm.js      | 2 +-
 .../socialSecurityBenefits/archives/socialSecurityForm.js   | 2 +-
 pc4mobx/hrmSalary/stores/payroll.js                         | 6 ++++++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/accumulationFundForm.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/accumulationFundForm.js
index ccd3ddc5..3f2465ab 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/accumulationFundForm.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/accumulationFundForm.js
@@ -149,7 +149,7 @@ export default class AccumulationFundForm extends React.Component {
       <div className="socialFormWrapper">
         <WeaSearchGroup
           title="公积金基础信息"
-          customComponent={<SocialTitle keyname="nonPayment" value={nonPayment.toString()}
+          customComponent={<SocialTitle keyname="nonPayment" value={!_.isNil(nonPayment) ? nonPayment.toString() : "0"}
                                         onChange={this.handleFormChange}/>}
           items={foundItems} col={2} showGroup needTigger={false}/>
         {
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/otherForm.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/otherForm.js
index f489835e..4516e770 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/otherForm.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/otherForm.js
@@ -129,7 +129,7 @@ export default class OtherForm extends React.Component {
       <div className="socialFormWrapper">
         <WeaSearchGroup
           title="其他福利基础信息"
-          customComponent={<SocialTitle keyname="nonPayment" value={nonPayment.toString()}
+          customComponent={<SocialTitle keyname="nonPayment" value={!_.isNil(nonPayment) ? nonPayment.toString() : "0"}
                                         onChange={this.handleFormChange}/>}
           items={otherItems} col={2} showGroup needTigger={false}/>
         {
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/socialSecurityForm.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/socialSecurityForm.js
index 8cc679c8..0d96be4e 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/socialSecurityForm.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/socialSecurityForm.js
@@ -139,7 +139,7 @@ export default class SocialSecurityForm extends React.Component {
       <div className="socialFormWrapper">
         <WeaSearchGroup
           title="社保基础信息"
-          customComponent={<SocialTitle keyname="nonPayment" value={nonPayment.toString()}
+          customComponent={<SocialTitle keyname="nonPayment" value={!_.isNil(nonPayment) ? nonPayment.toString() : "0" }
                                         onChange={this.handleFormChange}/>}
           items={socialItems} col={2} showGroup needTigger={false}/>
         {
diff --git a/pc4mobx/hrmSalary/stores/payroll.js b/pc4mobx/hrmSalary/stores/payroll.js
index 6f98abe1..a68f0ae8 100644
--- a/pc4mobx/hrmSalary/stores/payroll.js
+++ b/pc4mobx/hrmSalary/stores/payroll.js
@@ -506,7 +506,10 @@ export class payrollStore {
   @action
   grantPayroll = (params = {}) => {
     return new Promise((resolve, reject) => {
+      message.destroy();
+      message.loading("正在发放中...", 0);
       API.grantPayroll(params).then(res => {
+        message.destroy();
         if (res.status) {
           message.success("发送成功");
           resolve();
@@ -522,7 +525,10 @@ export class payrollStore {
   @action
   withdrawPayroll = (params = {}) => {
     return new Promise((resolve, reject) => {
+      message.destroy();
+      message.loading("正在撤回中...", 0);
       API.withdrawPayroll(params).then(res => {
+        message.destroy();
         if (res.status) {
           message.success("撤回成功");
           resolve();