From 709ec6abd72ca5b73f6b061b120af51413c01144 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Mon, 15 Apr 2024 16:07:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?hotfix/2.12.1.2403.02=20=E8=A7=84=E5=88=99?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE-=E5=8A=A0=E5=AF=86=E8=A7=A3=E5=AF=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js b/pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js index 3e50d8ad..efda13dd 100644 --- a/pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js +++ b/pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js @@ -38,7 +38,8 @@ class RuleConfig extends Component { const optionsList = { matchRule, orderRule, ascOrDesc, rule }; this.setState({ sysinfo, conditions: _.map(conditions, item => ({ - ...item, items: _.map(item.items, o => { + ...item, + items: _.map(item.items, o => { if (getKey(o) === "matchRule" || getKey(o) === "orderRule" || getKey(o) === "ascOrDesc" || getKey(o) === "rule") { return { ...o, options: _.map(optionsList[getKey(o)], g => ({ key: g.value, showname: g.defaultLabel })) }; } else if (getKey(o) === "OPEN_APPLICATION_ENCRYPT") { @@ -70,6 +71,8 @@ class RuleConfig extends Component { form.updateFields({ [item]: { value: sysinfo["taxDeclarationFunction"] === "0" ? "0" : "1" } }); } else if (item === "taxAgentShowStatus" || item === "salaryShowStatus" || item === "adjustShowStatus") { form.updateFields({ [item]: { value: sysinfo[item] || "1" } }); + } else if (item === "OPEN_APPLICATION_ENCRYPT") { + form.updateFields({ [item]: { value: _.isNil(sysinfo[item]) ? "1" : (sysinfo[item] || "") } }); } else { form.updateFields({ [item]: { value: sysinfo[item] || "" } }); } @@ -297,13 +300,15 @@ class RuleConfig extends Component { render() { const { baseFormStore: { form } } = this.props; - const { conditions, progressVisible, progress } = this.state; + const { conditions, progressVisible, progress, sysinfo } = this.state; + const ruleConditions = sysinfo.showEncryptOperationButton === "true" ? conditions : + _.filter(conditions, o => o.title !== getLabel(543358, "加密规则")); return ( {getLabel(543355, "规则配置")}} icon={} iconBgcolor="#F14A2D" buttons={[]} className="ruleWrapper-layout" > -
{renderRuleForm(form, conditions, this.handleChange)}
+
{renderRuleForm(form, ruleConditions, this.handleChange)}
{/*加解密进度条*/} { progressVisible && From 6d56f162b1c0e23496b7623bca86c916aa0c900d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Tue, 16 Apr 2024 17:10:31 +0800 Subject: [PATCH 2/3] hotfix/2.12.1.2403.02 --- pc4mobx/hrmSalary/pages/calculate/index.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/pages/calculate/index.less b/pc4mobx/hrmSalary/pages/calculate/index.less index 98cfc21f..699c416f 100644 --- a/pc4mobx/hrmSalary/pages/calculate/index.less +++ b/pc4mobx/hrmSalary/pages/calculate/index.less @@ -86,7 +86,7 @@ display: none; } - td { + td:not(.ant-table-selection-column) { span { width: 100%; overflow: hidden; From 91c22f4df94532bd224b39d5d37792e4925677ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Tue, 16 Apr 2024 19:10:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feature/2.12.1.2404.02-=E4=B8=AA=E7=A8=8E-?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BA=BA=E5=91=98=E6=8A=A5=E9=80=81=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=B7=BB=E5=8A=A0=E5=88=97=E8=A1=A8=E4=BD=9C=E5=BA=9F?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/apis/declare.js | 4 +++ .../pages/employeedeclareDetail/index.js | 29 +++++++++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/pc4mobx/hrmSalary/apis/declare.js b/pc4mobx/hrmSalary/apis/declare.js index 8c9a2a11..da1099df 100644 --- a/pc4mobx/hrmSalary/apis/declare.js +++ b/pc4mobx/hrmSalary/apis/declare.js @@ -98,6 +98,10 @@ export const getEmployeeSave = (params) => { export const employeeDelete = (params) => { return postFetch("/api/bs/hrmsalary/employeedeclare/delete", params); }; +//人员报送-作废 +export const employeeInvalid = (params) => { + return postFetch("/api/bs/hrmsalary/employeedeclare/invalid", params); +}; //人员报送-全部报送 export const employeedeclareDeclare = (params) => { diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js index dc55b42f..ed7805cf 100644 --- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js +++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js @@ -21,7 +21,7 @@ import { employeedeclareList4Add, employeedeclareList4Update, employeedeclareRefresh, - employeeDelete, + employeeDelete, employeeInvalid, getDeclareFeedback } from "../../apis/declare"; import { advanceConditions, submitStatus } from "./constants"; @@ -133,6 +133,8 @@ class Index extends Component { }); } else if (id === "DELETE") { this.handleDeleteDeclare([params.id]); + } else if (id === "VOID") { + this.handleVoidDeclare(params.id); } else if (id === "ROWSELECT") { const { selectedRowKeys } = params; this.setState({ selectedRowKeys }); @@ -144,7 +146,7 @@ class Index extends Component { "总计": getLabel(523, "总计"), "编辑": getLabel(501169, "编辑"), "操作": getLabel(30585, "操作"), "删除": getLabel(535052, "删除"), "共": getLabel(83698, "共"), "条": getLabel(18256, "条"), - "加载中": getLabel(83698, "加载中") + "加载中": getLabel(83698, "加载中"), "作废": getLabel(111, "作废") }; const childFrameObj = document.getElementById("atdTable"); childFrameObj && childFrameObj.contentWindow.postMessage(JSON.stringify({ ...payload, i18n }), "*"); @@ -293,6 +295,29 @@ class Index extends Component { this.setState({ loading: { ...this.state.loading, feedback: false } }); }); }; + /* + * Author: 黎永顺 + * Description:作废个税申报人员信息 + * Params: + * Date: 2024/4/16 + */ + handleVoidDeclare = (id) => { + const { selectedRowKeys } = this.state; + Modal.confirm({ + title: getLabel(131329, "信息确认"), + content: getLabel(111, "确认作废吗？"), + onOk: () => { + employeeInvalid({ id }).then(({ status, errormsg }) => { + if (status) { + message.success(getLabel(111, "作废成功！")); + this.queryEmployeeList(); + } else { + message.error(errormsg || getLabel(111, "作废失败！")); + } + }); + } + }); + }; /* * Author: 黎永顺 * Description: 删除个税申报人员信息