qt
/
salary-management-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

custom/钱智

This commit is contained in:
lys 2025-12-23 15:04:40 +08:00
parent 21731f0ca6
commit c53a7d5451
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js
View File

@ -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;

8
pc4mobx/hrmSalary/pages/calculate/calculate.js
View File

@ -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)}

6
pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
View File

@ -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];
};
};