From d652b2cdc61169d3c870781733a9a0a30f048e03 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Wed, 23 Apr 2025 16:13:49 +0800
Subject: [PATCH 1/3] release/2.19.1.2501.01

---
 .../pages/declare/components/declareQuery/index.js    |  2 +-
 .../declare/components/declareTablelist/index.js      | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/declare/components/declareQuery/index.js b/pc4mobx/hrmSalary/pages/declare/components/declareQuery/index.js
index f5627a0c..e85383ca 100644
--- a/pc4mobx/hrmSalary/pages/declare/components/declareQuery/index.js
+++ b/pc4mobx/hrmSalary/pages/declare/components/declareQuery/index.js
@@ -17,7 +17,7 @@ class Index extends Component {
     return (
       <div className="salary-btn-flex">
         <div className="mounth-range">
-          <span className="label">{getLabel(543549, "薪资所属月：")}</span>
+          <span className="label">{getLabel(111, "税款所属期：")}</span>
           <MonthRangePicker dateRange={dateRange} viewAttr={2}
                             onChange={v => this.props.onChange({ dateRange: v })}/>
         </div>
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 9016fa3fe960c8f3e3d0e0f3e7f75957a7fead22 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Wed, 23 Apr 2025 16:45:02 +0800
Subject: [PATCH 2/3] release/2.19.1.2501.01

---
 .../hrmSalary/pages/declare/components/declareDialog/index.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pc4mobx/hrmSalary/pages/declare/components/declareDialog/index.js b/pc4mobx/hrmSalary/pages/declare/components/declareDialog/index.js
index 4e21b0e9..d1dce632 100644
--- a/pc4mobx/hrmSalary/pages/declare/components/declareDialog/index.js
+++ b/pc4mobx/hrmSalary/pages/declare/components/declareDialog/index.js
@@ -46,7 +46,7 @@ class Index extends Component {
                   ...o, options: _.map(data, g => ({ key: g.id, showname: g.content }))
                   // helpfulTitle: getLabel(563420, "提示：可选择单个个税扣缴义务人进行申报，若不选择，则批量对管理下的所有个税扣缴义务人进行申报；")
                 };
-              } else if (getKey(o) === "salaryMonthStr") {
+              } else if (getKey(o) === "salaryMonth") {
                 return {
                   ...o,
                   label: sysinfo["TAX_DECLARATION_DATE_TYPE"] === "1" ? getLabel(111, "税款所属期") : getLabel(111, "薪资所属月")

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 3/3] 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 }) => {