diff --git a/pc4mobx/hrmSalary/apis/ledger.js b/pc4mobx/hrmSalary/apis/ledger.js index b04e881e..11baacc1 100644 --- a/pc4mobx/hrmSalary/apis/ledger.js +++ b/pc4mobx/hrmSalary/apis/ledger.js @@ -309,3 +309,7 @@ export const salarysobRangePreview = params => { export const salarysobRangeImportData = params => { return postFetch("/api/bs/hrmsalary/salarysob/range/importData", params); }; +//薪资账套-获取薪资账套中薪资项目明细 +export const getSalaryItemForm = params => { + return postFetch("/api/bs/hrmsalary/salarysob/item/getSalaryItemForm", params); +}; diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemEditSlide.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemEditSlide.js index fa968445..735014cd 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemEditSlide.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemEditSlide.js @@ -43,7 +43,7 @@ class LedgerSalaryItemEditSlide extends Component { { this.props.visible && } diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js index 3f743034..bb387ef6 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js @@ -49,6 +49,7 @@ class LedgerSalaryItemNormal extends Component { } handleEditFormnul = (field, record) => { + console.log(record); const { valueType, formulaId, dateType: dataType, id, key } = record; const { editFormulModal } = this.state; this.setState({ @@ -184,6 +185,7 @@ class LedgerSalaryItemNormal extends Component { render() { const { + editId, dataSource, onSaveCategory, onDropCategoryItem, @@ -220,7 +222,7 @@ class LedgerSalaryItemNormal extends Component { } > onDropCategoryItem(field, data)} onHandleItemhide={(data) => onHandleItemhide(field, data)} diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js index e33d7ce3..cd401a50 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js @@ -5,12 +5,10 @@ * Date: 2022/12/13 */ import React, { Component } from "react"; -import { message } from "antd"; import { WeaCheckbox, WeaHelpfulTip, WeaLocaleProvider, WeaTable } from "ecCom"; import LedgerSalaryItemEditSlide from "./ledgerSalaryItemEditSlide"; -import { getSalaryFieldForm } from "../../../apis/fieldManage"; +import { getSalaryItemForm } from "../../../apis/ledger"; import { commonEnumList } from "../../../apis/ruleconfig"; -import { saveItem } from "../../../apis/item"; const getLabel = WeaLocaleProvider.getLabel; @@ -38,7 +36,6 @@ class LedgerSalaryItemTable extends Component { onHandleItemhide( _.map([...dataSource], item => { if (id === item.id || id === item.key) { - alert(1); return { ...item, itemHide: String(value) @@ -59,6 +56,20 @@ class LedgerSalaryItemTable extends Component { }) ); }; + handleChangeSalaryItem = (data, id) => { + const { dataSource, onHandleItemhide } = this.props; + onHandleItemhide( + _.map([...dataSource], item => { + if (id === item.id || id === item.key) { + return { + ...item, + ...data + }; + } + return { ...item }; + }) + ); + }; /* * Author: 黎永顺 * Description: 编辑薪资项目 @@ -66,13 +77,22 @@ class LedgerSalaryItemTable extends Component { * Date: 2023/7/19 */ handleEditSalaryItem = async (record) => { + const { salarySobId, dataSource } = this.props, { salaryItemId } = record; + const { + itemHide: hideDefault, + valueType, + roundingMode, + pattern + } = _.find(dataSource, it => it.salaryItemId === salaryItemId); const { data: userStatusList } = await commonEnumList({ enumClass: "com.engine.salary.enums.sicategory.SharedTypeEnum" }); - getSalaryFieldForm({ id: record.salaryItemId }).then(({ status, data }) => { + getSalaryItemForm({ salarySobId, salaryItemId }).then(({ status, data }) => { if (status) { this.setState({ salaryItemPayload: { ...this.state.salaryItemPayload, - visible: true, request: data, record, + visible: true, + request: { ...data, hideDefault, valueType, roundingMode, pattern }, + record, userStatusList: _.map(userStatusList, it => ({ key: it.value.toString(), showname: it.defaultLabel })) } }); @@ -89,28 +109,12 @@ class LedgerSalaryItemTable extends Component { const { salaryItemPayload } = this.state; const { request, record } = salaryItemPayload; this.setState({ - salaryItemPayload: { ...salaryItemPayload, loading: true } + salaryItemPayload: { ...salaryItemPayload, visible: false } }); - saveItem(request).then(({ status, errorMsg }) => { - if (status) { - message.success(getLabel(22619, "保存成功")); - this.setState({ - salaryItemPayload: { ...salaryItemPayload, loading: false, visible: false } - }); - const { id } = record; - const { hideDefault } = request; - this.handleChangeItem(hideDefault.toString(), id); - console.log(this.props, this.state); - //TODO:渲染列表数据 - } else { - this.setState({ - salaryItemPayload: { ...salaryItemPayload, loading: false } - }); - message.error(errorMsg || getLabel(22620, "保存失败")); - } - }).catch(() => this.setState({ - salaryItemPayload: { ...salaryItemPayload, loading: false } - })); + const { id } = record; + const { hideDefault, roundingMode, pattern, valueType } = request; + this.handleChangeSalaryItem({ itemHide: hideDefault.toString(), roundingMode, pattern, valueType }, id); + //TODO:渲染列表数据 }; render() { @@ -204,9 +208,11 @@ class LedgerSalaryItemTable extends Component { { + const key = Object.keys(request)[0]; this.setState({ salaryItemPayload: { - ...salaryItemPayload, request + ...salaryItemPayload, request, + record: key === "valueType" ? { ...salaryItemPayload.record, request } : { ...salaryItemPayload.record } } }); }} diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js index 48fe3eda..8b2e350e 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js @@ -26,7 +26,7 @@ const tabs = [ { key: 4, title: "调薪计薪规则" } ]; -@inject("taxAgentStore") +@inject("taxAgentStore", "ledgerStore") @observer class LedgerSlide extends Component { constructor(props) { diff --git a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js index 17807081..7d1e59d9 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js @@ -26,6 +26,7 @@ class SalaryItemForm extends Component { switch (key) { case "useDefault": case "sortedIndex": + case "dataType": case "description": return { ...item, @@ -73,7 +74,7 @@ class SalaryItemForm extends Component { } return { ...item, - viewAttr: (key === "name" && ((editable && record.canEdit) || isAdd)) ? 3 : (key !== "name" && ((editable && record.canEdit) || isAdd)) ? 2 : 1 + viewAttr: (key === "name" && ((editable && record.canEdit && !isLedger) || isAdd)) ? 3 : (key !== "name" && ((editable && record.canEdit) || isAdd)) ? 2 : 1 }; }) });