diff --git a/pc4mobx/hrmSalary/components/selectItemsModal/index.js b/pc4mobx/hrmSalary/components/selectItemsModal/index.js index a3b2cce3..201aa7a2 100644 --- a/pc4mobx/hrmSalary/components/selectItemsModal/index.js +++ b/pc4mobx/hrmSalary/components/selectItemsModal/index.js @@ -1,3 +1,9 @@ +/* + * Author: 黎永顺 + * Description: + * Date: 2022-05-19 15:18:09 + * LastEditTime: 2022-06-29 10:06:13 + */ import React from 'react'; import { WeaInputSearch, WeaCheckbox } from 'ecCom' import { Row , Col, Modal, Dropdown, Menu, Button } from "antd" diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js index 2db9d2a5..3f74f2d9 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js @@ -840,7 +840,7 @@ export default class Attendance extends React.Component { } - {this.state.modalVisiable && + {/* {this.state.modalVisiable && */} { this.handleInitImportModal(); @@ -869,7 +869,8 @@ export default class Attendance extends React.Component { onCancel={() => { this.handleFinish(); }} - />} + /> + {/* } */} { diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js index 1f767197..aade9f6e 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js @@ -2,7 +2,7 @@ * Author: 黎永顺 * Description: 正常缴纳月份 * Date: 2022-04-20 08:56:08 - * LastEditTime: 2022-06-28 18:04:37 + * LastEditTime: 2022-06-29 09:53:36 */ import React, { Component } from "react"; import { Icon, Tooltip, Button, message, Modal, Spin } from "antd"; @@ -133,7 +133,8 @@ export default class NormalIndex extends Component { message.success("添加成功"); this.getSupplementaryList({ billMonth, - current: this.state.current + current: this.state.current, + paymentOrganization }); this.setState( { @@ -248,7 +249,11 @@ export default class NormalIndex extends Component { title: "确认信息", content: "确认删除勾选的数据吗?", onOk: () => { - siaccountCommonDelete({ billMonth, includes }).then(() => { + siaccountCommonDelete({ + billMonth, + includes, + paymentOrganization + }).then(() => { message.success("删除成功"); this.setState({ selectedRowKeys: [] }); selectedKey === "1"