- {getLabel(543549, "薪资所属月：")}
+ {getLabel(111, "税款所属期：")}
this.props.onChange({ dateRange: v })}/>
diff --git a/pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js b/pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js
index b2cab8ff..7d119c09 100644
--- a/pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js
+++ b/pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js
@@ -8,7 +8,7 @@ import React, { Component } from "react";
import { WeaLocaleProvider, WeaTable } from "ecCom";
import { Dropdown, Menu, message, Modal } from "antd";
import { getDeclareList, withDrawTaxDeclaration } from "../../../../apis/declare";
-import { sysConfCodeRule } from "../../../../apis/ruleconfig";
+import { sysConfCodeRule, sysinfo } from "../../../../apis/ruleconfig";
const getLabel = WeaLocaleProvider.getLabel;
@@ -35,9 +35,9 @@ class Index extends Component {
if (status && data === "1") this.setState({ showWithDrawBtn: data === "1" });
});
};
- getDeclareList = (props) => {
- const { pageInfo } = this.state;
- const { queryParams } = props;
+ getDeclareList = async (props) => {
+ const { data: sysData } = await sysinfo();
+ const { pageInfo } = this.state, { queryParams } = props;
const { dateRange, ...extra } = queryParams;
const [fromSalaryMonthStr, endSalaryMonthStr] = dateRange || [];
const params = { fromSalaryMonthStr, endSalaryMonthStr, ...extra };
@@ -46,7 +46,8 @@ class Index extends Component {
getDeclareList(payload).then(({ status, data }) => {
this.setState({ loading: false });
if (status) {
- const { columns, list: dataSource, pageNum, pageSize, total } = data;
+ let { columns, list: dataSource, pageNum, pageSize, total } = data;
+ sysData["TAX_DECLARATION_DATE_TYPE"] === "1" && (columns = _.filter(columns, o => o.dataIndex !== "salaryMonth"));
this.setState({
dataSource, pageInfo: { ...pageInfo, pageNum, pageSize, total },
columns: _.map(columns, o => {
From 9a50947d8aa7be5b730b863d5dd18449006888bc Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Wed, 23 Apr 2025 17:34:46 +0800
Subject: [PATCH 2/6] release/2.19.1.2501.01
---
.../pages/declare/components/declareTablelist/index.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js b/pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js
index 7d119c09..74100061 100644
--- a/pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js
+++ b/pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js
@@ -39,8 +39,8 @@ class Index extends Component {
const { data: sysData } = await sysinfo();
const { pageInfo } = this.state, { queryParams } = props;
const { dateRange, ...extra } = queryParams;
- const [fromSalaryMonthStr, endSalaryMonthStr] = dateRange || [];
- const params = { fromSalaryMonthStr, endSalaryMonthStr, ...extra };
+ const [fromSalaryMonth, endSalaryMonth] = dateRange || [];
+ const params = { fromSalaryMonth: fromSalaryMonth + "-01", endSalaryMonth: endSalaryMonth + "-01", ...extra };
const payload = { ...pageInfo, ...params };
this.setState({ loading: true });
getDeclareList(payload).then(({ status, data }) => {
From 5c02dc876c24ff015abddea07927df31d09be3cd Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Thu, 24 Apr 2025 14:37:36 +0800
Subject: [PATCH 3/6] =?UTF-8?q?release/3.0.1.2504.01-=E5=90=88=E5=B9=B6?=
=?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../datapush/components/PDDialog/customTreeSelect.js | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/datapush/components/PDDialog/customTreeSelect.js b/pc4mobx/hrmSalary/pages/datapush/components/PDDialog/customTreeSelect.js
index e595e7dc..bc8ad18a 100644
--- a/pc4mobx/hrmSalary/pages/datapush/components/PDDialog/customTreeSelect.js
+++ b/pc4mobx/hrmSalary/pages/datapush/components/PDDialog/customTreeSelect.js
@@ -73,9 +73,14 @@ class CustomTreeSelect extends Component {
const { itemName } = detail;
return (
this.getSourceItem(node.props.value)}
- onSelect={this.handleSelect}>
+ onSelect={this.handleSelect}
+ treeNodeFilterProp="title"
+ filterTreeNode={(inputValue, treeNode) => {
+ const title = treeNode.props.title.props ? treeNode.props.title.props.children[0].props.children : treeNode.props.title;
+ return title.toLowerCase().indexOf(inputValue.toLowerCase()) >= 0;
+ }}>
{
_.map(sourceList, o => (
From 4ecde5921e80caeecd91df7051235b5916ebcb31 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Thu, 24 Apr 2025 15:50:23 +0800
Subject: [PATCH 4/6] =?UTF-8?q?release/3.0.1.2504.01-=E5=90=88=E5=B9=B6?=
=?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pc4mobx/hrmSalary/pages/salary/components/personalScopeModal.js | 1 -
1 file changed, 1 deletion(-)
diff --git a/pc4mobx/hrmSalary/pages/salary/components/personalScopeModal.js b/pc4mobx/hrmSalary/pages/salary/components/personalScopeModal.js
index 70a5c202..d33be5f4 100644
--- a/pc4mobx/hrmSalary/pages/salary/components/personalScopeModal.js
+++ b/pc4mobx/hrmSalary/pages/salary/components/personalScopeModal.js
@@ -59,7 +59,6 @@ class PersonalScopeModal extends Component {
...scopeSelectLinkageDatas[cur],
browserConditionParam: {
...scopeSelectLinkageDatas[cur].browserConditionParam,
- isSingle: true,
replaceDatas: !_.isEmpty(record) ? [{
id: String(record.targetId),
name: record.targetName
From dee1059ca7fd18a9ab9e39e68cfe095ef3cb5c49 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Thu, 24 Apr 2025 16:38:36 +0800
Subject: [PATCH 5/6] release/2.19.1.2501.01
---
.../components/attendanceDataViewSlide.js | 78 ++++++++++++-------
.../attendance/components/index.less | 4 +-
2 files changed, 51 insertions(+), 31 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js
index be64c8e8..2f4804b6 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js
@@ -5,9 +5,9 @@
* Date: 2023/3/7
*/
import React, { Component } from "react";
-import { WeaInputSearch, WeaLocaleProvider, WeaSlideModal, WeaTable, WeaTop } from "ecCom";
-import { Button } from "antd";
+import { WeaInputSearch, WeaLocaleProvider, WeaSlideModal, WeaTop } from "ecCom";
import { viewAttendQuote } from "../../../../apis/attendance";
+import { Button, Spin } from "antd";
import "./index.less";
const { getLabel } = WeaLocaleProvider;
@@ -16,11 +16,31 @@ class AttendanceDataViewSlide extends Component {
constructor(props) {
super(props);
this.state = {
- loading: { query: false }, keyword: "", dataSource: [], columns: [],
- pageInfo: { current: 1, pageSize: 10, total: 0 }
+ loading: { query: false }, keyword: "", dataSource: [], pageInfo: { current: 1, pageSize: 10, total: 0 }
};
}
+ componentDidMount() {
+ window.addEventListener("message", this.handleReceive, false);
+ }
+
+ componentWillUnmount() {
+ window.removeEventListener("message", this.handleReceive, false);
+ }
+
+ handleReceive = async ({ data }) => {
+ const { type, payload: { id, params } = {} } = data;
+ if (type === "turn") {
+ switch (id) {
+ case "PAGEINFO":
+ this.setState({ pageInfo: { ...this.state.pageInfo, ...params } }, () => this.viewAttendQuote());
+ break;
+ default:
+ break;
+ }
+ }
+ };
+
componentWillReceiveProps(nextProps, nextContext) {
if (nextProps.visible !== this.props.visible && nextProps.visible) {
document.querySelector(".attendanceRefWrapper").classList.add("zIndex0-attendance");
@@ -33,19 +53,29 @@ class AttendanceDataViewSlide extends Component {
viewAttendQuote = (extraPayload = {}, props) => {
const { loading, pageInfo, keyword } = this.state;
- const { attendQuoteId } = props;
+ const { attendQuoteId } = props || this.props;
this.setState({ loading: { ...loading, query: true } });
viewAttendQuote({ ...pageInfo, attendQuoteId, keyword, ...extraPayload }).then(({ status, data }) => {
this.setState({ loading: { ...loading, query: false } });
if (status) {
const { columns, list: dataSource, pageNum: current, pageSize, total } = data.pageInfo;
this.setState({
- pageInfo: { ...pageInfo, current, pageSize, total }, dataSource,
- columns: _.map(columns, (o, i) => ({ ...o, width: 150, fixed: i === 0 ? "left" : null }))
- });
+ pageInfo: { ...pageInfo, current, pageSize, total }, dataSource
+ }, () => this.postMessageToChild({
+ pageInfo: this.state.pageInfo, dataSource, showRowSelection: false, unitTableType: "attendanceView",
+ columns: _.map(columns, (o, i) => ({ ...o, width: 150, fixed: i === 0 ? "left" : false }))
+ }));
}
}).catch(() => this.setState({ loading: { ...loading, query: false } }));
};
+ postMessageToChild = (payload = {}) => {
+ const i18n = {
+ "操作": getLabel(30585, "操作"), "编辑": getLabel(111, "编辑"), "共": getLabel(18609, "共"),
+ "条": getLabel(18256, "条")
+ };
+ const childFrameObj = document.getElementById("attendanceViewTable");
+ childFrameObj && childFrameObj.contentWindow.postMessage(JSON.stringify({ ...payload, i18n }), "*");
+ };
handleExportAttendQuote = () => {
if (!this.handleDebounce) {
this.handleDebounce = _.debounce(() => {
@@ -60,24 +90,7 @@ class AttendanceDataViewSlide extends Component {
render() {
const { showOperateBtn, salaryYearMonth, ...extra } = this.props;
- const { columns, dataSource, loading, pageInfo, keyword } = this.state;
- const pagination = {
- ...pageInfo,
- showTotal: (total) => `共 ${total} 条`,
- pageSizeOptions: ["10", "20", "50", "100"],
- showSizeChanger: true,
- showQuickJumper: true,
- onShowSizeChange: (current, pageSize) => {
- this.setState({
- pageInfo: { ...pageInfo, current, pageSize }
- }, () => this.viewAttendQuote({}, this.props));
- },
- onChange: (current) => {
- this.setState({
- pageInfo: { ...pageInfo, current }
- }, () => this.viewAttendQuote({}, this.props));
- }
- };
+ const { loading, keyword } = this.state;
const btns = [
,
{getLabel(543376, "考勤周期")}：{salaryYearMonth}