release/2.17.1.2411.01

pc4mobx/hrmSalary/apis/statistics.js

@@ -150,3 +150,7 @@ export const getPageListTemplatelist = (params) => {
 export const changePageListTemplate = (params) => {
   return postFetch("/api/bs/hrmsalary/common/pageList/template/change", params);
 };
+//薪酬统计报表-重置自定义列
+export const resetPageListSetting = (params) => {
+  return postFetch("/api/bs/hrmsalary/common/pageList/reset/setting", params);
+};

pc4mobx/hrmSalary/components/CustomBrowser/components/customTransferDialog.js

@@ -139,7 +139,7 @@ class CustomTransferDialog extends Component {
 
   render() {
     const { loading, listDatas, query, leftListSelectedKeys, rightDatas, rightCheckedKeys } = this.state;
-    const { searchParamsKey, saveLoading } = this.props;
+    const { searchParamsKey, saveLoading, btns = [] } = this.props;
     const buttons = [
       <Button type="primary" loading={saveLoading} onClick={this.handleOk}
               disabled={_.isEmpty(rightDatas)}>{getLabel(111, "确 定")}</Button>,
@@ -188,7 +188,9 @@ class CustomTransferDialog extends Component {
             data={rightDatas} checkedKeys={rightCheckedKeys}
             checkedCb={rightCheckedKeys => this.setState({ rightCheckedKeys })}
             onDoubleClick={this.onRightDoubleClick}
-            onDrag={(data) => {this.setState({rightDatas: data})}}
+            onDrag={(data) => {
+              this.setState({ rightDatas: data });
+            }}
           />
         </div>
       </div>
@@ -199,7 +201,7 @@ class CustomTransferDialog extends Component {
         className="custom_browser_dialog" draggable={false} style={{
         width: 784, height: 460, minHeight: 200, minWidth: 380,
         maxHeight: "90%", maxWidth: "90%", overflow: "hidden", transform: "translate(0px, 0px)"
-      }} buttons={buttons}>{dom}</WeaDialog>
+      }} buttons={[...btns, ...buttons]}>{dom}</WeaDialog>
     );
   }
 }

pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js

@@ -8,7 +8,7 @@ import React, { Component } from "react";
 import { inject, observer } from "mobx-react";
 import { WeaTableNew } from "comsMobx";
 import { WeaLoadingGlobal, WeaLocaleProvider, WeaSelect } from "ecCom";
-import { message, Spin } from "antd";
+import { Button, message, Spin } from "antd";
 import { getIframeParentHeight } from "../../../util";
 import { sysConfCodeRule } from "../../../apis/ruleconfig";
 import CustomTransferDialog from "../../../components/CustomBrowser/components/customTransferDialog";
@@ -17,6 +17,7 @@ import { MonthRangePicker } from "../../reportView/components/statisticalMicroSe
 import AdvanceInputBtn from "../components/advanceInputBtn";
 import SearchPannel from "../components/searchPannel";
 import * as API from "../../../apis/statistics";
+import { resetPageListSetting } from "../../../apis/statistics";
 import cs from "classnames";
 import "../index.less";
 
@@ -236,6 +237,18 @@ class SalaryDetails extends Component {
       });
     });
   };
+  resetColsSetting = () => {
+    resetPageListSetting({ page: "salary_details_report" }).then(({ status, errormsg }) => {
+      if (status) {
+        message.success(getLabel(111, "操作成功！"));
+        this.setState({
+          transferDialog: { ...this.state.transferDialog, visible: false, type: "default" }
+        }, () => this.getSalaryList());
+      } else {
+        message.error(errormsg);
+      }
+    });
+  };
 
   render() {
     const { loading, dataSource, transferDialog, tempDialog, tempPageList, templateId } = this.state;
@@ -282,6 +295,8 @@ class SalaryDetails extends Component {
           {/*/>*/}
           {/*默认显示列,薪资模板列表*/}
           <CustomTransferDialog {...transferDialog} onChange={this.savePageListSetting}
+                                btns={[<Button type="ghost"
+                                               onClick={this.resetColsSetting}>{getLabel(111, "重置")}</Button>]}
                                 onCancel={() => this.setState({
                                   transferDialog: {
                                     ...transferDialog, completeURL: "", visible: false, type: "default"