From a219206bc2af8c91ca461e928c5d9a6e153f36d1 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, 15 Feb 2023 18:47:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E8=B5=84=E8=B4=A6=E5=A5=97=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ledgerBaseSetting.js | 7 ++-- .../components/ledgerSalaryItemNormal.js | 35 ++++++++++++------- pc4mobx/hrmSalary/pages/ledgerPage/index.js | 6 ++++ 3 files changed, 34 insertions(+), 14 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js index 5ef37ea5..63d31658 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js @@ -8,6 +8,7 @@ import React, { Component } from "react"; import { WeaCheckbox, WeaFormItem, WeaHelpfulTip, WeaInput, WeaSelect, WeaTextarea } from "ecCom"; import { Col, Row } from "antd"; import { inject, observer } from "mobx-react"; +import {toJS} from 'mobx'; import { baseSettingFormItem } from "../config"; import { getLedgerBasicForm } from "../../../apis/ledger"; import { getAddMonthYearMonth, getCurrentYearMonth, getSubtractMonthYearMonth } from "../../../util/date"; @@ -150,7 +151,7 @@ class LedgerBaseSetting extends Component { }; render() { - const { editId } = this.props; + const { editId, taxAgentStore: { taxAgentOption } } = this.props; const { baseForm, settingBaseInfo } = this.state; const { canEdit, taxAgentId } = settingBaseInfo; let taxAgentIdDisabled = false, taxableItemsDisabled = false; @@ -181,7 +182,9 @@ class LedgerBaseSetting extends Component { : type === "SELECT" ? - this.handleChangeField(key, v)}/> : type === "CUSTOM" ? diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js index a9a7b503..405cb441 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js @@ -148,12 +148,15 @@ class LedgerSalaryItemNormal extends Component { onHandleItemhide, onChangeSelectedRowKeys, onAddSalaryItems, - incomeCategoriesTitleName + incomeCategoriesTitleName, + taxAgentStore } = this.props; + const { showOperateBtn } = taxAgentStore; const { categoryModal, addCategoryItemsVisible, editFormulModal } = this.state; return ( }> + title={}>
{ _.map(dataSource, field => { @@ -163,6 +166,7 @@ class LedgerSalaryItemNormal extends Component { title={ { name, onEditCategory, onDeleteCategory, sortedIndex, dataSourceLen, id, onUpgo, onDowngo, selectedRowKeys = [], onDeleteCategoryItems, - onAddCategoryItems, items + onAddCategoryItems, items, showOperateBtn } = props; return
{name} { - name !== "未分类" && + name !== "未分类" && showOperateBtn && onEditCategory(name, id)}/> } { - name !== "未分类" && _.isEmpty(items) && + name !== "未分类" && _.isEmpty(items) && showOperateBtn && onDeleteCategory(id)}/> } { - sortedIndex !== 0 && + sortedIndex !== 0 && showOperateBtn && onUpgo(sortedIndex)}/> } { - sortedIndex !== dataSourceLen - 1 && + sortedIndex !== dataSourceLen - 1 && showOperateBtn && onDowngo(sortedIndex)}/> }
- onDeleteCategoryItems(id, selectedRowKeys)}/> - onAddCategoryItems(id)}/> + { + showOperateBtn && + onDeleteCategoryItems(id, selectedRowKeys)}/> + onAddCategoryItems(id)}/> + + }
; }; const TitleComp = (props) => { - const { onAddCategory, titleName } = props; + const { onAddCategory, titleName, showOperateBtn } = props; return
{titleName} - + { + showOperateBtn && + + }
; }; diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/index.js b/pc4mobx/hrmSalary/pages/ledgerPage/index.js index f9a33810..65486005 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/index.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/index.js @@ -27,6 +27,12 @@ class Index extends Component { }; } + componentDidMount() { + const { taxAgentStore } = this.props; + const { fetchTaxAgentOption } = taxAgentStore; + fetchTaxAgentOption(); + } + handleEditLedger = (record) => { const { slideparams } = this.state; const { id } = record;