From a101de8355d089862d3e9f7e92f5b8a17a87efd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Mon, 19 Aug 2024 09:10:47 +0800
Subject: [PATCH] =?UTF-8?q?feature/2.15.1.2407.01-=E8=96=AA=E8=B5=84?=
=?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BB=A5=E5=8F=8A=E5=AD=97=E6=AE=B5=E7=AE=A1?=
=?UTF-8?q?=E7=90=86=E9=A1=B5=E9=9D=A2=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pc4mobx/hrmSalary/pages/salaryItem/index.js | 35 ++++-----
.../pages/salaryItem/salaryItemsTable.js | 72 +++++++++++++++----
2 files changed, 77 insertions(+), 30 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/index.js b/pc4mobx/hrmSalary/pages/salaryItem/index.js
index 0bf9a81b..8f61de7b 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/index.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/index.js
@@ -2,6 +2,7 @@ import React from "react";
import { inject, observer } from "mobx-react";
import { Button, Dropdown, Menu, message, Modal, Switch } from "antd";
import { WeaInputSearch, WeaLocaleProvider, WeaSlideModal, WeaTop } from "ecCom";
+import * as API from "../../apis/item";
import SalaryItemsTable from "./salaryItemsTable";
import { toDecimal_n } from "../../util";
import SystemSalaryItemModal from "./systemSalaryItemModal";
@@ -68,28 +69,29 @@ export default class SalaryItem extends React.Component {
});
};
- // 删除列表项
- handleDeleteItem(record) {
- const { salaryItemStore: { deleteItemRequest, getTableDatas } } = this.props;
+ handleDeleteItem = () => {
+ const { selectedRowKeys, isQuery } = this.state;
+ if (_.isEmpty(selectedRowKeys)) {
+ message.warning(getLabel(111, "请勾选数据！"));
+ return;
+ }
Modal.confirm({
- title: "信息确认",
- content: "确认删除该条数据吗？",
+ title: getLabel(131329, "信息确认"),
+ content: getLabel(111, "确认删除吗？"),
onOk: () => {
- deleteItemRequest([record.id]).then(() => {
- getTableDatas({ ...this.state.searchParams }).then(res => {
- this.setState({
- searchParams: {
- ...this.state.searchParams,
- total: res.total
- }
- });
- });
+ API.deleteItem(selectedRowKeys).then(({ status, errormsg }) => {
+ if (status) {
+ message.success(getLabel(111, "操作成功！"));
+ this.setState({ isQuery: !isQuery });
+ } else {
+ message.error(errormsg);
+ }
});
},
onCancel: () => {
}
});
- }
+ };
getColumns = () => {
const { salaryItemStore, taxAgentStore: { showSalaryItemBtn, showOperateBtn } } = this.props;
@@ -241,7 +243,7 @@ export default class SalaryItem extends React.Component {
let buttons = [
handleMenuClick({ key: "1" })}>{getLabel(111, "新增自定义薪资项")},
- ,
+ ,
this.setState({ name: val })}
placeholder={getLabel(111, "请输入名称")} onSearch={() => this.setState({ isQuery: !isQuery })}/>
];
@@ -326,6 +328,7 @@ export default class SalaryItem extends React.Component {
className="salaryProjectManagement">
this.setState({ selectedRowKeys: val })}/>
{/**/}
{/* this.getItemList(nextProps));
}
getItemList = (props) => {
@@ -51,10 +54,30 @@ class SalaryItemsTable extends Component {
}
});
};
+ handleDeleteItem = (record) => {
+ Modal.confirm({
+ title: getLabel(131329, "信息确认"),
+ content: getLabel(111, "确认删除吗？"),
+ onOk: () => {
+ API.deleteItem(selectedRowKeys).then(({ status, errormsg }) => {
+ if (status) {
+ message.success(getLabel(111, "操作成功！"));
+ this.getItemList(this.props);
+ } else {
+ message.error(errormsg);
+ }
+ });
+ },
+ onCancel: () => {
+ }
+ });
+ };
render() {
- const { dataSource, columns, pageInfo, selectedRowKeys } = this.state;
- // const { selectedRowKeys, onChange } = this.props;
+ const { dataSource, columns, pageInfo, loading } = this.state;
+ const {
+ selectedRowKeys, onChange, onDropMenuClick, taxAgentStore: { showOperateBtn, showSalaryItemBtn }
+ } = this.props;
const pagination = {
...pageInfo,
showTotal: total => `${getLabel(111, "共")} ${total} ${getLabel(111, "条")}`,
@@ -71,17 +94,38 @@ class SalaryItemsTable extends Component {
}
};
const rowSelection = {
- selectedRowKeys,
- onChange: (selectedRowKeys) => this.setState({ selectedRowKeys }),
- getCheckboxProps: record => {
- console.log(record)
- return ({
- disabled: !record.canDelete
- })
- }
+ selectedRowKeys, onChange,
+ getCheckboxProps: record => ({
+ disabled: !record.canDelete
+ })
};
- return ();
+ return (
+ (
+ {(showOperateBtn || showSalaryItemBtn) ? getLabel(111, "编辑") : getLabel(111, "查看")}
+ {
+ (showOperateBtn || showSalaryItemBtn) && record.canDelete &&
+ this.handleDeleteItem(record)}>{getLabel(111, "删除")}
+ }
+
+
+ onDropMenuClick("log", record.id)}>{getLabel(545781, "操作日志")}
+
+
+ }>
+
+
+ )
+ }
+ ]}/>);
}
}