From e45b4bbb403c150839f98a2891f8d2143360a80f Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Mon, 17 Nov 2025 13:47:05 +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
---
pc4mobx/hrmSalary/apis/calculate.js | 8 +++
.../hrmSalary/pages/calculate/calculate.js | 52 ++++++++++++++++---
2 files changed, 53 insertions(+), 7 deletions(-)
diff --git a/pc4mobx/hrmSalary/apis/calculate.js b/pc4mobx/hrmSalary/apis/calculate.js
index aee23326..313d438c 100644
--- a/pc4mobx/hrmSalary/apis/calculate.js
+++ b/pc4mobx/hrmSalary/apis/calculate.js
@@ -314,4 +314,12 @@ export const getAfterTaxAccountingProgress = (id) => {
// 批量计算薪资-钱智
export const batAccounting = (params) => {
return postFetch("/api/bs/hrmsalary/salaryacct/batAccounting", params);
+};
+//批量在线算税-钱智
+export const batCalcTax = (params) => {
+ return postFetch("/api/bs/hrmsalary/salaryacct/acctresult/batCalcTax", params);
+};
+//批量获取算税结果-钱智
+export const batCalcTaxFeedback = (params) => {
+ return postFetch("/api/bs/hrmsalary/salaryacct/acctresult/batCalcTaxFeedback", params);
};
\ No newline at end of file
diff --git a/pc4mobx/hrmSalary/pages/calculate/calculate.js b/pc4mobx/hrmSalary/pages/calculate/calculate.js
index bffb5f4d..d1e8cda7 100644
--- a/pc4mobx/hrmSalary/pages/calculate/calculate.js
+++ b/pc4mobx/hrmSalary/pages/calculate/calculate.js
@@ -15,7 +15,15 @@ import CalculateTablelist from "./components/calculateTablelist";
import CalculateDialog from "./components/calculateDialog";
import ProgressModal from "../../components/progressModal";
import LogDialog from "../../components/logViewModal";
-import { backCalculate, batAccounting, deleteSalaryacct, fileSalaryAcct, reAccounting } from "../../apis/calculate";
+import {
+ backCalculate,
+ batAccounting,
+ batCalcTax,
+ batCalcTaxFeedback,
+ deleteSalaryacct,
+ fileSalaryAcct,
+ reAccounting
+} from "../../apis/calculate";
import FormInfo from "../../components/FormInfo";
import { queryConditions } from "./config";
import { postFetch } from "../../util/request";
@@ -41,7 +49,7 @@ class Calculate extends Component {
}, isRefresh: false, logDialogVisible: false, conditions: [],
progressModule: { visible: false, progress: 0, title: getLabel(111, "正在归档中请稍后") },
calcDaialog: { visible: false, title: "" }, showAdvance: false, selectedRowKeys: [],
- loading: false
+ loading: { acct: false, tax: false, feedback: false }
};
this.timer = null;
this.handleDebounce = null;
@@ -73,21 +81,51 @@ class Calculate extends Component {
title: getLabel(538780, "核算")
}
})}>{getLabel(538780, "核算")},
- ,
+ ,
+ ,
this.setState({ showAdvance: !showAdvance })}
onChange={v => this.setState({
isRefresh: _.keys(v)[0] === "name" ? isRefresh : !isRefresh,
queryParams: { ...queryParams, ...v }
})} onSearch={() => this.setState({ isRefresh: !isRefresh })}/>
];
- return !admin ? calculateOpts.slice(2) : calculateOpts;
+ return !admin ? calculateOpts.slice(4) : calculateOpts;
+ };
+ handleBatCalcTax = () => {
+ const { selectedRowKeys: salaryAcctRecordIds, isRefresh, loading } = this.state;
+ this.setState({ loading: { ...loading, tax: true } });
+ batCalcTax({ salaryAcctRecordIds }).then(({ status, errormsg }) => {
+ this.setState({ loading: { ...loading, tax: false } });
+ if (status) {
+ message.success(getLabel(111, "操作成功!"));
+ this.setState({ isRefresh: !isRefresh });
+ } else {
+ message.error(errormsg);
+ }
+ });
+ };
+ handleBatCalcTaxFeedback = () => {
+ const { selectedRowKeys: salaryAcctRecordIds, isRefresh, loading } = this.state;
+ this.setState({ loading: { ...loading, feedback: true } });
+ batCalcTaxFeedback({ salaryAcctRecordIds }).then(({ status, errormsg }) => {
+ this.setState({ loading: { ...loading, feedback: false } });
+ if (status) {
+ message.success(getLabel(111, "操作成功!"));
+ this.setState({ isRefresh: !isRefresh });
+ } else {
+ message.error(errormsg);
+ }
+ });
};
handleBatAccounting = () => {
- const { selectedRowKeys: salaryAcctRecordIds, isRefresh } = this.state;
- this.setState({ loading: true });
+ const { selectedRowKeys: salaryAcctRecordIds, isRefresh, loading } = this.state;
+ this.setState({ loading: { ...loading, acct: true } });
batAccounting({ salaryAcctRecordIds }).then(({ status, errormsg }) => {
- this.setState({ loading: false });
+ this.setState({ loading: { ...loading, acct: false } });
if (status) {
message.success(getLabel(111, "操作成功!"));
this.setState({ isRefresh: !isRefresh });