From aaf733fdd2c7cb4ff26ed72b0f29b8df7bc57191 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Fri, 10 May 2024 16:33:02 +0800 Subject: [PATCH 1/6] =?UTF-8?q?hotfix/2.12.1.2404.02=20=E8=96=AA=E9=85=AC?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=E5=90=88=E8=AE=A1=E8=A1=8C?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=88=97=E8=A1=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/components/captchaModal/index.js | 1 - .../components/salaryDetails.js | 14 ++++++++------ .../mySalaryMobile/components/payrollList/index.js | 5 +++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/pc4mobx/hrmSalary/components/captchaModal/index.js b/pc4mobx/hrmSalary/components/captchaModal/index.js index 35661772..a7f00b9b 100644 --- a/pc4mobx/hrmSalary/components/captchaModal/index.js +++ b/pc4mobx/hrmSalary/components/captchaModal/index.js @@ -36,7 +36,6 @@ class Index extends Component { handleSendCaptcha = () => { sendMobileCode({ id: this.props.id }).then(({ status, data }) => { if (status) { - console.log(data); this.timeRef = setInterval(() => { const { time } = this.state; this.setState({ time: time - 1 }, () => { diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js index 7ff80bb3..280a0f46 100644 --- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js +++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js @@ -26,7 +26,7 @@ class SalaryDetails extends Component { this.state = { loading: false, dataSource: [], columns: [], selectedRowKeys: [], pageInfo: { current: 1, pageSize: 10, total: 0 }, payload: {}, - countResult: {}, showTotalCell: false + showTotalCell: false }; } @@ -82,14 +82,15 @@ class SalaryDetails extends Component { }; this.setState({ loading: true }); API.getSalaryList(payload).then(async ({ status, data }) => { - const [{ data: sumData }, { data: confCode }] = await Promise.all([API.getSalaryListSum(payload), sysConfCodeRule({ code: "OPEN_ACCT_RESULT_SUM" })]); + // API.getSalaryListSum(payload), + const [{ data: confCode }] = await Promise.all([sysConfCodeRule({ code: "OPEN_ACCT_RESULT_SUM" })]); this.setState({ loading: false }); if (status) { const { dataKey, pageInfo: pageparams } = data; const { list: dataSource, pageNum: current, total, pageSize } = pageparams; this.setState({ dataSource, pageInfo: { ...pageInfo, current, total, pageSize }, payload, - countResult: sumData.sumRow, showTotalCell: confCode === "1" + showTotalCell: confCode === "1" }, () => tableStore.getDatas(dataKey.datas)); } }).catch(() => this.setState({ loading: false })); @@ -105,12 +106,13 @@ class SalaryDetails extends Component { }; getColumns = () => { const { attendanceStore: { tableStore } } = this.props; - const { dataSource, pageInfo, selectedRowKeys, countResult, showTotalCell } = this.state; + const { dataSource, pageInfo, selectedRowKeys, showTotalCell, payload } = this.state; const columns = _.filter(toJS(tableStore.columns), (item) => item.display === "true" && item.dataIndex !== "acctTimes"); + const sumRowlistUrl = showTotalCell ? "/api/bs/hrmsalary/report/statistics/employee/salaryListSum" : ""; if (!_.isEmpty(columns)) { this.postMessageToChild({ - dataSource, pageInfo, selectedRowKeys, showTotalCell, calcDetail: true, tableScrollHeight: 154, - sumRow: countResult, + dataSource, pageInfo, selectedRowKeys, showTotalCell, calcDetail: true, tableScrollHeight: 154, payload, + sumRowlistUrl, columns: _.map(columns, (it, idx) => ({ ...it, width: (it.dataIndex === "taxAgent" || it.dataIndex === "salarySob") ? 176 : it.oldWidth, diff --git a/pc4mobx/hrmSalary/pages/mySalaryMobile/components/payrollList/index.js b/pc4mobx/hrmSalary/pages/mySalaryMobile/components/payrollList/index.js index 8968b469..69bac121 100644 --- a/pc4mobx/hrmSalary/pages/mySalaryMobile/components/payrollList/index.js +++ b/pc4mobx/hrmSalary/pages/mySalaryMobile/components/payrollList/index.js @@ -27,8 +27,9 @@ class Index extends Component { {getLabel(111, "发放时间")} {moment(it.sendTime).format("YYYY-MM")} - + {`${getLabel(33564, "查看")}>`} ; From 342dacae9cf81050c79cc12bdc33432edda4ead3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Sat, 11 May 2024 10:41:55 +0800 Subject: [PATCH 2/6] hotfix/2.12.1.2404.02 --- pc4mobx/hrmSalary/custom-components/index.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 pc4mobx/hrmSalary/custom-components/index.js diff --git a/pc4mobx/hrmSalary/custom-components/index.js b/pc4mobx/hrmSalary/custom-components/index.js new file mode 100644 index 00000000..e69de29b From 166dfa6979b2c65b172187f328de7536dbad659f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Sat, 11 May 2024 11:09:13 +0800 Subject: [PATCH 3/6] hotfix/2.12.1.2404.02 --- pc4mobx/hrmSalary/apis/custom-apis/index.js | 0 pc4mobx/hrmSalary/pages/custom-pages/index.js | 0 pc4mobx/hrmSalary/stores/custom-stores/index.js | 0 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 pc4mobx/hrmSalary/apis/custom-apis/index.js create mode 100644 pc4mobx/hrmSalary/pages/custom-pages/index.js create mode 100644 pc4mobx/hrmSalary/stores/custom-stores/index.js diff --git a/pc4mobx/hrmSalary/apis/custom-apis/index.js b/pc4mobx/hrmSalary/apis/custom-apis/index.js new file mode 100644 index 00000000..e69de29b diff --git a/pc4mobx/hrmSalary/pages/custom-pages/index.js b/pc4mobx/hrmSalary/pages/custom-pages/index.js new file mode 100644 index 00000000..e69de29b diff --git a/pc4mobx/hrmSalary/stores/custom-stores/index.js b/pc4mobx/hrmSalary/stores/custom-stores/index.js new file mode 100644 index 00000000..e69de29b From 78142d32fe6719ac1dbd6adffc2dd6e75d69e9c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Sat, 11 May 2024 11:33:09 +0800 Subject: [PATCH 4/6] hotfix/2.12.1.2404.02 --- pc4mobx/hrmSalary/stores/custom-stores/index.js | 2 ++ pc4mobx/hrmSalary/stores/index.js | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/stores/custom-stores/index.js b/pc4mobx/hrmSalary/stores/custom-stores/index.js index e69de29b..7be35b6b 100644 --- a/pc4mobx/hrmSalary/stores/custom-stores/index.js +++ b/pc4mobx/hrmSalary/stores/custom-stores/index.js @@ -0,0 +1,2 @@ +module.exports = { +}; diff --git a/pc4mobx/hrmSalary/stores/index.js b/pc4mobx/hrmSalary/stores/index.js index c9590ab3..56eee32a 100644 --- a/pc4mobx/hrmSalary/stores/index.js +++ b/pc4mobx/hrmSalary/stores/index.js @@ -19,6 +19,7 @@ import { StandingBookStore } from "./StandingBook"; import { PayrollFilesStore } from "./payrollFiles"; import { SpecialAddStore } from "./specialAdd"; import { ExternalPersonManageStore } from "./externalPersonManage"; +import CustomModule from "./custom-stores"; module.exports = { baseFormStore: new BaseFormStore(), @@ -41,5 +42,6 @@ module.exports = { standingBookStore: new StandingBookStore(), payrollFilesStore: new PayrollFilesStore(), specialAddStore: new SpecialAddStore(), - externalPersonManageStore: new ExternalPersonManageStore() + externalPersonManageStore: new ExternalPersonManageStore(), + ...CustomModule }; From 8f582ad3dd74cb2402e6d20463dbef544eba70d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Sat, 11 May 2024 15:06:47 +0800 Subject: [PATCH 5/6] hotfix/2.12.1.2404.02 --- pc4mobx/hrmSalary/apis/payroll.js | 4 ++++ .../pages/payroll/payrollGrant/index.js | 20 ++++++++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/pc4mobx/hrmSalary/apis/payroll.js b/pc4mobx/hrmSalary/apis/payroll.js index 01048186..b78fac43 100644 --- a/pc4mobx/hrmSalary/apis/payroll.js +++ b/pc4mobx/hrmSalary/apis/payroll.js @@ -240,3 +240,7 @@ export const salaryBillBaseSetPreviewWaterMark = (params) => { export const getSmsSalaryItemSet = (params) => { return WeaTools.callApi("/api/bs/hrmsalary/salaryBill/template/getSmsSalaryItemSet", "GET", params); }; +// 工资单导出PDF-检查 +export const genPdfBeforeExport = (params) => { + return WeaTools.callApi("/api/bs/hrmsalary/salaryBill/genPdfBeforeExport", "GET", params); +}; diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js index 4e44a75f..52bb065c 100644 --- a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js +++ b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js @@ -8,7 +8,7 @@ import { getQueryString } from "../../../util/url"; import { getSearchs, renderLoading } from "../../../util"; import CustomPaginationTable from "../../../components/customPaginationTable"; import PayrollPartTable from "./payrollPartTable"; -import { getPayrollIssuanceProgressBar } from "../../../apis/payroll"; +import { genPdfBeforeExport, getPayrollIssuanceProgressBar } from "../../../apis/payroll"; import ProgressModal from "../../../components/progressModal"; const getLabel = WeaLocaleProvider.getLabel; @@ -328,7 +328,14 @@ export default class PayrollGrant extends React.Component { { - window.open(`${window.ecologyContentPath || ""}/api/bs/hrmsalary/salaryBill/exportPdf?id=${record.id}&salarySendId=${getQueryString("id")}`, "_blank"); + genPdfBeforeExport({ id: record.id, salarySendId: getQueryString("id") }) + .then(({ status, errormsg }) => { + if (status) { + window.open(`${window.ecologyContentPath || ""}/api/bs/hrmsalary/salaryBill/exportPdf?id=${record.id}&salarySendId=${getQueryString("id")}`, "_blank"); + } else { + message.error(errormsg); + } + }); }}> {getLabel(111, "导出PDF")} @@ -343,7 +350,14 @@ export default class PayrollGrant extends React.Component { { - window.open(`${window.ecologyContentPath || ""}/api/bs/hrmsalary/salaryBill/exportPdf?id=${record.id}&salarySendId=${getQueryString("id")}`, "_blank"); + genPdfBeforeExport({ id: record.id, salarySendId: getQueryString("id") }) + .then(({ status, errormsg }) => { + if (status) { + window.open(`${window.ecologyContentPath || ""}/api/bs/hrmsalary/salaryBill/exportPdf?id=${record.id}&salarySendId=${getQueryString("id")}`, "_blank"); + } else { + message.error(errormsg); + } + }); }}> {getLabel(111, "导出PDF")} From a04be74c9c430b253c3c6b328a4daf32231cb150 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Mon, 13 May 2024 17:06:41 +0800 Subject: [PATCH 6/6] hotfix/2.12.1.2404.02 --- pc4mobx/hrmSalary/pages/payrollFiles/config/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js index 46bce19e..25b815a0 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js @@ -484,6 +484,6 @@ const HelpfulDiv = () => { {getLabel(544746, "c.返聘人员使用调薪功能调整薪资档案值或使用调整个税扣缴；")} {getLabel(545755, "2.调薪：档案中已存在的人员批量调整薪资项目值（包括返聘人员的情况）；")} - {getLabel(545756, "3.调整个税扣缴义务人：档案中已存在的人员批量调整个税扣缴义务人（包括返聘人员的情况）；")} + {/*{getLabel(545756, "3.调整个税扣缴义务人：档案中已存在的人员批量调整个税扣缴义务人（包括返聘人员的情况）；")}*/} ; };