- {renderLogSearchsForm(form, conditions, () => this.getLogs({ current: 1 }), () => {
+ {renderLogSearchsForm(form, conditions, () => this.getLogs({ current: 1 }, this.props), () => {
form.resetForm();
- this.getLogs({ current: 1 });
+ this.getLogs({ current: 1 }, this.props);
})}
{
+ columns: [..._.map(columns, o => {
if (o.dataIndex === "username") {
return { ...o, width: 150, fixed: "left" };
}
return { ...o, width: 150 };
- })
+ }), {
+ dataIndex: "options", title: getLabel(30585, "操作"),
+ width: 120, render: (_, record) => ( this.onDropMenuClick("log", record.id)}>{getLabel(545781, "操作日志")})
+ }]
});
}
}).catch(() => this.setState({ loading: false }));
@@ -88,10 +93,13 @@ class Index extends Component {
}
this.handleDebounce();
};
- onDropMenuClick = (key) => {
+ onDropMenuClick = (key, targetid = "") => {
switch (key) {
case "log":
- this.setState({ logDialogVisible: true });
+ this.setState({
+ logDialogVisible: true,
+ filterConditions: targetid ? `[{\"connectCondition\":\"AND\",\"columIndex\":\"targetid\",\"type\":\"=\",\"value\":\"${targetid}\"}]` : "[]"
+ });
break;
default:
break;
@@ -99,7 +107,7 @@ class Index extends Component {
};
render() {
- const { loading, dataSource, columns, pageInfo, showSearchAd, logDialogVisible } = this.state;
+ const { loading, dataSource, columns, pageInfo, showSearchAd, logDialogVisible, filterConditions } = this.state;
const pagination = {
...pageInfo,
showTotal: total => `${getLabel(18609, "共")} ${total} ${getLabel(18256, "条")}`,
@@ -145,7 +153,7 @@ class Index extends Component {
pagination={pagination} columns={columns}
/>
{/*操作日志*/}
- this.setState({ logDialogVisible: false })}/>
);
diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js
index fe2554e4..080dd0e4 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js
@@ -27,7 +27,10 @@ export const condition = [
labelcol: 6,
options: [],
rules: "required|string",
- viewAttr: 3
+ viewAttr: 3,
+ otherParams: {
+ showSearch: true, optionFilterProp: "children"
+ }
},
{
colSpan: 1,
diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/employeeDetails.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/employeeDetails.js
index dc89547d..17a73140 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/employeeDetails.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/employeeDetails.js
@@ -52,10 +52,14 @@ class EmployeeDetails extends Component {
columns: [...columns, {
title: "操作",
dataIndex: "operate",
- width: 80,
+ width: 120,
render: (_, record) => {
- return {getLabel(111, "查看")};
+ return
+ {getLabel(111, "查看")}
+ this.props.onFilterLog("log", record.id)}>{getLabel(545781, "操作日志")}
+ ;
}
}]
});
diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js
index ba66eec2..dccae63f 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js
@@ -44,6 +44,8 @@ class ReportList extends Component {
message.error(errormsg);
}
});
+ } else if (key === "log") {
+ this.props.onFilterLog(key, id);
}
};
reportStatisticsReportDelete = (payload) => {
@@ -106,6 +108,7 @@ class ReportList extends Component {
{getLabel(111, "编辑")}
{getLabel(77, "复制")}
{getLabel(111, "删除")}
+ {getLabel(545781, "操作日志")}
}>
diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js
index 3461e431..3666ec39 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js
@@ -43,7 +43,7 @@ class Index extends Component {
title: "", visible: false,
typeKey: "", id: ""
},
- logDialogVisible: false
+ logDialogVisible: false, filterConditions: "[]"
};
}
@@ -245,10 +245,13 @@ class Index extends Component {
initTable && this.dimensionTableRef.dimensionList();
});
};
- onDropMenuClick = (key) => {
+ onDropMenuClick = (key, targetid = "") => {
switch (key) {
case "log":
- this.setState({ logDialogVisible: true });
+ this.setState({
+ logDialogVisible: true,
+ filterConditions: targetid ? `[{\"connectCondition\":\"AND\",\"columIndex\":\"targetid\",\"type\":\"=\",\"value\":\"${targetid}\"}]` : "[]"
+ });
break;
default:
break;
@@ -259,7 +262,7 @@ class Index extends Component {
const { taxAgentStore: { statisticsReportBtn }, attendanceStore: { statisticsForm, reportForm } } = this.props;
const {
selectedKey, modalReq, slideReq, conditions, reportConditions,
- reportName, keyword, year, logDialogVisible
+ reportName, keyword, year, logDialogVisible, filterConditions
} = this.state;
const buttons = selectedKey === "statistics" ? [
,
@@ -303,9 +306,11 @@ class Index extends Component {
ref={dom => this.reportListRef = dom}
reportName={reportName}
onEdit={this.handleReqBtnsClick}
+ onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)}
/> : this.employeeListRef = dom}
keyword={keyword} year={year}
+ onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)}
/>
}
{/*操作日志*/}
- this.setState({ logDialogVisible: false })}/>
);
diff --git a/pc4mobx/hrmSalary/pages/calculate/calculate.js b/pc4mobx/hrmSalary/pages/calculate/calculate.js
index 6045ec6f..e6207394 100644
--- a/pc4mobx/hrmSalary/pages/calculate/calculate.js
+++ b/pc4mobx/hrmSalary/pages/calculate/calculate.js
@@ -166,14 +166,21 @@ class Calculate extends Component {
}
});
break;
+ case "log":
+ //操作日志
+ this.onDropMenuClick(key, record.id);
+ break;
default:
break;
}
};
- onDropMenuClick = (key) => {
+ onDropMenuClick = (key, targetid = "") => {
switch (key) {
case "log":
- this.setState({ logDialogVisible: true });
+ this.setState({
+ logDialogVisible: true,
+ filterConditions: targetid ? `[{\"connectCondition\":\"AND\",\"columIndex\":\"targetid\",\"type\":\"=\",\"value\":\"${targetid}\"}]` : "[]"
+ });
break;
default:
break;
@@ -181,7 +188,7 @@ class Calculate extends Component {
};
render() {
- const { queryParams, isRefresh, calcDaialog, progressModule, logDialogVisible } = this.state;
+ const { queryParams, isRefresh, calcDaialog, progressModule, logDialogVisible, filterConditions } = this.state;
return (
} iconBgcolor="#F14A2D"
buttons={this.renderCalculateOpts()} className="calculate-main-layout" showDropIcon
@@ -202,7 +209,7 @@ class Calculate extends Component {
}, () => bool === "refresh" && window.open(`/spa/hrmSalary/static/index.html#/main/hrmSalary/calculate/${id}`))}
/>
{/*操作日志*/}
- this.setState({ logDialogVisible: false })}/>
{/* 归档进度条*/}
{
diff --git a/pc4mobx/hrmSalary/pages/calculate/components/calculateTablelist/index.js b/pc4mobx/hrmSalary/pages/calculate/components/calculateTablelist/index.js
index 626eba5b..eecfa1db 100644
--- a/pc4mobx/hrmSalary/pages/calculate/components/calculateTablelist/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/components/calculateTablelist/index.js
@@ -72,7 +72,8 @@ class Index extends Component {
/>
,
render: (__, record) => {
- const { operate = [] } = record;
+ const { operate: opts = [] } = record;
+ const operate = [...opts, { index: "log", text: getLabel(30586, "查看日志") }];
return
{
_.map(operate.slice(0, 2), f => (
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataComp.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataComp.js
index 2395f7f1..cd8ec31a 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataComp.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataComp.js
@@ -5,8 +5,8 @@
* Date: 2023/2/24
*/
import React, { Component } from "react";
-import { WeaTable } from "ecCom";
-import { message, Modal } from "antd";
+import { WeaLocaleProvider, WeaTable } from "ecCom";
+import { Dropdown, Menu, message, Modal } from "antd";
import {
deleteAttendance,
getAttendanceFieldSettingList,
@@ -28,6 +28,8 @@ import SelectItemsWrapper from "../../../../components/selectItemsModal/selectIt
import AttendanceRefrenceDataModal from "./attendanceRefrenceDataModal";
import AttendanceDataViewSlide from "./attendanceDataViewSlide";
+const getLabel = WeaLocaleProvider.getLabel;
+
class AttendanceDataComp extends Component {
constructor(props) {
super(props);
@@ -364,7 +366,26 @@ class AttendanceDataComp extends Component {
);
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/fieldMangComp.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/fieldMangComp.js
index 687c6482..fd9f744e 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/fieldMangComp.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/fieldMangComp.js
@@ -5,13 +5,15 @@
* Date: 2023/2/24
*/
import React, { Component } from "react";
-import { WeaCheckbox, WeaTable } from "ecCom";
+import { WeaCheckbox, WeaLocaleProvider, WeaTable } from "ecCom";
import { Col, message, Row } from "antd";
import AttendanceCustomFieldsModal from "./attendanceCustomFieldsModal";
import { getAttendanceFieldList, updateAttendanceFieldStatus } from "../../../../apis/attendance";
import TipLabel from "../../../../components/TipLabel";
import { fieldsColumns } from "../columns";
+const getLabel = WeaLocaleProvider.getLabel;
+
class FieldMangComp extends Component {
constructor(props) {
super(props);
@@ -71,7 +73,7 @@ class FieldMangComp extends Component {
getColumns = () => {
const { columns } = this.state;
const { showOperateBtn } = this.props;
- return _.map(_.filter(columns, item => !!item.display), child => ({
+ return [..._.map(_.filter(columns, item => !!item.display), child => ({
...child,
render: (text, record) => {
switch (child.dataIndex) {
@@ -86,7 +88,13 @@ class FieldMangComp extends Component {
return ;
}
}
- }));
+ })), {
+ dataIndex: "options",
+ title: getLabel(30585, "操作"),
+ width: 120,
+ render: (_, record) => ( this.props.onFilterLog("log", record.id)}>{getLabel(545781, "操作日志")})
+ }];
};
render() {
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js
index 6172f5e0..7f4c67c1 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js
@@ -24,7 +24,7 @@ class Index extends Component {
super(props);
this.state = {
fieldName: "", selectedKey: "DATA", salaryMonth: [],
- logDialogVisible: false
+ logDialogVisible: false, filterConditions: "[]"
};
}
@@ -68,10 +68,13 @@ class Index extends Component {
visible: true, title: "引用考勤数据"
});
};
- onDropMenuClick = (key) => {
+ onDropMenuClick = (key, targetid = "") => {
switch (key) {
case "log":
- this.setState({ logDialogVisible: true });
+ this.setState({
+ logDialogVisible: true,
+ filterConditions: targetid ? `[{\"connectCondition\":\"AND\",\"columIndex\":\"targetid\",\"type\":\"=\",\"value\":\"${targetid}\"}]` : "[]"
+ });
break;
default:
break;
@@ -79,7 +82,7 @@ class Index extends Component {
};
render() {
- const { selectedKey, salaryMonth, fieldName, logDialogVisible } = this.state;
+ const { selectedKey, salaryMonth, fieldName, logDialogVisible, filterConditions } = this.state;
const { taxAgentStore: { showOperateBtn } } = this.props;
const topTab = [
{ title: "考勤数据", key: "DATA" },
@@ -119,18 +122,20 @@ class Index extends Component {
ref={dom => this.attendanceTableRef = dom}
showOperateBtn={showOperateBtn}
salaryYearMonth={salaryMonth}
+ onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)}
/> :
this.fieldMangRef = dom}
showOperateBtn={showOperateBtn}
fieldName={fieldName}
+ onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)}
/>
}