From 752eb6b6d17f3c7c2eafed027ff96e8ee8acac77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Wed, 28 Feb 2024 16:42:15 +0800 Subject: [PATCH] =?UTF-8?q?feature/2.10.1.2401.01-=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hrmSalary/pages/adjustSalaryManage/index.js | 16 +++++++++++++--- .../attendance/components/fieldMangComp.js | 16 +++++++++++++--- .../pages/externalPersonManage/index.js | 15 ++++++++++++--- .../components/payrollTable/index.js | 14 ++++++++++++-- .../components/grantTableList/index.js | 5 ----- pc4mobx/hrmSalary/pages/salaryItem/index.js | 13 +++++++++++-- 6 files changed, 61 insertions(+), 18 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/adjustSalaryManage/index.js b/pc4mobx/hrmSalary/pages/adjustSalaryManage/index.js index 034ef98d..59b752f3 100644 --- a/pc4mobx/hrmSalary/pages/adjustSalaryManage/index.js +++ b/pc4mobx/hrmSalary/pages/adjustSalaryManage/index.js @@ -11,7 +11,7 @@ import { adjustRecordItemList } from "../../apis/adjustManage"; import AdvanceInputBtn from "./components/advanceInputBtn"; import AdjustAdvanceSearchPannel from "./components/adjustAdvanceSearchPannel"; import cs from "classnames"; -import { Button } from "antd"; +import { Button, Dropdown, Menu } from "antd"; import { convertToUrlString } from "../../util/url"; import LogDialog from "../../components/logViewModal"; import "./index.less"; @@ -65,8 +65,18 @@ class Index extends Component { return { ...o, width: 150 }; }), { dataIndex: "options", title: getLabel(30585, "操作"), - width: 120, render: (_, record) => ( this.onDropMenuClick("log", record.id)}>{getLabel(545781, "操作日志")}) + width: 120, render: (_, record) => ( + + + this.onDropMenuClick("log", record.id)}>{getLabel(545781, "操作日志")} + + + }> + + ) }] }); } diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/fieldMangComp.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/fieldMangComp.js index fd9f744e..5380abfe 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/fieldMangComp.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/fieldMangComp.js @@ -6,7 +6,7 @@ */ import React, { Component } from "react"; import { WeaCheckbox, WeaLocaleProvider, WeaTable } from "ecCom"; -import { Col, message, Row } from "antd"; +import { Col, Dropdown, Menu, message, Row } from "antd"; import AttendanceCustomFieldsModal from "./attendanceCustomFieldsModal"; import { getAttendanceFieldList, updateAttendanceFieldStatus } from "../../../../apis/attendance"; import TipLabel from "../../../../components/TipLabel"; @@ -92,8 +92,18 @@ class FieldMangComp extends Component { dataIndex: "options", title: getLabel(30585, "操作"), width: 120, - render: (_, record) => ( this.props.onFilterLog("log", record.id)}>{getLabel(545781, "操作日志")}) + render: (_, record) => ( + + + this.props.onFilterLog("log", record.id)}>{getLabel(545781, "操作日志")} + + + }> + + ) }]; }; diff --git a/pc4mobx/hrmSalary/pages/externalPersonManage/index.js b/pc4mobx/hrmSalary/pages/externalPersonManage/index.js index 7a99295c..6ccce9c0 100644 --- a/pc4mobx/hrmSalary/pages/externalPersonManage/index.js +++ b/pc4mobx/hrmSalary/pages/externalPersonManage/index.js @@ -9,7 +9,7 @@ import { inject, observer } from "mobx-react"; import { WeaHelpfulTip, WeaLocaleProvider, WeaTab, WeaTable, WeaTop } from "ecCom"; import ExternalPersonManageEditSlide from "./components/externalPersonManageEditSlide"; import ExternalPersonImport from "./components/externalPersonImport"; -import { Button, message, Modal } from "antd"; +import { Button, Dropdown, Menu, message, Modal } from "antd"; import { getSearchs } from "../../util"; import { condition, searchCondition } from "./conditions"; import { deleteExtEmp, listPage } from "../../apis/externalPersonManage"; @@ -200,8 +200,17 @@ class Index extends Component { this.handleAdd(id)} style={{ paddingRight: 8 }}>编辑 - this.onDropMenuClick("log", id)} - style={{ paddingRight: 8 }}>{getLabel(545781, "操作日志")} + + + this.onDropMenuClick("log", id)}>{getLabel(545781, "操作日志")} + + + }> + + {/* this.handleDelete(id)}>删除*/} ) diff --git a/pc4mobx/hrmSalary/pages/mySalaryBenefits/components/payrollTable/index.js b/pc4mobx/hrmSalary/pages/mySalaryBenefits/components/payrollTable/index.js index 385cdf51..4e746a70 100644 --- a/pc4mobx/hrmSalary/pages/mySalaryBenefits/components/payrollTable/index.js +++ b/pc4mobx/hrmSalary/pages/mySalaryBenefits/components/payrollTable/index.js @@ -6,6 +6,7 @@ */ import React, { Component } from "react"; import { WeaLocaleProvider, WeaTable } from "ecCom"; +import { Dropdown, Menu } from "antd"; import { mySalaryBillList, mySalaryBillList4Card } from "../../../../apis/mySalaryBenefits"; import moment from "moment"; @@ -87,8 +88,17 @@ class Index extends Component { {getLabel(33564, "查看")} - this.props.onFilterLog("log", record.id)}>{getLabel(545781, "操作日志")} + + + this.props.onFilterLog("log", record.id)}>{getLabel(545781, "操作日志")} + + + }> + + ) }]} /> diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/components/grantTableList/index.js b/pc4mobx/hrmSalary/pages/payrollRelease/components/grantTableList/index.js index 25bbc2cf..64e91b27 100644 --- a/pc4mobx/hrmSalary/pages/payrollRelease/components/grantTableList/index.js +++ b/pc4mobx/hrmSalary/pages/payrollRelease/components/grantTableList/index.js @@ -143,11 +143,6 @@ class Index extends Component { style={{ marginRight: 10 }} target="_blank" >{getLabel(83110, "查看详情")} } - { - !canSeeDetail && - this.props.onFilterLog("log", record.id)}>{getLabel(545781, "操作日志")} - } { sendNum === sendTotal && !showGrant && this.handleDeleteItem(record)} >{getLabel(535052, "删除")} } - this.onDropMenuClick("log", record.id)}>{getLabel(545781, "操作日志")} + + + this.onDropMenuClick("log", record.id)}>{getLabel(545781, "操作日志")} + + + }> + + ); }