qt
/
salary-management-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/V2-薪资账套页面重构-1208' into develop

This commit is contained in:
黎永顺 2022-12-15 10:08:10 +08:00
parent 0cdca9c448 11120294d9
commit c7773749e4
6 changed files with 42 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pc4mobx/hrmSalary/pages/calculateDetail/editSalaryDetail.js
View File

@ -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
})}><WeaInput value={item.resultValue} disabled={!item.canEdit} onChange={(value) => {
this.handleItemValueChange(item.salaryItemName, value, true);
this.handleItemValueChange(item.salaryItemName, value, "inputItems");
}}/></Col>
</Row>
</Col>
@ -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
})}><WeaInput value={item.resultValue} disabled={!item.canEdit} onChange={(value) => {
this.handleItemValueChange(item.salaryItemName, value, false);
this.handleItemValueChange(item.salaryItemName, value, "formulaItems");
}}/></Col>
</Row>
</Col>
@ -180,7 +189,10 @@ export default class EditSalaryDetail extends React.Component {
}
{
selectedKey === "1" &&
<IssuedAndReissueTable dataSource={toJS(acctresultDetailForm.issuedAndReissueItems)}/>
<IssuedAndReissueTable
dataSource={toJS(acctresultDetailForm.issuedAndReissueItems)}
onChangeIssueReissueValue={this.handleItemValueChange}
/>
}
</div>
);

6
pc4mobx/hrmSalary/pages/calculateDetail/issuedAndReissueTable.js
View File

@ -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")}
/>;
}
},

2
pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js
View File

@ -266,7 +266,7 @@ export default class SalaryDetail extends React.Component {
measure={"%"}
title={
<SlideModalTitle
subtitle={"编辑薪资"}
subtitle="编辑薪资"
editable={true}
showOperateBtn={showOperateBtn}
onSave={() => this.handleEditSlideSave()}

12
pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBackCalcEditSlide.js
View File

@ -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: ""
}
});
};

2
pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js
View File

@ -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);
});

9
pc4mobx/hrmSalary/stores/calculate.js
View File

@ -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