From 93a07d6ff27ed0e2f4b3dc692e9b79d481e6e988 Mon Sep 17 00:00:00 2001 From: MustangDeng <670124965@qq.com> Date: Tue, 1 Mar 2022 09:42:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=BB=91=E5=AE=9A=E4=B9=8B?= =?UTF-8?q?=E5=89=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/slideModalTitle/index.js | 10 -- .../components/slideModalTitle/index.less | 4 +- pc4mobx/hrmSalary/index.js | 4 +- pc4mobx/hrmSalary/pages/mySalary/index.js | 18 ++- .../socialSecurityBenefits/programme/index.js | 2 +- pc4mobx/hrmSalary/pages/taxAgent/columns.js | 19 +-- pc4mobx/hrmSalary/pages/taxRate/columns.js | 118 +++++++++++++++++ .../pages/taxRate/editSlideContent.js | 72 ++++++++++ pc4mobx/hrmSalary/pages/taxRate/index.js | 123 ++++++++++++++++++ 9 files changed, 328 insertions(+), 42 deletions(-) create mode 100644 pc4mobx/hrmSalary/pages/taxRate/columns.js create mode 100644 pc4mobx/hrmSalary/pages/taxRate/editSlideContent.js create mode 100644 pc4mobx/hrmSalary/pages/taxRate/index.js diff --git a/pc4mobx/hrmSalary/components/slideModalTitle/index.js b/pc4mobx/hrmSalary/components/slideModalTitle/index.js index 5bbf0f5f..6cb95070 100644 --- a/pc4mobx/hrmSalary/components/slideModalTitle/index.js +++ b/pc4mobx/hrmSalary/components/slideModalTitle/index.js @@ -10,16 +10,6 @@ export default class SlideModalTitle extends React.Component {
{this.props.subtitle}
-
- { - this.props.subTabs.map(item => ( -
- {item.title} -
- )) - } - -
diff --git a/pc4mobx/hrmSalary/components/slideModalTitle/index.less b/pc4mobx/hrmSalary/components/slideModalTitle/index.less index 9eaf526b..3375f362 100644 --- a/pc4mobx/hrmSalary/components/slideModalTitle/index.less +++ b/pc4mobx/hrmSalary/components/slideModalTitle/index.less @@ -15,8 +15,8 @@ .slideTitle { display: inline-block; .subtitle { - height: 30px; - line-height: 30px; + height: 52px; + line-height: 52px; font-size: 14px; font-weight: 600; } diff --git a/pc4mobx/hrmSalary/index.js b/pc4mobx/hrmSalary/index.js index 93761f02..46805291 100644 --- a/pc4mobx/hrmSalary/index.js +++ b/pc4mobx/hrmSalary/index.js @@ -15,7 +15,7 @@ import SalarySet from './pages/salarySet'; import SalaryAccounting from './pages/salaryAccounting'; import PayrollPayment from './pages/payrollPayment'; import IndividualIncomeTaxApplicationForm from './pages/individualIncomeTaxApplicationForm'; -import IndividualIncomeTaxRateForm from './pages/individualIncomeTaxRateForm'; +import TaxRate from './pages/taxRate'; import TaxAgent from './pages/taxAgent'; @@ -76,7 +76,7 @@ const Routes = ( - + ); diff --git a/pc4mobx/hrmSalary/pages/mySalary/index.js b/pc4mobx/hrmSalary/pages/mySalary/index.js index 2c3ae5bf..5412aa46 100644 --- a/pc4mobx/hrmSalary/pages/mySalary/index.js +++ b/pc4mobx/hrmSalary/pages/mySalary/index.js @@ -18,7 +18,7 @@ import { payrollColumns, const { MonthPicker } = DatePicker; -@inject('mySalaryStore') +@inject('baseTableStore') @observer export default class MySalary extends React.Component { constructor(props) { @@ -29,9 +29,9 @@ export default class MySalary extends React.Component { } } render() { - const { mySalaryStore } = this.props; - const { loading, hasRight, form, condition, tableStore, showSearchAd, getTableDatas, doSearch, setShowSearchAd } = mySalaryStore; - const { tabIndex } = mySalaryStore + const { baseTableStore } = this.props; + const { loading, hasRight, form, condition, tableStore, showSearchAd, getTableDatas, doSearch, setShowSearchAd } = baseTableStore; + const { tabIndex } = baseTableStore if (!hasRight && !loading) { // 无权限处理 return renderNoright(); @@ -128,18 +128,16 @@ export default class MySalary extends React.Component { this.setState({selectedKey: v}) }} /> - + + { + this.state.selectedKey == '0' && + } { this.state.selectedKey == '1' && } { this.state.selectedKey == '2' && } - diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js index 294fee60..748ebe2e 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js @@ -132,7 +132,7 @@ export default class Programme extends React.Component { a.age - b.age, + }, + { + title: '上限(含)', + dataIndex: 'age', + key: 'age' + }, + ], + }, + { + title: '免税标准', + children: [ + { + title: '固定值', + dataIndex: 'companyAddress', + key: 'companyAddress', + width: 200, + }, + { + title: '比例', + dataIndex: 'companyName', + key: 'companyName', + }, + ], + }, + { + title: '应纳税所得额', + children: [ + { + title: '下限(不含)', + dataIndex: 'companyAddress', + key: 'companyAddress', + width: 200, + }, + { + title: '上限(含)', + dataIndex: 'companyName', + key: 'companyName', + }, + ], + }, + { + title: '税率', + dataIndex: 'gender', + key: 'gender', + width: 80, + fixed: 'right', + }, + { + title: '速算扣除', + dataIndex: 'gender', + key: 'gender', + width: 80, + fixed: 'right', + } + ]; + + +export const dataSource = []; + + + + + diff --git a/pc4mobx/hrmSalary/pages/taxRate/editSlideContent.js b/pc4mobx/hrmSalary/pages/taxRate/editSlideContent.js new file mode 100644 index 00000000..290e0287 --- /dev/null +++ b/pc4mobx/hrmSalary/pages/taxRate/editSlideContent.js @@ -0,0 +1,72 @@ +import React from 'react'; +import { Row, Col, Table } from "antd" +import { WeaInput, WeaTextarea, WeaSearchGroup } from "ecCom"; +import { slideColumns, dataSource} from './columns'; + + +export default class EditSlideContent extends React.Component { + constructor(props) { + super(props); + this.state = { + value: "" + } + } + render() { + return ( +
+ + + +
名称:
+ + + { + console.log(value); + this.setState({ value }); + }} + customBlur={v => { + console.log("custom blur", v); + }} + onFocus={v => console.log("focus", v)} + onBlur={v => console.log("blur", v)} + /> + + + + + +
备注:
+ + + { + console.log(value); + this.setState({ value }); + }} + customBlur={v => { + console.log("custom blur", v); + }} + onFocus={v => console.log("focus", v)} + onBlur={v => console.log("blur", v)} + /> + + + + + + + + ) + } +} \ No newline at end of file diff --git a/pc4mobx/hrmSalary/pages/taxRate/index.js b/pc4mobx/hrmSalary/pages/taxRate/index.js new file mode 100644 index 00000000..d38a61f2 --- /dev/null +++ b/pc4mobx/hrmSalary/pages/taxRate/index.js @@ -0,0 +1,123 @@ +import React from 'react'; +import { inject, observer } from 'mobx-react'; +import { toJS } from 'mobx'; + +import { Button, Table, DatePicker } from 'antd'; + +import { WeaTop, WeaTab, WeaRightMenu, WeaRangePicker, WeaTable, WeaInputSearch, WeaSlideModal } from 'ecCom'; + +import { renderNoright, getSearchs } from '../../util'; // 渲染form数据的方法：因为多个页面都会使用，所以抽的公共方法在util中 +import CustomTab from '../../components/customTab'; +import ContentWrapper from '../../components/contentWrapper'; + +import { columns, dataSource } from './columns'; + +import SlideModalTitle from '../../components/slideModalTitle'; +import EditSlideContent from './editSlideContent'; + +const { MonthPicker } = DatePicker; + +@inject('baseTableStore') +@observer +export default class TaxRate extends React.Component { + constructor(props) { + super(props); + this.state = { + value: "", + selectedKey: "0", + slideVisiable: false, + + } + } + render() { + const { baseTableStore } = this.props; + const { loading, hasRight, form, condition, tableStore, showSearchAd, getTableDatas, doSearch, setShowSearchAd } = baseTableStore; + + if (!hasRight && !loading) { // 无权限处理 + return renderNoright(); + } + + const rightMenu = [// 右键菜单 + { + key: 'BTN_COLUMN', + icon: , + content: '显示列定制', + onClick: this.showColumn + }, + ]; + const collectParams = { // 收藏功能配置 + favname: '个税税率表', + favouritetype: 1, + objid: 0, + link: 'wui/index.html#/ns_demo03/index', + importantlevel: 1, + }; + const adBtn = [ // 高级搜索内部按钮 + , + , + , + ]; + + const topTab = [ + ]; + + const renderSearchOperationItem = () => { + return
+ + {' '} + +
+ + } + + return ( +
+ + } // 左侧图标 + iconBgcolor='#F14A2D' // 左侧图标背景色 + showDropIcon={true} // 是否显示下拉按钮 + dropMenuDatas={rightMenu} // 下拉菜单（和页面的右键菜单相同） + dropMenuProps={{ collectParams }} // 收藏功能: 配置之后显示 收藏、帮助、显示页面地址 这3个功能 + > + + { + this.setState({ selectedKey: v }) + }} + /> + + + + + + } + content={()} + onClose={() => this.setState({ slideVisiable: false })} + showMask={true} + closeMaskOnClick={() => this.setState({ slideVisiable: false })} + onAnimationEnd={() => console.log('onAnimationEnd')} /> +
+ ) + } +}