个税-在线申报bug修改

2023-08-25 17:49:43 +08:00 · 2023-08-25 17:49:43 +08:00 · a4eab6fa47
parent bc952ecaad
commit a4eab6fa47
10 changed files with 144 additions and 21 deletions
--- a/pc4mobx/hrmSalary/apis/declare.js
+++ b/pc4mobx/hrmSalary/apis/declare.js
@ -233,4 +233,9 @@ export const taxPaymentVoucherPrintFeedback = (params) => {
  return postFetch("/api/bs/hrmsalary/taxPayment/voucher/print/feedback", params);
 };

+//个税申报表申报数据-缴款凭证打印反馈
+export const taxdeclarationUpdateIcon = (params) => {
+  return postFetch("/api/bs/hrmsalary/taxdeclaration/updateIcon", params);
+};
+

--- a/pc4mobx/hrmSalary/pages/declare/index.js
+++ b/pc4mobx/hrmSalary/pages/declare/index.js
@ -1,11 +1,11 @@
 import React from "react";
 import { inject, observer } from "mobx-react";
-import { Button, DatePicker, message, Modal } from "antd";
+import { Button, DatePicker, message, Modal, Tag } from "antd";
 import { WeaLocaleProvider, WeaNewScroll, WeaTop } from "ecCom";
 import CustomTab from "../../components/customTab";
 import CustomTable from "../../components/customTable";
 import GenerateModal from "./generateModal";
-import { getDeclareList, taxdeclarationDelete } from "../../apis/declare";
+import { getDeclareList, taxdeclarationDelete, taxdeclarationUpdateIcon } from "../../apis/declare";
 import { sysConfCodeRule } from "../../apis/ruleconfig";
 import moment from "moment";

@ -96,6 +96,17 @@ export default class Declare extends React.Component {
      }
    }, () => this.getDeclareList());
  };
