Merge branch 'feature/2.8.3.2307.02-薪资核算按自定义列导出' into release/2.8.3.2307.02

pc4mobx/hrmSalary/apis/calculate.js

@@ -568,3 +568,20 @@ export const cacheImportField = (params) => {
 export const salaryacctAcctresultCheckAuth = params => {
   return WeaTools.callApi("/api/bs/hrmsalary/salaryacct/acctresult/checkAuth", "GET", params);
 };
+
+//薪资核算-导出核算结果前生成可选的薪资项目
+export const getExportField = params => {
+  return WeaTools.callApi("/api/bs/hrmsalary/salaryacct/acctresult/exportField", "GET", params);
+};
+
+//薪资核算-导出薪资核算添加表头字段缓存
+export const customCacheExportField = (params) => {
+  return fetch("/api/bs/hrmsalary/salaryacct/acctresult/cacheExportField", {
+    method: "POST",
+    mode: "cors",
+    headers: {
+      "Content-Type": "application/json"
+    },
+    body: JSON.stringify(params)
+  }).then(res => res.json());
+};

pc4mobx/hrmSalary/pages/calculateDetail/customExportDialog.js

@@ -0,0 +1,127 @@
+/*
+ * Author: 黎永顺
+ * name: 薪资核算-自定义导出字段弹框
+ * Description:
+ * Date: 2023/7/17
+ */
+import React, { Component } from "react";
+import { Button, Col, message, Row } from "antd";
+import { WeaCheckbox, WeaDialog, WeaLocaleProvider, WeaSearchGroup } from "ecCom";
+import { customCacheExportField } from "../../apis/calculate";
+import { convertToUrlString, getQueryString } from "../../util/url";
+import "./acctResult/importModal/index.less";
+
+
+const { getLabel } = WeaLocaleProvider;
+
+class CustomExportDialog extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      itemsCheckeds: [],
+      showOnlyChecked: false
+    };
+  }
+
+  componentWillReceiveProps(nextProps, nextContext) {
+    if (nextProps.visible !== this.props.visible && nextProps.visible) {
+      this.setState({
+        itemsCheckeds: !_.isEmpty(nextProps.checkItems) ? nextProps.checkItems : []
+      });
+    }
+  }
+
+  customExportClick = () => {
+    const { searchItemsValue } = this.props;
+    const { itemsCheckeds } = this.state;
+    customCacheExportField({ salaryItems: _.map(itemsCheckeds, it => it.toString()) }).then(({ status, errorMsg }) => {
+      if (status) {
+        const { consolidatedTaxation, ...extra } = searchItemsValue;
+        const payload = { ...extra, consolidatedTaxation: consolidatedTaxation === "0" ? "" : consolidatedTaxation };
+        window.open(
+          `/api/bs/hrmsalary/salaryacct/acctresult/exportWithCustomFields?salaryAcctRecordId=${getQueryString("id")}&ids=&${convertToUrlString(payload)}&salaryItemIds=${itemsCheckeds.join(",")}`
+        );
+      } else {
+        message.error(errorMsg);
+      }
+    });
+  };
+  handleShowOnlyChecked = (showOnlyChecked) => this.setState({ showOnlyChecked: !!Number(showOnlyChecked) });
+  handleSelectGroupAll = (groupId, checked) => {
+    const { itemsCheckeds } = this.state;
+    const { itemsByGroup } = this.props;
+    _.map(itemsByGroup, item => {
+      if (item.salarySobItemGroupId === groupId) {
+        if (!!Number(checked)) {
+          this.setState({
+            itemsCheckeds: [...itemsCheckeds, ..._.map(item.salaryItems, child => child.salaryItemId)]
+          });
+        } else {
+          this.setState({
+            itemsCheckeds: _.differenceWith(itemsCheckeds, _.map(item.salaryItems, child => child.salaryItemId), _.isEqual)
+          });
+        }
+      }
+    });
+  };
+
+  render() {
+    const { showOnlyChecked, itemsCheckeds } = this.state;
+    const { itemsByGroup } = this.props;
+    let dataSource = _.map(itemsByGroup, item => {
+      return {
+        ...item,
+        salaryItems: _.map(item.salaryItems, child => {
+          return { ...child, checked: itemsCheckeds.includes(child.salaryItemId) };
+        })
+      };
+    });
+    if (showOnlyChecked) {
+      dataSource = _.map(dataSource, item => {
+        return { ...item, salaryItems: _.filter(item.salaryItems, it => !!it.checked) };
+      });
+    }
+    return (
+      <WeaDialog
+        {...this.props} hasScroll initLoadCss
+        scalable title={getLabel(111, "选择字段")}
+        style={{ width: 700, height: 484 }} className="addHeaderFieldsWrapper"
+        buttons={[
+          <Button type="primary" onClick={this.customExportClick}>{getLabel(17416, "导出")}</Button>,
+          <Button type="ghost" onClick={this.props.onCancel}>{getLabel(31129, "取消")}</Button>
+        ]}
+        bottomLeft={<WeaCheckbox content={getLabel(543378, "只显示已选中字段")}
+                                 onChange={this.handleShowOnlyChecked}/>}
+      >
+        {
+          _.map(dataSource, item => {
+            const { salarySobItemGroupName, salaryItems, salarySobItemGroupId } = item;
+            const value = _.every(salaryItems, it => !!it.checked) ? "1" : "0";
+            return <WeaSearchGroup showGroup needTigger
+                                   title={<WeaCheckbox content={salarySobItemGroupName} value={value}
+                                                       onChange={(val) => this.handleSelectGroupAll(salarySobItemGroupId, val)}/>}>
+              <Row gutter={16}>
+                {
+                  !_.isEmpty(salaryItems) ?
+                    _.map(salaryItems, it => {
+                      const { salaryItemId, salaryItemName, checked } = it;
+                      return <Col span={8} style={{ marginBottom: 16 }}>
+                        <WeaCheckbox content={salaryItemName} value={checked ? "1" : "0"}
+                                     onChange={() => this.setState({ itemsCheckeds: _.xorWith(itemsCheckeds, [salaryItemId], _.isEqual) })}/>
+                      </Col>;
+                    }) : <Col span={24} style={{
+                      minHeight: 20,
+                      padding: "5%",
+                      textAlign: "center"
+                    }}>{getLabel(83553, "暂无数据")}</Col>
+                }
+              </Row>
+            </WeaSearchGroup>;
+          })
+        }
+      </WeaDialog>
+    );
+  }
+}
+
+export default CustomExportDialog;

