From d9f3fafd51e13c4ee23a472c3abf808b633b12f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Tue, 19 Mar 2024 14:29:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?hotfix/2.12.1.2403.02=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=80=8F=E8=A7=86=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/apis/payrollFiles.js | 70 ++++++++++--------- .../pages/reportView/components/index.less | 7 ++ .../components/povitpivotChartModal.js | 21 ++++-- pc4mobx/hrmSalary/util/request.js | 3 + 4 files changed, 63 insertions(+), 38 deletions(-) diff --git a/pc4mobx/hrmSalary/apis/payrollFiles.js b/pc4mobx/hrmSalary/apis/payrollFiles.js index 7ebdb6bb..f2516b5a 100644 --- a/pc4mobx/hrmSalary/apis/payrollFiles.js +++ b/pc4mobx/hrmSalary/apis/payrollFiles.js @@ -1,5 +1,5 @@ import { WeaTools } from "ecCom"; -import { postFetch } from "../util/request"; +import { postExportFetch, postFetch } from "../util/request"; //获取薪资档案各tab的人数 export const queryTabTotal = (params) => { @@ -11,65 +11,69 @@ export const queryList = ({ url, ...params }) => { }; // 导入档案 export const importSalaryArchive = (params) => { - return postFetch('/api/bs/hrmsalary/salaryArchive/importSalaryArchive', params); -} + return postFetch("/api/bs/hrmsalary/salaryArchive/importSalaryArchive", params); +}; // 薪资档案预览 export const salaryArchivePreview = (params) => { - return postFetch('/api/bs/hrmsalary/salaryArchive/preview', params); -} + return postFetch("/api/bs/hrmsalary/salaryArchive/preview", params); +}; // 公共枚举接口 export const commonEnumList = (params) => { - return WeaTools.callApi('/api/bs/hrmsalary/common/enum/list', 'GET', params); -} + return WeaTools.callApi("/api/bs/hrmsalary/common/enum/list", "GET", params); +}; // 获取导入类型 export const getImportTypes = () => { - return WeaTools.callApi('/api/bs/hrmsalary/salaryArchive/getImportTypes', 'GET', {}); -} + return WeaTools.callApi("/api/bs/hrmsalary/salaryArchive/getImportTypes", "GET", {}); +}; // 发起调薪地址 export const salaryAdjustmentInfo = (params) => { - return WeaTools.callApi('/api/bs/hrmsalary/process/salaryAdjustmentInfo', 'GET', params); -} + return WeaTools.callApi("/api/bs/hrmsalary/process/salaryAdjustmentInfo", "GET", params); +}; // 停薪 export const stopSalary = (params) => { - return postFetch('/api/bs/hrmsalary/salaryArchive/stopSalary', params); -} + return postFetch("/api/bs/hrmsalary/salaryArchive/stopSalary", params); +}; // 一键全部设为定薪员工 export const allGotoFixed = (params) => { - return postFetch('/api/bs/hrmsalary/salaryArchive/allGotoFixed', params); -} + return postFetch("/api/bs/hrmsalary/salaryArchive/allGotoFixed", params); +}; // 设为定薪员工 export const gotoFixed = (params) => { - return postFetch('/api/bs/hrmsalary/salaryArchive/gotoFixed', params); -} + return postFetch("/api/bs/hrmsalary/salaryArchive/gotoFixed", params); +}; // 停薪 export const gotoStop = (params) => { - return postFetch('/api/bs/hrmsalary/salaryArchive/gotoStop', params); -} + return postFetch("/api/bs/hrmsalary/salaryArchive/gotoStop", params); +}; //全部停薪 export const allGotoStop = (params) => { - return postFetch('/api/bs/hrmsalary/salaryArchive/allGotoStop', params); -} + return postFetch("/api/bs/hrmsalary/salaryArchive/allGotoStop", params); +}; // 取消停薪 export const cancelStop = (params) => { - return postFetch('/api/bs/hrmsalary/salaryArchive/cancelStop', params); -} + return postFetch("/api/bs/hrmsalary/salaryArchive/cancelStop", params); +}; // 保存发薪设置 export const savePaySet = (params) => { - return postFetch('/api/bs/hrmsalary/salaryArchive/savePaySet', params); -} + return postFetch("/api/bs/hrmsalary/salaryArchive/savePaySet", params); +}; // 待定薪删除待办 export const deletePendingTodo = (params) => { - return postFetch('/api/bs/hrmsalary/salaryArchive/deletePendingTodo', params); -} + return postFetch("/api/bs/hrmsalary/salaryArchive/deletePendingTodo", params); +}; // 待停薪删除待办 export const deleteSuspendTodo = (params) => { - return postFetch('/api/bs/hrmsalary/salaryArchive/deleteSuspendTodo', params); -} + return postFetch("/api/bs/hrmsalary/salaryArchive/deleteSuspendTodo", params); +}; // 待定薪、停薪员工 是否允许删除薪资档案 export const salaryArchiveDelete = (params) => { - return WeaTools.callApi('/api/bs/hrmsalary/sys/conf/code?code=salaryArchiveDelete', 'GET', params); -} + return WeaTools.callApi("/api/bs/hrmsalary/sys/conf/code?code=salaryArchiveDelete", "GET", params); +}; // 删除薪资档案 export const deleteSalaryArchive = (params) => { - return postFetch('/api/bs/hrmsalary/salaryArchive/deleteSalaryArchive', params); -} + return postFetch("/api/bs/hrmsalary/salaryArchive/deleteSalaryArchive", params); +}; +// 数据透视列表导出 +export const exportDataPerspective = (params) => { + return postExportFetch("/api/bs/hrmsalary/report/statistics/report/exportDataPerspective", params); +}; diff --git a/pc4mobx/hrmSalary/pages/reportView/components/index.less b/pc4mobx/hrmSalary/pages/reportView/components/index.less index d77aab7f..53e93a64 100644 --- a/pc4mobx/hrmSalary/pages/reportView/components/index.less +++ b/pc4mobx/hrmSalary/pages/reportView/components/index.less @@ -62,6 +62,13 @@ .ant-spin-nested-loading, .ant-spin-container { height: 100%; } + + .header-custom { + width: 100%; + display: flex; + justify-content: space-between; + align-items: center; + } } .shareDialogWrapper { diff --git a/pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js b/pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js index 801bb99e..9f9bddf7 100644 --- a/pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js +++ b/pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js @@ -5,11 +5,12 @@ * Date: 2023/6/8 */ import React, { Component } from "react"; -import { WeaDialog, WeaLocaleProvider } from "ecCom"; -import { WeaTableNew } from "comsMobx"; -import { Spin } from "antd"; -import { toJS } from "mobx"; import { inject, observer } from "mobx-react"; +import { WeaDialog, WeaLoadingGlobal, WeaLocaleProvider } from "ecCom"; +import * as API from "../../../apis/payrollFiles"; +import { WeaTableNew } from "comsMobx"; +import { Button, Spin } from "antd"; +import { toJS } from "mobx"; import "./index.less"; const WeaTableComx = WeaTableNew.WeaTable; @@ -103,13 +104,23 @@ class PovitpivotChartModal extends Component { showSum: false, pageInfo }); }; + exportDataPerspective = () => { + WeaLoadingGlobal.start(); + const { id, dimensionId, dimensionValue, isShare } = this.props; + const promise = API.exportDataPerspective({ id, dimensionId, dimensionValue, isShare }); + WeaLoadingGlobal.destroy(); + }; render() { const { loading } = this.state; const { payrollFilesStore: { pivotTableStore } } = this.props; return ( + {getLabel(111, "数据透视")} + + } + scalable className="pivot-wrapper" initLoadCss visible={this.props.visible} style={{ width: "80vw", height: "80vh" }} buttons={[]} onCancel={this.props.onCancel}> diff --git a/pc4mobx/hrmSalary/util/request.js b/pc4mobx/hrmSalary/util/request.js index 821d58d6..4fd7e4e4 100644 --- a/pc4mobx/hrmSalary/util/request.js +++ b/pc4mobx/hrmSalary/util/request.js @@ -1,3 +1,5 @@ +import { WeaLoadingGlobal } from "ecCom"; + const server = window.server || ""; export const formHeaderPost = (url, method, params, header) => { if (typeof localStorage.access_token === "string" && localStorage.access_token !== "") { @@ -34,6 +36,7 @@ export const postExportFetch = (url, params) => { } url = server + url + "?__random__=" + (new Date()).valueOf(); return fetch(url, getFetchParams("POST", params)).then(res => { + WeaLoadingGlobal.destroy(); const filename = res.headers.get("Content-Disposition").split("filename=")[1]; res.blob().then(blob => { const url = window.URL.createObjectURL(blob); From 8af1f0a79a58ed712790bfc3b745e88ffeff6d18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Tue, 19 Mar 2024 17:55:37 +0800 Subject: [PATCH 2/3] =?UTF-8?q?hotfix/2.12.1.2403.02=20=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../doCalc/components/salaryEditCalcImport/index.js | 2 +- .../dataAcquisition/attendance/components/importDialog.js | 5 ++++- .../payrollFiles/components/salaryFileImportDialog/index.js | 2 +- .../components/standingBookCalcImportDialog.js | 2 +- .../components/welfareArchivesImportDialog/index.js | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js index 463c7df4..ce58c616 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js @@ -63,7 +63,7 @@ class Index extends Component { this.setState({ importDialog: { ...this.state.importDialog, link: this.handleExportTemp, - visible: nextProps.visible, title: nextProps.title + visible: nextProps.visible, title: nextProps.title, importResult: {} } }); } diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/importDialog.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/importDialog.js index bf67e4b2..72df9bde 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/importDialog.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/importDialog.js @@ -29,7 +29,10 @@ class Index extends Component { const { hasData, importDialog } = this.state; const { params, previewUrl } = nextProps; this.setState({ - importDialog: { ...importDialog, link: this.handleExportTemp, params, previewUrl, extraPreview: params } + importDialog: { + ...importDialog, importResult: {}, link: this.handleExportTemp, + params, previewUrl, extraPreview: params + } }); } diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileImportDialog/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileImportDialog/index.js index 1a60b901..313a8675 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileImportDialog/index.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileImportDialog/index.js @@ -51,7 +51,7 @@ class Index extends Component { if (isExtEmp) payload = { ...payload, extSalaryArchiveList: true }; this.setState({ importDialog: { - ...this.state.importDialog, extraPreview, + ...this.state.importDialog, extraPreview, importResult: {}, link: `/api/bs/hrmsalary/salaryArchive/downloadTemplate?${convertToUrlString(payload)}` } }); diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/standingBookCalcImportDialog.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/standingBookCalcImportDialog.js index 0dc97e42..fb4a2db8 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/standingBookCalcImportDialog.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/standingBookCalcImportDialog.js @@ -33,7 +33,7 @@ class StandingBookCalcImportDialog extends Component { const { data } = await API[fieldUrl](); this.setState({ importDialog: { - ...this.state.importDialog, link: this.handleExportTemp, title: getLabel(24023, "数据导入") + ...this.state.importDialog, importResult: {}, link: this.handleExportTemp, title: getLabel(24023, "数据导入") }, headerFieldsDialog: { ...this.state.headerFieldsDialog, itemsByGroup: data, diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareArchivesImportDialog/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareArchivesImportDialog/index.js index 149a304c..b61a17c2 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareArchivesImportDialog/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareArchivesImportDialog/index.js @@ -35,7 +35,7 @@ class Index extends Component { }; this.setState({ importDialog: { - ...this.state.importDialog, + ...this.state.importDialog, importResult: {}, link: `/api/bs/hrmsalary/scheme/template/export?${convertToUrlString(payload)}` } }); From 272e45d3e5e734e1867cca77272cba43042ccaef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Wed, 20 Mar 2024 09:10:06 +0800 Subject: [PATCH 3/3] =?UTF-8?q?hotfix/2.12.1.2403.02=20=E8=96=AA=E8=B5=84?= =?UTF-8?q?=E6=A1=A3=E6=A1=88=E8=B0=83=E8=96=AA=EF=BC=8C=E8=96=AA=E8=B5=84?= =?UTF-8?q?=E5=B0=8F=E6=95=B0=E4=BD=8D=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/salaryFile/salaryArchiveEditAdjLogRecord.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/salaryFile/salaryArchiveEditAdjLogRecord.js b/pc4mobx/hrmSalary/pages/salaryFile/salaryArchiveEditAdjLogRecord.js index a091c42f..a46b7129 100644 --- a/pc4mobx/hrmSalary/pages/salaryFile/salaryArchiveEditAdjLogRecord.js +++ b/pc4mobx/hrmSalary/pages/salaryFile/salaryArchiveEditAdjLogRecord.js @@ -63,7 +63,8 @@ class SalaryArchiveEditAdjLogRecordDialog extends Component { salaryArchiveItemDetail: { ...salaryArchiveItemDetail, list: _.map(salaryArchiveItemDetail.list, o => ({ - ...o, dataType: _.find(salaryArchiveItemDetail.salaryItemList, g => g.id === o.salaryItem).dataType + ...o, dataType: _.find(salaryArchiveItemDetail.salaryItemList, g => g.id === o.salaryItem).dataType, + pattern: _.find(salaryArchiveItemDetail.salaryItemList, g => g.id === o.salaryItem).pattern })) }, conditions: _.map(adjCondition, item => { @@ -108,7 +109,8 @@ class SalaryArchiveEditAdjLogRecordDialog extends Component { if (o.salaryItem === salaryItemId) { return { ...o, salaryBefore: data, - dataType: _.find(salaryArchiveItemDetail.salaryItemList, g => g.id === salaryItemId).dataType + dataType: _.find(salaryArchiveItemDetail.salaryItemList, g => g.id === salaryItemId).dataType, + pattern: _.find(salaryArchiveItemDetail.salaryItemList, g => g.id === salaryItemId).pattern }; } return { ...o }; @@ -238,7 +240,7 @@ class SalaryArchiveEditAdjLogRecordDialog extends Component { ...o, render: (__, record) => { if (record.dataType === "number") { return this.handleChangeAdjustAfter(record, v)} />; } else {