From 8a2891f4548ba1d00248942dd7913425292bb834 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Wed, 4 Dec 2024 17:06:29 +0800 Subject: [PATCH] release/2.17.1.2411.01 --- pc4mobx/hrmSalary/pages/calculate/doCalc/index.js | 5 ++--- .../attendance/components/attendanceDataViewSlide.js | 5 ++--- pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js | 2 ++ .../hrmSalary/pages/dataAcquisition/cumSituation/index.js | 2 ++ pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js | 2 ++ .../pages/dataAcquisition/specialAddDeduction/index.js | 2 ++ 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js index 4f4944c7..602e48b5 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js @@ -77,8 +77,7 @@ class Index extends Component { if (this.timer) clearInterval(this.timer); this.timer = setInterval(() => { getCalculateProgress(salaryAcctRecordId).then(({ data }) => { - let progress = data.progress; - if (progress === 1 && this.timer) { + if ((_.isNil(data) || data.progress === 1) && this.timer) { clearInterval(this.timer); this.timer = null; this.setState({ @@ -96,7 +95,7 @@ class Index extends Component { }); message.error(data.message); } - this.setState({ progress: Number(progress) * 100 }); + this.setState({ progress: Number(data.progress) * 100 }); }); }, 1000); }); diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js index f1e9b4fd..be64c8e8 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js @@ -41,8 +41,7 @@ class AttendanceDataViewSlide extends Component { const { columns, list: dataSource, pageNum: current, pageSize, total } = data.pageInfo; this.setState({ pageInfo: { ...pageInfo, current, pageSize, total }, dataSource, - // o.dataIndex === "username" ? "left" : - columns: _.map(columns, o => ({ ...o, width: 150, fixed: null })) + columns: _.map(columns, (o, i) => ({ ...o, width: 150, fixed: i === 0 ? "left" : null })) }); } }).catch(() => this.setState({ loading: { ...loading, query: false } })); @@ -103,7 +102,7 @@ class AttendanceDataViewSlide extends Component { + loading={loading.query} scroll={{ x: 1200, y: `calc(100vh - 240px)` }}/> } /> diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js index e1c8e21b..867c8423 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js @@ -28,6 +28,7 @@ import TableRecord from "../components/tableRecord"; import { dataCollectCondition } from "./columns"; import { removePropertyCondition } from "../../../util/response"; import { convertToUrlString } from "../../../util/url"; +import { getDomkes } from "../../../util"; import Layout from "../layout"; import moment from "moment"; @@ -239,6 +240,7 @@ class Index extends Component { addForm.validateForm().then(f => { if (f.isValid) { const payload = { + ..._.reduce(getDomkes(dataCollectCondition), (pre, cur) => ({ ...pre, [cur]: "" }), {}), ...addForm.getFormParams(), taxAgentName: _.find(taxAgentOption, it => it.key === addForm.getFormParams().taxAgentId).showname }; diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js index 7a0e0ea4..64cdd59e 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js @@ -27,6 +27,7 @@ import { dataCollectCondition, taxOptions } from "./columns"; import AddItems from "../addItems"; import TableRecord from "../components/tableRecord"; import { convertToUrlString } from "../../../util/url"; +import { getDomkes } from "../../../util"; const getKey = WeaTools.getKey; const getLabel = WeaLocaleProvider.getLabel; @@ -392,6 +393,7 @@ class Index extends Component { addForm.validateForm().then(f => { if (f.isValid) { const payload = { + ..._.reduce(getDomkes(dataCollectCondition), (pre, cur) => ({ ...pre, [cur]: "" }), {}), ...addForm.getFormParams(), taxAgentName: _.find(taxAgentOption, it => it.key === addForm.getFormParams().taxAgentId).showname }; diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js index f812edda..8f786982 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js @@ -29,6 +29,7 @@ import { dataCollectCondition } from "./columns"; import AddItems from "../addItems"; import TableRecord from "../components/tableRecord"; import { convertToUrlString } from "../../../util/url"; +import { getDomkes } from "../../../util"; const getKey = WeaTools.getKey; const getLabel = WeaLocaleProvider.getLabel; @@ -407,6 +408,7 @@ class Index extends Component { addForm.validateForm().then(f => { if (f.isValid) { const payload = { + ..._.reduce(getDomkes(dataCollectCondition), (pre, cur) => ({ ...pre, [cur]: "" }), {}), ...addForm.getFormParams(), taxAgentName: _.find(taxAgentOption, it => it.key === addForm.getFormParams().taxAgentId).showname }; diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js index 70c04767..5986baae 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js @@ -20,6 +20,7 @@ import { condition } from "./components/condition"; import AddItems from "../addItems"; import TableRecord from "../components/tableRecord"; import { convertToUrlString } from "../../../util/url"; +import { getDomkes } from "../../../util"; const getKey = WeaTools.getKey; const getLabel = WeaLocaleProvider.getLabel; @@ -345,6 +346,7 @@ class Index extends Component { addForm.validateForm().then(f => { if (f.isValid) { const payload = { + ..._.reduce(getDomkes(condition), (pre, cur) => ({ ...pre, [cur]: "" }), {}), ...addForm.getFormParams(), taxAgentName: _.find(taxAgentOption, it => it.key === addForm.getFormParams().taxAgentId).showname };