pc4mobx/hrmSalary/pages/calculateDetail/index.js

@@ -3,14 +3,25 @@ import UserSure from "./userSure";
 import { inject, observer } from "mobx-react";
 import SalaryDetail from "./salaryDetail";
 import { Button, Dropdown, Menu, message, Modal } from "antd";
-import { WeaBrowser, WeaCheckbox, WeaDropdown, WeaFormItem, WeaInput, WeaSearchGroup, WeaSelect, WeaTab } from "ecCom";
+import {
+  WeaBrowser,
+  WeaCheckbox,
+  WeaDropdown,
+  WeaFormItem,
+  WeaInput,
+  WeaLocaleProvider,
+  WeaSearchGroup,
+  WeaSelect,
+  WeaTab
+} from "ecCom";
 import { convertToUrlString, getQueryString } from "../../util/url";
 import AcctResultImportModal from "./acctResult/importModal/acctResultImportModal";
 import ProgressModal from "../../components/progressModal";
-import { salaryacctAcctresultCheckAuth } from "../../apis/calculate";
+import { getExportField, salaryacctAcctresultCheckAuth } from "../../apis/calculate";
+import CustomExportDialog from "./customExportDialog";
 import Authority from "../mySalary/authority";
 
-
+const getLabel = WeaLocaleProvider.getLabel;
 const { ButtonSelect } = WeaDropdown;
 
 @inject("calculateStore", "salaryFileStore", "taxAgentStore")
@@ -36,7 +47,10 @@ export default class CalculateDetail extends React.Component {
       progress: 0,
       accountIds: [],
       accountExceptInfo: "",
-      calculateAuth: false
+      calculateAuth: false,
+      customExportParams: {
+        visible: false, checkItems: [], itemsByGroup: []
+      }
     };
     this.id = "";
     this.timer = null;
@@ -239,9 +253,26 @@ export default class CalculateDetail extends React.Component {
       window.open(
         `/api/bs/hrmsalary/salaryacct/acctresult/export?salaryAcctRecordId=${this.id}&ids=&${convertToUrlString(payload)}`
       );
+    } else if (e.key === "4") {
+      //  自定义导出
+      this.getExportField();
     }
   };
 
+  getExportField = () => {
+    getExportField({ salaryAcctRecordId: getQueryString("id") }).then(({ status, data }) => {
+      if (status) {
+        const { checkItems, itemsByGroup } = data;
+        this.setState({
+          customExportParams: {
+            visible: true,
+            checkItems, itemsByGroup
+          }
+        });
+      }
+    });
+  };
+
   // 导入表单添加表头回调
   handleAcctModalAdd(fieldData) {
     this.setState({
@@ -284,13 +315,21 @@ export default class CalculateDetail extends React.Component {
   };
 
   render() {
-    const { selectedKey, acctResultImportVisiable, showSearchAd, calculateAuth } = this.state;
+    const {
+      selectedKey,
+      acctResultImportVisiable,
+      showSearchAd,
+      calculateAuth,
+      customExportParams,
+      searchItemsValue
+    } = this.state;
     const { taxAgentStore: { payrollPermission } } = this.props;
     const menu = (
       <Menu onClick={this.handleMenuClick.bind(this)}>
         <Menu.Item key="1">导入</Menu.Item>
         <Menu.Item key="2">线下对比</Menu.Item>
         <Menu.Item key="3">导出全部</Menu.Item>
+        <Menu.Item key="4">{getLabel(111, "自定义导出")}</Menu.Item>
       </Menu>
     );
 
@@ -417,6 +456,17 @@ export default class CalculateDetail extends React.Component {
               }}
               progress={this.state.progress}
             />}
+          <CustomExportDialog
+            {...customExportParams}
+            searchItemsValue={searchItemsValue}
+            onCancel={() => {
+              this.setState({
+                customExportParams: {
+                  visible: false, checkItems: [], itemsByGroup: []
+                }
+              });
+            }}
+          />
         </div>
       </Authority>
     );