qt
/
salary-management-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release/3.0.1.2504.01-合并业务线' into release/2.19.1.2503.01-业务线个税

This commit is contained in:
lys 2025-06-12 11:04:57 +08:00
parent 28c04380f9 b0e7cbfc41
commit e244468854
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editSalaryCalcSlide.js
View File

@ -43,7 +43,7 @@ class EditSalaryCalcSlide extends Component {
}); });
}; };
renderTitle = () => { renderTitle = () => {
const { loading } = this.state, { viewAttr } = this.props; const { loading, itemsByGroup } = this.state, { viewAttr } = this.props;
return <div className="titleDialog"> return <div className="titleDialog">
<div className="titleCol titleLeftBox"> <div className="titleCol titleLeftBox">
<div className="titleIcon"><i className="icon-coms-fa"/></div> <div className="titleIcon"><i className="icon-coms-fa"/></div>
@ -52,7 +52,7 @@ class EditSalaryCalcSlide extends Component {
<div className="titleCol titleRightBox"> <div className="titleCol titleRightBox">
{ {
viewAttr === 2 && viewAttr === 2 &&
<Button type="primary" onClick={this.save} loading={loading}>{getLabel(537558, "保存")}</Button> <Button type="primary" disabled={_.isEmpty(itemsByGroup)} onClick={this.save} loading={loading}>{getLabel(537558, "保存")}</Button>
} }
</div> </div>
</div>; </div>;

6
pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js
View File

@ -73,9 +73,9 @@ export default class GenerateDeclarationDetail extends React.Component {
render() { render() {
const { loading, pageInfo, columns, dataSource } = this.state; const { loading, pageInfo, columns, dataSource } = this.state;
const { taxAgentStore: { showOperateBtn } } = this.props; const { taxAgentStore: { PageAndOptAuth } } = this.props;
const buttons = showOperateBtn ? [<Button type="primary" const buttons = !!PageAndOptAuth.opts.length ? [<Button type="primary"
onClick={this.handleExport}>{getLabel(111, "导出全部")}</Button>] : []; onClick={this.handleExport}>{getLabel(111, "导出全部")}</Button>] : [];
const pagination = { const pagination = {
...pageInfo, ...pageInfo,
showTotal: (total) => `共 ${total} 条`, showTotal: (total) => `共 ${total} 条`,