From a7e75331e1a5b220f8b1f570beb3aed9bd2e3afb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Thu, 21 Mar 2024 13:49:18 +0800 Subject: [PATCH] =?UTF-8?q?hotfix/2.12.1.2403.02=201=E3=80=81=E5=B7=A5?= =?UTF-8?q?=E8=B5=84=E5=8D=95=E5=8F=91=E6=94=BE-=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E8=AF=A6=E6=83=85-=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2=20?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E8=83=BD=E5=A4=9A=E9=80=89=EF=BC=8C=20?= =?UTF-8?q?=E5=A4=9A=E9=80=89=E5=88=86=E9=83=A8=202=E3=80=81=E7=A4=BE?= =?UTF-8?q?=E4=BF=9D=E7=A6=8F=E5=88=A9=E5=8F=B0=E8=B4=A6=EF=BC=9A=E6=AD=A3?= =?UTF-8?q?=E5=B8=B8=E7=BC=B4=E7=BA=B3=E3=80=81=E8=A1=A5=E7=BC=B4=E3=80=81?= =?UTF-8?q?=E9=80=80=E5=B7=AE=E3=80=81=E8=A1=A5=E5=B7=AE=20=E9=AB=98?= =?UTF-8?q?=E7=BA=A7=E6=90=9C=E7=B4=A2=E5=A2=9E=E5=8A=A0=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E7=AD=9B=E9=80=89=EF=BC=8C=E5=A4=9A=E5=88=86=E9=83=A8=E7=AD=9B?= =?UTF-8?q?=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/payroll/payrollDetail/index.js | 9 ++++- .../components/makeupDifference.js | 4 +- .../standingBookDetail/components/normal.js | 39 ++++++++++++++----- .../standingBookDetail/components/regTop.js | 30 ++++++++++---- .../components/regression.js | 39 ++++++++++--------- pc4mobx/hrmSalary/stores/payroll.js | 6 ++- 6 files changed, 86 insertions(+), 41 deletions(-) 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 - - this.setState({ workcode: v })} - /> - + + + this.setState({ workcode: v })} + /> + + + this.setState({ departmentIds: v })}/> + + + this.setState({ subCompanyIds: v })}/> + + ; }; diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regTop.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regTop.js index 72acc3f1..0c6de7cc 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regTop.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regTop.js @@ -1,6 +1,6 @@ import React, { Component } from "react"; -import { Button } from "antd"; -import { WeaFormItem, WeaHelpfulTip, WeaInput, WeaLocaleProvider, WeaSearchGroup, WeaTab } from "ecCom"; +import { Button, Col, Row } from "antd"; +import { WeaBrowser, WeaFormItem, WeaHelpfulTip, WeaInput, WeaLocaleProvider, WeaSearchGroup, WeaTab } from "ecCom"; import { getQueryString } from "../../../../util/url"; const getLabel = WeaLocaleProvider.getLabel; @@ -11,6 +11,8 @@ class RegTop extends Component { this.state = { name: "", workcode: "", + departmentIds: "", + subCompanyIds: "", showSearchAd: false }; } @@ -56,12 +58,24 @@ class RegTop extends Component { }; getSearchs = () => { return - - this.setState({ workcode: v })} - /> - + + + this.setState({ workcode: v })} + /> + + + this.setState({ departmentIds: v })}/> + + + this.setState({ subCompanyIds: v })}/> + + ; }; diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regression.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regression.js index 4b4e790d..3b35e57e 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regression.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regression.js @@ -6,7 +6,6 @@ */ import React, { Component } from "react"; import { message, Modal } from "antd"; -import { WeaNewScroll } from "ecCom"; import RegTop from "./regTop"; import RegList from "./regList"; import RegAddEmployee from "./regAddEmployee"; @@ -75,6 +74,8 @@ class Regression extends Component { const { returnPersonModal } = 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 creator = Number(getQueryString("creator")); const paymentOrganization = getQueryString("paymentOrganization"); @@ -98,7 +99,7 @@ class Regression extends Component { window.open(url, "_self"); break; case "search": - this.regListRef.recessionList({ userName: name, workcode, current: 1 }); + this.regListRef.recessionList({ userName: name, workcode, departmentIds, subCompanyIds, current: 1 }); break; default: break; @@ -136,23 +137,23 @@ class Regression extends Component { />
{/**/} - this.regListRef = dom} - visible={returnPersonModal.visible} - onChangeRowkey={(selectKey) => this.setState({ selectKey })} - onEdit={this.handleEdit} - /> - {/*编辑弹框*/} - - {/* 弹框 */} - this.regEmmployeeRef = dom} - {...returnPersonModal} - loading={loading} - onCancel={this.handleCloseModal} - onSave={this.handleSave} - /> + this.regListRef = dom} + visible={returnPersonModal.visible} + onChangeRowkey={(selectKey) => this.setState({ selectKey })} + onEdit={this.handleEdit} + /> + {/*编辑弹框*/} + + {/* 弹框 */} + this.regEmmployeeRef = dom} + {...returnPersonModal} + loading={loading} + onCancel={this.handleCloseModal} + onSave={this.handleSave} + /> {/**/}
diff --git a/pc4mobx/hrmSalary/stores/payroll.js b/pc4mobx/hrmSalary/stores/payroll.js index e170d4fc..4da841d0 100644 --- a/pc4mobx/hrmSalary/stores/payroll.js +++ b/pc4mobx/hrmSalary/stores/payroll.js @@ -453,7 +453,11 @@ export class payrollStore { @action getInfoList = (params = {}) => { let form = this.grantListConditionForm.getFormParams(); - params = { ...form, ...params }; + params = { + ...form, ...params, + departmentIds: form.departmentIds ? form.departmentIds.split(",") : [], + subCompanyIds: form.subCompanyIds ? form.subCompanyIds.split(",") : [] + }; API.getInfoList(params).then(res => { if (res.status) { this.salaryGrantTableStore = res.data.columns;