From 2871043810dd6b0263964f947e3122195539b9ce Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Thu, 17 Jul 2025 17:28:48 +0800 Subject: [PATCH 01/10] release/2.19.1.2501.01 --- .../pages/socialSecurityBenefits/standingBook/columns.js | 1 + 1 file changed, 1 insertion(+) diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/columns.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/columns.js index bc9c1816..c42f0ec4 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/columns.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/columns.js @@ -22,6 +22,7 @@ export const socialAccountConditions = [ lanId: 537996, labelcol: 6, options: [], + multiple: true, rules: "required|string", viewAttr: 3 }, From 3d8b24288910186a1f6652cccd434f72445e4f16 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Thu, 24 Jul 2025 16:51:19 +0800 Subject: [PATCH 02/10] release/2.19.1.2501.01 --- .../pages/socialSecurityBenefits/standingBook/columns.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/columns.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/columns.js index c42f0ec4..84caeb48 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/columns.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/columns.js @@ -22,7 +22,9 @@ export const socialAccountConditions = [ lanId: 537996, labelcol: 6, options: [], - multiple: true, + otherParams: { + showSearch: true, optionFilterProp: "children" + }, rules: "required|string", viewAttr: 3 }, From 2321266533fd28b36893e3838f11b84467749f56 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Mon, 4 Aug 2025 16:23:10 +0800 Subject: [PATCH 03/10] release/2.19.1.2501.01 --- pc4mobx/hrmSalary/pages/adjustSalaryManage/index.less | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pc4mobx/hrmSalary/pages/adjustSalaryManage/index.less b/pc4mobx/hrmSalary/pages/adjustSalaryManage/index.less index f7648ef8..4305d22c 100644 --- a/pc4mobx/hrmSalary/pages/adjustSalaryManage/index.less +++ b/pc4mobx/hrmSalary/pages/adjustSalaryManage/index.less @@ -43,5 +43,15 @@ } } + + .wea-new-table { + .wea-new-table .ant-table-tbody > tr > td, + .wea-new-table .ant-table-thead > tr > th { + width: 100%; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + } } From 2b39980ed0ecf2f3394aafef26a055158839dbf1 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Mon, 4 Aug 2025 16:24:41 +0800 Subject: [PATCH 04/10] release/2.19.1.2501.01 --- pc4mobx/hrmSalary/pages/adjustSalaryManage/index.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/adjustSalaryManage/index.less b/pc4mobx/hrmSalary/pages/adjustSalaryManage/index.less index 4305d22c..fbeef936 100644 --- a/pc4mobx/hrmSalary/pages/adjustSalaryManage/index.less +++ b/pc4mobx/hrmSalary/pages/adjustSalaryManage/index.less @@ -45,8 +45,8 @@ } .wea-new-table { - .wea-new-table .ant-table-tbody > tr > td, - .wea-new-table .ant-table-thead > tr > th { + .ant-table-tbody > tr > td, + .ant-table-thead > tr > th { width: 100%; overflow: hidden; text-overflow: ellipsis; From 5f80e9e6b3c655ea5a4d19e5b594cc74f52314bb Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Mon, 4 Aug 2025 16:29:06 +0800 Subject: [PATCH 05/10] release/2.19.1.2501.01 --- pc4mobx/hrmSalary/pages/adjustSalaryManage/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/pages/adjustSalaryManage/index.js b/pc4mobx/hrmSalary/pages/adjustSalaryManage/index.js index a58245c7..813cb7d9 100644 --- a/pc4mobx/hrmSalary/pages/adjustSalaryManage/index.js +++ b/pc4mobx/hrmSalary/pages/adjustSalaryManage/index.js @@ -62,7 +62,7 @@ class Index extends Component { if (o.dataIndex === "username") { return { ...o, width: 150, fixed: "left" }; } - return { ...o, width: 150 }; + return { ...o, width: 150, render: (v) => ({v}) }; }), { dataIndex: "options", title: getLabel(30585, "操作"), width: 120, render: (_, record) => ( From 5ef2c5ecb435394134bb7d3d1926c6825f53acc7 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Tue, 2 Sep 2025 14:52:58 +0800 Subject: [PATCH 06/10] release/2.19.1.2501.01 --- pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js b/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js index 5a334965..f221b0ef 100644 --- a/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js +++ b/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js @@ -13,6 +13,7 @@ import Content from "../../components/pcTemplate/content"; import { confirmSalaryBill, feedBackSalaryBill, payrollCheckType } from "../../apis/payroll"; import CaptchaModal from "../../components/captchaModal"; import "./index.less"; +import { getQueryString } from "../../util/url"; const isIPhone = new RegExp("\\biPhone\\b|\\biPod\\b", "i").test(window.navigator.userAgent); const isEm = window.navigator.userAgent.indexOf("E-Mobile7") >= 0; @@ -84,7 +85,13 @@ class MySalaryView extends Component { const { captchaVisible, mySalaryStore } = this.state; const { params: { salaryInfoId } } = this.props; if (_.isEmpty(mySalaryStore)) { - return
; + return
+ this.setState({ captchaVisible: false })} + onConfirm={() => this.props.mySalaryStore.setInitEmVerify()} + /> +
; } const { salaryTemplate, salaryGroups, employeeInformation, sendTime } = mySalaryStore; const salaryProps = { @@ -106,11 +113,6 @@ class MySalaryView extends Component { - this.setState({ captchaVisible: false })} - onConfirm={() => mySalaryStore.setInitEmVerify()} - /> ); } From ff1da8b19bcdf32abbb923af4037e969cc16f19b Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Thu, 4 Sep 2025 09:59:22 +0800 Subject: [PATCH 07/10] release/2.19.1.2501.01 --- pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js b/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js index f221b0ef..e8b7cc58 100644 --- a/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js +++ b/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js @@ -89,7 +89,12 @@ class MySalaryView extends Component { this.setState({ captchaVisible: false })} - onConfirm={() => this.props.mySalaryStore.setInitEmVerify()} + onConfirm={() => { + this.props.mySalaryStore.setInitEmVerify(); + this.props.mySalaryStore.getMySalaryBill(Number(salaryInfoId)).then(data => { + this.setState({ mySalaryStore: data }); + }); + }} /> ; } From 915e946c3e82dd738128a80b265d6094a73fa6bd Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Fri, 12 Sep 2025 09:57:54 +0800 Subject: [PATCH 08/10] release/2.19.1.2501.01 --- .../pages/declare/generateDeclarationDetail.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js b/pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js index 91a1a88f..22d1c5ea 100644 --- a/pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js +++ b/pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js @@ -2,6 +2,7 @@ import React from "react"; import { inject, observer } from "mobx-react"; import { WeaLocaleProvider, WeaTable, WeaTop } from "ecCom"; import { getQueryString } from "../../util/url"; +import { sysinfo } from "../../apis/ruleconfig"; import * as API from "../../apis/declare"; import { Button } from "antd"; import "./index.less"; @@ -14,15 +15,21 @@ export default class GenerateDeclarationDetail extends React.Component { super(props); this.state = { loading: false, dataSource: [], columns: [], declareInfo: {}, - pageInfo: { current: 1, pageSize: 10, total: 0 } + pageInfo: { current: 1, pageSize: 10, total: 0 }, sysinfo: {} }; } componentDidMount() { this.getDetailList(); this.getDeclareInfo(); + this.getSysinfo(); } + getSysinfo = () => { + sysinfo().then(({ status, data: sysinfo }) => { + if (status) this.setState({ sysinfo }); + }); + }; getDetailList = () => { const { pageInfo } = this.state; const payload = { @@ -64,9 +71,10 @@ export default class GenerateDeclarationDetail extends React.Component { window.open(url, "_self"); }; renderTitle = () => { - const { declareInfo } = this.state; + const { declareInfo, sysinfo } = this.state; + const title = sysinfo["TAX_DECLARATION_DATE_TYPE"] === "1" ? getLabel(111, "税款所属期") : getLabel(111, "薪资所属月"); return ( - {getLabel(111, "薪资所属月")}：{declareInfo.salaryMonth} + {title}：{declareInfo.salaryMonth} {getLabel(111, "个税扣缴义务人")}：{declareInfo.taxAgentName} ); }; From efb5af1b101addd9375f67a1061f6251f586ea69 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Fri, 10 Oct 2025 11:05:18 +0800 Subject: [PATCH 09/10] release/2.19.1.2501.01 --- .../salaryEditCalc/editCalcTable.js | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js index 986bb1bb..c7798e3f 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js @@ -125,17 +125,18 @@ class EditCalcTable extends Component { }, 500); }); const { routeParams: { salaryAcctRecordId } } = this.props; - updateLockStatus({ ...payload, salaryAcctRecordId }).then(({ status, errormsg }) => { - if (status) { - clearInterval(this.timerLock); - this.setState({ - progressVisible: false, - progress: 0 - }, () => this.queryCalcResultList()); - } else { - message.error(errormsg); - } - }); + updateLockStatus({ ...payload, salaryAcctRecordId, acctEmpIds: this.state.selectedRowKeys }) + .then(({ status, errormsg }) => { + if (status) { + clearInterval(this.timerLock); + this.setState({ + progressVisible: false, + progress: 0 + }, () => this.queryCalcResultList()); + } else { + message.error(errormsg); + } + }); } }); }; @@ -341,4 +342,4 @@ const traverse = (arr, calcDetail) => { }; } }); -}; +}; \ No newline at end of file From 5e5e109b7e283d5669949303f572ad57ee5d5856 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Thu, 13 Nov 2025 16:42:10 +0800 Subject: [PATCH 10/10] release/2.19.1.2501.01 --- pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js b/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js index e8b7cc58..c03a5368 100644 --- a/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js +++ b/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js @@ -15,7 +15,7 @@ import CaptchaModal from "../../components/captchaModal"; import "./index.less"; import { getQueryString } from "../../util/url"; -const isIPhone = new RegExp("\\biPhone\\b|\\biPod\\b", "i").test(window.navigator.userAgent); +const isPhone = /(iPhone|iPad|iPod|iOS|Android)/i.test(window.navigator.userAgent); const isEm = window.navigator.userAgent.indexOf("E-Mobile7") >= 0; const { getLabel } = WeaLocaleProvider; @@ -132,8 +132,8 @@ export const ConfirmBtns = (props) => { } { - ((props.showFeedback === "1" && !isIPhone) || (props.showFeedback === "1" && isIPhone && isEm)) && + ((props.showFeedback === "1" && !isPhone) || (props.showFeedback === "1" && isEm)) && } ; -}; +}; \ No newline at end of file