From 8251303da263cc3b069d552cffa71b34692c4efd Mon Sep 17 00:00:00 2001 From: MustangDeng <670124965@qq.com> Date: Thu, 24 Mar 2022 14:18:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/apis/item.js | 9 +- .../pages/salaryItem/customSalaryItemSlide.js | 95 +++++++++++++++++-- ...Modal copy.js => deleteSalaryItemModal.js} | 0 pc4mobx/hrmSalary/pages/salaryItem/index.js | 20 +++- pc4mobx/hrmSalary/pages/taxAgent/index.js | 2 +- pc4mobx/hrmSalary/stores/salaryItem.js | 12 +++ 6 files changed, 124 insertions(+), 14 deletions(-) rename pc4mobx/hrmSalary/pages/salaryItem/{deleteSalaryItemModal copy.js => deleteSalaryItemModal.js} (100%) diff --git a/pc4mobx/hrmSalary/apis/item.js b/pc4mobx/hrmSalary/apis/item.js index 7e088d02..a5c77d6f 100644 --- a/pc4mobx/hrmSalary/apis/item.js +++ b/pc4mobx/hrmSalary/apis/item.js @@ -65,7 +65,14 @@ export const deleteItemList = params => { //薪资项目-新增薪资项目 export const saveItem = params => { - return WeaTools.callApi('/api/bs/hrmsalary/salaryitem/save', 'POST', params); + return fetch('/api/bs/hrmsalary/salaryitem/save', { + method: 'POST', + mode: 'cors', + headers: { + 'Content-Type': 'application/json' + }, + body: JSON.stringify(params) + }).then(res => res.json()) } //薪资项目-更新薪资项目 diff --git a/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js b/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js index ab1822cd..230f59d9 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js @@ -3,21 +3,102 @@ import { Row, Col, Switch, Radio } from 'antd' import { WeaHelpfulTip, WeaSelect, WeaTextarea, WeaInput } from 'ecCom' import "./index.less" +const roundingModeOptions = [ + { + key: "1", + selected: false, + showname: "原始数据" + }, + { + key: "2", + selected: false, + showname: "四舍五入" + }, + { + key: "3", + selected: false, + showname: "向上舍入" + }, + { + key: "4", + selected: false, + showname: "向下舍入" + } +]; + +const patternOptions = [ + { + key: "0", + showname: "0", + selected: false + }, + { + key: "1", + showname: "1", + selected: false + }, + { + key: "2", + showname: "2", + selected: false + }, + { + key: "3", + showname: "3", + selected: false + }, + { + key: "4", + showname: "4", + selected: false + }, + { + key: "5", + showname: "5", + selected: false + }, +] + export default class CustomSalaryItemSlide extends React.Component { + constructor(props) { + super(props) + this.state = { + request: { + name: '', + useDefault: 0, + useInEmployeeSalary: 0, + systemType:0, + roundingMode: 0, + pattern: 0, + valueType: 1, + description: "" + } + } + } + handleChange(params) { + let request = {...this.state.request, ...params} + this.setState({request}) + this.props.onChange(request) + } + + render() { + const { request } = this.state; + const { name, useDefault, useInEmployeeSalary, roundingMode, pattern, valueType, description } = request; + return (
名称 - + {this.handleChange({name: value})}}/> 默认使用 - + {this.handleChange({useDefault: value ? 1 : 0})}}/> 薪资档案引用 - + {this.handleChange({useInEmployeeSalary: value})}}/> 舍入规则 - + {this.handleChange({roundingMode: value})}}/> @@ -66,7 +147,7 @@ export default class CustomSalaryItemSlide extends React.Component { 保留小数位 - + {this.handleChange({pattern: value})}} value={pattern} style={{width: "200px"}}/> @@ -76,7 +157,7 @@ export default class CustomSalaryItemSlide extends React.Component { 取值方式 - + {this.handleChange({valueType: e.target.value})}}> 输入 公式 @@ -93,7 +174,7 @@ export default class CustomSalaryItemSlide extends React.Component { 备注 - + {this.handleChange({description: value})}}/> diff --git a/pc4mobx/hrmSalary/pages/salaryItem/deleteSalaryItemModal copy.js b/pc4mobx/hrmSalary/pages/salaryItem/deleteSalaryItemModal.js similarity index 100% rename from pc4mobx/hrmSalary/pages/salaryItem/deleteSalaryItemModal copy.js rename to pc4mobx/hrmSalary/pages/salaryItem/deleteSalaryItemModal.js diff --git a/pc4mobx/hrmSalary/pages/salaryItem/index.js b/pc4mobx/hrmSalary/pages/salaryItem/index.js index 8c5e7aeb..5ed76263 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/index.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/index.js @@ -14,7 +14,7 @@ import SystemSalaryItemModal from './systemSalaryItemModal' import { columns, dataSource } from './columns'; import SlideModalTitle from "../../components/slideModalTitle" import CustomSalaryItemSlide from './customSalaryItemSlide' -import DeleteSalaryItemModal from './deleteSalaryItemModal copy'; +import DeleteSalaryItemModal from './deleteSalaryItemModal'; const { MonthPicker } = DatePicker; @@ -28,7 +28,8 @@ export default class SalaryItem extends React.Component { this.state = { value: "", selectedKey: "0", - editSlideVisible: false + editSlideVisible: false, + request: {} } columns.map(item => { if(item.dataIndex == "refere") { @@ -153,15 +154,24 @@ export default class SalaryItem extends React.Component { } + const handleSlideSave = () => { + const { salaryItemStore: {saveItem}} = this.props; + saveItem(this.state.request); + } + const renderCustomOperate = () => { return (
- +
) } + const handleSaveSlideChange = (value) => { + this.setState({request: value}) + } + return (
{this.setState({selectedTab: item.key})} } /> } - content={} + content={ {handleSaveSlideChange(value)}}/>} onClose={() => this.setState({editSlideVisible: false})} showMask={true} closeMaskOnClick={() => this.setState({editSlideVisible: false})} /> diff --git a/pc4mobx/hrmSalary/pages/taxAgent/index.js b/pc4mobx/hrmSalary/pages/taxAgent/index.js index c9148b61..6b3e76dd 100644 --- a/pc4mobx/hrmSalary/pages/taxAgent/index.js +++ b/pc4mobx/hrmSalary/pages/taxAgent/index.js @@ -92,7 +92,7 @@ export default class TaxAgent extends React.Component { case '0': // 删除 Modal.confirm({ title: "信息确认", - content: "薪资档案中有员工在用该个税扣缴义务人，清空后才可删除", + content: "确认删除吗？", onOk() { doDelete([record.id]) }, diff --git a/pc4mobx/hrmSalary/stores/salaryItem.js b/pc4mobx/hrmSalary/stores/salaryItem.js index e0786621..ad1c83b7 100644 --- a/pc4mobx/hrmSalary/stores/salaryItem.js +++ b/pc4mobx/hrmSalary/stores/salaryItem.js @@ -141,6 +141,18 @@ export class SalaryItemStore { }) } + //薪资项目-新增薪资项目 + @action + saveItem = (params) => { + API.saveItem(params).then(res => { + if(res.status) { + message.success("新增成功") + } else { + message.error(res.errormsg || "新增失败") + } + }) + } + } \ No newline at end of file