Merge branch 'release/2.12.1.2404.02-个税' into custom-艾志工业-合并个税-外籍人员备份

pc4mobx/hrmSalary/apis/declare.js

@@ -102,6 +102,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) => {

pc4mobx/hrmSalary/pages/calculate/index.less

@@ -86,7 +86,7 @@
         display: none;
       }
 
-      td {
+      td:not(.ant-table-selection-column) {
         span {
           width: 100%;
           overflow: hidden;

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";
@@ -134,6 +134,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 });
@@ -145,7 +147,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 }), "*");
@@ -306,6 +308,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: 删除个税申报人员信息

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 (
       <WeaTop
         title={<span>{getLabel(543355, "规则配置")}</span>} icon={<i className="icon-coms-Flow-setting"/>}
         iconBgcolor="#F14A2D" buttons={[]} className="ruleWrapper-layout"
       >
-        <div className="ruleWrapper">{renderRuleForm(form, conditions, this.handleChange)}</div>
+        <div className="ruleWrapper">{renderRuleForm(form, ruleConditions, this.handleChange)}</div>
         {/*加解密进度条*/}
         {
           progressVisible &&