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 1/3] 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 From 680c4a0506a29b4402091a6ad24083dd833d33e0 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Mon, 22 Dec 2025 10:51:10 +0800 Subject: [PATCH 2/3] release/2.19.1.2501.01 --- .../reportView/components/statisticalMicroSettingsSlide.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js b/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js index 45ee98bb..f737061b 100644 --- a/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js +++ b/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js @@ -445,7 +445,9 @@ export const MonthRangePicker = (props) => { { - return current && endDate && current.getTime() > new Date(endDate).getTime(); + // 20251212前版本(问题时不能选到当月) + // return current && endDate && current.getTime() > new Date(endDate).getTime(); + return current && endDate && moment(`${new Date(current.getTime()).getFullYear()}-${new Date(current.getTime()).getMonth() + 1}`).isAfter(moment(endDate)); }} format="YYYY-MM" onChange={(val) => onChange([val, endDate])} @@ -507,4 +509,4 @@ export const getSalaryMonthValue = (dateType) => { break; } return [start, end]; -}; +}; \ No newline at end of file From 648b349f327840d64329186c53dd8569e72ff5ec 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, 22 Jan 2026 18:12:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?release/2.19.1.2501.01-=E4=B8=AA=E7=A8=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../employeeDeclareDetailSchemaEditDialog.js | 73 +++++++++++++++++-- .../pages/employeedeclareDetail/constants.js | 26 ++++++- .../pages/employeedeclareDetail/index.js | 5 +- 3 files changed, 96 insertions(+), 8 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js b/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js index df581337..051909c2 100644 --- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js +++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js @@ -33,7 +33,7 @@ class EmployeeDeclareDetailSchemaEditDialog extends Component { componentWillReceiveProps(nextProps, nextContext) { if (nextProps.visible !== this.props.visible && nextProps.visible) this.employeedeclareGetForm(nextProps); if (nextProps.visible !== this.props.visible && !nextProps.visible) { - this.props.employeeDeclareStore.initDeclareForm() + this.props.employeeDeclareStore.initDeclareForm(); this.employeeChangeInfo = {}; } } @@ -108,7 +108,7 @@ class EmployeeDeclareDetailSchemaEditDialog extends Component { if (id) { const filedKes = _.map(columns, it => it.dataIndex); _.map(filedKes, item => { - if (item === "disability" || item === "lonelyOld" || item === "martyrDependents") { + if (item === "disability" || item === "lonelyOld" || item === "martyrDependents" || item === "reissueSalary") { declareForm.updateFields({ [item]: result[item] || "OFF" }); } else if (item === "deductExpenses") { declareForm.updateFields({ [item]: result[item] || "ON" }); @@ -178,6 +178,7 @@ class EmployeeDeclareDetailSchemaEditDialog extends Component { valueSpan: ["employeeId"] } }); + if (value === "NORMAL" && declareForm.getFormParams().dismissDate) declareForm.updateFields({ dismissDate: "" }); }); break; case "employmentType": @@ -243,6 +244,63 @@ class EmployeeDeclareDetailSchemaEditDialog extends Component { }); }); break; + case "dismissDate": + const { employmentStatus } = declareForm.getFormParams(); + if (!value && employmentStatus === "ABNORMAL") this.setState({ + eConditions: _.map(eConditions, it => { + return { + ...it, items: _.map(it.items, child => { + if (getKey(child) === "dismissDate") { + return { ...child, viewAttr: 2 }; + } + return { ...child }; + }) + }; + }) + }, () => declareForm.updateFields({ employmentStatus: "NORMAL" })); + break; + case "reissueSalary": + this.setState({ + eConditions: _.map(eConditions, it => { + return { + ...it, items: _.map(it.items, child => { + if (getKey(child) === "reissueTaxCycle") { + return { ...child, viewAttr: value === "ON" ? 3 : 2 }; + } + return { ...child }; + }) + }; + }) + }, () => { + declareForm.initFormFields(this.state.eConditions); + const [employeeData] = this.state.employeeInfo["employee"] || this.employeeChangeInfo["employee"] || []; + !_.isEmpty(employeeData) && declareForm.updateFields({ + employeeType: { + value: [employeeData._entityType, [employeeData.id, employeeData.name, [{ + id: employeeData.id, + lastname: employeeData.name + }]]], + valueSpan: ["employeeId"] + } + }); + if (value === "OFF" && declareForm.getFormParams().reissueTaxCycle) declareForm.updateFields({ reissueTaxCycle: "" }); + }); + break; + case "reissueTaxCycle": + const { reissueSalary } = declareForm.getFormParams(); + if (!value && reissueSalary === "ON") this.setState({ + eConditions: _.map(eConditions, it => { + return { + ...it, items: _.map(it.items, child => { + if (getKey(child) === "reissueTaxCycle") { + return { ...child, viewAttr: 2 }; + } + return { ...child }; + }) + }; + }) + }, () => declareForm.updateFields({ reissueSalary: "OFF" })); + break; default: break; } @@ -254,12 +312,16 @@ class EmployeeDeclareDetailSchemaEditDialog extends Component { if (f.isValid) { const { employmentType, employmentDate, employmentStatus, dismissDate, cardType, entryDate, departureDate, - birthplace, taxReasons, ...params + birthplace, taxReasons, reissueSalary, reissueTaxCycle, ...params } = form.getFormParams(); if ((employmentType !== "OTHER" && !employmentDate) || (employmentStatus === "ABNORMAL" && !dismissDate)) { form.showError("dismissDate", getLabel(111, "\"离职日期\"未填写")); return; } + if (reissueSalary === "ON" && !reissueTaxCycle) { + form.showError("reissueTaxCycle", getLabel(111, "\"补发税款所属月份\"未填写")); + return; + } if ((cardType !== "RESIDENT_IDENTITY_CARDS" && !entryDate && !departureDate && !birthplace && !taxReasons)) { form.showError("entryDate", getLabel(111, "\"首次入境时间\"未填写")); form.showError("departureDate", getLabel(111, "\"预计离境时间\"未填写")); @@ -286,7 +348,8 @@ class EmployeeDeclareDetailSchemaEditDialog extends Component { const payload = { ...form.getFormParams(), id: this.props.id, taxAgentId: getQueryString("id"), - taxCycle: this.props.taxCycle + taxCycle: this.props.taxCycle, + reissueTaxCycle: reissueTaxCycle ? `${reissueTaxCycle}-01` : "" }; this.setState({ loading: true }); getEmployeeSave(payload).then(({ status, errormsg }) => { @@ -329,4 +392,4 @@ class EmployeeDeclareDetailSchemaEditDialog extends Component { } } -export default EmployeeDeclareDetailSchemaEditDialog; +export default EmployeeDeclareDetailSchemaEditDialog; \ No newline at end of file diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/constants.js b/pc4mobx/hrmSalary/pages/employeedeclareDetail/constants.js index 4e2525a7..dcbd7d7a 100644 --- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/constants.js +++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/constants.js @@ -371,6 +371,30 @@ export const declareConditions = [ value: "", viewAttr: 2 }, + { + colSpan: 1, + conditionType: "SELECT", + domkey: ["reissueSalary"], + fieldcol: 12, + label: "是否离职后补发工资", + lanId: 111, + labelcol: 6, + value: "OFF", + viewAttr: 2, + detailtype: 3, + options: [] + }, + { + colSpan: 1, + conditionType: "MONTHPICKER", + domkey: ["reissueTaxCycle"], + fieldcol: 12, + label: "补发税款所属月份", + lanId: 111, + labelcol: 6, + value: "", + viewAttr: 2 + }, { colSpan: 1, conditionType: "DATEPICKER", @@ -517,4 +541,4 @@ export const deductConditions = [ ], defaultshow: true } -]; +]; \ No newline at end of file diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js index 159567b1..7b9ef0d7 100644 --- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js +++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js @@ -468,7 +468,8 @@ class Index extends Component { {getLabel(542240, "税款所属期")}： this.setState({ - taxCycle: val, pageInfo: { ...pageInfo, current: 1 } + taxCycle: val, pageInfo: { ...pageInfo, current: 1 }, + selectedRowKeys: [] }, () => this.queryEmployeeList())}/> ,