diff --git a/pc4mobx/hrmSalary/components/importModal/index.js b/pc4mobx/hrmSalary/components/importModal/index.js new file mode 100644 index 00000000..5a759bf1 --- /dev/null +++ b/pc4mobx/hrmSalary/components/importModal/index.js @@ -0,0 +1,40 @@ +import React from 'react'; +import { WeaSteps, WeaDatePicker, WeaInput } from 'ecCom'; +import { Upload, Icon, Modal, Row, Col, Button } from "antd"; + +import ModalStep1 from './modalStep1' + +const Dragger = Upload.Dragger; + +const Step = WeaSteps.Step; + +export default class ImportModal extends React.Component { + constructor(props) { + super(props) + this.state = { + currentStep: 0, + } + } + render() { + const { currentStep } = this.state; + + return (下一步} + > +
+ + + + + +
+ { + this.state.currentStep == 0 && () + } + + + ) + } +} \ No newline at end of file diff --git a/pc4mobx/hrmSalary/components/importModal/modalStep1.js b/pc4mobx/hrmSalary/components/importModal/modalStep1.js new file mode 100644 index 00000000..14f23850 --- /dev/null +++ b/pc4mobx/hrmSalary/components/importModal/modalStep1.js @@ -0,0 +1,94 @@ +import React from 'react' +import { WeaSteps, WeaDatePicker, WeaInput } from 'ecCom'; +import { Upload, Icon, Row, Col, Button } from "antd"; + +const Dragger = Upload.Dragger; + +export default class ModalStep1 extends React.Component { + constructor(props) { + super(props) + this.state = { + datetime: "", + personValue: "" + } + } + render() { + const { datetime, personValue } = this.state + return ( +
+
+
+ 导入选项 +
+
+ + + 税款所属期 + this.setState({ datetime: value })} + /> + + + 个税扣缴义务人 + { + this.setState({ personValue: value }); + }} + /> + + +
+
+ +
+
+ 导入excel +
+
+ +
+

+ +

+

点击或将文件拖拽到此区域上传

+

支持单个或批量上传，严禁上传公司内部资料及其他违禁文件

+
+ +
+ +
+ +
+
+ 操作步骤 +
+ +
+ 1. 第一步，请选择导出的Excel文件或 点击这里下载模板 ，支持税务系统和社保平台下载的表格直接导入；
+ 2. 第二步，请一定要确定Excel文档中的格式是模板中的格式，没有被修改掉；
+ 3. 第三步，选择填写好的Excel文档，点击“下一步”按钮进行数据预览；
+ 4. 第四步，如果以上步骤和Excel文档正确的话，数据会被正确导入，导入成功会有提示。如果有问题，则会提示Excel文档的错误之处。
+
+ +
+ +
+
+ Excel文件说明 +
+ +
+ 1. 后缀名为xls或者xlsx；
+ 2. 数据请勿放在合并的单元格中；
+
+ +
+
+ ) + } +} \ No newline at end of file diff --git a/pc4mobx/hrmSalary/index.js b/pc4mobx/hrmSalary/index.js index 46805291..07b2918e 100644 --- a/pc4mobx/hrmSalary/index.js +++ b/pc4mobx/hrmSalary/index.js @@ -7,7 +7,7 @@ import Archives from './pages/socialSecurityBenefits/archives'; import StandingBook from './pages/socialSecurityBenefits/standingBook'; import SalaryItemManagement from './pages/salaryItemManagement'; import SalaryFile from './pages/salaryFile'; -import AccumulatedSpecialAdditionalDeduction from './pages/dataAcquisition/accumulatedSpecialAdditionalDeduction'; +import CumDeduct from './pages/dataAcquisition/cumDeduct'; import OtherTaxExemptDeductions from './pages/dataAcquisition/otherTaxExemptDeductions'; import CumulativeSituationInPreviousPeriods from './pages/dataAcquisition/cumulativeSituationInPreviousPeriods'; import AttendanceReference from './pages/dataAcquisition/attendanceReference'; @@ -45,7 +45,7 @@ const DataAcquisition = props => props.children; // salaryItemManagement 薪资项目管理 // salaryFile 薪资档案 // dataAcquisition 数据采集 -// accumulatedSpecialAdditionalDeduction 累计专项附加扣除 +// CumDeduct 累计专项附加扣除 // otherTaxExemptDeductions 其他免税扣除 // cumulativeSituationInPreviousPeriods 往期累计情况 // attendanceReference 考勤引用 @@ -67,7 +67,7 @@ const Routes = ( - + diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/accumulatedSpecialAdditionalDeduction/columns.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js similarity index 100% rename from pc4mobx/hrmSalary/pages/dataAcquisition/accumulatedSpecialAdditionalDeduction/columns.js rename to pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/accumulatedSpecialAdditionalDeduction/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js similarity index 71% rename from pc4mobx/hrmSalary/pages/dataAcquisition/accumulatedSpecialAdditionalDeduction/index.js rename to pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js index b4d1a329..7e05edd1 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/accumulatedSpecialAdditionalDeduction/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js @@ -2,13 +2,15 @@ import React from 'react'; import { inject, observer } from 'mobx-react'; import { toJS } from 'mobx'; -import { Button, Table, DatePicker } from 'antd'; +import { Button, Table, DatePicker, Dropdown, Menu, Modal } from 'antd'; import { WeaTop, WeaTab, WeaRightMenu, WeaRangePicker, WeaTable } from 'ecCom'; import { renderNoright, getSearchs } from '../../../util'; // 渲染form数据的方法：因为多个页面都会使用，所以抽的公共方法在util中 import CustomTab from '../../../components/customTab'; import ContentWrapper from '../../../components/contentWrapper'; +import ImportModal from '../../../components/importModal' + import { columns, dataSource } from './columns'; @@ -16,14 +18,18 @@ const { MonthPicker } = DatePicker; @inject('baseTableStore') @observer -export default class AccumulatedSpecialAdditionalDeduction extends React.Component { +export default class CumDeduct extends React.Component { constructor(props) { super(props); this.state = { value: "", - selectedKey: "0" + selectedKey: "0", + visiable: true } } + + + render() { const { baseTableStore } = this.props; const { loading, hasRight, form, condition, tableStore, showSearchAd, getTableDatas, doSearch, setShowSearchAd } = baseTableStore; @@ -54,18 +60,43 @@ export default class AccumulatedSpecialAdditionalDeduction extends React.Compone ]; const topTab = [ - ]; + ]; const renderSearchOperationItem = () => { return
- } + const handleButtonClick = () => { + } + + const handleMenuClick = () => { + + } + + const handleBtnImport = () => { + this.setState({ + visiable: true + }) + } + + + const menu = ( + + 导出选中 + + ); + + const btns = [ + , + + 导出全部 + + ] + return ( -
+
+ {this.setState({visiable: false})}}/>
) }