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

社保福利档案页面的接口联调

This commit is contained in:
18652063575 2022-11-01 15:50:54 +08:00
parent 023f70e692
commit abd8f2b9f4
9 changed files with 83 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pc4mobx/hrmSalary/apis/welfareScheme.js
View File

@ -25,7 +25,6 @@ export const createScheme = params => {
}).then(res => res.json())
};
export const updateScheme = params => {
return fetch('/api/bs/hrmsalary/scheme/update', {
method: 'POST',
mode: 'cors',

26
pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/accumulationFundForm.js
View File

@ -1,7 +1,7 @@
import React from "react";
import { inject, observer } from "mobx-react";
import { Col, Row, Select } from "antd";
import { WeaCheckbox, WeaDatePicker, WeaInput } from "ecCom";
import { WeaCheckbox, WeaDatePicker, WeaInput, WeaSelect } from "ecCom";
import GroupCard from "../../../components/groupCard";
import cs from "classnames";
import "./index.less";
@ -80,18 +80,20 @@ export default class AccumulationFundForm extends React.Component {
</Col>
<Col span={6} className="formItem borderR-none borderB-none">公积金方案名称：</Col>
<Col span={6} className="formItem borderB-none">
<Select defaultValue={data && data.fundSchemeId}
notFoundContent="暂无数据" value={data && data.fundSchemeId} style={{ width: "100%" }}
onChange={(value) => {
this.handleFormChange({ fundSchemeId: value });
this.handleFetchPaymentForm(value);
}}>
{
items && items[0].items && items[0].items[0] && items[0].items[0].options.map(item => (
<Option value={item.key}>{item.showname}</Option>
))
<WeaSelect
options={
(items && items[0].items && items[0].items[0]) ? [{
key: "",
showname: ""
}, ...items[0].items[0].options] : []
}
</Select>
value={data && data.fundSchemeId}
style={{ width: "100%" }}
onChange={(value, showname) => {
this.handleFormChange({ fundSchemeId: value, fundName: showname });
this.handleFetchPaymentForm(value);
}}
/>
</Col>
</Row>
<Row>

5
pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
View File

@ -285,7 +285,7 @@ export default class Archives extends React.Component {
const { pageInfo } = this.state;
this.setState({
selectedKey,
selectedRowKeys:[],
selectedRowKeys: [],
editSlideVisible: false,
pageInfo: {
...pageInfo,
@ -447,7 +447,8 @@ export default class Archives extends React.Component {
<div>4、维护好员工的社保福利档案数据后，点击【增员】，数据会进入【在缴员工】；</div>
<div>5、若不需给该员工缴纳，可点击【删除待办】进入【停缴员工】；进入【停缴员工】后，可以点击【取消停缴】再次进入【待增员】；</div>
<div>6、不管起始缴纳月维护到哪个月，都可以进行增员，不影响核算判断；若维护了最后缴纳月，且小于等于当前月，则增员失败；</div>
<div>7、增员失败情况：①终止缴纳月小于等于当前月；②其他的个税扣缴义务人下的在缴员工中存在该员工，在缴员工未进入停缴员工；</div>
<div>7、增员失败情况：①终止缴纳月小于等于当前月；</div>
{/* ②其他的个税扣缴义务人下的在缴员工中存在该员工，在缴员工未进入停缴员工；*/}
</div>;
break;
case "fixed":

25
pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/otherForm.js
View File

@ -1,7 +1,7 @@
import React from "react";
import { inject, observer } from "mobx-react";
import { Col, Row, Select } from "antd";
import { WeaCheckbox, WeaDatePicker, WeaInput } from "ecCom";
import { WeaCheckbox, WeaDatePicker, WeaInput, WeaSelect } from "ecCom";
import GroupCard from "../../../components/groupCard";
import "./index.less";
@ -86,18 +86,17 @@ export default class OtherForm extends React.Component {
</Col>
<Col span={6} className="formItem borderR-none borderB-none">其他福利方案名称：</Col>
<Col span={6} className="formItem borderB-none">
<Select defaultValue={data && data.otherName}
notFoundContent="暂无数据" value={data && data.otherName} style={{ width: "100%" }}
onChange={(value) => {
this.handleFormChange({ otherName: value });
this.handleFetchPaymentForm(value);
}}>
{
items && items[0].items && items[0].items[0] && items[0].items[0].options.map(item => (
<Option value={item.key}>{item.showname}</Option>
))
}
</Select>
<WeaSelect
options={(items && items[0].items && items[0].items[0]) ? [{
key: "",
showname: ""
}, ...items[0].items[0].options] : []}
value={data && data.otherSchemeId}
style={{ width: "100%" }}
onChange={(value, showname) => {
this.handleFormChange({ otherName: showname, otherSchemeId: value });
this.handleFetchPaymentForm(value);
}}/>
</Col>
</Row>
<Row>

25
pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/socialSecurityForm.js
View File

@ -1,7 +1,7 @@
import React from "react";
import GroupCard from "../../../components/groupCard";
import { Col, Row, Select } from "antd";
import { WeaCheckbox, WeaDatePicker, WeaInput } from "ecCom";
import { WeaCheckbox, WeaDatePicker, WeaInput, WeaSelect } from "ecCom";
import { inject, observer } from "mobx-react";
import cs from "classnames";
import "./index.less";
@ -84,21 +84,18 @@ export default class SocialSecurityForm extends React.Component {
</Col>
<Col span={6} className="formItem borderR-none borderB-none">社保方案名称：</Col>
<Col span={6} className="formItem">
<Select
defaultValue={data && data.socialName}
notFoundContent="暂无数据"
value={data && data.socialName} style={{ width: "100%" }}
onChange={(value) => {
this.handleFormChange({ socialName: value });
<WeaSelect
options={(items && items[0].items && items[0].items[0]) ? [{
key: "",
showname: ""
}, ...items[0].items[0].options] : []}
value={data && data.socialSchemeId}
style={{ width: "100%" }}
onChange={(value, showName) => {
this.handleFormChange({ socialName: showName, socialSchemeId: value });
this.handleFetchPaymentForm(value);
}}
>
{
items && items[0].items && items[0].items[0] && items[0].items[0].options.map(item => (
<Option value={item.key}>{item.showname}</Option>
))
}
</Select>
/>
</Col>
</Row>
<Row>

10
pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/columns.js
View File

@ -118,16 +118,16 @@ export const insertUpdateColumns = [
dataIndex: "paymentScope",
key: "paymentScope"
},
{
title: "基数上限",
dataIndex: "upperLimit",
key: "upperLimit"
},
{
title: "基数下限",
dataIndex: "lowerLimit",
key: "lowerLimit"
},
{
title: "基数上限",
dataIndex: "upperLimit",
key: "upperLimit"
},
{
title: "缴纳比例%",
dataIndex: "paymentProportion",

14
pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js
View File

@ -1,5 +1,5 @@
import React from "react";
import { WeaSelect, WeaInput, WeaTable } from "ecCom";
import { WeaSelect, WeaInput, WeaTable, WeaInputNumber } from "ecCom";
import { Row, Col, Switch } from "antd";
import { insertUpdateColumns } from "./columns";
import { inject, observer } from "mobx-react";
@ -104,7 +104,8 @@ export default class DefaultSlideForm extends React.Component {
} else if (item.dataIndex == "paymentProportion") {
item.render = (text, record) => {
return (
<WeaInput
<WeaInputNumber
precision={3}
value={text}
onChange={v => {
this.updateDataSource(record, v, "paymentProportion");
@ -115,7 +116,8 @@ export default class DefaultSlideForm extends React.Component {
} else if (item.dataIndex == "fixedCost") {
item.render = (text, record) => {
return (
<WeaInput
<WeaInputNumber
precision={2}
value={text}
onChange={v => {
this.updateDataSource(record, v, "fixedCost");
@ -126,7 +128,8 @@ export default class DefaultSlideForm extends React.Component {
} else if (item.dataIndex == "upperLimit") {
item.render = (text, record) => {
return (
<WeaInput
<WeaInputNumber
precision={2}
value={text}
onChange={v => {
this.updateDataSource(record, v, "upperLimit");
@ -137,7 +140,8 @@ export default class DefaultSlideForm extends React.Component {
} else if (item.dataIndex == "lowerLimit") {
item.render = (text, record) => {
return (
<WeaInput
<WeaInputNumber
precision={2}
value={text}
onChange={v => {
this.updateDataSource(record, v, "lowerLimit");

22
pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js
View File

@ -224,7 +224,7 @@ export default class Programme extends React.Component {
}
}
onCustomEdit=(record)=> {
onCustomEdit = (record) => {
const {
programmeStore: { getCustomForm, setCustomNewVisible, setCustomRequest },
taxAgentStore: { showOperateBtn }
@ -242,10 +242,10 @@ export default class Programme extends React.Component {
insuranceName: record["insurance_name"],
id: record.id,
isUse: record.is_use,
paymentScope: record["payment_scope"].split(",").map(item => paymentScopeEnum[item]).join(','),
paymentScope: record["payment_scope"].split(",").map(item => paymentScopeEnum[item]).join(","),
welfareType: welfareTypeEnum[record.welfare_type]
});
}
};
// 页面跳转
handlePageChange(value) {
@ -405,7 +405,6 @@ export default class Programme extends React.Component {
...defaultCompanyDataSource
]
};
if (currentOperate == "add") {
createScheme(request).then(res => {
if (res.status) this.setState({ slideVisiable: false });
@ -554,13 +553,14 @@ export default class Programme extends React.Component {
/>
}
content={
<DefaultSlideForm
customEditVisible={this.state.customEdit}
requestParams={requestParams}
onChange={requestParams => {
setRequestParams(requestParams);
}}
/>
this.state.slideVisiable ?
<DefaultSlideForm
customEditVisible={this.state.customEdit}
requestParams={requestParams}
onChange={requestParams => {
setRequestParams(requestParams);
}}
/> : null
}
onClose={() => {
handleSlideClose();

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

@ -9,7 +9,7 @@ import { Button, Icon, message, Modal, Spin, Tooltip } from "antd";
import { inject, observer } from "mobx-react";
import { toJS } from "mobx";
import { WeaDialog, WeaInputSearch, WeaTable } from "ecCom";
import { getSearchs, calcPageNo } from "../../../../util";
import { calcPageNo, getSearchs } from "../../../../util";
import { getQueryString } from "../../../../util/url";
import ProgressModal from "../../../../components/progressModal";
import AcctResultImportModal from "../../../calculateDetail/acctResult/importModal/acctResultImportModal";
@ -67,8 +67,8 @@ export default class NormalIndex extends Component {
if (nextProps.selectedKey != this.props.selectedKey) {
const { billMonth, paymentOrganization } = nextProps;
this.setState({
current: 1,
}, ()=>{
current: 1
}, () => {
const { current } = this.state;
nextProps.selectedKey === "1"
? this.getNormalList({ billMonth, current, paymentOrganization })
@ -77,7 +77,7 @@ export default class NormalIndex extends Component {
current,
paymentOrganization
});
})
});
}
}
@ -282,11 +282,11 @@ export default class NormalIndex extends Component {
? this.getNormalList({
billMonth,
paymentOrganization,
current: calcPageNo(this.state.tableData.total,this.state.current, 10, includes.length)
current: calcPageNo(this.state.tableData.total, this.state.current, 10, includes.length)
})
: this.getSupplementaryList({
billMonth,
current: calcPageNo(this.state.tableData.total,this.state.current, 10, includes.length),
current: calcPageNo(this.state.tableData.total, this.state.current, 10, includes.length),
paymentOrganization
});
});
@ -495,7 +495,7 @@ export default class NormalIndex extends Component {
selectedKey === "1" &&
<React.Fragment>
<Button type="primary" onClick={() => {
window.open(`/spa/hrmSalary/static/index.html#/main/hrmSalary/socialSecurityBenefits/sbofflineComparison?billMonth=${billMonth}&paymentOrganization=${paymentOrganization}`)
window.open(`/spa/hrmSalary/static/index.html#/main/hrmSalary/socialSecurityBenefits/sbofflineComparison?billMonth=${billMonth}&paymentOrganization=${paymentOrganization}`);
}}>线下对比</Button>
</React.Fragment>
}
@ -510,8 +510,11 @@ export default class NormalIndex extends Component {
{
this.props.type !== "detail" &&
<Tooltip title="导入数据">
<i className="icon-coms02-Template-import1" style={{ color: "#2db7f5", fontSize: 18, marginRight: 10 }}
onClick={() => this.setState({ importParams: { ...importParams, visible: true } })}/>
<i
className="icon-coms02-Import"
style={{ color: "#2db7f5", fontSize: 18, marginRight: 10 }}
onClick={() => this.setState({ importParams: { ...importParams, visible: true } })}
/>
</Tooltip>
}
{/*导入弹框*/}
@ -526,7 +529,7 @@ export default class NormalIndex extends Component {
});
}}
onCancel={() => {
this.setState({ importParams: { ...importParams, visible: false },fieldData: {} }, () => {
this.setState({ importParams: { ...importParams, visible: false }, fieldData: {} }, () => {
const { billMonth, selectedKey, paymentOrganization } = this.props;
const { current } = this.state;
selectedKey === "1"
@ -540,8 +543,11 @@ export default class NormalIndex extends Component {
}
<Tooltip title="导出全部">
<i className="icon-coms-export" style={{ color: "#2db7f5", fontSize: 18 }}
onClick={this.handleExport}/>
<i
className="icon-coms02-coms2-export"
style={{ color: "#2db7f5", fontSize: 18 }}
onClick={this.handleExport}
/>
</Tooltip>
<WeaInputSearch
value={this.state.searchValue}