diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js index f5589e45..0c12752c 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js @@ -125,17 +125,18 @@ class EditCalcTable extends Component { }, 500); }); const { routeParams: { salaryAcctRecordId } } = this.props; - updateLockStatus({ ...payload, salaryAcctRecordId }).then(({ status, errormsg }) => { - if (status) { - clearInterval(this.timerLock); - this.setState({ - progressVisible: false, - progress: 0 - }, () => this.queryCalcResultList()); - } else { - message.error(errormsg); - } - }); + updateLockStatus({ ...payload, salaryAcctRecordId, acctEmpIds: this.state.selectedRowKeys }) + .then(({ status, errormsg }) => { + if (status) { + clearInterval(this.timerLock); + this.setState({ + progressVisible: false, + progress: 0 + }, () => this.queryCalcResultList()); + } else { + message.error(errormsg); + } + }); } }); }; @@ -341,4 +342,4 @@ const traverse = (arr, calcDetail) => { }; } }); -}; +}; \ No newline at end of file diff --git a/pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js b/pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js index 928f715b..a7cd8b50 100644 --- a/pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js +++ b/pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js @@ -2,6 +2,7 @@ import React from "react"; import { inject, observer } from "mobx-react"; import { WeaLocaleProvider, WeaTable, WeaTop } from "ecCom"; import { getQueryString } from "../../util/url"; +import { sysinfo } from "../../apis/ruleconfig"; import * as API from "../../apis/declare"; import { Button } from "antd"; import "./index.less"; @@ -14,15 +15,21 @@ export default class GenerateDeclarationDetail extends React.Component { super(props); this.state = { loading: false, dataSource: [], columns: [], declareInfo: {}, - pageInfo: { current: 1, pageSize: 10, total: 0 } + pageInfo: { current: 1, pageSize: 10, total: 0 }, sysinfo: {} }; } componentDidMount() { this.getDetailList(); this.getDeclareInfo(); + this.getSysinfo(); } + getSysinfo = () => { + sysinfo().then(({ status, data: sysinfo }) => { + if (status) this.setState({ sysinfo }); + }); + }; getDetailList = () => { const { pageInfo } = this.state; const payload = { @@ -64,9 +71,10 @@ export default class GenerateDeclarationDetail extends React.Component { window.open(url, "_self"); }; renderTitle = () => { - const { declareInfo } = this.state; + const { declareInfo, sysinfo } = this.state; + const title = sysinfo["TAX_DECLARATION_DATE_TYPE"] === "1" ? getLabel(111, "税款所属期") : getLabel(111, "薪资所属月"); return ( - {getLabel(111, "薪资所属月")}:{declareInfo.salaryMonth} + {title}:{declareInfo.salaryMonth} {getLabel(111, "个税扣缴义务人")}:{declareInfo.taxAgentName} ); }; diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollDetail/payrollDetail.js b/pc4mobx/hrmSalary/pages/payroll/payrollDetail/payrollDetail.js index a0c9e495..ab058017 100644 --- a/pc4mobx/hrmSalary/pages/payroll/payrollDetail/payrollDetail.js +++ b/pc4mobx/hrmSalary/pages/payroll/payrollDetail/payrollDetail.js @@ -60,7 +60,8 @@ class PayrollDetail extends Component { render() { const { salarySendDetailBaseInfo, showSearchAd, conditions, isQuery, showTotalCell } = this.state; - const { taxAgentStore: { showOperateBtn } } = this.props; + const { taxAgentStore: { PageAndOptAuth } } = this.props; + const showOperateBtn = PageAndOptAuth.opts.length; const { salaryMonth, template } = salarySendDetailBaseInfo; const dropMenuDatas = [ { @@ -110,4 +111,4 @@ class PayrollDetail extends Component { } } -export default PayrollDetail; +export default PayrollDetail; \ No newline at end of file diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/makeupDifference.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/makeupDifference.js index c5e05729..66f4b8c1 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/makeupDifference.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/makeupDifference.js @@ -27,7 +27,7 @@ class MakeupDifference extends Component { tmpUrl: "exportSiaccountWelfarebalanceimporttemplatetetemplate", cacheUrl: "cacheBalanceWelfareList", importUrl: "importBalanceInsuranceDetail", - importparams: {} + importparams: {}, ..._.pick(this.props, ["billMonth", "paymentOrganization"]) }, returnEditPersonSlide: { title: "", editId: "", visible: false @@ -152,4 +152,4 @@ class MakeupDifference extends Component { } } -export default MakeupDifference; +export default MakeupDifference; \ No newline at end of file