diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/dimensionSlide.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/dimensionSlide.js index 92652ca1..f7104324 100644 --- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/dimensionSlide.js +++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/dimensionSlide.js @@ -168,11 +168,12 @@ class DimensionSlide extends Component { render() { const { loading, dimType, setting4RationGroupSpacing, setting4RationGroupIndividual } = this.state; const { form, condition } = this.props; + console.log(this.props); return ( diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js index 789f71b5..5fc4c40b 100644 --- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js +++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js @@ -240,7 +240,7 @@ class Index extends Component { }; render() { - const { taxAgentStore: { showOperateBtn }, attendanceStore: { statisticsForm, reportForm } } = this.props; + const { taxAgentStore: { statisticsReportBtn }, attendanceStore: { statisticsForm, reportForm } } = this.props; const { selectedKey, modalReq, slideReq, conditions, reportConditions, reportName } = this.state; const buttons = [ , @@ -252,13 +252,13 @@ class Index extends Component { onSearch={() => this.handleReqBtnsClick("search")}/> ]; const tabs = [ - { key: "statistics", title: getLabel(111, "统计表") }, - { key: "detail", title: getLabel(111, "员工明细") } + { key: "statistics", title: getLabel(111, "统计表") } + // { key: "detail", title: getLabel(111, "员工明细") } ]; return ( } - iconBgcolor="#F14A2D" buttons={!showOperateBtn ? buttons.slice(-1) : buttons} buttonSpace={10} + title={getLabel(111, "薪酬统计报表")} icon={} + iconBgcolor="#F14A2D" buttons={!statisticsReportBtn ? buttons.slice(-1) : buttons} buttonSpace={10} showDropIcon={false} tabDatas={tabs} className="xc_tj_fx_wrapper" selectedKey={selectedKey} onChange={selectedKey => this.setState({ selectedKey }, () => this.state.selectedKey === "statistics" && this.initReportFormCondition())} diff --git a/pc4mobx/hrmSalary/pages/reportView/components/customStatisticsItemsModal.js b/pc4mobx/hrmSalary/pages/reportView/components/customStatisticsItemsModal.js index 6cbc4959..f87d7912 100644 --- a/pc4mobx/hrmSalary/pages/reportView/components/customStatisticsItemsModal.js +++ b/pc4mobx/hrmSalary/pages/reportView/components/customStatisticsItemsModal.js @@ -339,7 +339,7 @@ class CustomStatisticsItemsModal extends Component { onClick={this.handleSaveStatisticalItems}>{getLabel(111, "保存")} } - style={{ width: 900, height: 500 }} + style={{ width: 900, height: 450 }} className="statisticItemsWrapper" >
@@ -357,21 +357,20 @@ class CustomStatisticsItemsModal extends Component { })) : []} completeParams={{ type: 162, - - fielddbtype: "browser.salaryItems", + fielddbtype: "browser.salaryItemBrowser", f_weaver_belongto_usertype: "0" }} conditionDataParams={{ - type: "browser.salaryItems", - fielddbtype: "browser.salaryItems", + type: "browser.salaryItemBrowser", + fielddbtype: "browser.salaryItemBrowser", f_weaver_belongto_usertype: "0" }} dataParams={{ - type: "browser.salaryItems", + type: "browser.salaryItemBrowser", f_weaver_belongto_usertype: "0" }} destDataParams={{ - type: "browser.salaryItems", + type: "browser.salaryItemBrowser", f_weaver_belongto_usertype: "0" }} isMultCheckbox diff --git a/pc4mobx/hrmSalary/stores/taxAgent.js b/pc4mobx/hrmSalary/stores/taxAgent.js index 7d95a81a..db2e38dd 100644 --- a/pc4mobx/hrmSalary/stores/taxAgent.js +++ b/pc4mobx/hrmSalary/stores/taxAgent.js @@ -16,6 +16,7 @@ export class TaxAgentStore { @observable showSearchAd = false; // 高级搜索面板显示 @observable showOperateBtn = false; // 页面操作按钮显示权限 @observable showSalaryItemBtn = false; // 薪资项目管理页面操作按钮显示权限 + @observable statisticsReportBtn = false; // 薪酬统计报表页面操作按钮显示权限 @observable loading = false; // 数据加载状态 @observable modalVisiable = false; // EditModal 模态框 @observable columns = []; @@ -37,6 +38,7 @@ export class TaxAgentStore { @action setShowOperateBtn = bool => (this.showOperateBtn = bool); @action setSalaryItemBtn = bool => (this.showSalaryItemBtn = bool);//薪资项目权限 + @action setStatisticsReportBtn = bool => (this.statisticsReportBtn = bool);//薪酬统计报表权限 // 初始化操作 @action @@ -141,6 +143,8 @@ export class TaxAgentStore { !isOpenDevolution ? true : isAdminEnable ? true : false ); this.setSalaryItemBtn((isOpenDevolution && (isChief || isAdminEnable))); + //薪酬统计报表权限 + this.setStatisticsReportBtn(!isOpenDevolution ? true : !!(isAdminEnable || isChief)); resolve({ status, data }); } else { reject();