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; const { paymentDialog } = this.state;
return ( return (
<React.Fragment> <React.Fragment>
<Dropdown.Button <Button type="ghost" onClick={this.handleTripartiteContributions}>{getLabel(111, "三方缴款")}</Button>
onClick={this.handleTripartiteContributions} {/*<Dropdown.Button*/}
overlay={ {/* onClick={this.handleTripartiteContributions}*/}
<Menu onClick={this.handleMenuChange}> {/* overlay={*/}
<Menu.Item key="bank_voucher_payment">{getLabel(111, "银行端凭证缴款")}</Menu.Item> {/* <Menu onClick={this.handleMenuChange}>*/}
<Menu.Item key="destory_voucher">{getLabel(111, "作废缴款凭证")}</Menu.Item> {/* <Menu.Item key="bank_voucher_payment">{getLabel(111, "银行端凭证缴款")}</Menu.Item>*/}
</Menu> {/* <Menu.Item key="destory_voucher">{getLabel(111, "作废缴款凭证")}</Menu.Item>*/}
} {/* </Menu>*/}
type="ghost">{getLabel(111, "三方缴款")}</Dropdown.Button> {/* }*/}
{/* type="ghost">{getLabel(111, "三方缴款")}</Dropdown.Button>*/}
<PaymentDialog <PaymentDialog
{...paymentDialog} {...paymentDialog}
onCancel={this.handleCancel} onCancel={this.handleCancel}

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

@ -152,8 +152,8 @@ class PaymentFeedbackBtn extends Component {
return { return {
...it, ...it,
options: [ options: [
{ key: "WITHHOLDING_PAY", showname: getLabel(111, "三方缴款") }, { key: "WITHHOLDING_PAY", showname: getLabel(111, "三方缴款"), selected: true },
{ key: "WITHHOLDING_VOUCHER", showname: getLabel(111, "缴款凭证打印") } // { 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 = []; let dropMenuDatas = [];
if (["DECLARE_SUCCESS_NO_PAY", "DECLARE_SUCCESS_UNPAID", "DECLARE_SUCCESS_PAID", "DECLARE_SUCCESS_PAYING"].includes(declareInfo.declareStatus)) { if (["DECLARE_SUCCESS_NO_PAY", "DECLARE_SUCCESS_UNPAID", "DECLARE_SUCCESS_PAID", "DECLARE_SUCCESS_PAYING"].includes(declareInfo.declareStatus)) {
dropMenuDatas = dropMenuDatas.concat([ // dropMenuDatas = dropMenuDatas.concat([
{ // {
key: "exportGetDeclareTaxResultFeedback", // key: "exportGetDeclareTaxResultFeedback",
icon: <i className="icon-coms-download2"/>, // icon: <i className="icon-coms-download2"/>,
content: getLabel(111, "下载申报内置算税结果"), // content: getLabel(111, "下载申报内置算税结果"),
onClick: onOperate // onClick: onOperate
}, // },
{ // {
key: "onlineComparison", // key: "onlineComparison",
icon: <i className="icon-coms-Journal-o"/>, // icon: <i className="icon-coms-Journal-o"/>,
content: getLabel(111, "在线对比"), // content: getLabel(111, "在线对比"),
onClick: onOperate // onClick: onOperate
} // }
]); // ]);
} }
return ( return (
<div className="taxDeclarationInfo_layout"> <div className="taxDeclarationInfo_layout">

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

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

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

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