From c53a7d5451fb6c55419e8b0c80def12e8c5a3dfa Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Tue, 23 Dec 2025 15:04:40 +0800
Subject: [PATCH] =?UTF-8?q?custom/=E9=92=B1=E6=99=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hrmSalary/pages/analysisOfSalaryStatistics/index.js   | 6 +++---
 pc4mobx/hrmSalary/pages/calculate/calculate.js            | 8 ++++----
 .../components/statisticalMicroSettingsSlide.js           | 6 ++++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js
index ad620f88..6b2125b4 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js
@@ -38,8 +38,8 @@ class Index extends Component {
       keyword: "",
       year: moment().format("YYYY"),
       dateRange: [
-        moment(new Date()).subtract(6, "months").format("YYYY-MM"),
-        moment(new Date()).format("YYYY-MM")
+        moment(new Date()).subtract(1, "months").format("YYYY-MM"),
+        moment(new Date()).subtract(1, "months").format("YYYY-MM")
       ],
       showSearchAd: false,
       isQuery: false,
@@ -379,4 +379,4 @@ class Index extends Component {
   }
 }
 
-export default Index;
+export default Index;
\ No newline at end of file
diff --git a/pc4mobx/hrmSalary/pages/calculate/calculate.js b/pc4mobx/hrmSalary/pages/calculate/calculate.js
index eeddb359..a91cf275 100644
--- a/pc4mobx/hrmSalary/pages/calculate/calculate.js
+++ b/pc4mobx/hrmSalary/pages/calculate/calculate.js
@@ -43,8 +43,8 @@ class Calculate extends Component {
       queryParams: {
         name: "", lastOperates: [],
         dateRange: [
-          moment(new Date()).subtract(1, "year").startOf("year").format("YYYY-MM"),
-          moment(new Date()).endOf("year").format("YYYY-MM")
+          moment(new Date()).subtract(1, "month").format("YYYY-MM"),
+          moment(new Date()).subtract(1, "month").format("YYYY-MM")
         ]
       }, isRefresh: false, logDialogVisible: false, conditions: [],
       progressModule: { visible: false, progress: 0, title: getLabel(111, "正在归档中请稍后") },
@@ -296,9 +296,9 @@ class Calculate extends Component {
             <Button type="primary" onClick={() => this.setState({
               calcDaialog: {
                 visible: true,
-                title: getLabel(538780, "核算")
+                title: getLabel(111, "账套生成")
               }
-            })}>{getLabel(538780, "核算")}</Button>
+            })}>{getLabel(111, "账套生成")}</Button>
             <Button type="ghost" loading={loading.acct} disabled={_.isEmpty(selectedRowKeys)}
                     onClick={this.handleBatAccounting}>{getLabel(111, "批量计算薪资")}</Button>
             <Button type="ghost" loading={loading.tax} disabled={_.isEmpty(selectedRowKeys)}
diff --git a/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js b/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
index 6124375d..a133adea 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
@@ -448,7 +448,9 @@ export const MonthRangePicker = (props) => {
     <WeaDatePicker
       value={startDate} disabled={disabled}
       disabledDate={(current) => {
-        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])}
@@ -510,4 +512,4 @@ export const getSalaryMonthValue = (dateType) => {
       break;
   }
   return [start, end];
-};
+};
\ No newline at end of file