diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
index 75822c8e..27928717 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
@@ -252,7 +252,7 @@ class EditCalcTable extends Component {
calculateStore: { ECSearchForm, otherConditions }, routeParams: { salaryAcctRecordId },
taxAgentStore: { showOperateBtn, PageAndOptAuth }, calcDetail = false
} = this.props;
- const { confirmAuth, submitAuth } = toJS(PageAndOptAuth);
+ const { confirmAuth, submitAuth, isAdminEnable, isChief } = toJS(PageAndOptAuth);
const {
employeeIds, subcompanyIds, departmentIds, positionIds, statuses, htqslxList, rsdlgsList, ...extra
} = ECSearchForm.getFormParams();
@@ -277,8 +277,9 @@ 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,
- calcDetail: (calcDetail || !showOperateBtn) && !confirmAuth && !submitAuth,
- showSee: (calcDetail || !showOperateBtn), tableScrollHeight: 265, pageSum,
+ calcDetail: (((calcDetail || !showOperateBtn) && !confirmAuth && !submitAuth) || (!isAdminEnable && !isChief)),
+ showSee: calcDetail && (isAdminEnable || isChief), tableScrollHeight: 265, pageSum,
+ // (calcDetail || !showOperateBtn)
columns: _.every(traverse(columns, (calcDetail || !showOperateBtn)), (it, idx) => !it.fixed) ? _.map(traverse(columns, (calcDetail || !showOperateBtn)), (it, idx) => ({
...it,
fixed: idx < 2 ? "left" : false
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
index 5c830aa8..bc7bd265 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
@@ -244,7 +244,12 @@ class Index extends Component {
{getLabel(543546, "核算所选人员")}
);
- const moreMenu = (
+ const moreMenu = (!showOperateBtn && (confirmAuth || submitAuth)) ? (
+
+ ) : (