diff --git a/pc4mobx/hrmSalary/pages/salaryFile/index.js b/pc4mobx/hrmSalary/pages/salaryFile/index.js index 0149cac8..7a58edca 100644 --- a/pc4mobx/hrmSalary/pages/salaryFile/index.js +++ b/pc4mobx/hrmSalary/pages/salaryFile/index.js @@ -89,8 +89,18 @@ export default class SalaryFile extends React.Component { isSingle={false} value={key === "departmentIds" ? departmentIds : positionIds} tabs={key === "departmentIds" ? [ + { + dataParams: null, + dataURL: null, + isSearch: false, + key: "2", + name: "组织结构", + selected: false, + showOrder: 0 + }, { dataParams: { list: "1" }, + dataURL: null, isSearch: true, key: "1", name: "按列表", diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/baseForm.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/baseForm.js index 317fb2b4..b64b3d87 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/baseForm.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/baseForm.js @@ -1,42 +1,58 @@ -import React from 'react' -import GroupCard from '../../../components/groupCard' -import { Row, Col } from 'antd' -import { inject, observer } from 'mobx-react'; -import "./index.less" +import React from "react"; +import GroupCard from "../../../components/groupCard"; +import { Col, Row, Tooltip } from "antd"; +import { inject, observer } from "mobx-react"; +import "./index.less"; -@inject('archivesStore') +@inject("archivesStore") @observer export default class BaseForm extends React.Component { - componentWillMount() { - const {archivesStore: {getBaseForm}} = this.props; - getBaseForm(this.props.employeeId) - } + componentWillMount() { + const { archivesStore: { getBaseForm } } = this.props; + getBaseForm(this.props.employeeId); + } - render() { - const { archivesStore: {baseFormData}} = this.props; - return ( -
- - - 姓名: - {baseFormData.username} - 部门: - {baseFormData.department} - 岗位: - {baseFormData.position} - + render() { + const { archivesStore: { baseFormData } } = this.props; + return ( +
+ + + 姓名: + + + {baseFormData.username} + + + 部门: + + + {baseFormData.department} + + + 岗位: + + + {baseFormData.position} + + + - - 入职日期: - {baseFormData.hiredate} - 手机号: - {baseFormData.telephone} - 离职时间: - {baseFormData.dimissionDate} - - -
- ) - } + + 入职日期: + {baseFormData.hiredate} + 手机号: + + + {baseFormData.telephone} + + + 离职时间: + {baseFormData.dimissionDate} + + +
+ ); + } } diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/socialSecurityForm.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/socialSecurityForm.js index 5fdd1b34..2a6b5162 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/socialSecurityForm.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/socialSecurityForm.js @@ -113,9 +113,12 @@ export default class SocialSecurityForm extends React.Component { 个税扣缴义务人： - this.handleFormChange({ paymentOrganization: value })}> { items && items[0].items && items[0].items[1] && items[0].items[1].options.map(item => ( diff --git a/pc4mobx/hrmSalary/pages/taxAgent/addTaxAgentModal.js b/pc4mobx/hrmSalary/pages/taxAgent/addTaxAgentModal.js index c963729d..f034ae40 100644 --- a/pc4mobx/hrmSalary/pages/taxAgent/addTaxAgentModal.js +++ b/pc4mobx/hrmSalary/pages/taxAgent/addTaxAgentModal.js @@ -100,8 +100,18 @@ export default class AddTaxAgentModal extends React.Component { type={57} title={"部门选择"} tabs={[ + { + dataParams: null, + dataURL: null, + isSearch: false, + key: "2", + name: "组织结构", + selected: false, + showOrder: 0 + }, { dataParams: { list: "1" }, + dataURL: null, isSearch: true, key: "1", name: "按列表",