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

pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editSalaryCalcSlide.js

@@ -43,7 +43,7 @@ class EditSalaryCalcSlide extends Component {
     });
   };
   renderTitle = () => {
-    const { loading } = this.state, { viewAttr } = this.props;
+    const { loading, itemsByGroup } = this.state, { viewAttr } = this.props;
     return <div className="titleDialog">
       <div className="titleCol titleLeftBox">
         <div className="titleIcon"><i className="icon-coms-fa"/></div>
@@ -52,7 +52,7 @@ class EditSalaryCalcSlide extends Component {
       <div className="titleCol titleRightBox">
         {
           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>;

pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js

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