From ec3d2faa081442cec9861a5d5f2c3f279ea50c9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 8 Aug 2024 14:53:11 +0800
Subject: [PATCH] =?UTF-8?q?release/2.15.1.2407.01-=E4=B8=AA=E7=A8=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/salary/components/taxAgentTable.js  | 12 ++++++++++
 pc4mobx/hrmSalary/pages/salary/index.less     |  2 +-
 pc4mobx/hrmSalary/pages/salary/taxAgent.js    | 23 +++++++++++++++++--
 3 files changed, 34 insertions(+), 3 deletions(-)

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 {
                   <a href="javaScript:void(0);" style={{ marginLeft: 10 }}
                      onClick={() => onOperate("delete", record.id)}>{getLabel(535052, "删除")}</a>
                 }
+                <Dropdown
+                  overlay={
+                    <Menu>
+                      <Menu.Item>
+                        <a href="javascript:void(0)" style={{ marginLeft: 10 }}
+                           onClick={() => onOperate("log", record.id)}>{getLabel(545781, "操作日志")}</a>
+                      </Menu.Item>
+                    </Menu>
+                  }>
+                  <a href="javascript:void(0)"><i className="icon-coms-more"/></a>
+                </Dropdown>
               </div>
           }
         ]}
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 = [
       <Button type="primary" onClick={this.taxAgentRangeSync}
@@ -202,6 +211,13 @@ class TaxAgent extends Component {
           icon={<i className="icon-coms-fa"/>}
           iconBgcolor="#F14A2D"
           buttons={btns}
+          showDropIcon onDropMenuClick={key => this.handleOperate(key)}
+          dropMenuDatas={[
+            {
+              key: "log", icon: <i className="iconfont icon-caozuorizhi32"/>,
+              content: getLabel(545781, "操作日志")
+            }
+          ]}
         >
           <div className="comContent">
             {
@@ -226,6 +242,9 @@ class TaxAgent extends Component {
             onOk={() => this.taxAgentTableRef.getTaxAgentList()}
             onCancel={(isUpdate = false) => this.handelResetSlide(isUpdate)}
           />
+          {/*操作日志*/}
+          <LogDialog visible={logDialogVisible} logFunction="taxagent" filterConditions={filterConditions}
+                     onCancel={() => this.setState({ logDialogVisible: false })}/>
         </WeaTop>
       </div>
     );