diff --git a/pc4mobx/hrmSalary/pages/salary/components/taxAgentTable.js b/pc4mobx/hrmSalary/pages/salary/components/taxAgentTable.js
index 8783090b..c21d1d41 100644
--- a/pc4mobx/hrmSalary/pages/salary/components/taxAgentTable.js
+++ b/pc4mobx/hrmSalary/pages/salary/components/taxAgentTable.js
@@ -6,6 +6,7 @@
*/
import React, { Component } from "react";
import { WeaLocaleProvider, WeaTable } from "ecCom";
+import { Dropdown, Menu } from "antd";
import * as API from "../../../apis/taxAgent";
import "./index.less";
@@ -114,6 +115,17 @@ class TaxAgentTable extends Component {
onOperate("delete", record.id)}>{getLabel(535052, "删除")}
}
+
+
+ onOperate("log", record.id)}>{getLabel(545781, "操作日志")}
+
+
+ }>
+
+
}
]}
diff --git a/pc4mobx/hrmSalary/pages/salary/index.less b/pc4mobx/hrmSalary/pages/salary/index.less
index 8373a244..de04ce9f 100644
--- a/pc4mobx/hrmSalary/pages/salary/index.less
+++ b/pc4mobx/hrmSalary/pages/salary/index.less
@@ -37,7 +37,7 @@
.ant-col-10 {
span:nth-child(2) {
- margin-top: -6px;
+ //margin-top: -6px;
}
}
}
diff --git a/pc4mobx/hrmSalary/pages/salary/taxAgent.js b/pc4mobx/hrmSalary/pages/salary/taxAgent.js
index 4cd931fc..4ab69a82 100644
--- a/pc4mobx/hrmSalary/pages/salary/taxAgent.js
+++ b/pc4mobx/hrmSalary/pages/salary/taxAgent.js
@@ -7,6 +7,7 @@ import ComHint from "./components/comHint";
import TaxAgentTable from "./components/taxAgentTable";
import TaxAgentSlide from "./components/taxAgentSlide";
import * as API from "../../apis/taxAgent";
+import LogDialog from "../../components/logViewModal";
import "./index.less";
const { getLabel } = WeaLocaleProvider;
@@ -24,7 +25,9 @@ class TaxAgent extends Component {
taxAgentSlideProps: {
isEdit: false, visible: false, title: getLabel(543629, "新增个税扣缴义务人"),
taxAgentId: "", current: 0, salaryOn: true
- }
+ },
+ logDialogVisible: false,
+ filterConditions: "[]"
};
this.taxAgentTableRef = null;
}
@@ -165,6 +168,12 @@ class TaxAgent extends Component {
}
});
break;
+ case "log":
+ this.setState({
+ logDialogVisible: true,
+ filterConditions: itemId ? `[{\"connectCondition\":\"AND\",\"columIndex\":\"targetid\",\"type\":\"=\",\"value\":\"${itemId}\"}]` : "[]"
+ });
+ break;
default:
break;
}
@@ -173,7 +182,7 @@ class TaxAgent extends Component {
render() {
const {
searchValue, decentralization, taxAgentSlideProps,
- permission, syncLoading
+ permission, syncLoading, logDialogVisible, filterConditions
} = this.state;
const btns = [
}
iconBgcolor="#F14A2D"
buttons={btns}
+ showDropIcon onDropMenuClick={key => this.handleOperate(key)}
+ dropMenuDatas={[
+ {
+ key: "log", icon: ,
+ content: getLabel(545781, "操作日志")
+ }
+ ]}
>
{
@@ -226,6 +242,9 @@ class TaxAgent extends Component {
onOk={() => this.taxAgentTableRef.getTaxAgentList()}
onCancel={(isUpdate = false) => this.handelResetSlide(isUpdate)}
/>
+ {/*操作日志*/}
+ this.setState({ logDialogVisible: false })}/>
);