From 64dd62cc8374c70d401deae45ed5c1e5cbdd0fe8 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, 2 Mar 2023 17:23:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=B5=84=E5=8D=95=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E8=83=8C=E6=99=AFbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/apis/payroll.js             | 23 ++++++++++---------
 .../dataAcquisition/components/tableRecord.js |  5 +++-
 .../pages/payroll/stepForm/showSettingForm.js |  2 +-
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/pc4mobx/hrmSalary/apis/payroll.js b/pc4mobx/hrmSalary/apis/payroll.js
index 8cf120c9..785c2791 100644
--- a/pc4mobx/hrmSalary/apis/payroll.js
+++ b/pc4mobx/hrmSalary/apis/payroll.js
@@ -175,13 +175,14 @@ export const savePayroll = params => {
 
 //工资单-编辑工资单
 export const updatePayroll = params => {
+  const { background, ...extra } = params;
   return fetch("/api/bs/hrmsalary/salaryBill/template/update", {
     method: "POST",
     mode: "cors",
     headers: {
       "Content-Type": "application/json"
     },
-    body: JSON.stringify(params)
+    body: JSON.stringify({ background: _.isNil(background) ? "" : background, ...extra })
   }).then(res => res.json());
 };
 
@@ -340,21 +341,21 @@ export const getReplenishRuleSetOptions = ({ salarySobId }) => {
 
 //添加发送和撤回人员范围列表
 export const sendRangeList = (params) => {
-  return postFetch('/api/bs/hrmsalary/salaryBill/send/range/list', params);
-}
+  return postFetch("/api/bs/hrmsalary/salaryBill/send/range/list", params);
+};
 //创建范围
 export const sendRangeSave = (params) => {
-  return postFetch('/api/bs/hrmsalary/salaryBill/send/range/save', params);
-}
+  return postFetch("/api/bs/hrmsalary/salaryBill/send/range/save", params);
+};
 //刪除范围
 export const sendRangeDelete = (params) => {
-  return postFetch('/api/bs/hrmsalary/salaryBill/send/range/delete', params);
-}
+  return postFetch("/api/bs/hrmsalary/salaryBill/send/range/delete", params);
+};
 //工资单模板-获取模板可用的分组
 export const getAvailableSalaryGroupSet = (params) => {
-  return postFetch('/api/bs/hrmsalary/salaryBill/template/getAvailableSalaryGroupSet', params);
-}
+  return postFetch("/api/bs/hrmsalary/salaryBill/template/getAvailableSalaryGroupSet", params);
+};
 //工资单模板-获取模板分组下可用的薪资项目
 export const getAvailableSalaryItemSet = (params) => {
-  return postFetch('/api/bs/hrmsalary/salaryBill/template/getAvailableSalaryItemSet', params);
-}
+  return postFetch("/api/bs/hrmsalary/salaryBill/template/getAvailableSalaryItemSet", params);
+};
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/components/tableRecord.js b/pc4mobx/hrmSalary/pages/dataAcquisition/components/tableRecord.js
index 616a36f0..00fedce7 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/components/tableRecord.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/components/tableRecord.js
@@ -55,7 +55,10 @@ class TableRecord extends Component {
       recordPayload: {
         ...recordPayload,
         ...modules
-      }
+      },
+      pageInfo: {
+        current: 1, pageSize: 10, total: 0
+      },
     }, () => this.getTableRecordData());
   };
 
diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js
index 50972199..440c41e2 100644
--- a/pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js
+++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js
@@ -81,7 +81,7 @@ export default class ShowSettingForm extends React.Component {
               labelCol={{ span: 6 }}
               wrapperCol={{ span: 18 }}
             >
-              <BackgroundUpload imageUrl={background} onChange={(value) => {
+              <BackgroundUpload imageUrl={background || null} onChange={(value) => {
                 this.handleChange({ background: value });
               }}/>
             </WeaFormItem>