From 0241c017b8a1536d26173a052d4c305423c37809 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, 24 Apr 2024 10:42:04 +0800 Subject: [PATCH 01/11] =?UTF-8?q?hotfix/2.12.1.2404.02=20=E6=9B=B4?= =?UTF-8?q?=E5=A4=9A=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hrmSalary/components/moreBtnMenu/index.js | 62 +++++++++++++ .../components/moreBtnMenu/index.less | 86 +++++++++++++++++++ 2 files changed, 148 insertions(+) create mode 100644 pc4mobx/hrmSalary/components/moreBtnMenu/index.js create mode 100644 pc4mobx/hrmSalary/components/moreBtnMenu/index.less diff --git a/pc4mobx/hrmSalary/components/moreBtnMenu/index.js b/pc4mobx/hrmSalary/components/moreBtnMenu/index.js new file mode 100644 index 00000000..003705c9 --- /dev/null +++ b/pc4mobx/hrmSalary/components/moreBtnMenu/index.js @@ -0,0 +1,62 @@ +/* + * Author: 黎永顺 + * name: 更多菜单列表 + * Description: + * Date: 2023/12/28 + */ +import React, { Component } from "react"; +import { WeaLocaleProvider } from "ecCom"; +import { Menu } from "antd"; +import "./index.less"; + +const getLabel = WeaLocaleProvider.getLabel; + +class Index extends Component { + constructor(props) { + super(props); + this.state = { + showDrop: false + }; + } + + render() { + const { showDrop } = this.state; + const { dropMenuDatas } = this.props; + const menu = dropMenuDatas ? + { + dropMenuDatas.forEach(d => d.key === o.key && typeof d.onClick === "function" && d.onClick(o.key)); + }}> + { + dropMenuDatas && dropMenuDatas.map((d, i) => { + return ( + + {d.icon} + {d.content} + + ); + })} + : ""; + return ( +
+ { + !_.isEmpty(dropMenuDatas) && + this.setState({ showDrop: true })}> + + + } +
this.setState({ showDrop: false })} + style={{ display: showDrop ? "block" : "none" }}> + this.setState({ showDrop: false })}> + + +
+ {menu} +
+
+ ); + } +} + +export default Index; diff --git a/pc4mobx/hrmSalary/components/moreBtnMenu/index.less b/pc4mobx/hrmSalary/components/moreBtnMenu/index.less new file mode 100644 index 00000000..9954df06 --- /dev/null +++ b/pc4mobx/hrmSalary/components/moreBtnMenu/index.less @@ -0,0 +1,86 @@ +.more-btn-menu-wrapper { + position: relative; + + .more-btn { + display: inline-block; + padding-left: 20px; + line-height: 40px; + vertical-align: middle; + cursor: pointer; + + .more-btn-icon { + font-size: 16px; + color: #484848; + cursor: pointer; + } + } + + .more-btn-menu { + max-width: 200px; + position: absolute; + right: -14px; + top: 45px; + border: 1px solid #dadada; + -webkit-box-shadow: 0 0 2px #dadada; + box-shadow: 0 0 2px #dadada; + z-index: 99; + -webkit-box-sizing: border-box; + box-sizing: border-box; + background: #FFF; + + .more-btn { + display: block; + -webkit-box-sizing: border-box; + box-sizing: border-box; + height: 44px; + line-height: 35px; + position: absolute; + right: -1px; + top: -44px; + padding: 0 13px; + border: 1px solid #dadada; + border-bottom: 0; + -webkit-box-shadow: 0 -1px 2px -1px #dadada; + box-shadow: 0 -1px 2px -1px #dadada; + background-color: #fff; + } + + .more-btn-menu-icon-background { + width: 36px; + height: 100%; + background-color: #f2f5f7; + border: 1px solid #dadada; + border-right: 0; + position: absolute; + top: -1px; + left: -1px; + z-index: 0; + -webkit-box-sizing: content-box; + box-sizing: content-box; + } + + .ant-menu { + margin: 10px 0; + border: 0; + text-align: left; + min-width: 120px; + + .ant-menu-item { + height: 30px; + line-height: 30px; + padding: 0 5px 0 0; + overflow: hidden; + white-space: nowrap; + -o-text-overflow: ellipsis; + text-overflow: ellipsis; + + .menu-icon { + display: inline-block; + width: 36px; + margin-right: 6px; + text-align: center; + } + } + } + } +} From 7dee340ab8d190c9aaae985470c44f7270d7b42c 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, 24 Apr 2024 15:20:13 +0800 Subject: [PATCH 02/11] hotfix/2.12.1.2404.02 --- .../pages/ledgerPage/components/ledgerSalaryItemBaseInfo.js | 1 + pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js | 1 + 2 files changed, 2 insertions(+) diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemBaseInfo.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemBaseInfo.js index eb827a0a..e2b191ae 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemBaseInfo.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemBaseInfo.js @@ -55,6 +55,7 @@ class LedgerSalaryItemBaseInfo extends Component { const options = _.map(empFieldListOptions, o => ({ ...o, disabled: _.map(dataSource, g => g.fieldId).includes(o.key) })); + if (_.isEmpty(dataSource) || _.isEmpty(options)) return null; return ( }>
diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js index ba853f81..e1f85aca 100644 --- a/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js +++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js @@ -290,6 +290,7 @@ class SalaryItemSettings extends Component { render() { const { onChangeSalaryItem, salaryBillItemNameSet } = this.props; const { dataList, modalPayload, checkedValue } = this.state; + if (_.isEmpty(dataList)) return null; return (
Date: Thu, 25 Apr 2024 16:23:31 +0800 Subject: [PATCH 03/11] hotfix/2.12.1.2404.02 --- pc4mobx/hrmSalary/apis/mySalaryBenefits.js | 3 +++ pc4mobx/hrmSalary/pages/mobilePayroll/passSetDialog.js | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pc4mobx/hrmSalary/apis/mySalaryBenefits.js b/pc4mobx/hrmSalary/apis/mySalaryBenefits.js index 0cb56cfe..b79a6718 100644 --- a/pc4mobx/hrmSalary/apis/mySalaryBenefits.js +++ b/pc4mobx/hrmSalary/apis/mySalaryBenefits.js @@ -42,6 +42,9 @@ export const doSecondAuth = (params, headers) => { return formHeaderPost("/api/encrypt/secondauthsetting/doSecondAuth", "POST", params, headers); // return WeaTools.callApi("/api/encrypt/secondauthsetting/doSecondAuth", "POST", params); }; +export const getPasswordForm = params => { + return WeaTools.callApi("/api/hrm/secondarypwd/getPasswordForm", "GET", params); +}; export const checkPassword = params => { return WeaTools.callApi("/api/hrm/secondarypwd/checkPassword", "POST", params); }; diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/passSetDialog.js b/pc4mobx/hrmSalary/pages/mobilePayroll/passSetDialog.js index f857c6d6..6f86c0b2 100644 --- a/pc4mobx/hrmSalary/pages/mobilePayroll/passSetDialog.js +++ b/pc4mobx/hrmSalary/pages/mobilePayroll/passSetDialog.js @@ -10,7 +10,7 @@ import { WeaSwitch } from "comsMobx"; import { condition, loginCondition } from "./pwdCondtion"; import { Button, message } from "antd"; import { RSAEcrypt } from "../../util/RSAUtil"; -import { checkPassword, saveSecondaryPwd } from "../../apis/mySalaryBenefits"; +import { checkPassword, getPasswordForm, saveSecondaryPwd } from "../../apis/mySalaryBenefits"; import "./index.less"; const getLabel = WeaLocaleProvider.getLabel; @@ -72,7 +72,8 @@ class PassSetDialog extends Component { }); return group; }; - saveSecondaryPassword = () => { + saveSecondaryPassword = async () => { + const { openRSA } = getPasswordForm(); const { isPassLoginPassword } = this.state; const { form } = this.props; const { secondaryPwd1, secondaryPwd2, validatecode, password } = form.getFormParams(); @@ -92,7 +93,7 @@ class PassSetDialog extends Component { } } const params = isPassLoginPassword ? { secondaryPwd1, secondaryPwd2 } : { password }; - RSAEcrypt("1", params).then(RSAParam => { + RSAEcrypt(openRSA, params).then(RSAParam => { isPassLoginPassword ? saveSecondaryPwd({ ...RSAParam, validatecode }).then(({ sign, message: msg }) => { if (sign === "1") { From 8751c14002bd7646bb0e460b78083a9977bc338e 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, 25 Apr 2024 16:39:58 +0800 Subject: [PATCH 04/11] hotfix/2.12.1.2404.02 --- pc4mobx/hrmSalary/pages/mobilePayroll/passSetDialog.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/passSetDialog.js b/pc4mobx/hrmSalary/pages/mobilePayroll/passSetDialog.js index 6f86c0b2..5e72cc72 100644 --- a/pc4mobx/hrmSalary/pages/mobilePayroll/passSetDialog.js +++ b/pc4mobx/hrmSalary/pages/mobilePayroll/passSetDialog.js @@ -73,7 +73,7 @@ class PassSetDialog extends Component { return group; }; saveSecondaryPassword = async () => { - const { openRSA } = getPasswordForm(); + const { openRSA } = await getPasswordForm(); const { isPassLoginPassword } = this.state; const { form } = this.props; const { secondaryPwd1, secondaryPwd2, validatecode, password } = form.getFormParams(); From f1670a038033dffca2cbd1876f7f149fff00db06 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, 26 Apr 2024 14:57:06 +0800 Subject: [PATCH 05/11] =?UTF-8?q?hotfix/2.12.1.2404.02=20=E6=A1=A3?= =?UTF-8?q?=E6=A1=88tab=E6=80=BB=E6=95=B0=E6=98=BE=E7=A4=BA=E7=9A=84?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/salaryFileList/index.js | 6 ++--- .../pages/payrollFiles/salaryFiles.js | 24 ++++++++++++------- .../components/welfareTableList/index.js | 6 ++--- .../welfareArchive/index.js | 24 ++++++++++++------- 4 files changed, 36 insertions(+), 24 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileList/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileList/index.js index 90c6938c..efe2605b 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileList/index.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileList/index.js @@ -45,7 +45,7 @@ class Index extends Component { } componentDidMount() { - this.getSalaryFileList(this.props); + this.getSalaryFileList(this.props, true); window.addEventListener("message", this.handleReceive, false); window.addEventListener("resize", this.handleResize, false); } @@ -152,7 +152,7 @@ class Index extends Component { const childFrameObj = document.getElementById("atdTable"); childFrameObj.contentWindow.postMessage(JSON.stringify({ ...payload, i18n }), "*"); }; - getSalaryFileList = (props) => { + getSalaryFileList = (props, init = false) => { const { pageInfo } = this.state; const { payrollFilesStore: { salaryFileQueryForm, queryList }, selectedKey, onChangeTopTabCount @@ -166,7 +166,7 @@ class Index extends Component { this.setState({ pageInfo: { ...pageInfo, current, pageSize, total }, dataSource }, () => { - onChangeTopTabCount(selectedKey, total); + onChangeTopTabCount(selectedKey, total, init); }); } }).catch(() => this.setState({ loading: false })); diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/salaryFiles.js b/pc4mobx/hrmSalary/pages/payrollFiles/salaryFiles.js index 59fed35e..344a3284 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/salaryFiles.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/salaryFiles.js @@ -85,15 +85,21 @@ class SalaryFiles extends Component { break; } }; - queryInsuranceTabTotal = (active, total) => { - API.queryTabTotal().then(({ status, data }) => { - if (status) { - const key = _.find(tabList, o => o.viewcondition === active).groupid; - this.setState({ - topTabCount: { ...this.state.topTabCount, ...data, [key]: total } - }); - } - }); + queryInsuranceTabTotal = (active, total, init) => { + const key = _.find(tabList, o => o.viewcondition === active).groupid; + if (init) { + API.queryTabTotal().then(({ status, data }) => { + if (status) { + this.setState({ + topTabCount: { ...this.state.topTabCount, ...data, [key]: total } + }); + } + }); + } else { + this.setState({ + topTabCount: { ...this.state.topTabCount, [key]: total } + }); + } }; handleReqBtnsCLick = (type, importType) => { const { state, handleSalaryOpts } = this.salaryFileListRef.wrappedInstance || {}; diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareTableList/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareTableList/index.js index 6d5e4468..a9029a86 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareTableList/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareTableList/index.js @@ -68,7 +68,7 @@ class Index extends Component { handleReceive = async ({ data }) => { const { type, payload: { id, params } = {} } = data; if (type === "init") { - this.getWelfareList(this.props); + this.getWelfareList(this.props, true); } else if (type === "turn") { const { record: { baseInfo, employeeId, paymentOrganization } = {}, interfaceParams = {} } = params; const { runStatuses, showOperateBtn } = this.props; @@ -154,7 +154,7 @@ class Index extends Component { getPaymentForm = async (props) => { return API.getPaymentForm({ ...props }); }; - getWelfareList = (props) => { + getWelfareList = (props, init = false) => { const { pageInfo } = this.state; const { archivesStore: { welfareForm }, runStatuses, onChangeTopTabCount, showOperateBtn } = props; const params = { ...pageInfo, ...welfareForm.getFormParams() }; @@ -182,7 +182,7 @@ class Index extends Component { }) }, () => { const { pageInfo, selectedRowKeys, columns, dataSource } = this.state; - onChangeTopTabCount(runStatuses, total); + onChangeTopTabCount(runStatuses, total, init); this.postMessageToChild({ dataSource, pageInfo, selectedRowKeys, runStatuses, columns, showOperateBtn diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/index.js index 76d00398..4da87e27 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/index.js @@ -46,15 +46,21 @@ class Index extends Component { this.setState({ showExtEmpsWitch: extEmpsWitch === "1" }); } - queryInsuranceTabTotal = (active, total) => { - API.queryInsuranceTabTotal().then(({ status, data }) => { - if (status) { - const key = _.find(tabList, o => o.viewcondition === active).groupid; - this.setState({ - topTabCount: { ...this.state.topTabCount, ...data, [key]: total } - }); - } - }); + queryInsuranceTabTotal = (active, total, init) => { + const key = _.find(tabList, o => o.viewcondition === active).groupid; + if (init) { + API.queryInsuranceTabTotal().then(({ status, data }) => { + if (status) { + this.setState({ + topTabCount: { ...this.state.topTabCount, ...data, [key]: total } + }); + } + }); + } else { + this.setState({ + topTabCount: { ...this.state.topTabCount, [key]: total } + }); + } }; handleOpenAdvanceSearch = () => this.setState({ showSearchAd: true }); handleAdvanceSearch = () => this.setState({ isQuery: !this.state.isQuery }); From c43e69af5dc2834e2ec1ce0078cdf5df24c25543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Sun, 28 Apr 2024 09:07:40 +0800 Subject: [PATCH 06/11] =?UTF-8?q?hotfix/2.12.1.2404.02=20=E8=96=AA?= =?UTF-8?q?=E9=85=AC=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=80=8F=E8=A7=86=20=E8=A1=A8=E6=A0=BC=E5=8F=98=E5=BD=A2?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/reportView/components/povitpivotChartModal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js b/pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js index 9f9bddf7..53fd5d26 100644 --- a/pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js +++ b/pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js @@ -77,7 +77,7 @@ class PovitpivotChartModal extends Component { const childFrameObj = document.getElementById("commonTable"); const { dataSource, showSum = false, pageInfo, columns } = payload; childFrameObj && childFrameObj.contentWindow.postMessage(JSON.stringify({ - dataSource, columns, showSum, pageInfo + dataSource, showSum, pageInfo, columns: _.map(columns, o => ({ ...o, width: o.oldWidth })) }), "*"); }; getDataPerspective = (payload) => { From 64bfb456182b373459f8accd98ef982964564eff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Sun, 28 Apr 2024 13:48:20 +0800 Subject: [PATCH 07/11] =?UTF-8?q?hotfix/2.12.1.2404.02=20=E8=96=AA?= =?UTF-8?q?=E9=85=AC=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hrmSalary/pages/reportView/components/reportContent.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js b/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js index 37700a22..a7808410 100644 --- a/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js +++ b/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js @@ -98,11 +98,11 @@ class ReportContent extends Component { countResult, columns: _.map(columns, it => ({ ...it, - dataIndex: it.column, width: 150, + dataIndex: it.column, width: it.width ? it.width + "px" : 150, title: it.text, align: "center", children: !_.isNil(it.children) ? _.map(it.children, child => ({ ...child, - dataIndex: child.column, width: 150, + dataIndex: child.column, width: child.width ? child.width + "px" : 150, title: child.text, align: "center" })) : [] })), From 718d1929bb58019add1c37e9cead198478a3741d 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, 29 Apr 2024 11:27:49 +0800 Subject: [PATCH 08/11] hotfix/2.12.1.2404.02 --- .../pages/calculate/components/calculateDialog/condition.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pc4mobx/hrmSalary/pages/calculate/components/calculateDialog/condition.js b/pc4mobx/hrmSalary/pages/calculate/components/calculateDialog/condition.js index 3274d070..be20527a 100644 --- a/pc4mobx/hrmSalary/pages/calculate/components/calculateDialog/condition.js +++ b/pc4mobx/hrmSalary/pages/calculate/components/calculateDialog/condition.js @@ -22,6 +22,9 @@ export const calculateConditions = [ lanId: 519146, labelcol: 6, options: [], + otherParams: { + showSearch: true, optionFilterProp: "children" + }, rules: "required|string", viewAttr: 3 }, From 29b5f9eb50e7ce88cb42918b652dd21d06c5e8ad 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, 29 Apr 2024 17:55:37 +0800 Subject: [PATCH 09/11] hotfix/2.12.1.2404.02 --- .../pages/reportView/components/povitpivotChartModal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js b/pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js index 53fd5d26..6a80e8fb 100644 --- a/pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js +++ b/pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js @@ -77,7 +77,7 @@ class PovitpivotChartModal extends Component { const childFrameObj = document.getElementById("commonTable"); const { dataSource, showSum = false, pageInfo, columns } = payload; childFrameObj && childFrameObj.contentWindow.postMessage(JSON.stringify({ - dataSource, showSum, pageInfo, columns: _.map(columns, o => ({ ...o, width: o.oldWidth })) + dataSource, showSum, pageInfo, columns: _.map(columns, o => ({ ...o, width: o.oldWidth, ellipsis: true })) }), "*"); }; getDataPerspective = (payload) => { From d8bad175140d901db490896ca29908f7dac1fe08 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, 6 May 2024 09:48:04 +0800 Subject: [PATCH 10/11] hotfix/2.12.1.2404.02 --- .../pages/dataAcquisition/cumDeduct/index.js | 32 +++++++++++-------- .../pages/dataAcquisition/index.less | 4 +++ .../hrmSalary/pages/dataAcquisition/layout.js | 16 ---------- 3 files changed, 22 insertions(+), 30 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js index 7fca9256..6c7721ab 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js @@ -83,17 +83,18 @@ class Index extends Component { * Date: 2023/2/17 */ autoAddAll = () => { - const { declareMonth } = this.state; + const { declareMonth, taxAgentId } = this.state; this.setState({ addAllLoading: true }); - autoAddAll({ yearMonth: declareMonth }).then(({ status, data, errormsg }) => { - this.setState({ addAllLoading: false }); - if (status) { - message.success(data || "操作成功"); - this.tableRef.getTableDate(); - } else { - message.error(errormsg || "操作失败"); - } - }).catch(() => this.setState({ addAllLoading: false })); + autoAddAll({ yearMonth: declareMonth, taxAgentIds: taxAgentId ? taxAgentId.split(",") : [] }) + .then(({ status, data, errormsg }) => { + this.setState({ addAllLoading: false }); + if (status) { + message.success(data || "操作成功"); + this.tableRef.getTableDate(); + } else { + message.error(errormsg || "操作失败"); + } + }).catch(() => this.setState({ addAllLoading: false })); }; /* * Author: 黎永顺 @@ -363,7 +364,7 @@ class Index extends Component { value: taxAgentId, onChange: this.screenChange, options: [{ key: "", showname: "全部" }, ...taxAgentOption], - key: "taxAgentId" + key: "taxAgentId", multiple: true }) } ]; @@ -500,7 +501,7 @@ class Index extends Component { declareMonth, taxAgentId, slidePayload, saveLoading, exportPayloadUrl, advanceCondition, importPayload, exportPayloadType, targetid } = this.state; - const tablePayload = { declareMonth: [declareMonth], taxAgentId }; + const tablePayload = { declareMonth: [declareMonth], taxAgentIds: taxAgentId ? taxAgentId.split(",") : [] }; return ( { ; }; export const DataCollectionSelect = (props) => { - const { value, label, onChange, options, key, labelCol = 10, wrapperCol = 14, viewAttr = 2 } = props; + const { + value, label, onChange, options, key, labelCol = 10, + wrapperCol = 14, viewAttr = 2, multiple = false + } = props; return onChange({ key, value: val })} options={options} - viewAttr={viewAttr}/> + viewAttr={viewAttr} multiple={multiple}/> ; }; diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/index.less b/pc4mobx/hrmSalary/pages/dataAcquisition/index.less index a580739f..f5272aed 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/index.less +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/index.less @@ -81,6 +81,10 @@ .wea-helpful-tip { padding-left: 10px; } + + .wea-form-item-wrapper { + display: inline-block !important; + } } .screenSituationWrapper { diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js b/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js index 0c42281c..9337f5f9 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js @@ -118,22 +118,6 @@ class Layout extends Component { importOpts={importOpts} importResult={importResult} templateLink={templateLink} previewUrl={previewUrl} onImportFile={onImportFile} /> - {/* onCancel(true)}*/} - {/* slideDataSource={slideDataSource}*/} - {/* previewImport={onPreviewImport}*/} - {/* importFile={onImportFile}*/} - {/* templateLink={templateLink}*/} - {/* renderFormComponent={() => importFormComponent}*/} - {/* visiable={importVisiable}*/} - {/* onCancel={onCancel}*/} - {/*/>*/} {/* 新增-编辑-详情弹框 */} Date: Mon, 6 May 2024 10:21:55 +0800 Subject: [PATCH 11/11] hotfix/2.12.1.2404.02 --- pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js index 6c7721ab..9f1e481f 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js @@ -363,7 +363,7 @@ class Index extends Component { label: "个税扣缴义务人", value: taxAgentId, onChange: this.screenChange, - options: [{ key: "", showname: "全部" }, ...taxAgentOption], + options: taxAgentOption, key: "taxAgentId", multiple: true }) }