-
1、数据进入【待减员】规则：①员工的人事状态属性从在职变成非在职，且在【在缴员工】里；②【在缴员工】里档案维护了缴纳终止月且小于等于当前月；③个税扣缴义务人发生调整；④某员工分权时在原个税扣缴义务人下处于【在缴员工】里但又将该员工添加到其他的个税扣缴义务人下的情况；
+ {/*④某员工分权时在原个税扣缴义务人下处于【在缴员工】里但又将该员工添加到其他的个税扣缴义务人下的情况；*/}
+
1、数据进入【待减员】规则：①员工的人事状态属性从在职变成非在职，且在【在缴员工】里；②【在缴员工】里档案维护了缴纳终止月且小于等于当前月；③个税扣缴义务人发生调整；
2、【待减员】为是否不再缴纳的待办状态，数据是从【在缴员工】中复制的，若不处理列表中的待办数据，也不影响社保福利核算；【待减员】维护的数据和【在缴员工】数据是同步的；
3、点击【减员】前先维护最后缴纳月，所有有起始缴纳月的福利项的最后缴纳月都小于等于当前月且无未归档的核算数据的档案才能减员成功，减员成功后数据进入【停缴员工】；
{/*
4、数据进入【待减员】规则的第四种情况下，若还需要在当前个税扣缴义务人下进行缴纳的话，当前该员工的【待减员】数据进行【删除待办】操作即可；若不在该个税扣缴义务人下继续缴纳，维护好最后缴纳月后进行【减员】操作，员工进入【停缴员工】；
*/}
@@ -500,7 +501,7 @@ export default class Archives extends React.Component {
default:
dom =
1、不需要缴纳社保福利的员工，保存在【停缴员工】；
-
2、【停缴员工】点击取消停缴，数据会回退到上次的位置（从【待减员】减员到停缴员工的，点击停缴返回到【在缴员工】，不返回到【待减员】）；
+ {/*
2、【停缴员工】点击取消停缴，数据会回退到上次的位置（从【待减员】减员到停缴员工的，点击停缴返回到【在缴员工】，不返回到【待减员】）；
*/}
{/*
3、若员工的社保福利从一个个税扣缴义务人下转到另一个个税扣缴义务人下去缴纳，则在转后的个税扣缴义务人的【待增员】中进行增员操作成功后，员工进入待【在缴员工】，而在原个税扣缴义务人下的【停缴员工】中，该员工数据将会被删除；是否开启分权员工的档案数据都只保存一份；
*/}
;
break;
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less
index 1373bb3d..9ed9d668 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less
@@ -77,6 +77,9 @@
.tableWrapper {
flex: 1;
overflow: hidden;
+ .ant-spin-nested-loading, .ant-spin-container {
+ height: 100%;
+ }
}
.tdEllipsis {
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
index b3b61565..f0a6cf0e 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
@@ -13,8 +13,7 @@ import { getQueryString } from "../../../../util/url";
import ProgressModal from "../../../../components/progressModal";
import AcctResultImportModal from "../../../calculateDetail/acctResult/importModal/acctResultImportModal";
import AdjustmentSlide from "./adjustmentSlide";
-import { getCalculateProgress, siaccountDetailCommonListSum } from "../../../../apis/calculate";
-import { sysConfCodeRule } from "../../../../apis/ruleconfig";
+import { getCalculateProgress } from "../../../../apis/calculate";
import RegEditDetial from "./regEditDetial";
import SupplementarySlide from "./supplementarySlide";
import _ from "lodash";
@@ -76,13 +75,7 @@ export default class NormalIndex extends Component {
handleReceive = async ({ data }) => {
const { type, payload: { id, params } = {} } = data;
if (type === "init") {
- const { selectedKey } = this.props;
- const { status, data: sysData } = await this.sysConfCodeRule();
- const { data: { sumRow: siaccountSum } } = await this.siaccountDetailCommonListSum();
- this.setState({
- showSum: selectedKey === "1" && status && sysData === "1",
- siaccountSum
- }, () => this.postMessageToChild());
+ this.postMessageToChild();
} else if (type === "turn") {
if (id === "PAGEINFO") {
const { pageNum: current, size: pageSize } = params;
@@ -105,13 +98,6 @@ export default class NormalIndex extends Component {
}
}
};
- sysConfCodeRule = () => {
- return sysConfCodeRule({ code: "OPEN_ACCT_RESULT_SUM" });
- };
- siaccountDetailCommonListSum = () => {
- const { billMonth, paymentOrganization } = this.props;
- return siaccountDetailCommonListSum({ billMonth, paymentOrganization });
- };
componentWillUnmount() {
if (this.timer) {
@@ -138,20 +124,22 @@ export default class NormalIndex extends Component {
}
postMessageToChild = () => {
+ const billMonth = getQueryString("billMonth");
+ const paymentOrganization = getQueryString("paymentOrganization");
const childFrameObj = document.getElementById("atdTable");
- const { current, pageSize, tableData, selectedRowKeys, showSum, siaccountSum } = this.state;
+ const { current, pageSize, tableData, selectedRowKeys, showSum, siaccountSum, searchValue: userName } = this.state;
const { list: dataSource, total, columns } = tableData;
const pageInfo = { current, pageSize, total };
childFrameObj.contentWindow.postMessage(JSON.stringify({
dataSource, columns, pageInfo,
- selectedRowKeys, showSum, siaccountSum,
+ selectedRowKeys, selectedKey: this.props.selectedKey,
+ sumpayload: { billMonth, paymentOrganization, userName },
showOperates: !getQueryString("type")
}), "*");
};
handleSearch(value) {
const { billMonth, selectedKey, paymentOrganization } = this.props;
- const { current } = this.state;
selectedKey === "1"
? this.getNormalList({
billMonth,
@@ -242,27 +230,19 @@ export default class NormalIndex extends Component {
}
};
getNormalList = async (payload = {}) => {
- const { status, data: sysData } = await this.sysConfCodeRule();
- const { data: { sumRow: siaccountSum } } = await this.siaccountDetailCommonListSum();
const { getNormalList } = this.props.standingBookStore;
getNormalList({ ...payload }).then(({ list, columns = [], total }) => {
this.setState({
- showSum: this.props.selectedKey === "1" && status && sysData === "1",
- siaccountSum,
tableData: { list, total, columns }
}, () => this.postMessageToChild());
});
};
getSupplementaryList = async (payload = {}) => {
- const { status, data: sysData } = await this.sysConfCodeRule();
- const { data: { sumRow: siaccountSum } } = await this.siaccountDetailCommonListSum();
const { getSupplementaryList } = this.props.standingBookStore;
getSupplementaryList({
...payload
}).then(({ list, columns = [], total }) => {
this.setState({
- showSum: this.props.selectedKey === "1" && status && sysData === "1",
- siaccountSum,
tableData: { list, columns, total }
}, () => this.postMessageToChild());
});
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js
index 87f373f4..e904adb9 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js
@@ -270,7 +270,7 @@ class RegEditDetial extends Component {
}