diff --git a/pc4mobx/hrmSalary/pages/custom-pages/lingyue/components/generateDataDialog.js b/pc4mobx/hrmSalary/pages/custom-pages/lingyue/components/generateDataDialog.js index 447224b6..84b2eb2f 100644 --- a/pc4mobx/hrmSalary/pages/custom-pages/lingyue/components/generateDataDialog.js +++ b/pc4mobx/hrmSalary/pages/custom-pages/lingyue/components/generateDataDialog.js @@ -14,7 +14,6 @@ import { Button, message } from "antd"; import { getSearchs } from "../../../../util"; import * as API from "../../../../apis/custom-apis/lingyue"; import { dataConditions } from "./conditions"; -import { generateFundReport } from "../../../../apis/custom-apis/lingyue"; const getLabel = WeaLocaleProvider.getLabel; const APIFOX = { @@ -34,14 +33,18 @@ class GenerateDataDialog extends Component { } componentWillReceiveProps(nextProps, nextContext) { - if (nextProps.visible !== this.props.visible && nextProps.visible) this.initLYForm(); + if (nextProps.visible !== this.props.visible && nextProps.visible) this.initLYForm(nextProps); if (nextProps.visible !== this.props.visible && !nextProps.visible) nextProps.LYStore.initDataForm(); } initLYForm = () => { + const { type } = props; this.setState({ conditions: _.map(dataConditions, item => ({ - ...item, items: _.map(item.items, o => ({ ...o, label: getLabel(o.lanId, o.label) })) + ...item, + items: _.map(item.items, o => ({ + ...o, label: type === "salarySum" ? getLabel(111, "薪资所属月") : getLabel(o.lanId, o.label) + })) })) }, () => { const { LYStore: { dataForm } } = this.props; diff --git a/pc4mobx/hrmSalary/pages/custom-pages/lingyue/fundSummary/index.js b/pc4mobx/hrmSalary/pages/custom-pages/lingyue/fundSummary/index.js index 40e21518..74772ba7 100644 --- a/pc4mobx/hrmSalary/pages/custom-pages/lingyue/fundSummary/index.js +++ b/pc4mobx/hrmSalary/pages/custom-pages/lingyue/fundSummary/index.js @@ -53,7 +53,7 @@ class Index extends Component { + fycdgsqcLabel={getLabel(111, "费用承担公司")} queryDateLabel={getLabel(111, "费用所属期")}> this.listRef = dom} onInit={() => this.forceUpdate()} ffgsqcLabel={getLabel(111, "购买公司全称")} onChangeReport={this.getSIReportGmgsList}/> diff --git a/pc4mobx/hrmSalary/pages/custom-pages/lingyue/layout.js b/pc4mobx/hrmSalary/pages/custom-pages/lingyue/layout.js index 8f73ba1f..4c369fe6 100644 --- a/pc4mobx/hrmSalary/pages/custom-pages/lingyue/layout.js +++ b/pc4mobx/hrmSalary/pages/custom-pages/lingyue/layout.js @@ -38,7 +38,7 @@ class Layout extends Component { render() { const { title, query, onChange, listRef, isQuery, lyAuth = false, ffgsqcLabel, taxAgentStore: { salaryManager }, - companyOpts, costCompanyOpts, fycdgsqcLabel + companyOpts, costCompanyOpts, fycdgsqcLabel, queryDateLabel } = this.props, { options } = this.state; const { salaryMonth, ffgsqc, fycdgsqc, jtStatus, ffStatus } = query; let buttons = [ @@ -61,7 +61,7 @@ class Layout extends Component { onDropMenuClick={key => listRef.handleOperate(key)}>
- + onChange({ ...query, salaryMonth: value, isQuery: !isQuery })}/> diff --git a/pc4mobx/hrmSalary/pages/custom-pages/lingyue/salarySummary/index.js b/pc4mobx/hrmSalary/pages/custom-pages/lingyue/salarySummary/index.js index 5e725f9d..d54143f1 100644 --- a/pc4mobx/hrmSalary/pages/custom-pages/lingyue/salarySummary/index.js +++ b/pc4mobx/hrmSalary/pages/custom-pages/lingyue/salarySummary/index.js @@ -53,7 +53,7 @@ class Index extends Component { + fycdgsqcLabel={getLabel(111, "费用承担公司")} queryDateLabel={getLabel(111, "薪资所属月")}> this.listRef = dom} onInit={() => this.forceUpdate()} ffgsqcLabel={getLabel(111, "发放公司全称")} onChangeReport={this.getSalaryReportFFgsList}/> diff --git a/pc4mobx/hrmSalary/pages/custom-pages/lingyue/socialSummary/index.js b/pc4mobx/hrmSalary/pages/custom-pages/lingyue/socialSummary/index.js index 3f697d74..f70cf4d2 100644 --- a/pc4mobx/hrmSalary/pages/custom-pages/lingyue/socialSummary/index.js +++ b/pc4mobx/hrmSalary/pages/custom-pages/lingyue/socialSummary/index.js @@ -53,7 +53,7 @@ class Index extends Component { + fycdgsqcLabel={getLabel(111, "费用承担公司")} queryDateLabel={getLabel(111, "费用所属期")}> this.listRef = dom} onInit={() => this.forceUpdate()} ffgsqcLabel={getLabel(111, "购买公司全称")} onChangeReport={this.getSIReportGmgsList}/>