From 5b43e43f4a1ad12d8f6725d35a6bc77a385ac289 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Thu, 21 Sep 2023 15:20:59 +0800 Subject: [PATCH 1/7] hotfix/2.9.42309.01 --- .../standingBookDetail/components/adjustTable.js | 8 +++++++- .../components/adjustmentDefaultSlide.js | 2 +- .../standingBookDetail/components/adjustmentSlide.js | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js index 2a1b9c6d..4d7a3bf8 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js @@ -410,7 +410,13 @@ class AdjustTable extends Component { this.setState({ dataSource: _.map(this.state.dataSource, it => { if (record.target === it.target && record.uuid === it.uuid) { - return { ...it, status: true, id: successIds[0] }; + return { + ...it, status: true, id: successIds[0], + targetOptions: _.map([_.find(targetOptions, o => o.employeeId == target)], v => ({ + key: v.target.toString(), + showname: v.username + })) + }; } return { ...it }; }) diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentDefaultSlide.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentDefaultSlide.js index 5651926e..47542d39 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentDefaultSlide.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentDefaultSlide.js @@ -69,7 +69,7 @@ class AdjustmentDefaultSlide extends Component { dataIndex: "categoryType", title: "统计调差福利类型（单位）", render: (text, record) => { return ( - {_.map(record.categoryTypeOptions, it => it.showname).join(",")} + {_.map(_.filter(record.categoryTypeOptions, o => (record.categoryType.split(",").includes(o.key))), it => it.showname).join(",")} ); } }, diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentSlide.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentSlide.js index 2fb3f37c..94c8d72d 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentSlide.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentSlide.js @@ -83,6 +83,7 @@ class AdjustmentSlide extends Component { }; handleSetasDefault = () => { const { adjustDefSlide } = this.state; + console.log(this.adjustTableRef.state.dataSource); this.setState({ adjustDefSlide: { ...adjustDefSlide, From e4d9a2c545b7703d3afc91c795f0868957700d02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Thu, 21 Sep 2023 15:45:58 +0800 Subject: [PATCH 2/7] hotfix/2.9.42309.01 --- .../components/salaryStatisticsDetailShareLogDialog.js | 6 +++--- pc4mobx/hrmSalary/pages/salaryItem/index.js | 2 +- .../standingBookDetail/components/adjustTable.js | 2 +- .../standingBookDetail/components/adjustmentSlide.js | 1 - 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/reportView/components/salaryStatisticsDetailShareLogDialog.js b/pc4mobx/hrmSalary/pages/reportView/components/salaryStatisticsDetailShareLogDialog.js index 1632940f..51fdc5d0 100644 --- a/pc4mobx/hrmSalary/pages/reportView/components/salaryStatisticsDetailShareLogDialog.js +++ b/pc4mobx/hrmSalary/pages/reportView/components/salaryStatisticsDetailShareLogDialog.js @@ -158,9 +158,9 @@ class SalaryStatisticsDetailShareLogDialog extends Component { title={

{getLabel(111, "1、分享状态为成功且撤回状态为空时，可操作撤回；")}

-

{getLabel(111, "2、撤回后不可重新分享；")}

-

{getLabel(111, "3、分享状态为失败，可操作重新分享；")}

-

{getLabel(111, "4、重新分享：以当前分享记录的分享报表、有效时间、渠道和说明重新分享，分享后自动刷新分享时间和分享状态")}

+ {/*

{getLabel(111, "2、撤回后不可重新分享；")}

*/} + {/*

{getLabel(111, "3、分享状态为失败，可操作重新分享；")}

*/} + {/*

{getLabel(111, "4、重新分享：以当前分享记录的分享报表、有效时间、渠道和说明重新分享，分享后自动刷新分享时间和分享状态")}

*/}
} /> diff --git a/pc4mobx/hrmSalary/pages/salaryItem/index.js b/pc4mobx/hrmSalary/pages/salaryItem/index.js index c2c63718..a4ffcd0a 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/index.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/index.js @@ -384,7 +384,7 @@ export default class SalaryItem extends React.Component { onCancel={() => this.setState({ syncSalarySetDialog: { ...this.state.syncSalarySetDialog, - visible: false, id: "", title: "" + visible: false, title: "" } })} /> diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js index 4d7a3bf8..45023dba 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js @@ -409,7 +409,7 @@ class AdjustTable extends Component { if (_.isEmpty(errorMessage)) { this.setState({ dataSource: _.map(this.state.dataSource, it => { - if (record.target === it.target && record.uuid === it.uuid) { + if (record.id === it.id || (!it.id && record.uuid === it.uuid)) { return { ...it, status: true, id: successIds[0], targetOptions: _.map([_.find(targetOptions, o => o.employeeId == target)], v => ({ diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentSlide.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentSlide.js index 94c8d72d..2fb3f37c 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentSlide.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentSlide.js @@ -83,7 +83,6 @@ class AdjustmentSlide extends Component { }; handleSetasDefault = () => { const { adjustDefSlide } = this.state; - console.log(this.adjustTableRef.state.dataSource); this.setState({ adjustDefSlide: { ...adjustDefSlide, From 12d4b5c33cf158f96281236c80803643a8b4a92a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Thu, 21 Sep 2023 16:13:18 +0800 Subject: [PATCH 3/7] hotfix/2.9.42309.01 --- .../standingBookDetail/components/adjustTable.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js index 45023dba..d8b91776 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js @@ -330,7 +330,7 @@ class AdjustTable extends Component { }; handleClick = (record) => { - const { status, id, paymentOrganization, billMonth, employeeId } = record; + const { status, id, paymentOrganization, billMonth, employeeId, target } = record; const { targetOptions } = this.state; if (status) { Modal.confirm({ @@ -339,7 +339,7 @@ class AdjustTable extends Component { onOk: () => { const payload = { id, paymentOrganization, billMonth }; compensationBack(payload).then(async ({ status, data, errormsg }) => { - const { data: categoryTypeOptions } = await compensationCategoryType({ id: _.find(targetOptions, child => child.employeeId == employeeId).target }); + const { data: categoryTypeOptions } = await compensationCategoryType({ id: _.find(targetOptions, child => (child.employeeId == employeeId || child.employeeId == target)).target }); if (status) { message.success(data || "撤回成功"); this.setState({ From 61637e6de7065768f5758234f9b4c9b227a08bfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Thu, 21 Sep 2023 18:18:47 +0800 Subject: [PATCH 4/7] =?UTF-8?q?feature/2.9.42309.01-=E8=96=AA=E9=85=AC?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=E5=88=86=E4=BA=AB=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/reportList.js | 7 ++++ .../analysisOfSalaryStatistics/index.less | 41 +++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js index 30b8a474..af813553 100644 --- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js +++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js @@ -97,6 +97,13 @@ class ReportList extends Component { } + { + isShare && +
+ {getLabel(111, "被分享")} +
+
+ } ; }) diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.less b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.less index e0326f2a..5a3c335e 100644 --- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.less +++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.less @@ -31,6 +31,47 @@ justify-content: space-between; padding: 22px 0 22px 16px; border: 1px solid #e5e5e5; + position: relative; + + .ant-ribbon { + padding: 0 8px; + color: #1677ff; + font-size: 12px; + line-height: 22px; + list-style: none; + position: absolute; + top: 0; + white-space: nowrap; + background-color: #1677ff; + border-radius: 4px; + + .ant-ribbon-text { + color: #FFF; + } + + .ant-ribbon-corner { + position: absolute; + top: 100%; + width: 8px; + height: 8px; + color: currentcolor; + border: 4px solid; + transform: scaleY(.75); + transform-origin: top; + filter: brightness(75%); + } + } + + .ant-ribbon-placement-end { + inset-inline-end: -8px; + border-end-end-radius: 0; + + .ant-ribbon-corner { + inset-inline-end: 0; + border-inline-end-color: transparent; + border-block-end-color: transparent; + } + } .cardLeft { display: flex; From 4bb3bc403a9748da83ab9c0f1bbebfaaac330285 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, 26 Sep 2023 16:38:47 +0800 Subject: [PATCH 5/7] =?UTF-8?q?feature/2.9.42310.01-=E5=B7=A5=E8=B5=84?= =?UTF-8?q?=E5=8D=95=E5=8F=91=E6=94=BE=E5=AF=BC=E5=87=BAPDF=2020230926?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/payroll/payrollGrant/index.js | 48 +++++++++++++++---- 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js index d52797f0..7818af09 100644 --- a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js +++ b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js @@ -306,7 +306,6 @@ export default class PayrollGrant extends React.Component { const { selectedKey, showFeedbackColumn } = this.state; const { payrollStore } = this.props; const { salaryGrantTableStore: columns, salarySendDetailBaseInfo } = payrollStore; - const notShowGrantOrWithdraw = salarySendDetailBaseInfo.haveBackCalc === 1 && salarySendDetailBaseInfo.salaryAcctType === "0"; return _.map([ ..._.filter(toJS(columns), it => ((selectedKey === "0" && it.dataIndex !== "billReadStatus" && it.dataIndex !== "billConfirmStatus") || (selectedKey === "1" && !showFeedbackColumn && it.dataIndex !== "billReadStatus" && it.dataIndex !== "billConfirmStatus") || (selectedKey === "1" && showFeedbackColumn))), { @@ -315,14 +314,37 @@ export default class PayrollGrant extends React.Component { dataIndex: "", display: true, render: (text, record) => { - if (record.sendStatus === "1" && salarySendDetailBaseInfo.canSend) { - return ( - this.handleWithdraw({ ids: [record.id] })}> - 撤回 - - ); + if (record.sendStatus === "1") { + if (salarySendDetailBaseInfo.canSend) { + return ( + + this.handleWithdraw({ ids: [record.id] })}> + 撤回 + + { + window.open(`${window.ecologyContentPath || ""}/api/bs/hrmsalary/salaryBill/send/exportPdf?id=${record.id}`, "_blank"); + }}> + {getLabel(111, "导出PDF")} + + + ); + } else { + return ( + + { + window.open(`${window.ecologyContentPath || ""}/api/bs/hrmsalary/salaryBill/send/exportPdf?id=${record.id}`, "_blank"); + }}> + {getLabel(111, "导出PDF")} + + + ); + } } else if (salarySendDetailBaseInfo.canSend) { return ( { switch (e.key) { @@ -360,6 +381,9 @@ export default class PayrollGrant extends React.Component { case "4": this.handleExportSelect(); break; + case "5": + window.open(`${window.ecologyContentPath || ""}/api/bs/hrmsalary/salaryBill/send/exportPdf?salarySendId=${getQueryString("id")}`, "_blank"); + break; default: break; } @@ -368,6 +392,10 @@ export default class PayrollGrant extends React.Component { 全部导出 导出选中 + { + selectedKey === "1" && + {getLabel(111, "导出PDF")} + } ); let btnDom = [ From 3d8bef9147ac8b9fca1c1c20f989b0a664374caf 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, 27 Sep 2023 09:21:53 +0800 Subject: [PATCH 6/7] =?UTF-8?q?feature/2.9.42310.01-=E5=B7=A5=E8=B5=84?= =?UTF-8?q?=E5=8D=95=E5=8F=91=E6=94=BE=E5=AF=BC=E5=87=BAPDF=2020230926?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js index 7818af09..b6d505a2 100644 --- a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js +++ b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js @@ -326,7 +326,7 @@ export default class PayrollGrant extends React.Component { { - window.open(`${window.ecologyContentPath || ""}/api/bs/hrmsalary/salaryBill/send/exportPdf?id=${record.id}`, "_blank"); + window.open(`${window.ecologyContentPath || ""}/api/bs/hrmsalary/salaryBill/exportPdf?id=${record.id}&salarySendId=${getQueryString("id")}`, "_blank"); }}> {getLabel(111, "导出PDF")} @@ -338,7 +338,7 @@ export default class PayrollGrant extends React.Component { { - window.open(`${window.ecologyContentPath || ""}/api/bs/hrmsalary/salaryBill/send/exportPdf?id=${record.id}`, "_blank"); + window.open(`${window.ecologyContentPath || ""}/api/bs/hrmsalary/salaryBill/exportPdf?id=${record.id}&salarySendId=${getQueryString("id")}`, "_blank"); }}> {getLabel(111, "导出PDF")} @@ -382,7 +382,7 @@ export default class PayrollGrant extends React.Component { this.handleExportSelect(); break; case "5": - window.open(`${window.ecologyContentPath || ""}/api/bs/hrmsalary/salaryBill/send/exportPdf?salarySendId=${getQueryString("id")}`, "_blank"); + window.open(`${window.ecologyContentPath || ""}/api/bs/hrmsalary/salaryBill/exportPdf?salarySendId=${getQueryString("id")}&id=`, "_blank"); break; default: break; From 486254601ffa1376e1e972bbdb4a39f9777ff122 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, 27 Sep 2023 14:35:37 +0800 Subject: [PATCH 7/7] =?UTF-8?q?feature/2.9.42310.01-=E5=B7=A5=E8=B5=84?= =?UTF-8?q?=E5=8D=95=E5=8F=91=E6=94=BE=E5=AF=BC=E5=87=BAPDF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/payroll/payrollGrant/index.js | 36 +++++++++++-------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js index b6d505a2..ff091152 100644 --- a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js +++ b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js @@ -323,25 +323,31 @@ export default class PayrollGrant extends React.Component { onClick={() => this.handleWithdraw({ ids: [record.id] })}> 撤回 - { - window.open(`${window.ecologyContentPath || ""}/api/bs/hrmsalary/salaryBill/exportPdf?id=${record.id}&salarySendId=${getQueryString("id")}`, "_blank"); - }}> - {getLabel(111, "导出PDF")} - + { + salarySendDetailBaseInfo.showPdfBtn && + { + window.open(`${window.ecologyContentPath || ""}/api/bs/hrmsalary/salaryBill/exportPdf?id=${record.id}&salarySendId=${getQueryString("id")}`, "_blank"); + }}> + {getLabel(111, "导出PDF")} + + } ); } else { return ( - { - window.open(`${window.ecologyContentPath || ""}/api/bs/hrmsalary/salaryBill/exportPdf?id=${record.id}&salarySendId=${getQueryString("id")}`, "_blank"); - }}> - {getLabel(111, "导出PDF")} - + { + salarySendDetailBaseInfo.showPdfBtn && + { + window.open(`${window.ecologyContentPath || ""}/api/bs/hrmsalary/salaryBill/exportPdf?id=${record.id}&salarySendId=${getQueryString("id")}`, "_blank"); + }}> + {getLabel(111, "导出PDF")} + + } ); } @@ -393,7 +399,7 @@ export default class PayrollGrant extends React.Component { 全部导出 导出选中 { - selectedKey === "1" && + selectedKey === "1" && salarySendDetailBaseInfo.showPdfBtn && {getLabel(111, "导出PDF")} }