diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js index 9a460c53..4aa67eaa 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js @@ -162,7 +162,10 @@ class EditCalcTable extends Component { const sumRowlistUrl = this.props.showTotalCell ? "/api/bs/hrmsalary/salaryacct/acctresult/sum" : ""; this.postMessageToChild({ dataSource, pageInfo, selectedRowKeys, showTotalCell: this.props.showTotalCell, sumRowlistUrl, payload, - columns: _.map(traverse(columns), (it, idx) => ({ ...it, fixed: idx < 2 ? "left" : false })) + columns: _.every(traverse(columns), (it, idx) => !it.fixed) ? _.map(traverse(columns), (it, idx) => ({ + ...it, + fixed: idx < 2 ? "left" : false + })) : traverse(columns) }); }); } @@ -211,11 +214,12 @@ const traverse = (arr) => { if (!_.isEmpty(item.children)) { return { title: item.text, width: item.width + "px", ellipsis: true, - dataIndex: item.column, children: traverse(item.children) + dataIndex: item.column, children: traverse(item.children), + fixed: item.fixed || false }; } else { return { - title: item.text, width: item.width + "px", + title: item.text, width: item.width + "px", fixed: item.fixed || false, dataIndex: item.column, ellipsis: true, lockStatus: item.lockStatus }; } diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/index.js index db623a70..11312f3e 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/index.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/index.js @@ -634,7 +634,7 @@ class Index extends Component { }); }}>调薪); } - selectedKey !== "stop" && arrList.push(); + (showOperateBtn && selectedKey !== "stop") && arrList.push(); return arrList; }; //切换tab @@ -730,7 +730,7 @@ class Index extends Component { paysetParams, extEmpsWitch } = this.state; - const { payrollFilesStore: { tableStore } } = this.props; + const { payrollFilesStore: { tableStore }, taxAgentStore: { showOperateBtn } } = this.props; const renderSearch = () => { const searchItems = [ { com: this.Input("姓名", "username") }, @@ -871,6 +871,7 @@ class Index extends Component { { diff --git a/pc4mobx/hrmSalary/pages/salaryFile/salaryItemChangeList.js b/pc4mobx/hrmSalary/pages/salaryFile/salaryItemChangeList.js index 21b8042a..de239ae8 100644 --- a/pc4mobx/hrmSalary/pages/salaryFile/salaryItemChangeList.js +++ b/pc4mobx/hrmSalary/pages/salaryFile/salaryItemChangeList.js @@ -59,7 +59,7 @@ export default class SalaryItemChangeList extends React.Component { // 获取Columns getColumns = () => { - const { salaryFileStore: { singleSalaryItemList }, selectedKey } = this.props; + const { salaryFileStore: { singleSalaryItemList }, selectedKey, showOperateBtn } = this.props; let columns = []; if (singleSalaryItemList.columns) { columns = _.map([...singleSalaryItemList.columns], o => { @@ -83,7 +83,7 @@ export default class SalaryItemChangeList extends React.Component { } return { ...o, width, render: text => ({text}) }; }); - if (selectedKey === "fixed") { + if (showOperateBtn && selectedKey === "fixed") { columns = [...columns, { dataIndex: "operate", fixed: "right", width: 120, title: "操作", render: (text, record) => { diff --git a/pc4mobx/hrmSalary/pages/salaryFile/saralyFileViewSlide.js b/pc4mobx/hrmSalary/pages/salaryFile/saralyFileViewSlide.js index 59428135..24a3d631 100644 --- a/pc4mobx/hrmSalary/pages/salaryFile/saralyFileViewSlide.js +++ b/pc4mobx/hrmSalary/pages/salaryFile/saralyFileViewSlide.js @@ -80,7 +80,8 @@ export default class SalaryFileViewSlide extends React.Component { salaryFileStore: { detailForm, adjustSalaryItems, setAdjustSalaryItems }, selectedKey, handleSetpay, - paysetParams + paysetParams, + showOperateBtn } = this.props; const { baseInfo } = detailForm; const items = [ @@ -189,7 +190,7 @@ export default class SalaryFileViewSlide extends React.Component { > { this.state.selectedTab === "0" ? - : + : }