qt
/
salary-management-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hotfix/2.12.1.2403.02 

1、工资单发放-查看详情-高级搜索 部门能多选， 多选分部
2、社保福利台账：正常缴纳、补缴、退差、补差 高级搜索增加部门筛选，多分部筛选
This commit is contained in:
黎永顺 2024-03-21 13:49:18 +08:00
parent 272e45d3e5
commit a7e75331e1
6 changed files with 86 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pc4mobx/hrmSalary/pages/payroll/payrollDetail/index.js
View File

@ -87,9 +87,14 @@ export default class PayrollDetail extends React.Component {
const { child, ...extraParams } = extra; const { child, ...extraParams } = extra;
const salarySendId = getQueryString("id"); const salarySendId = getQueryString("id");
const { payrollStore } = this.props; const { payrollStore } = this.props;
const { detailListConditionForm: form } = payrollStore; const { detailListConditionForm: form, setDetailListShowSearchAd } = payrollStore;
const payload = { salarySendId, ...pageInfo, ...extraParams, ...form.getFormParams() }; 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 }); this.setState({ loading: true });
setDetailListShowSearchAd(false)
getPayrollDetailList(payload).then(({ status, data }) => { getPayrollDetailList(payload).then(({ status, data }) => {
this.setState({ loading: false }); this.setState({ loading: false });
if (status) { if (status) {

4
pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/makeupDifference.js
View File

@ -62,6 +62,8 @@ class MakeupDifference extends Component {
const { importDiffModal, addPersonalDialog } = this.state; const { importDiffModal, addPersonalDialog } = this.state;
const name = this.regTopRef.state.name; const name = this.regTopRef.state.name;
const workcode = this.regTopRef.state.workcode; 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 billMonth = getQueryString("billMonth");
const paymentOrganization = getQueryString("paymentOrganization"); const paymentOrganization = getQueryString("paymentOrganization");
switch (key) { switch (key) {
@ -85,7 +87,7 @@ class MakeupDifference extends Component {
window.open(url, "_self"); window.open(url, "_self");
break; break;
case "search": case "search":
this.diffListRef.recessionList({ userName: name, workcode, current: 1 }); this.diffListRef.recessionList({ userName: name, workcode, departmentIds, subCompanyIds, current: 1 });
break; break;
case "add": case "add":
this.setState({ this.setState({

39
pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
View File

@ -5,9 +5,9 @@
* LastEditTime: 2022-06-29 09:53:36 * LastEditTime: 2022-06-29 09:53:36
*/ */
import React, { Component } from "react"; 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 { 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 { calcPageNo } from "../../../../util";
import { getQueryString } from "../../../../util/url"; import { getQueryString } from "../../../../util/url";
import ProgressModal from "../../../../components/progressModal"; import ProgressModal from "../../../../components/progressModal";
@ -19,6 +19,7 @@ import SupplementarySlide from "./supplementarySlide";
import _ from "lodash"; import _ from "lodash";
import "./index.less"; import "./index.less";
const getLabel = WeaLocaleProvider.getLabel;
@inject("standingBookStore") @inject("standingBookStore")
@observer @observer
export default class NormalIndex extends Component { export default class NormalIndex extends Component {
@ -44,6 +45,8 @@ export default class NormalIndex extends Component {
}, },
searchValue: "", searchValue: "",
workcode: "", workcode: "",
departmentIds: "",
subCompanyIds: "",
progressVisible: false, progressVisible: false,
progress: 0, progress: 0,
fieldData: {}, //选中的表单头信息 fieldData: {}, //选中的表单头信息
@ -149,14 +152,18 @@ export default class NormalIndex extends Component {
current: 1, current: 1,
paymentOrganization, paymentOrganization,
userName: this.state.searchValue, 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({ : this.getSupplementaryList({
billMonth, billMonth,
current: 1, current: 1,
paymentOrganization, paymentOrganization,
userName: this.state.searchValue, 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 = () => { getSearchs = () => {
return <WeaSearchGroup needTigger showGroup title="其他条件"> return <WeaSearchGroup needTigger showGroup title="其他条件">
<WeaFormItem label="工号" labelCol={{ span: 4 }} wrapperCol={{ span: 8 }}> <Row>
<WeaInput <Col span={12}><WeaFormItem label="工号" labelCol={{ span: 4 }} wrapperCol={{ span: 18 }}>
value={this.state.workcode} <WeaInput
onChange={v => this.setState({ workcode: v })} value={this.state.workcode}
/> onChange={v => this.setState({ workcode: v })}
</WeaFormItem> />
</WeaFormItem></Col>
<Col span={12}><WeaFormItem label={getLabel(27511, "部门")} labelCol={{ span: 4 }} wrapperCol={{ span: 18 }}>
<WeaBrowser
isSingle={false} value={this.state.departmentIds} type={57}
onChange={v => this.setState({ departmentIds: v })}/>
</WeaFormItem></Col>
<Col span={12}><WeaFormItem label={getLabel(33553, "分部")} labelCol={{ span: 4 }} wrapperCol={{ span: 18 }}>
<WeaBrowser
isSingle={false} value={this.state.subCompanyIds} type={164}
onChange={v => this.setState({ subCompanyIds: v })}/>
</WeaFormItem></Col>
</Row>
</WeaSearchGroup>; </WeaSearchGroup>;
}; };

30
pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regTop.js
View File

@ -1,6 +1,6 @@
import React, { Component } from "react"; import React, { Component } from "react";
import { Button } from "antd"; import { Button, Col, Row } from "antd";
import { WeaFormItem, WeaHelpfulTip, WeaInput, WeaLocaleProvider, WeaSearchGroup, WeaTab } from "ecCom"; import { WeaBrowser, WeaFormItem, WeaHelpfulTip, WeaInput, WeaLocaleProvider, WeaSearchGroup, WeaTab } from "ecCom";
import { getQueryString } from "../../../../util/url"; import { getQueryString } from "../../../../util/url";
const getLabel = WeaLocaleProvider.getLabel; const getLabel = WeaLocaleProvider.getLabel;
@ -11,6 +11,8 @@ class RegTop extends Component {
this.state = { this.state = {
name: "", name: "",
workcode: "", workcode: "",
departmentIds: "",
subCompanyIds: "",
showSearchAd: false showSearchAd: false
}; };
} }
@ -56,12 +58,24 @@ class RegTop extends Component {
}; };
getSearchs = () => { getSearchs = () => {
return <WeaSearchGroup needTigger showGroup title="其他条件"> return <WeaSearchGroup needTigger showGroup title="其他条件">
<WeaFormItem label="工号" labelCol={{ span: 4 }} wrapperCol={{ span: 8 }}> <Row>
<WeaInput <Col span={12}><WeaFormItem label="工号" labelCol={{ span: 4 }} wrapperCol={{ span: 18 }}>
value={this.state.workcode} <WeaInput
onChange={v => this.setState({ workcode: v })} value={this.state.workcode}
/> onChange={v => this.setState({ workcode: v })}
</WeaFormItem> />
</WeaFormItem></Col>
<Col span={12}><WeaFormItem label={getLabel(27511, "部门")} labelCol={{ span: 4 }} wrapperCol={{ span: 18 }}>
<WeaBrowser
isSingle={false} value={this.state.departmentIds} type={57}
onChange={v => this.setState({ departmentIds: v })}/>
</WeaFormItem></Col>
<Col span={12}><WeaFormItem label={getLabel(33553, "分部")} labelCol={{ span: 4 }} wrapperCol={{ span: 18 }}>
<WeaBrowser
isSingle={false} value={this.state.subCompanyIds} type={164}
onChange={v => this.setState({ subCompanyIds: v })}/>
</WeaFormItem></Col>
</Row>
</WeaSearchGroup>; </WeaSearchGroup>;
}; };

39
pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regression.js
View File

@ -6,7 +6,6 @@
*/ */
import React, { Component } from "react"; import React, { Component } from "react";
import { message, Modal } from "antd"; import { message, Modal } from "antd";
import { WeaNewScroll } from "ecCom";
import RegTop from "./regTop"; import RegTop from "./regTop";
import RegList from "./regList"; import RegList from "./regList";
import RegAddEmployee from "./regAddEmployee"; import RegAddEmployee from "./regAddEmployee";
@ -75,6 +74,8 @@ class Regression extends Component {
const { returnPersonModal } = this.state; const { returnPersonModal } = this.state;
const name = this.regTopRef.state.name; const name = this.regTopRef.state.name;
const workcode = this.regTopRef.state.workcode; 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 billMonth = getQueryString("billMonth");
const creator = Number(getQueryString("creator")); const creator = Number(getQueryString("creator"));
const paymentOrganization = getQueryString("paymentOrganization"); const paymentOrganization = getQueryString("paymentOrganization");
@ -98,7 +99,7 @@ class Regression extends Component {
window.open(url, "_self"); window.open(url, "_self");
break; break;
case "search": case "search":
this.regListRef.recessionList({ userName: name, workcode, current: 1 }); this.regListRef.recessionList({ userName: name, workcode, departmentIds, subCompanyIds, current: 1 });
break; break;
default: default:
break; break;
@ -136,23 +137,23 @@ class Regression extends Component {
/> />
<div className="tableWrapper"> <div className="tableWrapper">
{/*<WeaNewScroll height="100%">*/} {/*<WeaNewScroll height="100%">*/}
<RegList <RegList
type="regression" type="regression"
ref={dom => this.regListRef = dom} ref={dom => this.regListRef = dom}
visible={returnPersonModal.visible} visible={returnPersonModal.visible}
onChangeRowkey={(selectKey) => this.setState({ selectKey })} onChangeRowkey={(selectKey) => this.setState({ selectKey })}
onEdit={this.handleEdit} onEdit={this.handleEdit}
/> />
{/*编辑弹框*/} {/*编辑弹框*/}
<RegEditDetial {...returnEditPersonSlide} onCancel={this.handleCloseModal}/> <RegEditDetial {...returnEditPersonSlide} onCancel={this.handleCloseModal}/>
{/* 弹框 */} {/* 弹框 */}
<RegAddEmployee <RegAddEmployee
ref={dom => this.regEmmployeeRef = dom} ref={dom => this.regEmmployeeRef = dom}
{...returnPersonModal} {...returnPersonModal}
loading={loading} loading={loading}
onCancel={this.handleCloseModal} onCancel={this.handleCloseModal}
onSave={this.handleSave} onSave={this.handleSave}
/> />
{/*</WeaNewScroll>*/} {/*</WeaNewScroll>*/}
</div> </div>
</div> </div>

6
pc4mobx/hrmSalary/stores/payroll.js
View File

@ -453,7 +453,11 @@ export class payrollStore {
@action @action
getInfoList = (params = {}) => { getInfoList = (params = {}) => {
let form = this.grantListConditionForm.getFormParams(); 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 => { API.getInfoList(params).then(res => {
if (res.status) { if (res.status) {
this.salaryGrantTableStore = res.data.columns; this.salaryGrantTableStore = res.data.columns;