From 573f2cf62d8aa04c07294ec85b503e285b8bfcf0 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Tue, 15 Apr 2025 09:26:52 +0800
Subject: [PATCH] =?UTF-8?q?release/3.0.1.2504.01-=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datapush/components/pushRecord/index.js   |  6 +++--
 pc4mobx/hrmSalary/pages/datapush/index.js     | 25 +++++++++++--------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/datapush/components/pushRecord/index.js b/pc4mobx/hrmSalary/pages/datapush/components/pushRecord/index.js
index f73e220b..7bcb8bd5 100644
--- a/pc4mobx/hrmSalary/pages/datapush/components/pushRecord/index.js
+++ b/pc4mobx/hrmSalary/pages/datapush/components/pushRecord/index.js
@@ -47,9 +47,11 @@ class Index extends Component {
         this.setState({
           pageInfo: { ...pageInfo, current, pageSize, total }, dataSource,
           columns: [...columns, {
-            title: getLabel(111, "操作"), dataIndex: "opts", width: 120, render: (__, record) => (<React.Fragment>
+            title: getLabel(111, "操作"), dataIndex: "opts", width: 140, render: (__, record) => (<React.Fragment>
               <a href="javascript: void(0);" style={{ marginRight: 10 }}
-                 onClick={() => this.props.onChange("push", record)}>{getLabel(111, "推送")}</a>
+                 onClick={() => _.debounce(this.props.onChange("push", record), 300)}>{getLabel(111, "推送")}</a>
+              <a href="javascript: void(0);" style={{ marginRight: 10 }}
+                 onClick={() => this.props.onChange("withdraw", record)}>{getLabel(111, "撤回")}</a>
               <a href="javascript: void(0);"
                  onClick={() => this.props.onChange("view", record)}>{getLabel(111, "查看详情")}</a>
             </React.Fragment>)
diff --git a/pc4mobx/hrmSalary/pages/datapush/index.js b/pc4mobx/hrmSalary/pages/datapush/index.js
index bdabd479..17f23fab 100644
--- a/pc4mobx/hrmSalary/pages/datapush/index.js
+++ b/pc4mobx/hrmSalary/pages/datapush/index.js
@@ -27,7 +27,7 @@ class Index extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      selectedKey: "datapush", isQuery: false, query: { name: "" },
+      selectedKey: "pushRecord", isQuery: false, query: { name: "" },
       DPDialog: { visible: false, title: "", detail: {} }, //数据推送弹框
       pushDetailDialog: { visible: false, recordId: "" } //数据推送记录查看推送详情弹框
     };
@@ -60,6 +60,9 @@ class Index extends Component {
       case "view":
         this.setState({ pushDetailDialog: { visible: true, recordId: detail.id } });
         break;
+      case "push":
+        console.log(detail)
+        break;
       default:
         break;
     }
@@ -70,16 +73,6 @@ class Index extends Component {
     const { taxAgentStore: { PageAndOptAuth } } = this.props;
     const showOperateBtn = PageAndOptAuth.opts.includes("admin");
     const tabs = [
-      {
-        title: getLabel(111, "数据推送"), key: "datapush", showDropIcon: false, dropMenuDatas: [],
-        buttons: showOperateBtn ? [
-          <Button type="primary" onClick={() => this.handleOperate("create")}>{getLabel(111, "新建")}</Button>,
-          <WeaInputSearch style={{ top: -3 }} value={query.name} onSearch={this.handleAdvanceSearch}
-                          onChange={v => this.setState({ query: { ...query, name: v } })}/>
-        ] : [<WeaInputSearch style={{ top: -3 }} value={query.name} onSearch={this.handleAdvanceSearch}
-                             onChange={v => this.setState({ query: { ...query, name: v } })}/>],
-        children: <DatapushList isQuery={isQuery} query={query} onChange={this.handleOperate}/>
-      },
       {
         title: getLabel(111, "推送记录"), key: "pushRecord", showDropIcon: false, dropMenuDatas: [],
         buttons: showOperateBtn ? [
@@ -89,6 +82,16 @@ class Index extends Component {
         ] : [<WeaInputSearch style={{ top: -3 }} value={query.name} onSearch={this.handleAdvanceSearch}
                              onChange={v => this.setState({ query: { ...query, name: v } })}/>],
         children: <PushRecord isQuery={isQuery} query={query} onChange={this.handleOperate}/>
+      },
+      {
+        title: getLabel(111, "数据推送"), key: "datapush", showDropIcon: false, dropMenuDatas: [],
+        buttons: showOperateBtn ? [
+          <Button type="primary" onClick={() => this.handleOperate("create")}>{getLabel(111, "新建")}</Button>,
+          <WeaInputSearch style={{ top: -3 }} value={query.name} onSearch={this.handleAdvanceSearch}
+                          onChange={v => this.setState({ query: { ...query, name: v } })}/>
+        ] : [<WeaInputSearch style={{ top: -3 }} value={query.name} onSearch={this.handleAdvanceSearch}
+                             onChange={v => this.setState({ query: { ...query, name: v } })}/>],
+        children: <DatapushList isQuery={isQuery} query={query} onChange={this.handleOperate}/>
       }
     ];
     return (