diff --git a/pc4mobx/hrmSalary/pages/calculate/calculate.js b/pc4mobx/hrmSalary/pages/calculate/calculate.js index d1e8cda7..eeddb359 100644 --- a/pc4mobx/hrmSalary/pages/calculate/calculate.js +++ b/pc4mobx/hrmSalary/pages/calculate/calculate.js @@ -41,7 +41,7 @@ class Calculate extends Component { super(props); this.state = { queryParams: { - name: "", + name: "", lastOperates: [], dateRange: [ moment(new Date()).subtract(1, "year").startOf("year").format("YYYY-MM"), moment(new Date()).endOf("year").format("YYYY-MM") @@ -75,25 +75,26 @@ class Calculate extends Component { const { queryParams, isRefresh, showAdvance, loading, selectedRowKeys } = this.state; const admin = PageAndOptAuth.opts.includes("admin"); let calculateOpts = [ - , - , - , - , + // , + // , + // , + // , this.setState({ showAdvance: !showAdvance })} onChange={v => this.setState({ isRefresh: _.keys(v)[0] === "name" ? isRefresh : !isRefresh, queryParams: { ...queryParams, ...v } })} onSearch={() => this.setState({ isRefresh: !isRefresh })}/> ]; - return !admin ? calculateOpts.slice(4) : calculateOpts; + return calculateOpts; + // return !admin ? calculateOpts.slice(4) : calculateOpts; }; handleBatCalcTax = () => { const { selectedRowKeys: salaryAcctRecordIds, isRefresh, loading } = this.state; @@ -268,7 +269,7 @@ class Calculate extends Component { render() { const { queryParams, isRefresh, calcDaialog, progressModule, logDialogVisible, filterConditions, conditions, showAdvance, - selectedRowKeys + selectedRowKeys, loading } = this.state; return ( } iconBgcolor="#F14A2D" @@ -291,6 +292,20 @@ class Calculate extends Component { onClick={() => this.setState({ showAdvance: !showAdvance })}>{getLabel(111, "取消")} +
+ + + + +
this.setState({ selectedRowKeys: v })}/> diff --git a/pc4mobx/hrmSalary/pages/calculate/components/calculateQuery/index.js b/pc4mobx/hrmSalary/pages/calculate/components/calculateQuery/index.js index 0c74ccd5..95885b33 100644 --- a/pc4mobx/hrmSalary/pages/calculate/components/calculateQuery/index.js +++ b/pc4mobx/hrmSalary/pages/calculate/components/calculateQuery/index.js @@ -5,17 +5,40 @@ * Date: 2023/10/9 */ import React, { Component } from "react"; -import { WeaInputSearch, WeaLocaleProvider } from "ecCom"; +import { WeaInputSearch, WeaLocaleProvider, WeaSelect } from "ecCom"; import { MonthRangePicker } from "../../../reportView/components/statisticalMicroSettingsSlide"; +import { commonEnumList } from "../../../../apis/ruleconfig"; const getLabel = WeaLocaleProvider.getLabel; class Index extends Component { + constructor(props) { + super(props); + this.state = { salaryaccountingStatus: [] }; + } + + componentDidMount() { + commonEnumList({ enumClass: "com.engine.salary.enums.salaryaccounting.SalaryAcctOptEnum" }) + .then(({ status, data }) => { + if (status) { + this.setState({ + salaryaccountingStatus: _.map(data, item => ({ key: item.defaultLabel, showname: item.defaultLabel })) + }); + } + }); + } + render() { - const { queryParams } = this.props; - const { dateRange, name } = queryParams; + const { queryParams } = this.props, { salaryaccountingStatus } = this.state; + const { dateRange, name, lastOperates = [] } = queryParams; return (
+
+ {getLabel(111, "批量操作状态:")} + this.props.onChange({ lastOperates: v.split(",") })}/> +
{getLabel(543549, "薪资所属月:")}