Merge branch 'feature/230701-工资单定时发送任务' into develop

pc4mobx/hrmSalary/pages/payroll/SalarySendList.js

@@ -1,6 +1,6 @@
 import React from "react";
 import { inject, observer } from "mobx-react";
-import { message, Tag } from "antd";
+import { Dropdown, Menu, message, Tag } from "antd";
 import moment from "moment";
 import CustomPaginationTable from "../../components/customPaginationTable";
 import "../calculate/index.less";
@@ -91,6 +91,7 @@ export default class SalarySendList extends React.Component {
         {
           title: "操作",
           key: "operate",
+          width: 150,
           render: (text, record) => {
             const { sendNum, sendTotal, salaryAcctType, haveBackCalc, canSeeDetail } = record;
             //显示发放
@@ -106,7 +107,14 @@ export default class SalarySendList extends React.Component {
                 }
                 {
                   sendNum !== sendTotal && !showGrant &&
-                  <a href="javascript:void(0);" onClick={() => this.handleUpdateTemplate(record)}>更新模板</a>
+                  <Dropdown
+                    overlay={
+                      <Menu onClick={() => this.handleUpdateTemplate(record)}>
+                        <Menu.Item key="delete">更新模板</Menu.Item>
+                      </Menu>
+                    }>
+                    <i className="icon-coms-more more"/>
+                  </Dropdown>
                 }
               </React.Fragment>
             );

pc4mobx/hrmSalary/pages/payroll/templateSettingList.js

@@ -2,7 +2,7 @@ import React from "react";
 import { inject, observer } from "mobx-react";
 import { WeaLocaleProvider, WeaTable } from "ecCom";
 import { toJS } from "mobx";
-import { Radio, Spin } from "antd";
+import { Dropdown, Menu, Radio, Spin } from "antd";
 
 const getLabel = WeaLocaleProvider.getLabel;
 @inject("payrollStore")
@@ -93,8 +93,14 @@ export default class TemplateSettingList extends React.Component {
                onClick={() => this.onOperatesClick(record, "0")}>{getLabel(501169, "编辑")}</a>
             <a href="javascript:void(0);" style={{ marginRight: 10 }}
                onClick={() => this.onOperatesClick(record, "1")}>{getLabel(77, "复制")}</a>
-            <a href="javascript:void(0);"
-               onClick={() => this.onOperatesClick(record, "2")}>{getLabel(535052, "删除")}</a>
+            <Dropdown
+              overlay={
+                <Menu onClick={() => this.onOperatesClick(record, "2")}>
+                  <Menu.Item key="delete">{getLabel(535052, "删除")}</Menu.Item>
+                </Menu>
+              }>
+              <i className="icon-coms-more more"/>
+            </Dropdown>
           </React.Fragment>;
         }
       }