diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollDetail/index.js b/pc4mobx/hrmSalary/pages/payroll/payrollDetail/index.js
index 6e6479c0..efa982db 100644
--- a/pc4mobx/hrmSalary/pages/payroll/payrollDetail/index.js
+++ b/pc4mobx/hrmSalary/pages/payroll/payrollDetail/index.js
@@ -87,9 +87,14 @@ export default class PayrollDetail extends React.Component {
const { child, ...extraParams } = extra;
const salarySendId = getQueryString("id");
const { payrollStore } = this.props;
- const { detailListConditionForm: form } = payrollStore;
- const payload = { salarySendId, ...pageInfo, ...extraParams, ...form.getFormParams() };
+ const { detailListConditionForm: form, setDetailListShowSearchAd } = payrollStore;
+ const payload = {
+ salarySendId, ...pageInfo, ...extraParams, ...form.getFormParams(),
+ departmentIds: form.getFormParams().departmentIds ? form.getFormParams().departmentIds.split(",") : [],
+ subCompanyIds: form.getFormParams().subCompanyIds ? form.getFormParams().subCompanyIds.split(",") : []
+ };
this.setState({ loading: true });
+ setDetailListShowSearchAd(false)
getPayrollDetailList(payload).then(({ status, data }) => {
this.setState({ loading: false });
if (status) {
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/makeupDifference.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/makeupDifference.js
index 9ff5fb28..d0085fd7 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/makeupDifference.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/makeupDifference.js
@@ -62,6 +62,8 @@ class MakeupDifference extends Component {
const { importDiffModal, addPersonalDialog } = this.state;
const name = this.regTopRef.state.name;
const workcode = this.regTopRef.state.workcode;
+ const departmentIds = this.regTopRef.state.departmentIds ? this.regTopRef.state.departmentIds.split(",") : [];
+ const subCompanyIds = this.regTopRef.state.subCompanyIds ? this.regTopRef.state.subCompanyIds.split(",") : [];
const billMonth = getQueryString("billMonth");
const paymentOrganization = getQueryString("paymentOrganization");
switch (key) {
@@ -85,7 +87,7 @@ class MakeupDifference extends Component {
window.open(url, "_self");
break;
case "search":
- this.diffListRef.recessionList({ userName: name, workcode, current: 1 });
+ this.diffListRef.recessionList({ userName: name, workcode, departmentIds, subCompanyIds, current: 1 });
break;
case "add":
this.setState({
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
index 45f1a728..d7366471 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
@@ -5,9 +5,9 @@
* LastEditTime: 2022-06-29 09:53:36
*/
import React, { Component } from "react";
-import { Button, Icon, message, Modal, Spin, Tooltip } from "antd";
+import { Button, Col, Icon, message, Modal, Row, Spin, Tooltip } from "antd";
import { inject, observer } from "mobx-react";
-import { WeaFormItem, WeaInput, WeaSearchGroup, WeaTab } from "ecCom";
+import { WeaBrowser, WeaFormItem, WeaInput, WeaLocaleProvider, WeaSearchGroup, WeaTab } from "ecCom";
import { calcPageNo } from "../../../../util";
import { getQueryString } from "../../../../util/url";
import ProgressModal from "../../../../components/progressModal";
@@ -19,6 +19,7 @@ import SupplementarySlide from "./supplementarySlide";
import _ from "lodash";
import "./index.less";
+const getLabel = WeaLocaleProvider.getLabel;
@inject("standingBookStore")
@observer
export default class NormalIndex extends Component {
@@ -44,6 +45,8 @@ export default class NormalIndex extends Component {
},
searchValue: "",
workcode: "",
+ departmentIds: "",
+ subCompanyIds: "",
progressVisible: false,
progress: 0,
fieldData: {}, //选中的表单头信息
@@ -149,14 +152,18 @@ export default class NormalIndex extends Component {
current: 1,
paymentOrganization,
userName: this.state.searchValue,
- workcode: this.state.workcode
+ workcode: this.state.workcode,
+ departmentIds: this.state.departmentIds ? this.state.departmentIds.split(",") : [],
+ subCompanyIds: this.state.subCompanyIds ? this.state.subCompanyIds.split(",") : []
})
: this.getSupplementaryList({
billMonth,
current: 1,
paymentOrganization,
userName: this.state.searchValue,
- workcode: this.state.workcode
+ workcode: this.state.workcode,
+ departmentIds: this.state.departmentIds ? this.state.departmentIds.split(",") : [],
+ subCompanyIds: this.state.subCompanyIds ? this.state.subCompanyIds.split(",") : []
});
};
@@ -445,12 +452,24 @@ export default class NormalIndex extends Component {
};
getSearchs = () => {
return