+  handleUpdateicon = (record) => {
+    const { id: taxDeclareRecordId } = record;
+    taxdeclarationUpdateIcon({ taxDeclareRecordId }).then(({ status, errormsg }) => {
+      this.getDeclareList();
+      if (status) {
+        message.success(getLabel(502230, "删除成功！"));
+      } else {
+        message.error(errormsg || getLabel(20462, "删除失败！"));
+      }
+    });
+  };

  render() {
    const { taxAgentStore: { showOperateBtn } } = this.props;
@ -147,7 +158,27 @@ export default class Declare extends React.Component {
              <CustomTable
                loading={loading}
                columns={[
-                  ...columns,
+                  ..._.map(columns, it => {
+                    if (it.dataIndex === "taxDeclareStatusDesc") {
+                      return {
+                        ...it,
+                        render: (text, record) => {
+                          return (<div className="declare-status-box">
+                            {text}
+                            {
+                              record.displayIcon &&
+                              <span title={getLabel(111, "该个税申报表对应的核算数据被重新核算")} className="icon-span">
+                                <Tag closable onClose={() => this.handleUpdateicon(record)}>
+                                  <i className="icon-coms02-Warning-01"/>
+                                </Tag>
+                              </span>
+                            }
+                          </div>);
+                        }
+                      };
+                    }
+                    return { ...it };
+                  }),
                  {
                    title: "操作",
                    dataIndex: "operate",
--- a/pc4mobx/hrmSalary/pages/declare/index.less
+++ b/pc4mobx/hrmSalary/pages/declare/index.less
@ -2,6 +2,7 @@
  .tabWrapper {
    padding-left: 10px
  }
+
  .tableWrapper {
    height: calc(100vh - 48px);
    overflow: auto;
@ -24,3 +25,32 @@
    }
  }
 }
+
+.declare-status-box {
+  .icon-span {
+    cursor: pointer;
+
+    .ant-tag:hover .anticon-cross {
+      display: block;
+    }
+
+    .ant-tag {
+      background: transparent;
+      border-radius: 0;
+      border: none;
+      position: relative;
+
+      .anticon-cross {
+        position: absolute;
+        right: -1px;
+        top: -1px;
+        display: none;
+      }
+    }
+
+    i.icon-coms02-Warning-01 {
+      font-size: 16px;
+      color: red;
+    }
+  }
+}
--- a/pc4mobx/hrmSalary/pages/declareDetail/components/taxDeclarationInfo.js
+++ b/pc4mobx/hrmSalary/pages/declareDetail/components/taxDeclarationInfo.js
@ -5,8 +5,11 @@
 * Date: 2023/8/18
 */
 import React, { Component } from "react";
+import { message, Tag } from "antd";
 import { WeaLocaleProvider } from "ecCom";
 import DeclareResultDialog from "./declareResultDialog";
+import { taxdeclarationUpdateIcon } from "../../../apis/declare";
+import { getQueryString } from "../../../util/url";

 const { getLabel } = WeaLocaleProvider;

@ -26,6 +29,16 @@ class TaxDeclarationInfo extends Component {
      resDialog: { ...this.state.resDialog, visible: true, title: `${title}${getLabel(111, "详情")}`, type }
    });
  };
+  handleUpdateicon = () => {
+    taxdeclarationUpdateIcon({ taxDeclareRecordId: getQueryString("id") })
+      .then(({ status, errormsg }) => {
+        if (status) {
+          message.success(getLabel(502230, "删除成功！"));
+        } else {
+          message.error(errormsg || getLabel(20462, "删除失败！"));
+        }
+      });
+  };

  render() {
    const { resDialog } = this.state;
@ -46,7 +59,17 @@ class TaxDeclarationInfo extends Component {
            _.map(infoItem, item => {
              return <div className="info-item">
                <span className="label">{item["label"]}：</span>
-                <span className="value">{declareInfo[item["key"]]}</span>
+                <span className="value">
+                  {declareInfo[item["key"]]}
+                  {
+                    (item["key"] === "declareStatusDesc" && declareInfo["displayIcon"]) &&
+                    <span title={getLabel(111, "该个税申报表对应的核算数据被重新核算")} className="icon-span">
+                                <Tag closable onClose={this.handleUpdateicon}>
+                                  <i className="icon-coms02-Warning-01"/>
+                                </Tag>
+                              </span>
+                  }
+                </span>
                {
                  item.key === "taxPaidAmount" &&
                  <span className="value">{getLabel(111, "元")}</span>
--- a/pc4mobx/hrmSalary/pages/declareDetail/index.less
+++ b/pc4mobx/hrmSalary/pages/declareDetail/index.less
@ -2,6 +2,33 @@
  .declareDetail-layout-content {
    padding: 0 16px;
  }
+
+  .icon-span {
+    cursor: pointer;
+
+    .ant-tag:hover .anticon-cross {
+      display: block;
+    }
+
+    .ant-tag {
+      background: transparent;
+      border-radius: 0;
+      border: none;
+      position: relative;
+
+      .anticon-cross {
+        position: absolute;
+        right: -1px;
+        top: -1px;
+        display: none;
+      }
+    }
+
+    i.icon-coms02-Warning-01 {
+      font-size: 16px;
+      color: red;
+    }
+  }
 }

 .taxDeclarationInfo_layout {
--- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js
+++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js
@ -129,6 +129,7 @@ class EmployeeDeclareDetailSchemaEditDialog extends Component {
    const { employeeDeclareStore: { declareForm } } = this.props;
    const key = Object.keys(res)[0];
    const value = res[key].value;
+    console.log(132, res, declareForm.getFormParams());
    switch (key) {
      case "employmentStatus":
        this.setState({
@ -147,6 +148,7 @@ class EmployeeDeclareDetailSchemaEditDialog extends Component {
            };
          })
        }, () => {
+          console.log(150, this.state.eConditions);
          declareForm.initFormFields(this.state.eConditions);
        });
        break;
--- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/constants.js
+++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/constants.js
@ -171,7 +171,7 @@ export const declareConditions = [
  {
    items: [
      {
-        colSpan: 2,
+        colSpan: 1,
        fieldcol: 12,
        labelcol: 6,
        rules: "selectLinkageRequired",
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerTable.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerTable.js
@ -82,19 +82,24 @@ class LedgerTable extends Component {
            {
              showOperateBtn &&
              <a href="javascript:void(0);" className="mr10"
-                 onClick={() => this.handleMenuClick({ key: "copy" }, record)}>复制</a>
-            }
-            {
-              showOperateBtn &&
-              <Popover
-                overlayClassName="moreIconWrapper"
-                placement="bottomRight"
-                content={<Menu onClick={(e) => this.handleMenuClick(e, record)}>
-                  <Menu.Item key="delete">删除</Menu.Item>
-                </Menu>} title="">
-                <i className="icon-coms-more"/>
-              </Popover>
+                 onClick={() => this.handleMenuClick({ key: "delete" }, record)}>删除</a>
            }
+            {/*{*/}
+            {/*  showOperateBtn &&*/}
+            {/*  <a href="javascript:void(0);" className="mr10"*/}
+            {/*     onClick={() => this.handleMenuClick({ key: "copy" }, record)}>复制</a>*/}
+            {/*}*/}
+            {/*{*/}
+            {/*  showOperateBtn &&*/}
+            {/*  <Popover*/}
+            {/*    overlayClassName="moreIconWrapper"*/}
+            {/*    placement="bottomRight"*/}
+            {/*    content={<Menu onClick={(e) => this.handleMenuClick(e, record)}>*/}
+            {/*      <Menu.Item key="delete">删除</Menu.Item>*/}
+            {/*    </Menu>} title="">*/}
+            {/*    <i className="icon-coms-more"/>*/}
+            {/*  </Popover>*/}
+            {/*}*/}
          </div>;
        };
      } else {
--- a/pc4mobx/hrmSalary/pages/salary/components/constants.js
+++ b/pc4mobx/hrmSalary/pages/salary/components/constants.js
@ -68,7 +68,7 @@ export const fieldList = [
    viewAttr: 3
  },
  {
-    key: "registrationNo",
+    key: "taxRegistrationNumber",
    label: "登记序号",
    type: "TEXT",
    lanId: 111,
@ -107,7 +107,7 @@ export const taxFillCondition = [
      {
        colSpan: 1,
        conditionType: "INPUT",
-        domkey: ["taxCode"],
+        domkey: ["taxRegistrationNumber"],
        fieldcol: 14,
        label: "登记序号",
        lanId: 111,
--- a/pc4mobx/hrmSalary/pages/salary/components/taxDeclarationInfo.js
+++ b/pc4mobx/hrmSalary/pages/salary/components/taxDeclarationInfo.js
@ -25,7 +25,7 @@ class TaxDeclarationInfo extends Component {
        account: "",
        realNamePassword: "",
        netPassword: null,
-        registrationNo: "",
+        taxRegistrationNumber: "",
        departmentCode: "",
        taxInforVerifiyStatus: ""
      },