{
decentralization === "0" ?
getSearchs(salarytaxAgentForm, convertConditon(decentralizationConditions, !isChief), 1, false) :
diff --git a/pc4mobx/hrmSalary/pages/salary/components/index.less b/pc4mobx/hrmSalary/pages/salary/components/index.less
index 0bd7ee92..921c6451 100644
--- a/pc4mobx/hrmSalary/pages/salary/components/index.less
+++ b/pc4mobx/hrmSalary/pages/salary/components/index.less
@@ -1,4 +1,21 @@
.taxAgentSlideContent {
+ height: 100%;
+ background: #F6F6F6;
+
+ .ant-steps {
+ margin: 0 0 20px 0 !important;
+ padding-top: 20px;
+ }
+
+ .personal-scope {
+ padding: 8px 16px;
+ height: 100%;
+
+ .wea-tab, .wea-new-table {
+ background: #FFF;
+ }
+ }
+
.baseSettingWrapper, .taxDeclarationInfoWrapper {
padding: 12px 12px 12px 20px;
diff --git a/pc4mobx/hrmSalary/pages/salary/components/personalScope.js b/pc4mobx/hrmSalary/pages/salary/components/personalScope.js
index 66070632..37356d3d 100644
--- a/pc4mobx/hrmSalary/pages/salary/components/personalScope.js
+++ b/pc4mobx/hrmSalary/pages/salary/components/personalScope.js
@@ -191,18 +191,18 @@ class PersonalScope extends Component {
value={searchValue}
onChange={searchValue => this.setState({ searchValue })}
placeholder="请输入对象"
- onSearch={() => this.personalScopeTableRef.getPersonalScopeList()}
+ onSearch={() => this.personalScopeTableRef.getPersonalScopeList(selectedKey, 1)}
/>
] : [
this.setState({ searchValue })}
placeholder="请输入对象"
- onSearch={() => this.personalScopeTableRef.getPersonalScopeList()}
+ onSearch={() => this.personalScopeTableRef.getPersonalScopeList(selectedKey, 1)}
/>];
(selectedKey === "listExclude" || selectedKey === "listExt") && btns.shift();
return (
-
+
{
+ getPersonalScopeList = (tabActive = this.props.tabActive, current) => {
const { searchValue, taxAgentId } = this.props;
const { pageInfo, loading } = this.state;
const payload = {
- taxAgentId,
- targetName: searchValue,
- ...pageInfo
+ taxAgentId, targetName: searchValue, ...pageInfo, current: current || pageInfo.current
};
this.setState({ loading: { ...loading, query: true } });
APIFox[tabActive](payload).then(({ status, data }) => {
@@ -129,6 +127,7 @@ class PersonalScopeTable extends Component {
pagination={pagination}
loading={loading.query}
columns={columns}
+ scroll={{ y: `calc(100vh - 230px)` }}
/>
);
}
diff --git a/pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js b/pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js
index 074d2590..1a6140cd 100644
--- a/pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js
+++ b/pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js
@@ -8,12 +8,13 @@ import React, { Component } from "react";
import { inject, observer } from "mobx-react";
import { Button, message, Modal } from "antd";
import { WeaLocaleProvider, WeaSlideModal, WeaSteps } from "ecCom";
-import SlideModalTitle from "../../../components/slideModalTitle";
import { decentralizationConditions, editConditions } from "../../taxAgent/editConditions";
import BaseSettings, { convertConditon } from "./baseSettings";
import PersonalScope from "./personalScope";
import TaxDeclarationInfo from "./taxDeclarationInfo";
import TaxFilingInfoDialofg from "./taxFillingInfoDialog";
+import WeaTopTitle from "../../../components/custom-title/weaTopTitle";
+import WeaReqTitle from "../../../components/custom-title/weaReqTitle";
import * as API from "../../../apis/taxAgent";
import { registrationCheck } from "../../../apis/taxAgent";
import "./index.less";
@@ -226,9 +227,6 @@ class TaxAgentSlide extends Component {
}
return CurrentDom;
};
- handleChangeSlideTab = (current) => {
- this.setState({ current: Number(current) });
- };
handleSubmit = (selectKey) => {
const { taxFilingInfoDialofg, taxAgentId } = this.state;
const { fieldForm } = this.taxInfoRef.state;
@@ -267,7 +265,7 @@ class TaxAgentSlide extends Component {
render() {
const {
- isEdit, title, visible, onCancel, salaryOn, decentralization, isChief, taxAgentStore: { showOperateBtn }
+ isEdit, title, visible, onCancel, salaryOn, decentralization, isChief, taxAgentStore: { PageAndOptAuth }
} = this.props;
const { current, taxAgentId, taxFilingInfoDialofg, loading, verifyLoading } = this.state;
let tabs = [
@@ -308,28 +306,15 @@ class TaxAgentSlide extends Component {
}
];
tabs = !salaryOn ? _.filter(tabs, it => it.key !== 1) : tabs;
+ const showOperateBtn = PageAndOptAuth.opts.includes("admin");
return (
{
- }}
- selectedTab={current}
- customOperate={this.renderCustomOperate()}
- subItemChange={this.handleChangeSlideTab}
- />
+ !taxAgentId ? current === o.key).createBtns}/> :
+ current === o.key).editBtns : []}
+ tabDatas={tabs} selectedKey={String(current)} title={title}
+ onChange={cur => this.setState({ current: parseInt(cur) })}/>
}
content={
diff --git a/pc4mobx/hrmSalary/pages/salary/index.less b/pc4mobx/hrmSalary/pages/salary/index.less
index 6c63517f..e6dacf00 100644
--- a/pc4mobx/hrmSalary/pages/salary/index.less
+++ b/pc4mobx/hrmSalary/pages/salary/index.less
@@ -72,4 +72,30 @@
//margin-top: -6px;
}
}
+
+ .taxAgentSlide {
+ .wea-slide-modal-title {
+ height: auto;
+ line-height: normal;
+ text-align: left;
+ background: #FFF;
+
+ .wea-new-top .ant-col-10 {
+ padding-right: 45px !important;
+ }
+ }
+
+ .rodal-close {
+ z-index: 99;
+ top: 10px !important;
+ }
+
+ .wea-new-top-req-wapper .wea-new-top-req-title > div:last-child {
+ right: 45px !important;
+ }
+
+ .wea-slide-modal-content {
+ height: 100%;
+ }
+ }
}