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

Merge branch 'feature/2.14.4.2406.02-个税部分接口改造' into release/2.14.4.2406.02-个税

This commit is contained in:
黎永顺 2024-07-16 09:34:43 +08:00
parent 2c6bdc71ce 5f4d52761a
commit f8aff8c12b
5 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -332,15 +332,16 @@ class PaymentBtn extends Component {
const { paymentDialog } = this.state;
return (
<React.Fragment>
<Dropdown.Button
onClick={this.handleTripartiteContributions}
overlay={
<Menu onClick={this.handleMenuChange}>
<Menu.Item key="bank_voucher_payment">{getLabel(111, "银行端凭证缴款")}</Menu.Item>
<Menu.Item key="destory_voucher">{getLabel(111, "作废缴款凭证")}</Menu.Item>
</Menu>
}
type="ghost">{getLabel(111, "三方缴款")}</Dropdown.Button>
<Button type="ghost" onClick={this.handleTripartiteContributions}>{getLabel(111, "三方缴款")}</Button>
{/*<Dropdown.Button*/}
{/* onClick={this.handleTripartiteContributions}*/}
{/* overlay={*/}
{/* <Menu onClick={this.handleMenuChange}>*/}
{/* <Menu.Item key="bank_voucher_payment">{getLabel(111, "银行端凭证缴款")}</Menu.Item>*/}
{/* <Menu.Item key="destory_voucher">{getLabel(111, "作废缴款凭证")}</Menu.Item>*/}
{/* </Menu>*/}
{/* }*/}
{/* type="ghost">{getLabel(111, "三方缴款")}</Dropdown.Button>*/}
<PaymentDialog
{...paymentDialog}
onCancel={this.handleCancel}

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

@ -152,8 +152,8 @@ class PaymentFeedbackBtn extends Component {
return {
...it,
options: [
{ key: "WITHHOLDING_PAY", showname: getLabel(111, "三方缴款") },
{ key: "WITHHOLDING_VOUCHER", showname: getLabel(111, "缴款凭证打印") }
{ key: "WITHHOLDING_PAY", showname: getLabel(111, "三方缴款"), selected: true },
// { key: "WITHHOLDING_VOUCHER", showname: getLabel(111, "缴款凭证打印") }
]
};
})

28
pc4mobx/hrmSalary/pages/declareDetail/components/taxDeclarationInfo.js
View File

@ -55,20 +55,20 @@ class TaxDeclarationInfo extends Component {
];
let dropMenuDatas = [];
if (["DECLARE_SUCCESS_NO_PAY", "DECLARE_SUCCESS_UNPAID", "DECLARE_SUCCESS_PAID", "DECLARE_SUCCESS_PAYING"].includes(declareInfo.declareStatus)) {
dropMenuDatas = dropMenuDatas.concat([
{
key: "exportGetDeclareTaxResultFeedback",
icon: <i className="icon-coms-download2"/>,
content: getLabel(111, "下载申报内置算税结果"),
onClick: onOperate
},
{
key: "onlineComparison",
icon: <i className="icon-coms-Journal-o"/>,
content: getLabel(111, "在线对比"),
onClick: onOperate
}
]);
// dropMenuDatas = dropMenuDatas.concat([
// {
// key: "exportGetDeclareTaxResultFeedback",
// icon: <i className="icon-coms-download2"/>,
// content: getLabel(111, "下载申报内置算税结果"),
// onClick: onOperate
// },
// {
// key: "onlineComparison",
// icon: <i className="icon-coms-Journal-o"/>,
// content: getLabel(111, "在线对比"),
// onClick: onOperate
// }
// ]);
}
return (
<div className="taxDeclarationInfo_layout">

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

@ -388,9 +388,9 @@ class Index extends Component {
<Button type="ghost"
loading={loading.cancel}
onClick={() => confirmDialog("cancel", () => this.handleOperateDeclare("cancel", { reportType }))}>{getLabel(111, "作废申报")}</Button>,
<Button type="ghost"
loading={loading.refreshingPay}
onClick={this.taxPaymentVoucherStatusSync}>{getLabel(111, "刷新缴款状态")}</Button>
// <Button type="ghost"
// loading={loading.refreshingPay}
// onClick={this.taxPaymentVoucherStatusSync}>{getLabel(111, "刷新缴款状态")}</Button>
));
if (!intelCalcSalaryStatus) {
if (["NOT_DECLARE", "DECLARE_FAIL"].includes(declareInfo.declareStatus)) {

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

@ -21,7 +21,8 @@ import {
employeedeclareList4Add,
employeedeclareList4Update,
employeedeclareRefresh,
employeeDelete, employeeInvalid,
employeeDelete,
employeeInvalid,
getDeclareFeedback
} from "../../apis/declare";
import { advanceConditions, submitStatus } from "./constants";
@ -146,7 +147,8 @@ class Index extends Component {
"总计": getLabel(523, "总计"), "编辑": getLabel(501169, "编辑"),
"操作": getLabel(30585, "操作"), "删除": getLabel(535052, "删除"),
"共": getLabel(83698, "共"), "条": getLabel(18256, "条"),
"加载中": getLabel(83698, "加载中"), "作废": getLabel(111, "作废")
"加载中": getLabel(83698, "加载中")
// "作废": getLabel(111, "作废")
};
const childFrameObj = document.getElementById("atdTable");
childFrameObj && childFrameObj.contentWindow.postMessage(JSON.stringify({ ...payload, i18n }), "*");