diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js index 22a80218..97d5e28e 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js @@ -4,6 +4,7 @@ export const tabCondition = [ groupid: "PENDING", showcount: true, title: "待定薪", + lanId: 542689, viewcondition: "pending" }, { @@ -11,6 +12,7 @@ export const tabCondition = [ groupid: "FIXED", showcount: true, title: "发薪员工", + lanId: 111, viewcondition: "fixed" }, { @@ -18,6 +20,7 @@ export const tabCondition = [ groupid: "SUSPEND", showcount: true, title: "待停薪", + lanId: 542691, viewcondition: "suspend" }, { @@ -25,6 +28,7 @@ export const tabCondition = [ groupid: "STOP", showcount: true, title: "停薪员工", + lanId: 111, viewcondition: "stop" }, { @@ -32,6 +36,7 @@ export const tabCondition = [ groupid: "EXT", showcount: true, title: "非系统人员", + lanId: 542679, viewcondition: "ext" } ]; diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/index.js index 65dde0d6..bc8da79c 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/index.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/index.js @@ -552,7 +552,7 @@ class Index extends Component { this.setState({ selectedRowKeys: [] }); }}/> }> - @@ -803,7 +803,11 @@ class Index extends Component { dropMenuDatas={rightMenu} > ({...it, title: getLabel(it.lanId, it.title)})) : + _.map(tabCondition, it=> ({...it, title: getLabel(it.lanId, it.title)})) + } counts={tabCount} className="payrollFilesTab" keyParam="viewcondition" //主键 diff --git a/pc4mobx/hrmSalary/pages/salaryFile/changeSalaryModal.js b/pc4mobx/hrmSalary/pages/salaryFile/changeSalaryModal.js index fbb01683..b88dab2a 100644 --- a/pc4mobx/hrmSalary/pages/salaryFile/changeSalaryModal.js +++ b/pc4mobx/hrmSalary/pages/salaryFile/changeSalaryModal.js @@ -1,6 +1,7 @@ import React from "react"; import { Button, Col, message, Row } from "antd"; import { WeaDatePicker, WeaDialog, WeaInput, WeaLocaleProvider, WeaSelect, WeaTable } from "ecCom"; +import { toJS } from "mobx"; import { inject, observer } from "mobx-react"; import moment from "moment"; import "./index.less"; @@ -78,6 +79,7 @@ export default class ChangeSalaryModal extends React.Component { const { salaryFileStore: { salaryItemChangeForm }, recordId } = this.props; const { salaryItemList } = salaryItemChangeForm; let { columns } = salaryItemChangeForm; + console.log(toJS(columns)); return columns.map(item => { item = { ...item }; if (item.dataIndex == "salaryItem") { diff --git a/pc4mobx/hrmSalary/pages/taxAgent/editModal.js b/pc4mobx/hrmSalary/pages/taxAgent/editModal.js index 3fdb60be..0d311f56 100644 --- a/pc4mobx/hrmSalary/pages/taxAgent/editModal.js +++ b/pc4mobx/hrmSalary/pages/taxAgent/editModal.js @@ -139,7 +139,7 @@ export default class EditModal extends React.Component { initLoadCss className="taxagentModalWrapper" visible={visible} - style={{ width: 800, height: 450 }} + style={{ width: 860, height: 450 }} hasScroll> {title.indexOf(getLabel(501169, "编辑")) >= 0 && (