From 3e0975af12fa66e314d66a8213fb8401fe182187 Mon Sep 17 00:00:00 2001 From: MustangDeng <670124965@qq.com> Date: Mon, 14 Mar 2022 18:58:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4=E5=BC=95=E7=94=A8=E5=BC=B9?= =?UTF-8?q?=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/selectItemsModal/index.js | 9 +-- .../attendance/headerSetModal.js | 14 ++++ .../pages/dataAcquisition/attendance/index.js | 19 ++++-- .../attendance/refereAttendFormModal.js | 65 +++++++++++++++++++ 4 files changed, 97 insertions(+), 10 deletions(-) create mode 100644 pc4mobx/hrmSalary/pages/dataAcquisition/attendance/headerSetModal.js create mode 100644 pc4mobx/hrmSalary/pages/dataAcquisition/attendance/refereAttendFormModal.js diff --git a/pc4mobx/hrmSalary/components/selectItemsModal/index.js b/pc4mobx/hrmSalary/components/selectItemsModal/index.js index 2e699a76..4e94fa20 100644 --- a/pc4mobx/hrmSalary/components/selectItemsModal/index.js +++ b/pc4mobx/hrmSalary/components/selectItemsModal/index.js @@ -4,7 +4,7 @@ import { Row , Col, Modal, Dropdown, Menu, Button } from "antd" import SelectItemsWrapper from './selectItemsWrapper' -const items = [ +export const items = [ { key: "1", title: "测试", @@ -38,11 +38,8 @@ export default class SelectItemModal extends React.Component { placeholder={"请输入关键字"} /> - - - - - + {this.props.children} +
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/headerSetModal.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/headerSetModal.js new file mode 100644 index 00000000..c8ee03f1 --- /dev/null +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/headerSetModal.js @@ -0,0 +1,14 @@ +import React from 'react' +import { Modal } from 'antd' +import SelectItemModal, { items } from '../../../components/selectItemsModal/selectItemsWrapper'; + + +export default class HeaderSetModal extends React.Component { + render() { + return ( + + + + ) + } +} \ No newline at end of file diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js index a797312a..6a87ea2f 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js @@ -14,7 +14,10 @@ import { columns, dataSource } from './columns'; import MonthRange from '../../../components/monthRange' import ImportModal from '../../../components/importModal' import HeaderSet from "../../../components/importModal/headerSet" -import SelectItemModal from '../../../components/selectItemsModal' +import SelectItemModal, {items} from '../../../components/selectItemsModal' +import RefereAttendFormModal from './refereAttendFormModal' +import SelectItemsWrapper from '../../../components/selectItemsModal/selectItemsWrapper' + const { MonthPicker } = DatePicker; @@ -30,7 +33,8 @@ export default class Attendance extends React.Component { endDate: "", modalParam: {}, modalVisiable: false, - selectItemVisible: false + selectItemVisible: false, + refereAttendFormVisible: false } } render() { @@ -67,7 +71,7 @@ export default class Attendance extends React.Component { const renderSearchOperationItem = () => { return
- +
@@ -162,7 +166,14 @@ export default class Attendance extends React.Component { onCancel={() => { this.setState({modalVisiable: false})}} /> - this.setState({selectItemVisible: false})}/> + this.setState({selectItemVisible: false})}> +
+ + +
+
+ + this.setState({refereAttendFormVisible: false})}/>
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/refereAttendFormModal.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/refereAttendFormModal.js new file mode 100644 index 00000000..0f64decc --- /dev/null +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/refereAttendFormModal.js @@ -0,0 +1,65 @@ +import React from 'react' +import { Modal, Row, Col, Button } from 'antd' +import { WeaSelect, WeaInput, WeaBrowser, WeaDatePicker } from "ecCom" +import SelectItemModal, {items} from '../../../components/selectItemsModal' +import SelectItemsWrapper from '../../../components/selectItemsModal/selectItemsWrapper' + + + +export default class RefereAttendFormModal extends React.Component { + constructor(props) { + super(props) + this.state = { + headerSetVisible: false + } + } + render() { + return ( + + + + +
+ } visible={this.props.visible} onCancel={this.props.onCancel}> + + 薪资所属月: + + + + + + 薪资账套: + + + + + + 添加账套外人员 + + + + + + 备注 + + + + + + + this.setState({headerSetVisible: false})}> + + + + + + ) + } +} \ No newline at end of file