From 28c50dc56334a92133be4329954dbb7d0cefc8d9 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 Nov 2023 11:03:19 +0800 Subject: [PATCH 1/7] hotfix/2.9.42311.02 --- pc4mobx/hrmSalary/pages/mobilePayroll/pwdCondtion.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/pwdCondtion.js b/pc4mobx/hrmSalary/pages/mobilePayroll/pwdCondtion.js index e7c1fbbb..95140f16 100644 --- a/pc4mobx/hrmSalary/pages/mobilePayroll/pwdCondtion.js +++ b/pc4mobx/hrmSalary/pages/mobilePayroll/pwdCondtion.js @@ -13,9 +13,8 @@ export const loginCondition = [ fieldcol: 18, label: getLabel(388431, "登录密码"), labelcol: 6, - detailtype: 3, + detailtype: 1, rules: "required|string", - type: "password", viewAttr: 3 } ], @@ -35,10 +34,9 @@ export const condition = [ fieldcol: 18, label: getLabel(409, "密码"), labelcol: 6, - detailtype: 3, + detailtype: 1, rules: "required|string", - viewAttr: 3, - type: "password" + viewAttr: 3 }, { colSpan: 1, @@ -49,7 +47,7 @@ export const condition = [ labelcol: 6, rules: "required|string", viewAttr: 3, - type: "password" + detailtype: 1 }, { colSpan: 1, From 9f114e9867a271efbba035466bd064bc89774d9f 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 Nov 2023 11:17:38 +0800 Subject: [PATCH 2/7] hotfix/2.9.42311.02 --- .../hrmSalary/pages/mobilePayroll/pwdCondtion.js | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/pwdCondtion.js b/pc4mobx/hrmSalary/pages/mobilePayroll/pwdCondtion.js index 95140f16..5cb571e6 100644 --- a/pc4mobx/hrmSalary/pages/mobilePayroll/pwdCondtion.js +++ b/pc4mobx/hrmSalary/pages/mobilePayroll/pwdCondtion.js @@ -15,7 +15,10 @@ export const loginCondition = [ labelcol: 6, detailtype: 1, rules: "required|string", - viewAttr: 3 + viewAttr: 3, + otherParams: { + type: "password" + } } ], title: "", @@ -36,7 +39,10 @@ export const condition = [ labelcol: 6, detailtype: 1, rules: "required|string", - viewAttr: 3 + viewAttr: 3, + otherParams: { + type: "password" + } }, { colSpan: 1, @@ -47,7 +53,10 @@ export const condition = [ labelcol: 6, rules: "required|string", viewAttr: 3, - detailtype: 1 + detailtype: 1, + otherParams: { + type: "password" + } }, { colSpan: 1, From 0798d2bf965508c2aff10bca7a5975810fe50262 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 Nov 2023 14:15:49 +0800 Subject: [PATCH 3/7] hotfix/2.9.42311.02 --- .../standingBookDetail/components/inputPaymentAmount.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/inputPaymentAmount.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/inputPaymentAmount.js index ea62431c..634e6b30 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/inputPaymentAmount.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/inputPaymentAmount.js @@ -19,7 +19,7 @@ class InputPaymentAmount extends Component { render: (text, record) => { return ( this.handleChangeBaseItem(record, val, type, "per")} /> ); @@ -30,7 +30,7 @@ class InputPaymentAmount extends Component { render: (text, record) => { return ( this.handleChangeBaseItem(record, val, type, "com")} /> ); From ff870c110c2783b167d8748d4d8ea2c159084123 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 Nov 2023 16:51:40 +0800 Subject: [PATCH 4/7] =?UTF-8?q?hotfix/2.9.42311.02-=E8=96=AA=E8=B5=84?= =?UTF-8?q?=E6=A0=B8=E7=AE=97=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../doCalc/components/salaryCalcPersonConfirm/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryCalcPersonConfirm/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryCalcPersonConfirm/index.js index 6c544e8f..83588d5b 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryCalcPersonConfirm/index.js +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryCalcPersonConfirm/index.js @@ -210,7 +210,7 @@ class Index extends Component { }, { title: - {getLabel(542308, "环比上月增加人员")} + {getLabel(542309, "环比上月增加人员")} Date: Tue, 14 Nov 2023 14:45:13 +0800 Subject: [PATCH 5/7] hotfix/2.9.42311.02 --- .../components/calculateTablelist/index.js | 4 +- pc4mobx/hrmSalary/pages/calculate/index.less | 11 ++-- .../fieldManagement/components/fieldTable.js | 1 + .../ledgerPage/components/ledgerTable.js | 1 + .../salaryArchiveEditAdjLogRecord.js | 58 ++++++++++++++++--- 5 files changed, 61 insertions(+), 14 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/calculate/components/calculateTablelist/index.js b/pc4mobx/hrmSalary/pages/calculate/components/calculateTablelist/index.js index 7fc9df9a..626eba5b 100644 --- a/pc4mobx/hrmSalary/pages/calculate/components/calculateTablelist/index.js +++ b/pc4mobx/hrmSalary/pages/calculate/components/calculateTablelist/index.js @@ -114,7 +114,7 @@ class Index extends Component { } }; } - return { ...o, width }; + return { ...o, width, render: (txt) => ({txt}) }; }) }); } @@ -142,7 +142,7 @@ class Index extends Component { }; return ( diff --git a/pc4mobx/hrmSalary/pages/calculate/index.less b/pc4mobx/hrmSalary/pages/calculate/index.less index 013d6d00..b0418614 100644 --- a/pc4mobx/hrmSalary/pages/calculate/index.less +++ b/pc4mobx/hrmSalary/pages/calculate/index.less @@ -75,7 +75,6 @@ .calculate-body { height: 100%; width: 100%; - padding: 16px; overflow-y: auto; .wea-new-table { @@ -84,10 +83,12 @@ .ant-table-tbody { td { - width: 100%; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; + span { + width: 100%; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } } } diff --git a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldTable.js b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldTable.js index e90564b3..87af593d 100644 --- a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldTable.js +++ b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldTable.js @@ -114,6 +114,7 @@ class FieldTable extends Component { pagination={pagination} loading={loading} columns={this.getColumns()} + scroll={{ y: "calc(100vh - 152px)" }} /> ); } diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerTable.js index 2c712894..38ba8a5b 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerTable.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerTable.js @@ -195,6 +195,7 @@ class LedgerTable extends Component { pagination={pagination} loading={loading} columns={this.getColumns()} + scroll={{ y: "calc(100vh - 152px)" }} /> ({ + ...o, dataType: _.find(salaryArchiveItemDetail.salaryItemList, g => g.id === o.salaryItem).dataType + })) + }, conditions: _.map(adjCondition, item => { return { ...item, @@ -100,7 +106,10 @@ class SalaryArchiveEditAdjLogRecordDialog extends Component { ...salaryArchiveItemDetail, list: _.map(list, o => { if (o.salaryItem === salaryItemId) { - return { ...o, salaryBefore: data }; + return { + ...o, salaryBefore: data, + dataType: _.find(salaryArchiveItemDetail.salaryItemList, g => g.id === salaryItemId).dataType + }; } return { ...o }; }) @@ -109,6 +118,23 @@ class SalaryArchiveEditAdjLogRecordDialog extends Component { } }); }; + handleChangeAdjustAfter = (record, v) => { + const { salaryArchiveItemDetail } = this.state; + const { list } = salaryArchiveItemDetail; + this.setState({ + salaryArchiveItemDetail: { + ...salaryArchiveItemDetail, + list: _.map(list, o => { + if (o.salaryItem === record.salaryItem) { + return { + ...o, adjustAfter: v + }; + } + return { ...o }; + }) + } + }); + }; save = () => { const { salaryFileStore: { adjForm, fetchSingleSalaryItemList, getArchiveForm } } = this.props; const { pass } = this.tableEdit.refs.edit.doRequiredCheck(); @@ -201,13 +227,31 @@ class SalaryArchiveEditAdjLogRecordDialog extends Component { this.tableEdit = dom} deleteConfirm - columns={adjColumns} datas={list} showCopy={false} - showAdd={!id} showDelete={!id} + datas={list} showCopy={false} showAdd={!id} showDelete={!id} onChange={o => this.setState({ salaryArchiveItemDetail: { - ...salaryArchiveItemDetail, list: o + ...salaryArchiveItemDetail, list: _.map(o, it => ({ ...it, dataType: "" })) } - })} + })} columns={_.map(adjColumns, o => { + if (o.dataIndex === "adjustAfter") { + return { + ...o, render: (__, record) => { + if (record.dataType === "number") { + return this.handleChangeAdjustAfter(record, v)} + />; + } else { + return this.handleChangeAdjustAfter(record, v)} + />; + } + } + }; + } + return { ...o }; + })} /> :
From f4574570d95ea5560fe230457989fbeb76097db1 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, 15 Nov 2023 13:53:56 +0800 Subject: [PATCH 6/7] hotfix/2.9.42311.02 --- .../pages/calculate/calcOc/components/salaryCalcOcList.js | 2 +- .../calculate/doCalc/components/salaryEditCalc/baseInfo.js | 4 ++-- .../calculate/doCalc/components/salaryEditCalc/index.less | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/calculate/calcOc/components/salaryCalcOcList.js b/pc4mobx/hrmSalary/pages/calculate/calcOc/components/salaryCalcOcList.js index e3dda5fb..817a7b6d 100644 --- a/pc4mobx/hrmSalary/pages/calculate/calcOc/components/salaryCalcOcList.js +++ b/pc4mobx/hrmSalary/pages/calculate/calcOc/components/salaryCalcOcList.js @@ -84,7 +84,7 @@ class SalaryCalcOcList extends Component { render: (__, record) => { const formulaDesc = record["customParameters"][`${o["dataIndex"]}`]; const showDifference = record[`${o["dataIndex"]}_type`] === "number"; - const { acctResultValue, excelResultValue } = record[o["dataIndex"]]; + const { acctResultValue, excelResultValue } = record[o["dataIndex"]] || {}; return
this.setState({ formulaDesc })}>
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/baseInfo.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/baseInfo.js index 3539ec72..129d9cb7 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/baseInfo.js +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/baseInfo.js @@ -40,10 +40,10 @@ class EditSalaryBaseInfo extends Component { "esf-form-last-item": (index === baseInfo.length - 1 && (index + 1) % 2 === 1) })}> - {fieldName} + {fieldName} - {fieldValue} + {fieldValue} diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less index 831c2bd9..91797921 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less @@ -168,6 +168,10 @@ display: inline-block; line-height: 24px; padding: 8px 16px; + width: 100%; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; } } From 373b0aad564213573f9e120e9bbdecb3fc1b7b97 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, 17 Nov 2023 13:33:56 +0800 Subject: [PATCH 7/7] hotfix/2.9.42311.02 --- pc4mobx/hrmSalary/pages/calculate/calcOc/index.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/pages/calculate/calcOc/index.js b/pc4mobx/hrmSalary/pages/calculate/calcOc/index.js index 62e0a92d..0869e675 100644 --- a/pc4mobx/hrmSalary/pages/calculate/calcOc/index.js +++ b/pc4mobx/hrmSalary/pages/calculate/calcOc/index.js @@ -9,6 +9,7 @@ import { Button } from "antd"; import { WeaCheckbox, WeaInputSearch, WeaLocaleProvider } from "ecCom"; import SalaryCalcOcList from "./components/salaryCalcOcList"; import SalaryCalcOcImport from "./components/salaryCalcOcImport"; +import { convertToUrlString } from "../../../util/url"; import Layout from "../doCalc/layout"; import "./index.less"; @@ -34,8 +35,12 @@ class Index extends Component { }; handleExportClick = () => { + const { form: { onlyDiffEmployee, onlyDiffSalaryItem } } = this.state; const { routeParams: { salaryAcctRecordId } } = this.props; - window.open(`/api/bs/hrmsalary/salaryacct/comparisonresult/export?salaryAcctRecordId=${salaryAcctRecordId}`, "_blank"); + const payload = { + salaryAcctRecordId, onlyDiffEmployee, onlyDiffSalaryItem + }; + window.open(`/api/bs/hrmsalary/salaryacct/comparisonresult/export?${convertToUrlString(payload)}`, "_blank"); }; handleImportClick = () => { const { routeParams: { salaryAcctRecordId } } = this.props;