From 11120294d9802f76847c0526f4a260dd0dbcd066 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, 15 Dec 2022 10:07:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E8=B5=84=E8=B4=A6=E5=A5=97=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/calculateDetail/editSalaryDetail.js | 30 +++++++++++++------ .../calculateDetail/issuedAndReissueTable.js | 6 ++-- .../pages/calculateDetail/salaryDetail.js | 2 +- .../components/ledgerBackCalcEditSlide.js | 12 +++++--- .../pages/salaryItem/formalFormModal.js | 2 ++ pc4mobx/hrmSalary/stores/calculate.js | 9 +++++- 6 files changed, 42 insertions(+), 19 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/editSalaryDetail.js b/pc4mobx/hrmSalary/pages/calculateDetail/editSalaryDetail.js index e268ac5f..075c55a1 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/editSalaryDetail.js +++ b/pc4mobx/hrmSalary/pages/calculateDetail/editSalaryDetail.js @@ -22,28 +22,37 @@ export default class EditSalaryDetail extends React.Component { acctresultDetail(this.props.id); } - handleItemValueChange(field, value, isInput) { + handleItemValueChange = (field, value, isInput) => { + console.log(field, value, isInput); const { calculateStore: { acctresultDetailForm, setAcctresultDetailForm } } = this.props; let form = { ...acctresultDetailForm }; - if (isInput) { + if (isInput === "inputItems") { form.inputItems = acctresultDetailForm.inputItems.map(item => { item = { ...item }; - if (item.salaryItemName == field) { + if (item.salaryItemName === field) { item.resultValue = value; } return item; }); - } else { + } else if (isInput === "formulaItems") { form.formulaItems = acctresultDetailForm.formulaItems.map(item => { item = { ...item }; - if (item.salaryItemName == field) { + if (item.salaryItemName === field) { + item.resultValue = value; + } + return item; + }); + } else if (isInput === "issuedAndReissueItems") { + form.issuedAndReissueItems = acctresultDetailForm.issuedAndReissueItems.map(item => { + item = { ...item }; + if (item.salaryItemName === field) { item.resultValue = value; } return item; }); } setAcctresultDetailForm(form); - } + }; renderTableTr = (data, isInput) => { const tables = []; @@ -132,7 +141,7 @@ export default class EditSalaryDetail extends React.Component { "borderB-none": Math.ceil((index + 1) / 3) === len / 3, "borderR-none": (index + 1) % 3 === 0 })}> { - this.handleItemValueChange(item.salaryItemName, value, true); + this.handleItemValueChange(item.salaryItemName, value, "inputItems"); }}/> @@ -166,7 +175,7 @@ export default class EditSalaryDetail extends React.Component { "borderB-none": Math.ceil((index + 1) / 3) === len / 3, "borderR-none": (index + 1) % 3 === 0 })}> { - this.handleItemValueChange(item.salaryItemName, value, false); + this.handleItemValueChange(item.salaryItemName, value, "formulaItems"); }}/> @@ -180,7 +189,10 @@ export default class EditSalaryDetail extends React.Component { } { selectedKey === "1" && - + } ); diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/issuedAndReissueTable.js b/pc4mobx/hrmSalary/pages/calculateDetail/issuedAndReissueTable.js index ddeea850..ff82bad7 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/issuedAndReissueTable.js +++ b/pc4mobx/hrmSalary/pages/calculateDetail/issuedAndReissueTable.js @@ -9,7 +9,7 @@ import { WeaHelpfulTip, WeaInputNumber, WeaTable } from "ecCom"; class IssuedAndReissueTable extends Component { render() { - const { dataSource } = this.props; + const { dataSource, onChangeIssueReissueValue } = this.props; const columns = [ { dataIndex: "salaryItemName", @@ -35,9 +35,7 @@ class IssuedAndReissueTable extends Component { min={0} precision={2} value={text || 0} - onChange={(value) => { - console.log(value); - }} + onChange={(value) => onChangeIssueReissueValue(record.salaryItemName, value, "issuedAndReissueItems")} />; } }, diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js b/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js index a7791cba..91cf2263 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js +++ b/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js @@ -266,7 +266,7 @@ export default class SalaryDetail extends React.Component { measure={"%"} title={ this.handleEditSlideSave()} diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBackCalcEditSlide.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBackCalcEditSlide.js index 6386dbff..b427977f 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBackCalcEditSlide.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBackCalcEditSlide.js @@ -24,11 +24,13 @@ class LedgerBackCalcEditSlide extends Component { roundingMode: "", valueType: "", salaryItem: [], + formulaId: "", backCalcEditFormulModal: { visible: false, valueType: "", dataType: "", - backCalcType: "" + backCalcType: "", + formulaId: "" } }; } @@ -74,14 +76,15 @@ class LedgerBackCalcEditSlide extends Component { }; handleEditFormnul = () => { const { backCalcType } = this.props; - const { backCalcEditFormulModal, valueType, dataType } = this.state; + const { backCalcEditFormulModal, valueType, dataType, formulaId } = this.state; this.setState({ backCalcEditFormulModal: { ...backCalcEditFormulModal, visible: true, valueType, dataType: _.lowerCase(dataType), - backCalcType + backCalcType, + formulaId } }); }; @@ -93,7 +96,8 @@ class LedgerBackCalcEditSlide extends Component { visible: false, valueType: "", dataType: "", - backCalcType: "" + backCalcType: "", + formulaId: "" } }); }; diff --git a/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js b/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js index 5d1d327c..f521f909 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js @@ -64,6 +64,8 @@ export default class FormalFormModal extends React.Component { let groupParams = {}; if (this.referenceType == "sql") { groupParams = { "referenceType": "sql" }; + }else{ + groupParams = this.props.backCalcType === "issuedItems" ? { "referenceType": "backCalc" } : {}; } salaryAcctImportTemplateParam(groupParams); }); diff --git a/pc4mobx/hrmSalary/stores/calculate.js b/pc4mobx/hrmSalary/stores/calculate.js index 63b5b235..3b7c9820 100644 --- a/pc4mobx/hrmSalary/stores/calculate.js +++ b/pc4mobx/hrmSalary/stores/calculate.js @@ -501,7 +501,14 @@ export class calculateStore { return record; }); - let items = inputItems.concat(formulaItems); + let issuedAndReissueItems = this.acctresultDetailForm.issuedAndReissueItems.map(item => { + let record = {}; + record.salaryItemId = item.salaryItemId; + record.resultValue = item.resultValue; + return record; + }); + + let items = inputItems.concat(formulaItems).concat(issuedAndReissueItems); let params = { salaryAcctEmpId: recordId, items