From 3b2b25cbde1908534f794783f2a5f56dbe6cafd1 Mon Sep 17 00:00:00 2001 From: MustangDeng <670124965@qq.com> Date: Wed, 16 Mar 2022 10:41:38 +0800 Subject: [PATCH] ledger formSlide step --- .../hrmSalary/components/stepSlide/index.js | 7 +- .../components/stepSlide/stepSlideHeader.js | 2 +- .../pages/dataAcquisition/attendance/index.js | 85 ++----------- .../hrmSalary/pages/ledger/calcRulesForm.js | 20 ++++ pc4mobx/hrmSalary/pages/ledger/columns.js | 86 +++++++++++++ pc4mobx/hrmSalary/pages/ledger/index.js | 70 ++++++++++- pc4mobx/hrmSalary/pages/ledger/index.less | 113 ++++++++++++++++++ .../hrmSalary/pages/ledger/salaryItemForm.js | 60 ++++++++++ .../hrmSalary/pages/ledger/slideRefereUser.js | 24 ++++ .../hrmSalary/pages/ledger/validRulesForm.js | 24 ++++ 10 files changed, 411 insertions(+), 80 deletions(-) create mode 100644 pc4mobx/hrmSalary/pages/ledger/calcRulesForm.js create mode 100644 pc4mobx/hrmSalary/pages/ledger/salaryItemForm.js create mode 100644 pc4mobx/hrmSalary/pages/ledger/slideRefereUser.js create mode 100644 pc4mobx/hrmSalary/pages/ledger/validRulesForm.js diff --git a/pc4mobx/hrmSalary/components/stepSlide/index.js b/pc4mobx/hrmSalary/components/stepSlide/index.js index db94ddc5..0151b678 100644 --- a/pc4mobx/hrmSalary/components/stepSlide/index.js +++ b/pc4mobx/hrmSalary/components/stepSlide/index.js @@ -1,10 +1,12 @@ import React from 'react'; import StepSlideHeader from './stepSlideHeader' import { WeaSlideModal } from 'ecCom' +import { Button } from "antd" import SlideModalTitle from '../../components/slideModalTitle' export default class StepSlide extends React.Component { render() { + const { currentStep } = this.props; return ( } - content={( + content={( {this.props.content} )} onClose={() => setSlideVisiable(false)} diff --git a/pc4mobx/hrmSalary/components/stepSlide/stepSlideHeader.js b/pc4mobx/hrmSalary/components/stepSlide/stepSlideHeader.js index 7256ad6e..e7f47d69 100644 --- a/pc4mobx/hrmSalary/components/stepSlide/stepSlideHeader.js +++ b/pc4mobx/hrmSalary/components/stepSlide/stepSlideHeader.js @@ -8,7 +8,7 @@ export default class StepSlideHeader extends React.Component { return (
- + diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js index be664e4e..de54ca0f 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js @@ -41,77 +41,16 @@ export default class Attendance extends React.Component { refereAttendFormVisible: false, tabSelectedKey: "0", itemMangeVisible: false, - columns: [ - { - title: "姓名", - dataIndex: 'username', - key: 'username', - }, - { - title: "个税扣缴义务人", - dataIndex: 'ywr', - key: 'ywr', - }, - { - title: "部门", - dataIndex: 'bm', - key: 'title', - }, - { - title: "手机号", - dataIndex: 'sjh', - key: 'sjh', - }, - { - title: "工号", - dataIndex: 'gh', - key: 'gh', - }, - { - title: "证件号码", - dataIndex: 'sfzh', - key: 'sfzh', - }, - { - title: "入职日期", - dataIndex: 'rzrq', - key: 'rzrq', - }, - { - title: "累计子女教育", - dataIndex: 'ljznjy', - key: 'ljznjy', - }, - { - title: "累计继续教育", - dataIndex: 'ljjxjy', - key: 'ljjxjy', - }, - { - title: "累计住房贷款利息", - dataIndex: 'ljzfdklx', - key: 'ljfdklx', - }, - { - title: "累计住房租金", - dataIndex: 'ljzfzj', - key: 'ljzfzj', - }, - { - title: "累计赡养老人", - dataIndex: 'ljsylr', - key: 'ljsylr', - }, - { - title: "操作", - key: 'cz', - render: (text, record) => { - return () - } - }] + columns: columns.map(item => { + if(item.key == "cz") { + item.render = (text, record) => { + return () + } + } + }) } } @@ -257,10 +196,6 @@ export default class Attendance extends React.Component { dropMenuProps={{ collectParams }} // 收藏功能: 配置之后显示 收藏、帮助、显示页面地址 这3个功能 > - - - - { this.state.tabSelectedKey == 0 ?
diff --git a/pc4mobx/hrmSalary/pages/ledger/calcRulesForm.js b/pc4mobx/hrmSalary/pages/ledger/calcRulesForm.js new file mode 100644 index 00000000..936b994e --- /dev/null +++ b/pc4mobx/hrmSalary/pages/ledger/calcRulesForm.js @@ -0,0 +1,20 @@ +import React from 'react' +import { Table, Icon } from 'antd' +import { slideStep4Columns, dataSource} from './columns' +import "./index.less" + +export default class CalRulesForm extends React.Component { + render() { + return ( +
+
+ + +
+
+ + + + ) + } +} \ No newline at end of file diff --git a/pc4mobx/hrmSalary/pages/ledger/columns.js b/pc4mobx/hrmSalary/pages/ledger/columns.js index 6d2919a8..620c9d19 100644 --- a/pc4mobx/hrmSalary/pages/ledger/columns.js +++ b/pc4mobx/hrmSalary/pages/ledger/columns.js @@ -33,6 +33,92 @@ export const columns = [ } ] +export const slideStep2Columns= [ + { + title: "对象类型", + dataIndex: 'title', + key: 'title', + }, + { + title: "对象", + dataIndex: 'title', + key: 'title', + }, + { + title: "安全级别", + dataIndex: 'title', + key: 'title', + }, + { + title: "员工状态", + dataIndex: 'title', + key: 'title' + }, +] + +export const slideStep3Columns = [ + { + title: "薪资项目", + dataIndex: 'title', + key: 'title', + }, + { + title: "规则", + dataIndex: 'title', + key: 'title', + }, + { + title: "来源", + dataIndex: 'title', + key: 'title', + }, + { + title: "类型", + dataIndex: 'title', + key: 'title', + } +] + +export const slideStep4Columns = [ + { + title: "薪资项目", + dataIndex: 'title', + key: 'title', + }, + { + title: "计薪规则", + dataIndex: 'title', + key: 'title', + }, + { + title: "操作", + dataIndex: 'cz', + key: 'cz', + }, +] + +export const slideStep5Columns = [ + { + title: "规则名称", + dataIndex: 'title', + key: 'title', + }, + { + title: "校验规则", + dataIndex: 'title', + key: 'title', + }, + { + title: "备注", + dataIndex: 'title', + key: 'title', + }, + { + title: "操作", + dataIndex: 'cz', + key: 'cz', + }, +] export const dataSource = [{ title: "测试" diff --git a/pc4mobx/hrmSalary/pages/ledger/index.js b/pc4mobx/hrmSalary/pages/ledger/index.js index e9fd0b77..3dc48099 100644 --- a/pc4mobx/hrmSalary/pages/ledger/index.js +++ b/pc4mobx/hrmSalary/pages/ledger/index.js @@ -11,8 +11,12 @@ import CustomTab from '../../components/customTab'; import ContentWrapper from '../../components/contentWrapper'; import StepSlide from '../../components/stepSlide' import SlideBaseForm from './slideBaseForm' +import SlideRefereUser from './slideRefereUser' import { columns, dataSource } from './columns'; +import SalaryItemForm from './salaryItemForm'; +import CalRulesForm from './calcRulesForm'; +import ValidRulesForm from './validRulesForm'; const { MonthPicker } = DatePicker; @@ -25,6 +29,7 @@ export default class Ledger extends React.Component { value: "", selectedKey: "0", stepSlideVisible: false, + currentStep: 4, columns: columns.map(item => { if(item.dataIndex == "cz") { item.render = () =>
@@ -47,7 +52,7 @@ export default class Ledger extends React.Component { render() { const { baseTableStore } = this.props; const { loading, hasRight, form, condition, tableStore, showSearchAd, getTableDatas, doSearch, setShowSearchAd } = baseTableStore; - + const { currentStep } = this.state; if (!hasRight && !loading) { // 无权限处理 return renderNoright(); } @@ -74,7 +79,7 @@ export default class Ledger extends React.Component { ]; const topTab = [ - ]; + ]; const renderRightOperation = () => { return ( @@ -85,7 +90,18 @@ export default class Ledger extends React.Component { ) } + const nextStep = () => { + const { currentStep } = this.state; + this.setState({currentStep: currentStep + 1}) + } + + const prevStep = () => { + const { currentStep } = this.state; + this.setState({currentStep: currentStep - 1}); + } + return ( +
{this.setState({stepSlideVisible: false})}} + customOperate = { +
+ { + currentStep == 0 && + } + { + currentStep == 1 &&
+ + +
+ } + { + (currentStep == 2 || currentStep == 3) &&
+ + + +
+ } + { + currentStep == 4 && +
+ + +
+ + } +
+ } title="新建账套" - content={} + content={ +
+ { + currentStep == 0 && + } + { + currentStep == 1 && + } + { + currentStep == 2 && + } + { + currentStep == 3 && + } + { + currentStep == 4 && + } +
+ + } /> } diff --git a/pc4mobx/hrmSalary/pages/ledger/index.less b/pc4mobx/hrmSalary/pages/ledger/index.less index 6b335d40..1480677d 100644 --- a/pc4mobx/hrmSalary/pages/ledger/index.less +++ b/pc4mobx/hrmSalary/pages/ledger/index.less @@ -24,4 +24,117 @@ .higelinered { color: red; } +} + +.slideRefereUser { + .refereUserHeader { + height: 47px; + line-height: 47px; + padding-left: 10px; + padding-right: 10px; + } + .headerLeft { + display: inline-block; + color: #666; + .selectedCrumbs { + color: #4ba9f2; + } + + } + .headerIcon { + float: right; + } + .searchInput { + margin-top: 10px; + float: right; + } + .headerIcon { + color: #4ba9f2; + display: inline-block; + .iconItem { + cursor: pointer; + margin-right: 10px; + } + } +} + +.salaryItemForm { + padding: 10px 20px; + .btnBar { + height: 47px; + .btns { + display: inline-block; + } + .searchInputWrapper { + float: right; + display: inline-block; + } + } + .userInfoWrapper { + overflow: hidden; + .rightBtnsWrapper { + float: right; + display: inline-block; + .iconItem { + margin-right: 10px; + color: #2db7f5; + } + } + } + .userInfoSelected { + margin-top: 10px; + margin-bottom: 10px; + .selectedItem { + margin-right: 10px; + } + + } + .tableItemWrapper { + margin-top: 10px; + .rightBtnsWrapper { + float: right; + .iconItem { + margin-right: 10px; + color: #2db7f5; + } + } + + } +} + +.calRulesForm { + padding: 10px 20px; + .headerIcon { + float: right; + .iconItem { + margin-right: 10px; + color: #2db7f5; + } + } + .tableWrapper { + margin-top: 20px; + } +} + +.validRulesForm { + padding: 10px 20px; + .headerBar { + height: 47px; + line-height: 47px; + .inputSearch { + margin-top: 8px; + float: right; + } + .btnsWrapper { + float: right; + .iconItem { + margin-right: 10px; + cursor: pointer; + color: #2db7f5; + } + } + } + .tableWrapper { + margin-top: 20px; + } } \ No newline at end of file diff --git a/pc4mobx/hrmSalary/pages/ledger/salaryItemForm.js b/pc4mobx/hrmSalary/pages/ledger/salaryItemForm.js new file mode 100644 index 00000000..e1522933 --- /dev/null +++ b/pc4mobx/hrmSalary/pages/ledger/salaryItemForm.js @@ -0,0 +1,60 @@ +import React from 'react' +import { Button, Icon, Table } from 'antd' +import { WeaInputSearch, WeaHelpfulTip } from 'ecCom' +import { slideStep3Columns, dataSource} from './columns' +import "./index.less" + +export default class SalaryItemForm extends React.Component { + render() { + return ( +
+
+
+ + +
+
+ +
+ +
+ +
+
+ + 员工信息 + +
+ +
+ +
+ +
+ 个税扣缴义务人 + 姓名 + 部门 + +
+
+ +
+
+ 未分类 + + + + + +
+
+ + + ) + } +} \ No newline at end of file diff --git a/pc4mobx/hrmSalary/pages/ledger/slideRefereUser.js b/pc4mobx/hrmSalary/pages/ledger/slideRefereUser.js new file mode 100644 index 00000000..a72be6e5 --- /dev/null +++ b/pc4mobx/hrmSalary/pages/ledger/slideRefereUser.js @@ -0,0 +1,24 @@ +import React from 'react'; +import { Icon, Table } from 'antd'; +import { WeaInputSearch } from "ecCom" +import { slideStep2Columns, dataSource } from './columns' + +export default class SlideRefereUser extends React.Component { + render() { + return ( +
+
+
关联人员范围 {' '} | {' '} 从范围中排除
+ +
+ + +
+
+
+
+ + + ) + } +} \ No newline at end of file diff --git a/pc4mobx/hrmSalary/pages/ledger/validRulesForm.js b/pc4mobx/hrmSalary/pages/ledger/validRulesForm.js new file mode 100644 index 00000000..034a1a57 --- /dev/null +++ b/pc4mobx/hrmSalary/pages/ledger/validRulesForm.js @@ -0,0 +1,24 @@ +import React from 'react' +import { WeaInputSearch } from 'ecCom' +import { Table, Icon } from 'antd' +import { dataSource, slideStep5Columns} from './columns' + +export default class ValidRulesForm extends React.Component { + render() { + return ( +
+
+ + + + + +
+
+
+ + + ) + + } +} \ No newline at end of file