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

Merge branch 'release/2.19.1.2503.01-业务线个税' into custom-联特

This commit is contained in:
lys 2025-07-11 17:22:13 +08:00
parent 55746b6efd 90c950774d
commit 45af43bc87
5 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pc4mobx/hrmSalary/components/CustomBrowser/components/associativeSearchMult.js
View File

@ -127,7 +127,7 @@ class AssociativeSearchMult extends Component {
}
let options = data.map(d => <Option key={d.id} title={d.name}>{d.name}</Option>);
!tags && selectedValues && selectedValues.map((v) => {
v && options.unshift(<Option key={v} title={datas[v].name}>{datas[v].name}</Option>);
v && datas[v] && options.unshift(<Option key={v} title={datas[v].name}>{datas[v].name}</Option>);
});
const select = <Select
{...this.props}

8
pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserDialog.js
View File

@ -91,11 +91,11 @@ class CustomBrowserDialog extends Component {
this.props.onCancel && this.props.onCancel();
};
getItemById = (id) => {
const { listDatas } = this.state;
const { listDatas } = this.state, dataSource = [...listDatas, ..._.values(this.props.datas)];
if (this.selectedData[id]) return this.selectedData[id];
if (!_.isEmpty(listDatas)) {
for (let i = 0; i < listDatas.length; i++) {
if (String(id) === String(listDatas[i].id)) return listDatas[i];
if (!_.isEmpty(dataSource)) {
for (let i = 0; i < dataSource.length; i++) {
if (String(id) === String(dataSource[i].id)) return dataSource[i];
}
}
};

11
pc4mobx/hrmSalary/pages/declareDetail/components/paymentBtn.js
View File

@ -5,7 +5,7 @@
* Date: 2023/8/22
*/
import React, { Component } from "react";
import { WeaLocaleProvider, WeaLoadingGlobal } from "ecCom";
import { WeaLoadingGlobal, WeaLocaleProvider } from "ecCom";
import { inject, observer } from "mobx-react";
import { Button, message, Modal } from "antd";
import PaymentDialog from "./paymentDialog";
@ -46,7 +46,7 @@ class PaymentBtn extends Component {
style={{ textAlign: "center" }}>{getLabel(111, "若申请过银行缴款，点击确定，将自动作废银行缴款凭证。并进行三方缴款。 ")}</div>
</div>,
onOk: () => {
taxPaymentTaxAmount({ taxDeclareRecordId: getQueryString("id") })
taxPaymentTaxAmount({ taxDeclareRecordId: getQueryString("id"), reportType: this.props.reportType })
.then(({ status, data, errormsg }) => {
if (status) {
const { paymentDialog } = this.state;
@ -82,7 +82,8 @@ class PaymentBtn extends Component {
const { taxCycle: taxYearMonth, taxAgentId } = this.props.declareInfo;
const payload = {
taxDeclareRecordId: getQueryString("id"),
taxAgentId, taxYearMonth: taxYearMonth + "-01"
taxAgentId, taxYearMonth: taxYearMonth + "-01",
reportType: this.props.reportType
};
this.setState({
paymentDialog: {
@ -122,7 +123,7 @@ class PaymentBtn extends Component {
};
getBankAccountInfo = (payload) => {
let loop = () => {
WeaLoadingGlobal.start({ tip: getLabel(111, "获取三方信息中...") });
WeaLoadingGlobal.start({ tip: getLabel(111, "获取三方信息中...") });
clearTimeout(this.timer);
this.timer = setTimeout(async () => {
let response = await taxPaymentgetAgreementFeedback(payload);
@ -236,7 +237,7 @@ class PaymentBtn extends Component {
};
handleMenuChange = ({ key }) => {
if (key === "bank_voucher_payment") {
taxPaymentTaxAmount({ taxDeclareRecordId: getQueryString("id") })
taxPaymentTaxAmount({ taxDeclareRecordId: getQueryString("id"), reportType: this.props.reportType })
.then(({ status, data, errormsg }) => {
if (status) {
const { paymentDialog } = this.state;

5
pc4mobx/hrmSalary/pages/declareDetail/components/paymentFeedbackBtn.js
View File

@ -53,7 +53,8 @@ class PaymentFeedbackBtn extends Component {
const { taxCycle: taxYearMonth, taxAgentId } = this.props.declareInfo;
const payload = {
taxDeclareRecordId: getQueryString("id"),
taxAgentId, taxYearMonth: taxYearMonth + "-01"
taxAgentId, taxYearMonth: taxYearMonth + "-01",
reportType: this.props.reportType
};
this.setState({
paymentDialog: {
@ -152,7 +153,7 @@ class PaymentFeedbackBtn extends Component {
return {
...it,
options: [
{ key: "WITHHOLDING_PAY", showname: getLabel(111, "三方缴款"), selected: true },
{ key: "WITHHOLDING_PAY", showname: getLabel(111, "三方缴款"), selected: true }
// { key: "WITHHOLDING_VOUCHER", showname: getLabel(111, "缴款凭证打印") }
]
};

2
pc4mobx/hrmSalary/pages/declareDetail/index.js
View File

@ -430,7 +430,7 @@ class Index extends Component {
if (intelCalcSalaryStatus && (declareInfo.declareStatus === "DECLARE_SUCCESS_UNPAID")) {
btns.push(
<PaymentBtn declareInfo={declareInfo} updateDeclare={this.declare} reportType={reportType}/>,
<PaymentFeedbackBtn declareInfo={declareInfo} updateDeclare={this.declare}/>
<PaymentFeedbackBtn declareInfo={declareInfo} updateDeclare={this.declare} reportType={reportType}/>
);
}
if (intelCalcSalaryStatus && declareInfo.taxPaidAmount && parseFloat(declareInfo.taxPaidAmount) > 0) {