From 2dd2175ea2e373e09ce1f8427d7956b21bbc9baa 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, 8 Mar 2023 15:57:00 +0800 Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E8=B5=84=E8=B4=A6=E5=A5=97-=E8=96=AA?= =?UTF-8?q?=E8=B5=84=E9=A1=B9=E7=9B=AE=E5=85=AC=E5=BC=8F=E4=BF=9D=E5=AD=98?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/apis/ledger.js | 21 ++++++++++++++++++- .../ledgerPage/components/ledgerSlide.js | 4 ++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/pc4mobx/hrmSalary/apis/ledger.js b/pc4mobx/hrmSalary/apis/ledger.js index 6e7a3f17..b04e881e 100644 --- a/pc4mobx/hrmSalary/apis/ledger.js +++ b/pc4mobx/hrmSalary/apis/ledger.js @@ -139,13 +139,32 @@ export const getLedgerItemGroupForm = params => { //保存薪资帐套薪资项目 export const saveLedgerItem = params => { + const { itemGroups, items, ...extra } = params; + const payload = { + itemGroups: _.map(itemGroups, item => { + return { + ...item, + items: _.map(item.items, it => { + delete it.formulaContent; + return { ...it }; + }) + }; + }), + items: _.map(items, child => { + delete child.formulaContent; + return { ...child }; + }) || [], + ...extra + }; + + return fetch("/api/bs/hrmsalary/salarysob/item/save", { method: "POST", mode: "cors", headers: { "Content-Type": "application/json" }, - body: JSON.stringify(params) + body: JSON.stringify(payload) }).then(res => res.json()); }; diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js index 1ffc292e..48fe3eda 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js @@ -119,7 +119,7 @@ class LedgerSlide extends Component { return { ...item, items: _.map(item.items, it => { - delete it.formulaContent; + // delete it.formulaContent; // if (it.id && it.id.length > 4) delete it.id; return { ...it }; }) @@ -127,7 +127,7 @@ class LedgerSlide extends Component { }), items: _.map(_.find(itemGroups, it => it.name === "未分类").items, child => { // if (child.id && child.id.length > 4) delete child.id; - delete child.formulaContent; + // delete child.formulaContent; return { ...child }; }) || [], salarySobId: salarySobId || saveSalarySobId