diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileList/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileList/index.js index 90c6938c..768e000c 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileList/index.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileList/index.js @@ -100,12 +100,12 @@ class Index extends Component { case "CHANGE-SALARY": case "VIEW": case "EDIT": - const { taxAgentStore: { showOperateBtn }, selectedKey: runStatuses } = this.props; + const { taxAgentStore: { showOperateBtn, isDepAuth }, selectedKey: runStatuses } = this.props; const { record: { id: salaryArchiveId } } = params; this.setState({ salaryFilesEditSlide: { ...this.state.salaryFilesEditSlide, visible: true, salaryArchiveId, - runStatuses, showOperateBtn + runStatuses, showOperateBtn: showOperateBtn || isDepAuth } }); break; @@ -172,7 +172,7 @@ class Index extends Component { }).catch(() => this.setState({ loading: false })); }; getColumns = () => { - const { payrollFilesStore: { tableStore }, taxAgentStore: { showOperateBtn } } = this.props; + const { payrollFilesStore: { tableStore }, taxAgentStore: { showOperateBtn, isDepAuth } } = this.props; const columns = _.map(_.filter(toJS(tableStore.columns), (item) => item.display === "true"), (it, idx) => ({ dataIndex: it.dataIndex, title: it.title, align: "left", width: (it.dataIndex === "taxAgentName" || it.dataIndex === "operate") ? 185 : 150, @@ -181,7 +181,7 @@ class Index extends Component { })); if (!_.isEmpty(columns)) { this.postMessageToChild({ - columns, showOperateBtn, selectedKey: this.props.selectedKey, + columns, showOperateBtn: showOperateBtn || isDepAuth, selectedKey: this.props.selectedKey, showDelSalaryFileBtn: this.props.showDelSalaryFileBtn, dataSource: this.state.dataSource, selectedRowKeys: this.state.selectedRowKeys, showSum: false, pageInfo: this.state.pageInfo diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/salaryFiles.js b/pc4mobx/hrmSalary/pages/payrollFiles/salaryFiles.js index 596b79c1..20084337 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/salaryFiles.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/salaryFiles.js @@ -241,14 +241,14 @@ class SalaryFiles extends Component { selectedKey, topTabCount, showSearchAd, isQuery, showDelSalaryFileBtn, showExtEmpsWitch, salaryFileImpDialog, salaryImportTypes, logDialogVisible, filterConditions } = this.state; - const { taxAgentStore: { showOperateBtn } } = this.props; + const { taxAgentStore: { showOperateBtn, isDepAuth } } = this.props; return (
} - iconBgcolor="#F14A2D" showDropIcon dropMenuDatas={renderDropMenuDatas(selectedKey, showOperateBtn)} + iconBgcolor="#F14A2D" showDropIcon dropMenuDatas={renderDropMenuDatas(selectedKey, showOperateBtn || isDepAuth)} onDropMenuClick={this.onDropMenuClick} - buttons={renderReqBtns(selectedKey, salaryImportTypes, this.handleReqBtnsCLick, showOperateBtn)} + buttons={renderReqBtns(selectedKey, salaryImportTypes, this.handleReqBtnsCLick, showOperateBtn || isDepAuth)} replaceTab={ {/*列表*/} this.salaryFileListRef = dom} - selectedKey={selectedKey} showOperateBtn={showOperateBtn} + selectedKey={selectedKey} showOperateBtn={showOperateBtn || isDepAuth} showDelSalaryFileBtn={showDelSalaryFileBtn} onChangeTopTabCount={this.queryInsuranceTabTotal} onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)} diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/index.js index f2844ef5..fb7debff 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/index.js @@ -145,15 +145,15 @@ class Index extends Component { selectedKey, topTabCount, showSearchAd, isQuery, recordDialogVisible, logDialogVisible, filterConditions, welfareImpDialog, showExtEmpsWitch } = this.state; - const { taxAgentStore: { showOperateBtn } } = this.props; + const { taxAgentStore: { showOperateBtn, isDepAuth } } = this.props; const tipList = _.find(welfareTipList, o => o.viewcondition === selectedKey).list; return (
} iconBgcolor="#F14A2D" showDropIcon onDropMenuClick={this.onDropMenuClick} - dropMenuDatas={renderDropMenuDatas(selectedKey, getLabel, showOperateBtn)} - buttons={renderReqBtns(selectedKey, getLabel, this.handleOpenAdvanceSearch, this.handleAdvanceSearch, this.onDropMenuClick, showOperateBtn)} + dropMenuDatas={renderDropMenuDatas(selectedKey, getLabel, showOperateBtn || isDepAuth)} + buttons={renderReqBtns(selectedKey, getLabel, this.handleOpenAdvanceSearch, this.handleAdvanceSearch, this.onDropMenuClick, showOperateBtn || isDepAuth)} replaceTab={ {/*列表*/} this.welfareListRef = dom} - runStatuses={selectedKey} showOperateBtn={showOperateBtn} + runStatuses={selectedKey} showOperateBtn={showOperateBtn || isDepAuth} onChangeTopTabCount={this.queryInsuranceTabTotal} onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)} />