+ this.setState({ selectedKey })}
+ />
+ this.personalScopeTableRef = dom}
+ tabActive={selectedKey}
+ searchValue={searchValue}
+ onChangeSelectKey={rowKeys => this.setState({ rowKeys })}
+ />
+
+ this.setState({
+ personalAddModal: { ...personalAddModal, visible: false }
+ })}/>
+
+ );
+ }
+}
+
+export default PersonalScope;
diff --git a/pc4mobx/hrmSalary/pages/salary/components/personalScopeModal.js b/pc4mobx/hrmSalary/pages/salary/components/personalScopeModal.js
new file mode 100644
index 00000000..0dcaa106
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/salary/components/personalScopeModal.js
@@ -0,0 +1,119 @@
+/*
+ * Author: 黎永顺
+ * name: 新增人员范围弹框
+ * Description:
+ * Date: 2022/11/30
+ */
+import React, { Component } from "react";
+import { WeaBrowser, WeaDialog, WeaFormItem, WeaSearchGroup, WeaSelect } from "ecCom";
+import { Button } from "antd";
+import { getTaxAgentRangeForm } from "../../../apis/taxAgent";
+
+class PersonalScopeModal extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ employeeStatus: [],
+ targetTypeList: [],
+ targetType: "EMPLOYEE",
+ targetTypeIds: ""
+ };
+ }
+
+ componentDidMount() {
+ this.getTaxAgentRangeForm();
+ }
+
+ getTaxAgentRangeForm = () => {
+ getTaxAgentRangeForm().then(({ status, data }) => {
+ if (status) {
+ const { employeeStatus, targetTypeList } = data;
+ this.setState({
+ targetTypeList: _.map(targetTypeList, it => ({ key: it.id, showname: it.name })),
+ employeeStatus
+ });
+ }
+ });
+ };
+ renderBrowser = () => {
+ const { targetType, targetTypeIds } = this.state;
+ let browserType = {};
+ switch (targetType) {
+ case "EMPLOYEE":
+ browserType = { ...browserType, type: 17, title: "人员选择" };
+ break;
+ case "DEPT":
+ browserType = { ...browserType, type: 57, title: "部门选择" };
+ break;
+ case "SUBCOMPANY":
+ browserType = { ...browserType, type: 164, title: "分部选择" };
+ break;
+ case "POSITION":
+ browserType = { ...browserType, type: 278, title: "岗位选择" };
+ break;
+ default:
+ break;
+ }
+ return
+
+
+ {
+ !taxAgentId &&
+
+ {
+ _.map(tabs, item => {
+ const { key, title } = item;
+ return ;
+ })
+ }
+
+ }
+ {
+ this.renderChildren()
+ }
+
+ }
+ onClose={onCancel}
+ />
+ );
+ }
+}
+
+export default TaxAgentSlide;
diff --git a/pc4mobx/hrmSalary/pages/salary/components/taxAgentTable.js b/pc4mobx/hrmSalary/pages/salary/components/taxAgentTable.js
new file mode 100644
index 00000000..8d9b2465
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/salary/components/taxAgentTable.js
@@ -0,0 +1,116 @@
+/*
+ * Author: 黎永顺
+ * name: 个税扣缴义务人列表
+ * Description:
+ * Date: 2022/11/29
+ */
+import React, { Component } from "react";
+import { WeaTable } from "ecCom";
+import * as API from "../../../apis/taxAgent";
+import "./index.less";
+
+class TaxAgentTable extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ loading: {
+ query: false
+ },
+ dataSource: [],
+ columns: [],
+ pageInfo: {
+ current: 1,
+ pageSize: 10,
+ total: 0
+ }
+ };
+ }
+
+ componentDidMount() {
+ this.getTaxAgentList();
+ }
+
+ getTaxAgentList = () => {
+ const { pageInfo, loading } = this.state;
+ const { searchValue, onOperate } = this.props;
+ const payload = {
+ name: searchValue,
+ ...pageInfo
+ };
+ this.setState({ loading: { ...loading, query: true } });
+ API.getTaxAgentList(payload).then(({ status, data }) => {
+ this.setState({ loading: { ...loading, query: false } });
+ if (status) {
+ const { pageNum: current, pageSize, total, columns, list: dataSource } = data;
+ this.setState({
+ pageInfo: { ...pageInfo, current, pageSize, total },
+ dataSource,
+ columns: _.map(columns, item => {
+ if (item.dataIndex === "employeeRange") {
+ return {
+ ...item,
+ render: (text, record) => {
+ return onOperate("edit", record.id, 2)}>{text};
+ }
+ };
+ }
+ return {
+ ...item,
+ render: (text) => {
+ return {text};
+ }
+ };
+ })
+ });
+ }
+ }).catch(() => {
+ this.setState({ loading: { ...loading, query: false } });
+ });
+ };
+
+ render() {
+ const { dataSource, columns, pageInfo, loading } = this.state;
+ const { onOperate } = this.props;
+ const pagination = {
+ ...pageInfo,
+ showTotal: total => `共 ${total} 条`,
+ showSizeChanger: true,
+ showQuickJumper: true,
+ pageSizeOptions: ["10", "20", "50", "100"],
+ onShowSizeChange: (current, pageSize) => {
+ this.setState({
+ pageInfo: { ...pageInfo, current, pageSize }
+ }, () => {
+ this.getTaxAgentList();
+ });
+ },
+ onChange: current => {
+ this.setState({
+ pageInfo: { ...pageInfo, current }
+ }, () => {
+ this.getTaxAgentList();
+ });
+ }
+ };
+ return (
+
+ 个税扣缴义务人
+ {
+ permission.isChief &&
+
+ }
+
;
return (
-
);
diff --git a/pc4mobx/hrmSalary/stores/taxAgent.js b/pc4mobx/hrmSalary/stores/taxAgent.js
index 3a042247..1d6052c8 100644
--- a/pc4mobx/hrmSalary/stores/taxAgent.js
+++ b/pc4mobx/hrmSalary/stores/taxAgent.js
@@ -9,6 +9,10 @@ import { hasIconInTax } from "../apis/taxAgent";
const { TableStore } = WeaTableNew;
export class TaxAgentStore {
+ @observable salarytaxAgentForm = new WeaForm(); //新版个税扣缴义务人表单实体
+
+
+
@observable tableStore = new TableStore(); // new table
@observable form = new WeaForm(); //表单实体
@observable formDecentralization = new WeaForm(); //关闭分权表单
@@ -39,6 +43,8 @@ export class TaxAgentStore {
@action setSalaryItemBtn = bool => (this.showSalaryItemBtn = bool);//薪资项目权限
+ @action setSalarytaxAgentForm = () => (this.salarytaxAgentForm = new WeaForm());//薪资项目权限
+
// 初始化操作
@action
doInit = params => {
diff --git a/pc4mobx/hrmSalary/util/index.js b/pc4mobx/hrmSalary/util/index.js
index ffaa1956..d132c64e 100644
--- a/pc4mobx/hrmSalary/util/index.js
+++ b/pc4mobx/hrmSalary/util/index.js
@@ -70,6 +70,7 @@ export const getSearchs = (form, condition, col, isCenter) => {
/>
),
colSpan:1,
+ hide: fields.hide
})
});
group.push(
From 2899e32909210eb1f10342894e821dd35855240e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 1 Dec 2022 09:24:03 +0800
Subject: [PATCH 003/165] =?UTF-8?q?=E4=B8=AA=E7=A8=8E=E6=89=A3=E7=BC=B4?=
=?UTF-8?q?=E4=B9=89=E5=8A=A1=E4=BA=BA=E9=A1=B5=E9=9D=A2=E9=87=8D=E6=9E=84?=
=?UTF-8?q?1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/salary/components/index.less | 15 +++
.../pages/salary/components/personalScope.js | 32 +++--
.../salary/components/personalScopeModal.js | 116 ++++++++++++++----
.../pages/salary/components/taxAgentSlide.js | 11 +-
pc4mobx/hrmSalary/pages/salary/taxAgent.js | 27 +++-
5 files changed, 165 insertions(+), 36 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/salary/components/index.less b/pc4mobx/hrmSalary/pages/salary/components/index.less
index e1bcdfe8..a0dcddd6 100644
--- a/pc4mobx/hrmSalary/pages/salary/components/index.less
+++ b/pc4mobx/hrmSalary/pages/salary/components/index.less
@@ -53,3 +53,18 @@
}
}
}
+
+//添加关联人员弹框中的下拉框样式
+.personalScopeModalWrapper{
+ .wea-select,.ant-select-selection,.ant-select{
+ width: 100%;
+ }
+ .wea-select{
+ display: inline-block;
+ position: relative;
+ }
+ .ant-select-selection{
+ height: 30px;
+ border-radius: 0;
+ }
+}
diff --git a/pc4mobx/hrmSalary/pages/salary/components/personalScope.js b/pc4mobx/hrmSalary/pages/salary/components/personalScope.js
index 7486aa81..4bbf53c9 100644
--- a/pc4mobx/hrmSalary/pages/salary/components/personalScope.js
+++ b/pc4mobx/hrmSalary/pages/salary/components/personalScope.js
@@ -24,7 +24,9 @@ class PersonalScope extends Component {
rowKeys: [],
personalAddModal: {
visible: false,
- title: "关联人员"
+ title: "关联人员",
+ includeType: "",
+ taxAgentId: ""
}
};
this.personalScopeTableRef = null;
@@ -68,9 +70,15 @@ class PersonalScope extends Component {
* Date: 2022/11/30
*/
handleAddPersonal = () => {
- const { personalAddModal } = this.state;
+ const { personalAddModal, selectedKey } = this.state;
+ const { taxAgentId } = this.props;
this.setState({
- personalAddModal: { ...personalAddModal, visible: true }
+ personalAddModal: {
+ ...personalAddModal,
+ visible: true,
+ includeType: selectedKey === "listInclude" ? 1 : 0,
+ taxAgentId
+ }
});
};
@@ -124,10 +132,20 @@ class PersonalScope extends Component {
searchValue={searchValue}
onChangeSelectKey={rowKeys => this.setState({ rowKeys })}
/>
-
-
+
+
+
+
+ }
+
+ this.taxAgentTableRef = dom}/>
+
-
{
decentralization === "0" ?
- getSearchs(salarytaxAgentForm, decentralizationConditions, 1, true) :
- getSearchs(salarytaxAgentForm, editConditions, 1, true)
+ getSearchs(salarytaxAgentForm, convertConditon(decentralizationConditions, !isChief), 1, false) :
+ getSearchs(salarytaxAgentForm, convertConditon(editConditions, !isChief), 1, false)
}
);
@@ -32,3 +32,17 @@ class BaseSettings extends Component {
}
export default BaseSettings;
+
+export const convertConditon = (condition, bool) => {
+ return _.map(condition, item => {
+ return {
+ ...item,
+ items: _.map(item.items, child => {
+ return {
+ ...child,
+ viewAttr: bool ? 1 : child.viewAttr
+ };
+ })
+ };
+ });
+};
diff --git a/pc4mobx/hrmSalary/pages/salary/components/index.less b/pc4mobx/hrmSalary/pages/salary/components/index.less
index a0dcddd6..0743a792 100644
--- a/pc4mobx/hrmSalary/pages/salary/components/index.less
+++ b/pc4mobx/hrmSalary/pages/salary/components/index.less
@@ -1,3 +1,29 @@
+.taxAgentSlideContent {
+ .baseSettingWrapper, .taxDeclarationInfoWrapper {
+ padding: 12px 12px 12px 20px;
+
+ .wea-search-group {
+ padding: 0;
+ border: 1px solid #e5e5e5;
+ border-bottom: none;
+
+ .wea-content {
+ padding: 0;
+
+ .wea-form-cell, .wea-form-item {
+ border-bottom: 1px solid #e5e5e5;
+ padding: 5px 10px 5px 30px;
+
+ .wea-form-item {
+ padding: 0 !important;
+ border-bottom: none !important;
+ }
+ }
+ }
+ }
+ }
+}
+
.comHint {
width: 100%;
margin: 16px 0;
@@ -55,15 +81,17 @@
}
//添加关联人员弹框中的下拉框样式
-.personalScopeModalWrapper{
- .wea-select,.ant-select-selection,.ant-select{
+.personalScopeModalWrapper {
+ .wea-select, .ant-select-selection, .ant-select {
width: 100%;
}
- .wea-select{
+
+ .wea-select {
display: inline-block;
position: relative;
}
- .ant-select-selection{
+
+ .ant-select-selection {
height: 30px;
border-radius: 0;
}
diff --git a/pc4mobx/hrmSalary/pages/salary/components/personalScope.js b/pc4mobx/hrmSalary/pages/salary/components/personalScope.js
index 0e4b71c0..54ba7ccb 100644
--- a/pc4mobx/hrmSalary/pages/salary/components/personalScope.js
+++ b/pc4mobx/hrmSalary/pages/salary/components/personalScope.js
@@ -5,12 +5,14 @@
* Date: 2022/11/30
*/
import React, { Component } from "react";
-import { message, Modal } from "antd";
+import { Button, message, Modal } from "antd";
import { inject, observer } from "mobx-react";
import { WeaButtonIcon, WeaInputSearch, WeaTab } from "ecCom";
-import { taxAgentRangeDelete } from "../../../apis/taxAgent";
+import { taxAgentRangeDelete, taxAgentRangeImportData, taxAgentRangePreview } from "../../../apis/taxAgent";
import PersonalScopeTable from "./personalScopeTable";
import PersonalScopeModal from "./personalScopeModal";
+import ImportModal from "../../../components/importModal";
+import { importEmployColumns } from "../../taxAgent/columns";
@inject("taxAgentStore")
@@ -25,7 +27,13 @@ class PersonalScope extends Component {
personalAddModal: {
visible: false,
title: "关联人员",
- includeType: "",
+ includeType: ""
+ },
+ previewDataSource: [],
+ importParams: {
+ visible: false,
+ step: 0,
+ importResult: {}
}
};
this.personalScopeTableRef = null;
@@ -74,13 +82,36 @@ class PersonalScope extends Component {
personalAddModal: {
...personalAddModal,
visible: true,
- includeType: selectedKey === "listInclude" ? 1 : 0,
+ includeType: selectedKey === "listInclude" ? 1 : 0
+ }
+ });
+ };
+ salaryArchivePreview = (params) => {
+ taxAgentRangePreview(params).then(({ status, data }) => {
+ if (status) {
+ const { preview } = data;
+ this.setState({
+ previewDataSource: preview
+ });
+ }
+ });
+ };
+ handleImportFile = (params) => {
+ const { taxAgentId } = this.props;
+ taxAgentRangeImportData({ ...params, taxAgentId }).then(({ status, data }) => {
+ if (status) {
+ this.setState({
+ importParams: {
+ ...this.state.importParams,
+ importResult: data
+ }
+ });
}
});
};
render() {
- const { selectedKey, searchValue, rowKeys, personalAddModal } = this.state;
+ const { selectedKey, searchValue, rowKeys, personalAddModal, importParams, previewDataSource } = this.state;
const { taxAgentStore: { hideIconInTax, showSalaryItemBtn }, taxAgentId } = this.props;
const topTab = [
{
@@ -93,6 +124,12 @@ class PersonalScope extends Component {
}
];
const btns = (hideIconInTax || showSalaryItemBtn) ? [
+ ,
onOperate("edit", record.id)}> 编辑
+ {
+ isChief &&
+ onOperate("delete", record.id)}> 删除
+ }
}
]}
diff --git a/pc4mobx/hrmSalary/pages/salary/components/taxDeclarationInfo.js b/pc4mobx/hrmSalary/pages/salary/components/taxDeclarationInfo.js
index f4b77ad0..a155dc49 100644
--- a/pc4mobx/hrmSalary/pages/salary/components/taxDeclarationInfo.js
+++ b/pc4mobx/hrmSalary/pages/salary/components/taxDeclarationInfo.js
@@ -69,30 +69,32 @@ class TaxDeclarationInfo extends Component {
render() {
const { fieldItem, fieldForm } = this.state;
return (
-
{
permission.isChief &&
-
+
@@ -192,13 +208,14 @@ class TaxAgent extends Component {
}
this.taxAgentTableRef = dom}/>
+
+
+
+ {getLabel(111, "智能算薪")}
+ {getLabel(111, "开启智能算薪并输入正确的账号密码，且购买了智能算薪流量，才能正常使用智能算薪功能。")}
+
+
+
+
+
+
+ {this.renderChildren()}
+
+ );
+ }
+}
+
+export default Index;
From f6db0c18dd16a7b2ff2805ebde60d01e585214f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Fri, 21 Jul 2023 15:56:13 +0800
Subject: [PATCH 010/165] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E6=99=BA=E8=83=BD?=
=?UTF-8?q?=E7=AE=97=E8=96=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/enableSettings.js | 25 +++++++++++++------
1 file changed, 18 insertions(+), 7 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/intelligentCalculateSalarySettings/components/enableSettings.js b/pc4mobx/hrmSalary/pages/intelligentCalculateSalarySettings/components/enableSettings.js
index a6990968..93c305f0 100644
--- a/pc4mobx/hrmSalary/pages/intelligentCalculateSalarySettings/components/enableSettings.js
+++ b/pc4mobx/hrmSalary/pages/intelligentCalculateSalarySettings/components/enableSettings.js
@@ -5,32 +5,43 @@
* Date: 2023/7/19
*/
import React, { Component } from "react";
-import { Button, Col, Row } from "antd";
+import { Button, Col, Input, Row } from "antd";
import TipLabel from "../../../components/TipLabel";
-import { WeaCheckbox, WeaFormItem, WeaInput, WeaLocaleProvider, WeaSearchGroup } from "ecCom";
+import { WeaCheckbox, WeaFormItem, WeaLocaleProvider, WeaSearchGroup } from "ecCom";
import "./index.less";
const getLabel = WeaLocaleProvider.getLabel;
class EnableSettings extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ enable: "1"
+ };
+ }
+
+ handleEnale = (enable) => {
+ };
+
render() {
+ const { enable } = this.state;
const tipList = [
getLabel(111, "1、智能算薪默认是开启的，若购买了智能算薪，请先配置账号密码，在购买的流量足够的前提下即可正常使用；"),
getLabel(111, "2、您可在【接口流量统计】中查看接口流量使用情况；"),
getLabel(111, "3、您可以设置【流量不足提醒】，提前提醒可以避免次月要用时因流量不足无法使用的情况。"),
getLabel(111, "4、如您需了解您购买的流量的使用明细，可查看【流量使用记录】；")
];
- const Input = label => {
+ const InputAccount = label => {
return (
{getLabel(111, "开启智能算薪并输入正确的账号密码，且购买了智能算薪流量，才能正常使用智能算薪功能。")}
- children
+
+ );
+ }
+}
+
+export default Index;
From 67d17fcbee3e9f71bc90873da1cb5e52b91b86e8 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, 24 Jul 2023 10:49:30 +0800
Subject: [PATCH 012/165] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E4=BA=BA=E5=91=98?=
=?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8A=A5=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../hrmSalary/components/TipLabel/index.less | 65 ++++++++++---------
.../hrmSalary/pages/employeedeclare/index.js | 12 +++-
2 files changed, 46 insertions(+), 31 deletions(-)
diff --git a/pc4mobx/hrmSalary/components/TipLabel/index.less b/pc4mobx/hrmSalary/components/TipLabel/index.less
index addc7741..b88403e9 100644
--- a/pc4mobx/hrmSalary/components/TipLabel/index.less
+++ b/pc4mobx/hrmSalary/components/TipLabel/index.less
@@ -1,36 +1,41 @@
.tipLabelWrapper {
- border-left: 1px solid #e2ecf2;
+ border-left: 1px solid #e2ecf2;
+ border-bottom: 1px solid #e2ecf2;
+ border-right: 1px solid #e2ecf2;
+ border-radius: 0px 0px 5px 5px;
+ width: 100%;
+ overflow: hidden;
+
+ .titleWrapper {
+ width: 100%;
+ line-height: 19.2px;
+ padding: 10px;
border-bottom: 1px solid #e2ecf2;
- border-right: 1px solid #e2ecf2;
- border-radius: 0px 0px 5px 5px;
+ background-color: #f7fbfe;
+ }
+
+ .tipContentWrapper {
+ padding: 10px;
+ background: #FFF;
+ }
+
+ .tipContentItem {
+ line-height: 20px;
+ padding: 10px 16px 0px;
+ color: rgb(153, 153, 153);
+ }
+
+ .tipContentItem:first-child {
+ padding-top: 0;
+ }
+
+ .formLabel {
+ font-size: 14px;
+ }
+
+ .contentWrapper {
width: 100%;
overflow: hidden;
- .titleWrapper {
- width: 100%;
- line-height: 19.2px;
- padding: 10px;
- border-bottom: 1px solid #e2ecf2;
- background-color: #f7fbfe;
- }
- .tipContentWrapper {
- padding: 10px;
- }
- .tipContentItem {
- line-height: 20px;
- padding: 0px 16px;
- padding-top: 10px;
- color: rgb(153, 153, 153);
- }
- .tipContentItem:first {
- padding-top: 0px;
- }
-
- .formLabel {
- font-size: 14px;
- }
- .contentWrapper {
- width: 100%;
- overflow: hidden;
- }
+ }
}
diff --git a/pc4mobx/hrmSalary/pages/employeedeclare/index.js b/pc4mobx/hrmSalary/pages/employeedeclare/index.js
index 91e40529..c43be4b3 100644
--- a/pc4mobx/hrmSalary/pages/employeedeclare/index.js
+++ b/pc4mobx/hrmSalary/pages/employeedeclare/index.js
@@ -6,11 +6,16 @@
*/
import React, { Component } from "react";
import { WeaInputSearch, WeaLocaleProvider, WeaTop } from "ecCom";
+import { Col, Row } from "antd";
+import TipLabel from "../../components/TipLabel";
const { getLabel } = WeaLocaleProvider;
class Index extends Component {
render() {
+ const tipList = [
+ getLabel(111, "1、点击查看详情，管理各个个税扣缴义务人的人员报送信息，如购买了在线报送服务，可在线报送，如未购买在线报送服务，也可导出数据线下报送。")
+ ];
return (
children
+
+
+
+
+
);
}
From a3231c252d60f71b9ae54ec1c4a23bb9582592c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 27 Jul 2023 16:07:19 +0800
Subject: [PATCH 013/165] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E5=AF=B9=E6=8E=A5e1?=
=?UTF-8?q?0=E4=B8=AA=E7=A8=8E=E6=89=A3=E7=BC=B4=E4=B9=89=E5=8A=A1?=
=?UTF-8?q?=E4=BA=BA=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/salary/components/taxAgentSlide.js | 43 +++++++++++--------
.../pages/salary/components/taxAgentTable.js | 13 +++---
pc4mobx/hrmSalary/pages/salary/taxAgent.js | 43 ++++++++++---------
3 files changed, 54 insertions(+), 45 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js b/pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js
index e55ddf30..e80e33e4 100644
--- a/pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js
+++ b/pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js
@@ -7,7 +7,7 @@
import React, { Component } from "react";
import { inject, observer } from "mobx-react";
import { Button, message } from "antd";
-import { WeaSlideModal, WeaSteps } from "ecCom";
+import { WeaLocaleProvider, WeaSlideModal, WeaSteps } from "ecCom";
import SlideModalTitle from "../../../components/slideModalTitle";
import { decentralizationConditions, editConditions } from "../../taxAgent/editConditions";
import BaseSettings, { convertConditon } from "./baseSettings";
@@ -16,11 +16,12 @@ import TaxDeclarationInfo from "./taxDeclarationInfo";
import * as API from "../../../apis/taxAgent";
import "./index.less";
+const { getLabel } = WeaLocaleProvider;
const Step = WeaSteps.Step;
const tabs = [
- { key: 0, title: "基础设置" },
- { key: 1, title: "报税信息" },
- { key: 2, title: "人员范围" }
+ { key: 0, title: getLabel(82751, "基础设置") },
+ { key: 1, title: getLabel(111, "报税信息") },
+ { key: 2, title: getLabel(124810, "人员范围") }
];
@inject("taxAgentStore")
@@ -79,13 +80,13 @@ class TaxAgentSlide extends Component {
API.saveTaxAgent(payload).then(({ status, data, errormsg }) => {
this.setState({ loading: false });
if (status) {
- message.success("保存成功");
+ message.success(getLabel(22619, "保存成功"));
this.setState({
- current: current + 1,
+ current: true ? current + 2 : current + 1,
taxAgentId: data
}, () => onOk());
} else {
- message.error(errormsg || "保存失败");
+ message.error(errormsg || getLabel(22620, "保存失败"));
}
}).catch(() => this.setState({ loading: false }));
};
@@ -101,10 +102,10 @@ class TaxAgentSlide extends Component {
API.updateTaxAgent(payload).then(({ status, data, errormsg }) => {
this.setState({ loading: false });
if (status) {
- message.success("更新成功");
+ message.success(getLabel(31439, "更新成功"));
onCancel(true);
} else {
- message.error(errormsg || "更新失败");
+ message.error(errormsg || getLabel(31825, "更新失败"));
}
}).catch(() => this.setState({ loading: false }));
};
@@ -158,20 +159,23 @@ class TaxAgentSlide extends Component {
case 0:
CurrentDom = [
+ loading={loading}>{isEdit ? getLabel(537558, "保存") : getLabel(33199, "保存并进入下一步")}
];
break;
case 1:
- const tmpV = [];
+ const tmpV = [];
const tmpJ = [
- ,
-
+ ,
+
];
CurrentDom = isEdit ? tmpV : [...tmpV, ...tmpJ];
break;
case 2:
- CurrentDom = !isEdit ?
- []
+ CurrentDom = (!isEdit && false) ?
+ []
: [];
break;
default:
@@ -185,8 +189,9 @@ class TaxAgentSlide extends Component {
};
render() {
- const { title, visible, onCancel, taxAgentStore: { showOperateBtn } } = this.props;
+ const { isEdit, title, visible, onCancel, taxAgentStore: { showOperateBtn } } = this.props;
const { current, taxAgentId } = this.state;
+ const tabData = true && _.filter(tabs, it => it.key !== 1);
return (
- onOperate("edit", record.id)}> 编辑
+ onOperate("edit", record.id)}>{getLabel(501169, "编辑")}
{
isChief &&
onOperate("delete", record.id)}> 删除
+ onClick={() => onOperate("delete", record.id)}>{getLabel(535052, "删除")}
}
}
diff --git a/pc4mobx/hrmSalary/pages/salary/taxAgent.js b/pc4mobx/hrmSalary/pages/salary/taxAgent.js
index 07042e64..3c611e6f 100644
--- a/pc4mobx/hrmSalary/pages/salary/taxAgent.js
+++ b/pc4mobx/hrmSalary/pages/salary/taxAgent.js
@@ -1,13 +1,15 @@
import React, { Component } from "react";
import { inject, observer } from "mobx-react";
import { Button, message, Modal } from "antd";
-import { WeaCheckbox, WeaFormItem, WeaInputSearch, WeaSearchGroup, WeaTop } from "ecCom";
+import { WeaCheckbox, WeaFormItem, WeaInputSearch, WeaLocaleProvider, WeaSearchGroup, WeaTop } from "ecCom";
import ComHint from "./components/comHint";
import TaxAgentTable from "./components/taxAgentTable";
import TaxAgentSlide from "./components/taxAgentSlide";
import * as API from "../../apis/taxAgent";
import "./index.less";
+const { getLabel } = WeaLocaleProvider;
+
@inject("taxAgentStore")
@observer
class TaxAgent extends Component {
@@ -21,7 +23,7 @@ class TaxAgent extends Component {
taxAgentSlideProps: {
isEdit: false,
visible: false,
- title: "新增个税扣缴义务人",
+ title: getLabel(543629, "新增个税扣缴义务人"),
taxAgentId: "",
current: 0
}
@@ -59,8 +61,8 @@ class TaxAgent extends Component {
taxAgentBaseSave = devolutionStatus => {
this.setState({ decentralization: this.state.decentralization }, () => {
Modal.confirm({
- title: "信息确认",
- content: `确认${devolutionStatus === "0" ? "停用" : "启用"}分权?`,
+ title: getLabel(131329, "信息确认"),
+ content: `${getLabel(33703, "确认")}${devolutionStatus === "0" ? getLabel(26471, "停用") : getLabel(26472, "启用")}${getLabel(524044, "分权")}?`,
onOk: () => {
const paylaod = { devolutionStatus };
const { taxAgentStore } = this.props;
@@ -76,8 +78,6 @@ class TaxAgent extends Component {
message.error(errormsg || `${devolutionStatus === "0" ? "停用" : "启用"}分权失败`);
}
});
- },
- onCancel() {
}
});
});
@@ -109,10 +109,10 @@ class TaxAgent extends Component {
taxAgentRangeSync({}).then(({ status, data, errormsg }) => {
this.setState({ syncLoading: false });
if (status) {
- message.success(data || "操作成功");
+ message.success(data || getLabel(30700, "操作成功"));
this.taxAgentTableRef.getTaxAgentList();
} else {
- message.error(data || errormsg || "操作失败");
+ message.error(data || errormsg || getLabel(30651, "操作失败"));
}
});
};
@@ -124,7 +124,7 @@ class TaxAgent extends Component {
...this.state.taxAgentSlideProps,
isEdit: false,
visible: false,
- title: "新增个税扣缴义务人",
+ title: getLabel(543629, "新增个税扣缴义务人"),
taxAgentId: "",
current: 0
}
@@ -139,22 +139,22 @@ class TaxAgent extends Component {
this.setState({
taxAgentSlideProps: {
...this.state.taxAgentSlideProps,
- visible: true, title: "编辑个税扣缴义务人",
+ visible: true, title: getLabel(543632, "编辑个税扣缴义务人"),
taxAgentId: itemId, current, isEdit: true
}
});
break;
case "delete":
Modal.confirm({
- title: "信息确认",
- content: `确认要删除吗?`,
+ title: getLabel(131329, "信息确认"),
+ content: getLabel(388758, "确认要删除吗?"),
onOk: () => {
API.deleteTaxAgent([itemId]).then(({ status, errormsg }) => {
if (status) {
- message.success("删除成功");
+ message.success(getLabel(502230, "删除成功"));
this.taxAgentTableRef.getTaxAgentList();
} else {
- message.error(errormsg || "删除失败");
+ message.error(errormsg || getLabel(20462, "删除失败"));
}
});
}
@@ -171,28 +171,29 @@ class TaxAgent extends Component {
permission, syncLoading
} = this.state;
const btns = [
- ,
+ ,
- 个税扣缴义务人
+ {getLabel(537996, "个税扣缴义务人")}
{
permission.isChief &&
}
;
return (
{
permission.isChief &&
-
-
+
+
From 9ae523ad878ead578e04bd506dcaada94971970f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Fri, 28 Jul 2023 09:23:35 +0800
Subject: [PATCH 014/165] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E6=99=BA=E8=83=BD?=
=?UTF-8?q?=E7=AE=97=E8=96=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/enableSettings.js | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/pc4mobx/hrmSalary/pages/intelligentCalculateSalarySettings/components/enableSettings.js b/pc4mobx/hrmSalary/pages/intelligentCalculateSalarySettings/components/enableSettings.js
index 93c305f0..bc24c71b 100644
--- a/pc4mobx/hrmSalary/pages/intelligentCalculateSalarySettings/components/enableSettings.js
+++ b/pc4mobx/hrmSalary/pages/intelligentCalculateSalarySettings/components/enableSettings.js
@@ -5,7 +5,7 @@
* Date: 2023/7/19
*/
import React, { Component } from "react";
-import { Button, Col, Input, Row } from "antd";
+import { Button, Col, Input, Modal, Row } from "antd";
import TipLabel from "../../../components/TipLabel";
import { WeaCheckbox, WeaFormItem, WeaLocaleProvider, WeaSearchGroup } from "ecCom";
import "./index.less";
@@ -21,6 +21,19 @@ class EnableSettings extends Component {
}
handleEnale = (enable) => {
+ if (enable === "1") {
+ this.setState({ enable });
+ } else {
+ Modal.confirm({
+ title: getLabel(131329, "信息确认"),
+ content: getLabel(111, "确定要关闭智能算薪功能吗？关闭后，将无法使用在线报送人员信息、在线获取专项附加扣除数据、在线个税申报等功能！"),
+ onOk: () => {
+ },
+ onCancel: () => {
+ this.setState({ enable: this.state.enable });
+ }
+ });
+ }
};
render() {
From 3645c524345dc68903c1e33134083d3da9c54cca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Wed, 9 Aug 2023 10:35:49 +0800
Subject: [PATCH 015/165] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E6=99=BA=E8=83=BD?=
=?UTF-8?q?=E7=AE=97=E8=96=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../intelligentCalculateSalarySettings.js | 15 ++++
.../excelEditor/components/codeAction.js | 20 ++---
.../hrmSalary/components/excelEditor/index.js | 2 +-
.../components/conditions.js | 16 ++--
.../components/dimensionSlide.js | 22 ++---
.../components/dimensionTable.js | 22 ++---
.../components/employeeDetails.js | 4 +-
.../components/groupIndividualEditTable.js | 2 +-
.../components/groupSpacingEditTable.js | 16 ++--
.../components/reportList.js | 16 ++--
.../components/statisticsModal.js | 6 +-
.../components/enableSettings.js | 89 +++++++++++++++----
.../components/insufficientTrafficAlert.js | 8 +-
13 files changed, 155 insertions(+), 83 deletions(-)
create mode 100644 pc4mobx/hrmSalary/apis/intelligentCalculateSalarySettings.js
diff --git a/pc4mobx/hrmSalary/apis/intelligentCalculateSalarySettings.js b/pc4mobx/hrmSalary/apis/intelligentCalculateSalarySettings.js
new file mode 100644
index 00000000..9ce1d575
--- /dev/null
+++ b/pc4mobx/hrmSalary/apis/intelligentCalculateSalarySettings.js
@@ -0,0 +1,15 @@
+import { WeaTools } from "ecCom";
+import { postFetch } from "../util/request";
+
+//智能算薪-计费配置编辑表单
+export const apiflowBillingConfigGet = (params) => {
+ return WeaTools.callApi("/api/bs/hrmsalary/taxdeclaration/apiflow/billing/config/get", "GET", params);
+};
+//智能算薪-计费配置保存
+export const apiflowBillingConfigSave = (params) => {
+ return postFetch("/api/bs/hrmsalary/taxdeclaration/apiflow/billing/config/save", params);
+};
+//智能算薪-计费配置开关
+export const apiflowBillingConfigEnable = (params) => {
+ return postFetch("/api/bs/hrmsalary/taxdeclaration/apiflow/billing/config/enable", params);
+};
diff --git a/pc4mobx/hrmSalary/components/excelEditor/components/codeAction.js b/pc4mobx/hrmSalary/components/excelEditor/components/codeAction.js
index bca61000..80d7df91 100644
--- a/pc4mobx/hrmSalary/components/excelEditor/components/codeAction.js
+++ b/pc4mobx/hrmSalary/components/excelEditor/components/codeAction.js
@@ -123,10 +123,10 @@ class CodeAction extends Component {
}
diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js
index a622aefb..3fd68eba 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js
@@ -11,7 +11,7 @@ export const condition = [
conditionType: "SELECT",
domkey: ["dimType"],
fieldcol: 14,
- label: getLabel(111, "维度类型"),
+ label: getLabel(389137, "维度类型"),
labelcol: 6,
options: [],
detailtype: 3,
@@ -23,7 +23,7 @@ export const condition = [
conditionType: "SELECT",
domkey: ["setting4Qualitative"],
fieldcol: 14,
- label: getLabel(111, "统计维度"),
+ label: getLabel(506800, "统计维度"),
labelcol: 6,
options: [],
rules: "required|string",
@@ -34,7 +34,7 @@ export const condition = [
conditionType: "INPUT",
domkey: ["dimName"],
fieldcol: 14,
- label: getLabel(111, "统计维度名称"),
+ label: getLabel(543321, "统计维度名称"),
labelcol: 6,
value: "",
rules: "required|string",
@@ -45,7 +45,7 @@ export const condition = [
conditionType: "SELECT",
domkey: ["dimCode"],
fieldcol: 14,
- label: getLabel(111, "分组所属字段"),
+ label: getLabel(543322, "分组所属字段"),
labelcol: 6,
options: [],
viewAttr: 2,
@@ -57,13 +57,13 @@ export const condition = [
conditionType: "TEXTAREA",
domkey: ["remark"],
fieldcol: 14,
- label: getLabel(111, "描述"),
+ label: getLabel(433, "描述"),
labelcol: 6,
value: "",
viewAttr: 2
}
],
- title: getLabel(111, "基础设置"),
+ title: getLabel(82751, "基础设置"),
defaultshow: true
}
];
@@ -75,7 +75,7 @@ export const reportCondition = [
conditionType: "INPUT",
domkey: ["reportName"],
fieldcol: 14,
- label: getLabel(111, "报表名称"),
+ label: getLabel(15517, "报表名称"),
labelcol: 6,
value: "",
rules: "required|string",
@@ -86,7 +86,7 @@ export const reportCondition = [
conditionType: "SELECT",
domkey: ["dimensionIds"],
fieldcol: 14,
- label: getLabel(111, "统计维度"),
+ label: getLabel(506800, "统计维度"),
labelcol: 6,
options: [],
rules: "required|string",
diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/dimensionSlide.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/dimensionSlide.js
index b7bd9c2e..8afc64d6 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/dimensionSlide.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/dimensionSlide.js
@@ -89,8 +89,8 @@ class DimensionSlide extends Component {
if (dimType === "QUALITATIVE") {
if (!setting4Qualitative || !extraParams.dimName) {
Modal.warning({
- title: getLabel(111, "信息确认"),
- content: getLabel(111, "必要信息不完整，红色*为必填项！")
+ title: getLabel(131329, "信息确认"),
+ content: getLabel(383779, "必要信息不完整，红色*为必填项！")
});
return;
}
@@ -100,8 +100,8 @@ class DimensionSlide extends Component {
} else {
if (!extraParams.dimName) {
Modal.warning({
- title: getLabel(111, "信息确认"),
- content: getLabel(111, "必要信息不完整，红色*为必填项！")
+ title: getLabel(131329, "信息确认"),
+ content: getLabel(383779, "必要信息不完整，红色*为必填项！")
});
return;
}
@@ -109,7 +109,7 @@ class DimensionSlide extends Component {
const { setting4RationGroupSpacing } = this.state;
const bool = _.every(setting4RationGroupSpacing, it => it.startValue !== "" && it.endValue !== "" && it.startValue <= it.endValue);
if (_.isEmpty(setting4RationGroupSpacing) || !bool) {
- message.warning(getLabel(111, "请完善分组设置相关数据!分组设置不能为空，起始值结束值必填，且起始值需小于结束值！"));
+ message.warning(getLabel(543318, "请完善分组设置相关数据!分组设置不能为空，起始值结束值必填，且起始值需小于结束值！"));
return;
} else {
payload = {
@@ -127,7 +127,7 @@ class DimensionSlide extends Component {
const { setting4RationGroupIndividual } = this.state;
const bool = _.every(setting4RationGroupIndividual, it => it.value !== "");
if (_.isEmpty(setting4RationGroupIndividual) || !bool) {
- message.warning(getLabel(111, "请完善分组设置相关数据!分组设置不能为空,且数值必填"));
+ message.warning(getLabel(543319, "请完善分组设置相关数据!分组设置不能为空,且数值必填"));
return;
} else {
payload = {
@@ -141,11 +141,11 @@ class DimensionSlide extends Component {
dimensionSave(payload).then(({ status, errormsg }) => {
this.setState({ loading: false });
if (status) {
- message.success(getLabel(111, "保存成功"));
+ message.success(getLabel(22619, "保存成功"));
onCancel(true);
this.props.form.resetForm();
} else {
- message.error(errormsg || getLabel(111, "保存失败"));
+ message.error(errormsg || getLabel(22620, "保存失败"));
}
}).catch(() => this.setState({ loading: false }));
};
@@ -176,15 +176,15 @@ class DimensionSlide extends Component {
className="dimensionSlideWrapper"
title={
+
{
dimType === "RATION_GROUP_SPACING" &&
{
Modal.confirm({
- title: getLabel(111, "信息确认"),
- content: getLabel(111, "确认要删除吗?"),
+ title: getLabel(131329, "信息确认"),
+ content: getLabel(388758, "确认要删除吗?"),
onOk: () => {
dimensionDelete(payload).then(({ status, errormsg }) => {
if (status) {
- message.success(getLabel(111, "删除成功"));
+ message.success(getLabel(502230, "删除成功"));
this.dimensionList();
} else {
- message.error(errormsg || getLabel(111, "删除失败"));
+ message.error(errormsg || getLabel(20462, "删除失败"));
}
});
}
@@ -67,7 +67,7 @@ class DimensionTable extends Component {
const { onEdit } = this.props;
const pagination = {
...pageInfo,
- showTotal: total => `${getLabel(111, "共")} ${total} ${getLabel(111, "条")}`,
+ showTotal: total => `${getLabel(18609, "共")} ${total} ${getLabel(18256, "条")}`,
showQuickJumper: true,
showSizeChanger: true,
pageSizeOptions: ["10", "20", "50", "100"],
@@ -83,22 +83,22 @@ class DimensionTable extends Component {
}
};
const columns = [
- { dataIndex: "dimName", title: getLabel(111, "统计维度") },
- { dataIndex: "remark", title: getLabel(111, "描述") },
- { dataIndex: "dimType", title: getLabel(111, "维度类型") },
+ { dataIndex: "dimName", title: getLabel(506800, "统计维度") },
+ { dataIndex: "remark", title: getLabel(433, "描述") },
+ { dataIndex: "dimType", title: getLabel(389137, "维度类型") },
{
- dataIndex: "operate", title: getLabel(111, "操作"),
+ dataIndex: "operate", title: getLabel(30585, "操作"),
render: (_, record) => {
return (
{
record.canEdit &&
- onEdit(record.id)}>{getLabel(111, "编辑")}
+ onEdit(record.id)}>{getLabel(501169, "编辑")}
}
{
record.canDelete &&
this.dimensionDelete([record.id])}>{getLabel(111, "删除")}
+ onClick={() => this.dimensionDelete([record.id])}>{getLabel(535052, "删除")}
}
);
diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/employeeDetails.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/employeeDetails.js
index dc89547d..bbc6d643 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/employeeDetails.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/employeeDetails.js
@@ -55,7 +55,7 @@ class EmployeeDetails extends Component {
width: 80,
render: (_, record) => {
return {getLabel(111, "查看")};
+ href={`${window.location.origin}/spa/hrmSalary/static/index.html#/main/hrmSalary/analysisOfSalaryStatistics/${record.id}?name=${record.name}&dept=${record.department || ""}`}>{getLabel(33564, "查看")};
}
}]
});
@@ -67,7 +67,7 @@ class EmployeeDetails extends Component {
const { dataSource, loading, columns, pageInfo } = this.state;
const pagination = {
...pageInfo,
- showTotal: total => `${getLabel(111, "共")} ${total} ${getLabel(111, "条")}`,
+ showTotal: total => `${getLabel(18609, "共")} ${total} ${getLabel(18256, "条")}`,
showQuickJumper: true,
showSizeChanger: true,
pageSizeOptions: ["10", "20", "50", "100"],
diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/groupIndividualEditTable.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/groupIndividualEditTable.js
index 1d709bc6..50b864b5 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/groupIndividualEditTable.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/groupIndividualEditTable.js
@@ -32,7 +32,7 @@ class GroupIndividualEditTable extends Component {
const { dataSource } = this.state;
const columns = [
{
- title: getLabel(111, "分组设置值"),
+ title: getLabel(543320, "分组设置值"),
dataIndex: "value",
key: "value",
com: [
diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/groupSpacingEditTable.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/groupSpacingEditTable.js
index c976cd93..3cb29022 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/groupSpacingEditTable.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/groupSpacingEditTable.js
@@ -39,7 +39,7 @@ class GroupSpacingEditTable extends Component {
const { dataSource } = this.state;
const columns = [
{
- title: getLabel(111, "起始值"),
+ title: getLabel(541412, "起始值"),
dataIndex: "startValue",
key: "startValue",
com: [
@@ -47,19 +47,19 @@ class GroupSpacingEditTable extends Component {
]
},
{
- title: getLabel(111, "含"),
+ title: getLabel(33864, "含"),
dataIndex: "includeStart",
key: "includeStart",
com: [
{
type: "CHECKBOX",
key: "includeStart",
- otherParams: { content: getLabel(111, "含") }
+ otherParams: { content: getLabel(33864, "含") }
}
]
},
{
- title: getLabel(111, "至"),
+ title: getLabel(15322, "至"),
dataIndex: "to",
key: "to",
com: [
@@ -67,7 +67,7 @@ class GroupSpacingEditTable extends Component {
]
},
{
- title: getLabel(111, "结束值"),
+ title: getLabel(508931, "结束值"),
dataIndex: "endValue",
key: "endValue",
com: [
@@ -75,14 +75,14 @@ class GroupSpacingEditTable extends Component {
]
},
{
- title: getLabel(111, "含"),
+ title: getLabel(33864, "含"),
dataIndex: "includeEnd",
key: "includeEnd",
com: [
{
type: "CHECKBOX",
key: "includeEnd",
- otherParams: { content: getLabel(111, "含") }
+ otherParams: { content: getLabel(33864, "含") }
}
]
}
@@ -90,7 +90,7 @@ class GroupSpacingEditTable extends Component {
return (
({ ...item, to: getLabel(111, "至") }))}
+ datas={_.map(dataSource, item => ({ ...item, to: getLabel(15322, "至") }))}
showCopy={false} onChange={this.handleChangeTableData}
/>
);
diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js
index 6510d5b1..0345cad3 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js
@@ -34,16 +34,16 @@ class ReportList extends Component {
};
reportStatisticsReportDelete = (payload) => {
Modal.confirm({
- title: getLabel(111, "信息确认"),
- content: getLabel(111, "确认删除本条数据吗?"),
+ title: getLabel(131329, "信息确认"),
+ content: getLabel(543231, "确认删除本条数据吗?"),
onOk: () => {
const { reportName = "" } = this.props;
reportStatisticsReportDelete(payload).then(({ status, errormsg }) => {
if (status) {
- message.success(getLabel(111, "删除成功"));
+ message.success(getLabel(502230, "删除成功"));
this.reportStatisticsReportList({ reportName });
} else {
- message.error(errormsg || getLabel(111, "删除失败"));
+ message.error(errormsg || getLabel(20462, "删除失败"));
}
});
}
@@ -71,7 +71,7 @@ class ReportList extends Component {
return (
{
- _.isEmpty(dataSource) ? this.handleOptsClick(e, id, dimensionId)}>
- {getLabel(111, "编辑")}
- {getLabel(111, "删除")}
+ {getLabel(501169, "编辑")}
+ {getLabel(535052, "删除")}
}>
diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/statisticsModal.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/statisticsModal.js
index c8920887..75595c3e 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/statisticsModal.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/statisticsModal.js
@@ -31,15 +31,15 @@ class StatisticsModal extends Component {
this.setState({ loading: false });
if (status) {
onCancel(true);
- message.success(getLabel(111, "保存成功"));
+ message.success(getLabel(22619, "保存成功"));
form.resetForm();
} else {
- message.error(errormsg || getLabel(111, "保存失败"));
+ message.error(errormsg || getLabel(22620, "保存失败"));
}
}).catch(() => this.setState({ loading: false }));
} else {
Modal.warning({
- title: getLabel(111, "信息确认"),
+ title: getLabel(131329, "信息确认"),
content: getLabel(111, "必要信息不完整，红色*为必填项！")
});
}
diff --git a/pc4mobx/hrmSalary/pages/intelligentCalculateSalarySettings/components/enableSettings.js b/pc4mobx/hrmSalary/pages/intelligentCalculateSalarySettings/components/enableSettings.js
index bc24c71b..ed849754 100644
--- a/pc4mobx/hrmSalary/pages/intelligentCalculateSalarySettings/components/enableSettings.js
+++ b/pc4mobx/hrmSalary/pages/intelligentCalculateSalarySettings/components/enableSettings.js
@@ -5,9 +5,14 @@
* Date: 2023/7/19
*/
import React, { Component } from "react";
-import { Button, Col, Input, Modal, Row } from "antd";
+import { Button, Col, Input, message, Modal, Row } from "antd";
import TipLabel from "../../../components/TipLabel";
import { WeaCheckbox, WeaFormItem, WeaLocaleProvider, WeaSearchGroup } from "ecCom";
+import {
+ apiflowBillingConfigEnable,
+ apiflowBillingConfigGet,
+ apiflowBillingConfigSave
+} from "../../../apis/intelligentCalculateSalarySettings";
import "./index.less";
const getLabel = WeaLocaleProvider.getLabel;
@@ -16,45 +21,94 @@ class EnableSettings extends Component {
constructor(props) {
super(props);
this.state = {
- enable: "1"
+ enable: "1", id: "",
+ appKey: "", appSecret: "",
+ loading: false
};
}
+ componentDidMount() {
+ this.apiflowBillingConfigGet();
+ }
+
+ apiflowBillingConfigGet = () => {
+ apiflowBillingConfigGet().then(({ status, data }) => {
+ if (status) {
+ const { id, appKey, appSecret, enable } = data;
+ this.setState({
+ appKey, appSecret, enable: enable ? "1" : "0", id
+ });
+ }
+ });
+ };
+ apiflowBillingConfigEnable = (enable) => {
+ apiflowBillingConfigEnable({ enable }).then(({ status, errormsg }) => {
+ if (status) {
+ message.success(enable === "OFF" ? getLabel(111, "关闭成功！") : getLabel(111, "开启成功！"));
+ enable === "OFF" && this.setState({ enable: "0" });
+ } else {
+ message.error(errormsg || (enable === "OFF" ? getLabel(111, "关闭失败！") : getLabel(111, "开启失败！")));
+ this.setState({ enable: this.state.enable });
+ }
+ });
+ };
+ apiflowBillingConfigSave = () => {
+ const { enable, id, appKey, appSecret } = this.state;
+ const payload = {
+ id, appKey, appSecret,
+ enable: enable === "1" ? "ON" : "OFF"
+ };
+ this.setState({ loading: true });
+ apiflowBillingConfigSave(payload).then(({ status, errormsg }) => {
+ this.setState({ loading: false });
+ if (status) {
+ message.success(getLabel(384521, "设置成功！"));
+ } else {
+ message.error(errormsg || getLabel(384522, "设置失败！"));
+ }
+ }).catch(() => this.setState({ loading: false }));
+ };
handleEnale = (enable) => {
if (enable === "1") {
- this.setState({ enable });
+ this.setState({ enable }, () => this.apiflowBillingConfigEnable("ON"));
} else {
Modal.confirm({
title: getLabel(131329, "信息确认"),
- content: getLabel(111, "确定要关闭智能算薪功能吗？关闭后，将无法使用在线报送人员信息、在线获取专项附加扣除数据、在线个税申报等功能！"),
- onOk: () => {
- },
+ content: getLabel(544344, "确定要关闭智能算薪功能吗？关闭后，将无法使用在线报送人员信息、在线获取专项附加扣除数据、在线个税申报等功能！"),
+ onOk: () => this.apiflowBillingConfigEnable("OFF"),
onCancel: () => {
this.setState({ enable: this.state.enable });
}
});
}
};
+ handleChangeInput = (key, val) => this.setState({ [key]: val });
render() {
- const { enable } = this.state;
+ const { enable, appKey, appSecret, loading } = this.state;
const tipList = [
- getLabel(111, "1、智能算薪默认是开启的，若购买了智能算薪，请先配置账号密码，在购买的流量足够的前提下即可正常使用；"),
- getLabel(111, "2、您可在【接口流量统计】中查看接口流量使用情况；"),
- getLabel(111, "3、您可以设置【流量不足提醒】，提前提醒可以避免次月要用时因流量不足无法使用的情况。"),
- getLabel(111, "4、如您需了解您购买的流量的使用明细，可查看【流量使用记录】；")
+ getLabel(544282, "1、智能算薪默认是开启的，若购买了智能算薪，请先配置账号密码，在购买的流量足够的前提下即可正常使用；"),
+ getLabel(544283, "2、您可在【接口流量统计】中查看接口流量使用情况；"),
+ getLabel(544284, "3、您可以设置【流量不足提醒】，提前提醒可以避免次月要用时因流量不足无法使用的情况。"),
+ getLabel(544285, "4、如您需了解您购买的流量的使用明细，可查看【流量使用记录】；")
];
const InputAccount = label => {
return (
-
+ this.handleChangeInput("appKey", e.target.value)}
+ />
);
};
const InputPassword = label => {
return (
-
+ this.handleChangeInput("appSecret", e.target.value)}
+ />
);
};
@@ -74,12 +128,15 @@ class EnableSettings extends Component {
-
+
-
+
this.setState({ remind })}/>
{
remind === "1" &&
Date: Wed, 9 Aug 2023 15:02:27 +0800
Subject: [PATCH 016/165] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E5=AF=B9=E6=8E=A5e1?=
=?UTF-8?q?0=E4=B8=AA=E7=A8=8E=E6=89=A3=E7=BC=B4=E4=B9=89=E5=8A=A1?=
=?UTF-8?q?=E4=BA=BA=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../intelligentCalculateSalarySettings.js | 4 +++
pc4mobx/hrmSalary/apis/taxAgent.js | 16 ++++-----
.../pages/salary/components/constants.js | 35 +++++++++++++------
.../pages/salary/components/taxAgentSlide.js | 18 +++++-----
.../salary/components/taxDeclarationInfo.js | 35 +++++++++++--------
pc4mobx/hrmSalary/pages/salary/taxAgent.js | 15 +++++---
6 files changed, 74 insertions(+), 49 deletions(-)
diff --git a/pc4mobx/hrmSalary/apis/intelligentCalculateSalarySettings.js b/pc4mobx/hrmSalary/apis/intelligentCalculateSalarySettings.js
index 9ce1d575..d545b9bb 100644
--- a/pc4mobx/hrmSalary/apis/intelligentCalculateSalarySettings.js
+++ b/pc4mobx/hrmSalary/apis/intelligentCalculateSalarySettings.js
@@ -5,6 +5,10 @@ import { postFetch } from "../util/request";
export const apiflowBillingConfigGet = (params) => {
return WeaTools.callApi("/api/bs/hrmsalary/taxdeclaration/apiflow/billing/config/get", "GET", params);
};
+//智能算薪-查询计费配置开关状态
+export const apiflowBillingConfigStatus = (params) => {
+ return WeaTools.callApi("/api/bs/hrmsalary/taxdeclaration/apiflow/billing/config/status", "GET", params);
+};
//智能算薪-计费配置保存
export const apiflowBillingConfigSave = (params) => {
return postFetch("/api/bs/hrmsalary/taxdeclaration/apiflow/billing/config/save", params);
diff --git a/pc4mobx/hrmSalary/apis/taxAgent.js b/pc4mobx/hrmSalary/apis/taxAgent.js
index 3ca3a72d..38852581 100644
--- a/pc4mobx/hrmSalary/apis/taxAgent.js
+++ b/pc4mobx/hrmSalary/apis/taxAgent.js
@@ -1,5 +1,5 @@
import { WeaTools } from "ecCom";
-import { formPost, postFetch } from "../util/request";
+import { postFetch } from "../util/request";
//个税扣缴义务人列表
export const getTaxAgentList = (params) => {
@@ -7,9 +7,9 @@ export const getTaxAgentList = (params) => {
method: "POST",
mode: "cors",
headers: {
- "Content-Type": "application/json",
+ "Content-Type": "application/json"
},
- body: JSON.stringify(params),
+ body: JSON.stringify(params)
}).then((res) => res.json());
};
//同步人员范围
@@ -18,9 +18,9 @@ export const taxAgentRangeSync = (params) => {
method: "POST",
mode: "cors",
headers: {
- "Content-Type": "application/json",
+ "Content-Type": "application/json"
},
- body: JSON.stringify(params),
+ body: JSON.stringify(params)
}).then((res) => res.json());
};
@@ -122,9 +122,5 @@ export const hasIconInTax = (params) => {
};
//获取报税信息表单
export const taxReturnGetForm = (params) => {
- return WeaTools.callApi(
- "/api/bs/hrmsalary/taxReturn/getForm",
- "GET",
- params
- );
+ return WeaTools.callApi("/api/bs/hrmsalary/taxReturn/getForm", "GET", params);
};
diff --git a/pc4mobx/hrmSalary/pages/salary/components/constants.js b/pc4mobx/hrmSalary/pages/salary/components/constants.js
index 0d0eede3..5e4fc6c7 100644
--- a/pc4mobx/hrmSalary/pages/salary/components/constants.js
+++ b/pc4mobx/hrmSalary/pages/salary/components/constants.js
@@ -2,58 +2,68 @@ export const fieldList = [
{
key: "name",
label: "名称",
+ lanId: 33439,
type: "TEXT",
viewAttr: 1
},
{
- key: "dutyParagraph",
+ key: "taxCode",
label: "税号",
+ lanId: 111,
type: "TEXT",
viewAttr: 3
},
{
- key: "taxDeclarationRegion",
+ key: "city",
label: "报税所属区域",
+ lanId: 111,
type: "SELECT",
viewAttr: 3
},
{
- key: "areaNumber",
+ key: "areaCode",
label: "行政区划代码",
+ lanId: 111,
type: "TEXT",
viewAttr: 3
},
{
- key: "passwordVerifyType",
+ key: "passwordType",
label: "密码校验类型",
+ lanId: 111,
type: "RADIO",
viewAttr: 3,
options: [
{
- key: "0",
- showname: "个税网报密码"
+ key: "TAX_NET_PASSWORD",
+ showname: "个税网报密码",
+ lanId: 111,
},
{
- key: "2",
- showname: "实名账号密码"
+ key: "REAL_NAME_PASSWORD",
+ showname: "实名账号密码",
+ lanId: 111,
}
]
},
{
- key: "realNameAccount",
+ key: "account",
label: "实名账号",
+ lanId: 111,
type: "TEXT",
viewAttr: 3
},
{
- key: "realNameAccountPassword",
+ key: "realNamePassword",
label: "实名账号密码",
+ lanId: 111,
type: "PASSWORD",
viewAttr: 3
},
{
- key: "taxOnlinePassword",
+ key: "netPassword",
label: "个税网报密码",
+ lanId: 111,
type: "PASSWORD",
viewAttr: 3
},
@@ -61,17 +71,20 @@ export const fieldList = [
key: "registrationNo",
label: "登记序号",
type: "TEXT",
+ lanId: 111,
viewAttr: 1
},
{
key: "departmentCode",
label: "部门编码",
+ lanId: 111,
type: "TEXT",
viewAttr: 1
},
{
key: "taxInforVerifiyStatus",
label: "报税信息验证状态",
+ lanId: 111,
type: "TEXT",
viewAttr: 1
}
diff --git a/pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js b/pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js
index e80e33e4..f760a72d 100644
--- a/pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js
+++ b/pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js
@@ -18,11 +18,6 @@ import "./index.less";
const { getLabel } = WeaLocaleProvider;
const Step = WeaSteps.Step;
-const tabs = [
- { key: 0, title: getLabel(82751, "基础设置") },
- { key: 1, title: getLabel(111, "报税信息") },
- { key: 2, title: getLabel(124810, "人员范围") }
-];
@inject("taxAgentStore")
@observer
@@ -74,7 +69,7 @@ class TaxAgentSlide extends Component {
* Date: 2022/12/1
*/
saveTaxAgent = (payload) => {
- const { onOk } = this.props;
+ const { onOk, salaryOn } = this.props;
const { current } = this.state;
this.setState({ loading: true });
API.saveTaxAgent(payload).then(({ status, data, errormsg }) => {
@@ -82,7 +77,7 @@ class TaxAgentSlide extends Component {
if (status) {
message.success(getLabel(22619, "保存成功"));
this.setState({
- current: true ? current + 2 : current + 1,
+ current: !salaryOn ? current + 2 : current + 1,
taxAgentId: data
}, () => onOk());
} else {
@@ -189,9 +184,14 @@ class TaxAgentSlide extends Component {
};
render() {
- const { isEdit, title, visible, onCancel, taxAgentStore: { showOperateBtn } } = this.props;
+ const tabs = [
+ { key: 0, title: getLabel(82751, "基础设置") },
+ { key: 1, title: getLabel(544342, "报税信息") },
+ { key: 2, title: getLabel(124810, "人员范围") }
+ ];
+ const { isEdit, title, visible, onCancel, salaryOn, taxAgentStore: { showOperateBtn } } = this.props;
const { current, taxAgentId } = this.state;
- const tabData = true && _.filter(tabs, it => it.key !== 1);
+ const tabData = !salaryOn ? _.filter(tabs, it => it.key !== 1) : tabs;
return (
it.key !== "realNameAccount" && it.key !== "realNameAccountPassword")
+ fieldItem: _.filter(_.map(fieldList, item => ({
+ ...item,
+ label: getLabel(item.lanId, item.label)
+ })), it => it.key !== "account" && it.key !== "realNamePassword")
}, () => {
this.taxReturnGetForm();
});
@@ -52,14 +57,14 @@ class TaxDeclarationInfo extends Component {
[key]: value
}
}, () => {
- if (key === "passwordVerifyType" && this.state.fieldForm.passwordVerifyType === "2") {
+ if (key === "passwordType" && this.state.fieldForm.passwordType === "REAL_NAME_PASSWORD") {
this.setState({
- fieldItem: _.filter(fieldList, it => it.key !== "taxOnlinePassword"),
+ fieldItem: _.filter(fieldList, it => it.key !== "netPassword"),
fieldForm: { ...this.state.fieldForm, realNameAccount: "", realNameAccountPassword: "" }
});
- } else if (key === "passwordVerifyType" && this.state.fieldForm.passwordVerifyType === "0") {
+ } else if (key === "passwordType" && this.state.fieldForm.passwordType === "TAX_NET_PASSWORD") {
this.setState({
- fieldItem: _.filter(fieldList, it => it.key !== "realNameAccount" && it.key !== "realNameAccountPassword"),
+ fieldItem: _.filter(fieldList, it => it.key !== "account" && it.key !== "realNamePassword"),
fieldForm: { ...this.state.fieldForm, taxOnlinePassword: "" }
});
}
@@ -87,7 +92,9 @@ class TaxDeclarationInfo extends Component {
}
{
type === "RADIO" &&
- ({ ...it, showname: getLabel(it.lanId, it.showname) }))}
+ viewAttr={viewAttr}
onChange={(v) => this.handleChangeValue(key, v)}/>
}
;
diff --git a/pc4mobx/hrmSalary/pages/salary/taxAgent.js b/pc4mobx/hrmSalary/pages/salary/taxAgent.js
index 3c611e6f..4cd931fc 100644
--- a/pc4mobx/hrmSalary/pages/salary/taxAgent.js
+++ b/pc4mobx/hrmSalary/pages/salary/taxAgent.js
@@ -2,6 +2,7 @@ import React, { Component } from "react";
import { inject, observer } from "mobx-react";
import { Button, message, Modal } from "antd";
import { WeaCheckbox, WeaFormItem, WeaInputSearch, WeaLocaleProvider, WeaSearchGroup, WeaTop } from "ecCom";
+import { apiflowBillingConfigStatus } from "../../apis/intelligentCalculateSalarySettings";
import ComHint from "./components/comHint";
import TaxAgentTable from "./components/taxAgentTable";
import TaxAgentSlide from "./components/taxAgentSlide";
@@ -21,11 +22,8 @@ class TaxAgent extends Component {
decentralization: "0", //启用分权
permission: {},
taxAgentSlideProps: {
- isEdit: false,
- visible: false,
- title: getLabel(543629, "新增个税扣缴义务人"),
- taxAgentId: "",
- current: 0
+ isEdit: false, visible: false, title: getLabel(543629, "新增个税扣缴义务人"),
+ taxAgentId: "", current: 0, salaryOn: true
}
};
this.taxAgentTableRef = null;
@@ -34,6 +32,7 @@ class TaxAgent extends Component {
componentDidMount() {
this.getTaxAgentBaseForm();
this.getPermission();
+ this.apiflowBillingConfigStatus();
}
getTaxAgentBaseForm = () => {
@@ -52,6 +51,12 @@ class TaxAgent extends Component {
}
});
};
+ apiflowBillingConfigStatus = () => {
+ const { taxAgentSlideProps } = this.state;
+ apiflowBillingConfigStatus().then(({ status, data }) => {
+ if (status) this.setState({ taxAgentSlideProps: { ...taxAgentSlideProps, salaryOn: data } });
+ });
+ };
/*
* Author: 黎永顺
* Description:开启关闭个税扣缴义务人开关
From d41687c3fb64fc80373c99b7eed4bad3a3a0f351 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 10 Aug 2023 10:22:16 +0800
Subject: [PATCH 017/165] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E4=B8=AA=E7=A8=8E?=
=?UTF-8?q?=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pc4mobx/hrmSalary/apis/taxAgent.js | 7 +++++-
.../pages/salary/components/taxAgentSlide.js | 21 +++++++++++++++--
.../salary/components/taxDeclarationInfo.js | 23 ++++++++++++++++---
3 files changed, 45 insertions(+), 6 deletions(-)
diff --git a/pc4mobx/hrmSalary/apis/taxAgent.js b/pc4mobx/hrmSalary/apis/taxAgent.js
index 38852581..f22de23d 100644
--- a/pc4mobx/hrmSalary/apis/taxAgent.js
+++ b/pc4mobx/hrmSalary/apis/taxAgent.js
@@ -122,5 +122,10 @@ export const hasIconInTax = (params) => {
};
//获取报税信息表单
export const taxReturnGetForm = (params) => {
- return WeaTools.callApi("/api/bs/hrmsalary/taxReturn/getForm", "GET", params);
+ return WeaTools.callApi("/api/bs/hrmsalary/taxAgent/taxReturn/getForm", "GET", params);
+};
+
+//个税信息-保存并验证报税信息
+export const saveAndCheck = (params) => {
+ return postFetch("/api/bs/hrmsalary/taxAgent/taxReturn/saveAndCheck", params);
};
diff --git a/pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js b/pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js
index f760a72d..9f49ca38 100644
--- a/pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js
+++ b/pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js
@@ -6,7 +6,7 @@
*/
import React, { Component } from "react";
import { inject, observer } from "mobx-react";
-import { Button, message } from "antd";
+import { Button, message, Modal } from "antd";
import { WeaLocaleProvider, WeaSlideModal, WeaSteps } from "ecCom";
import SlideModalTitle from "../../../components/slideModalTitle";
import { decentralizationConditions, editConditions } from "../../taxAgent/editConditions";
@@ -122,7 +122,24 @@ class TaxAgentSlide extends Component {
});
};
handleSaveAndVerify = () => {
- console.log(this.taxInfoRef);
+ const { taxAgentId } = this.state;
+ const { fieldForm, fieldItem } = this.taxInfoRef.state;
+ const { city: cityVal, ...extra } = fieldForm;
+ const boolean = _.every(_.filter(fieldItem, item => item.viewAttr === 3), it => fieldForm[it.key]);
+ if (!boolean) {
+ Modal.warning({
+ title: getLabel(131329, "信息确认"),
+ content: getLabel(518702, "必要信息不完整，红色*为必填项！")
+ });
+ return;
+ }
+ const [nation, province, city] = cityVal ? cityVal.split("-") : [];
+ // requestType: 1:保存并验证 2：保存
+ const payload = {
+ ...extra, nation, province, city,
+ taxAgentId, requestType: 1
+ };
+ console.log(_.omitBy(payload, val => _.isNil(val)));
};
renderChildren = () => {
const { current, taxAgentId } = this.state;
diff --git a/pc4mobx/hrmSalary/pages/salary/components/taxDeclarationInfo.js b/pc4mobx/hrmSalary/pages/salary/components/taxDeclarationInfo.js
index 5849e51b..cef52e95 100644
--- a/pc4mobx/hrmSalary/pages/salary/components/taxDeclarationInfo.js
+++ b/pc4mobx/hrmSalary/pages/salary/components/taxDeclarationInfo.js
@@ -45,8 +45,18 @@ class TaxDeclarationInfo extends Component {
taxReturnGetForm = () => {
const { taxAgentId } = this.props;
- taxReturnGetForm({ taxAgentId }).then((status, data) => {
- console.log(data);
+ taxReturnGetForm({ taxAgentId }).then(({ status, data }) => {
+ if (status) {
+ const { fieldForm } = this.state;
+ this.setState({
+ fieldForm: {
+ ...fieldForm,
+ ..._.reduce(_.keys(fieldForm), (pre, cur) => {
+ return { ...pre, [cur]: data[cur] };
+ }, {})
+ }
+ });
+ }
});
};
handleChangeValue = (key, value) => {
@@ -88,7 +98,14 @@ class TaxDeclarationInfo extends Component {
{
type === "SELECT" &&
this.handleChangeValue(key, v)}/>
+ onChange={(__, ___, datas) => {
+ if (!_.isEmpty(datas)) {
+ this.handleChangeValue(key, `1-${datas[0].pid}-${datas[0].id}`);
+ } else {
+ this.handleChangeValue(key, "");
+ }
+ }}
+ />
}
{
type === "RADIO" &&
From bc91806e37a9fb27fb93b9d5e96ff963b6260254 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 10 Aug 2023 11:11:23 +0800
Subject: [PATCH 018/165] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E4=B8=AA=E7=A8=8E?=
=?UTF-8?q?=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/salary/components/taxAgentSlide.js | 31 +++++++++++++------
.../salary/components/taxDeclarationInfo.js | 8 ++---
2 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js b/pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js
index 9f49ca38..b3647225 100644
--- a/pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js
+++ b/pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js
@@ -27,6 +27,7 @@ class TaxAgentSlide extends Component {
this.state = {
current: 0,
loading: false,
+ verifyLoading: false,
taxAgentId: ""
};
this.taxInfoRef = null;
@@ -121,10 +122,10 @@ class TaxAgentSlide extends Component {
}
});
};
- handleSaveAndVerify = () => {
+ handleSaveAndVerify = (jumpAll = false) => {
const { taxAgentId } = this.state;
const { fieldForm, fieldItem } = this.taxInfoRef.state;
- const { city: cityVal, ...extra } = fieldForm;
+ const { city: cityVal, netPassword, realNamePassword, ...extra } = fieldForm;
const boolean = _.every(_.filter(fieldItem, item => item.viewAttr === 3), it => fieldForm[it.key]);
if (!boolean) {
Modal.warning({
@@ -137,9 +138,18 @@ class TaxAgentSlide extends Component {
// requestType: 1:保存并验证 2：保存
const payload = {
...extra, nation, province, city,
- taxAgentId, requestType: 1
+ taxAgentId, requestType: 1, password: netPassword || realNamePassword
};
- console.log(_.omitBy(payload, val => _.isNil(val)));
+ this.setState({ verifyLoading: true });
+ API.saveAndCheck(_.omitBy(payload, val => _.isNil(val))).then(({ status, errormsg }) => {
+ this.setState({ verifyLoading: false });
+ if (status) {
+ message.error(errormsg || getLabel(22619, "保存成功！"));
+ jumpAll ? this.props.onCancel(true) : this.props.onOk();
+ } else {
+ message.error(errormsg || getLabel(22620, "保存失败！"));
+ }
+ }).catch(() => this.setState({ verifyLoading: false }));
};
renderChildren = () => {
const { current, taxAgentId } = this.state;
@@ -162,8 +172,8 @@ class TaxAgentSlide extends Component {
return CurrentDom;
};
renderCustomOperate = () => {
- const { isChief, isEdit } = this.props;
- const { current, loading } = this.state;
+ const { isChief, isEdit, salaryOn } = this.props;
+ const { current, loading, verifyLoading } = this.state;
let CurrentDom = [];
//总管理员权限
if (isChief) {
@@ -175,17 +185,18 @@ class TaxAgentSlide extends Component {
];
break;
case 1:
- const tmpV = [];
+ const tmpV = [];
const tmpJ = [
- ,
+ ,
];
CurrentDom = isEdit ? tmpV : [...tmpV, ...tmpJ];
break;
case 2:
- CurrentDom = (!isEdit && false) ?
+ CurrentDom = (!isEdit && salaryOn) ?
[]
: [];
diff --git a/pc4mobx/hrmSalary/pages/salary/components/taxDeclarationInfo.js b/pc4mobx/hrmSalary/pages/salary/components/taxDeclarationInfo.js
index cef52e95..708bf93a 100644
--- a/pc4mobx/hrmSalary/pages/salary/components/taxDeclarationInfo.js
+++ b/pc4mobx/hrmSalary/pages/salary/components/taxDeclarationInfo.js
@@ -19,11 +19,11 @@ class TaxDeclarationInfo extends Component {
name: "",
taxCode: "",
city: "",
- areaCode: "",
+ areaCode: null,
passwordType: "TAX_NET_PASSWORD",
account: "",
realNamePassword: "",
- netPassword: "",
+ netPassword: null,
registrationNo: "",
departmentCode: "",
taxInforVerifiyStatus: ""
@@ -70,12 +70,12 @@ class TaxDeclarationInfo extends Component {
if (key === "passwordType" && this.state.fieldForm.passwordType === "REAL_NAME_PASSWORD") {
this.setState({
fieldItem: _.filter(fieldList, it => it.key !== "netPassword"),
- fieldForm: { ...this.state.fieldForm, realNameAccount: "", realNameAccountPassword: "" }
+ fieldForm: { ...this.state.fieldForm, account: null, realNamePassword: null, netPassword: null }
});
} else if (key === "passwordType" && this.state.fieldForm.passwordType === "TAX_NET_PASSWORD") {
this.setState({
fieldItem: _.filter(fieldList, it => it.key !== "account" && it.key !== "realNamePassword"),
- fieldForm: { ...this.state.fieldForm, taxOnlinePassword: "" }
+ fieldForm: { ...this.state.fieldForm, netPassword: null, account: null, realNamePassword: null }
});
}
});
From d43b31a5c2a4ff3c56fc68b63d73bfc708a1bb37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 10 Aug 2023 14:07:18 +0800
Subject: [PATCH 019/165] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E4=B8=AA=E7=A8=8E?=
=?UTF-8?q?=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../hrmSalary/pages/employeedeclare/index.js | 52 +++++++++++++++++--
1 file changed, 47 insertions(+), 5 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/employeedeclare/index.js b/pc4mobx/hrmSalary/pages/employeedeclare/index.js
index c43be4b3..028f5961 100644
--- a/pc4mobx/hrmSalary/pages/employeedeclare/index.js
+++ b/pc4mobx/hrmSalary/pages/employeedeclare/index.js
@@ -5,29 +5,71 @@
* Date: 2023/7/24
*/
import React, { Component } from "react";
-import { WeaInputSearch, WeaLocaleProvider, WeaTop } from "ecCom";
+import { WeaInputSearch, WeaLocaleProvider, WeaTable, WeaTop } from "ecCom";
import { Col, Row } from "antd";
import TipLabel from "../../components/TipLabel";
const { getLabel } = WeaLocaleProvider;
class Index extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ pageInfo: { current: 1, pageSize: 10, total: 0 },
+ loading: false
+ };
+ }
+
render() {
+ const { pageInfo } = this.state;
const tipList = [
- getLabel(111, "1、点击查看详情，管理各个个税扣缴义务人的人员报送信息，如购买了在线报送服务，可在线报送，如未购买在线报送服务，也可导出数据线下报送。")
+ getLabel(544290, "1、点击查看详情，管理各个个税扣缴义务人的人员报送信息，如购买了在线报送服务，可在线报送，如未购买在线报送服务，也可导出数据线下报送。")
];
return (
- ({getLabel(83110, "查看详情")})
+ }
+ ]}
+ dataSource={[]}
+ pagination={{
+ ...pageInfo,
+ showTotal: total => `${getLabel(18609, "共")} ${total} ${getLabel(18256, "条")}`,
+ showQuickJumper: true,
+ showSizeChanger: true,
+ pageSizeOptions: ["10", "20", "50", "100"],
+ onShowSizeChange: (current, pageSize) => {
+ this.setState({
+ pageInfo: { ...pageInfo, current, pageSize }
+ });
+ },
+ onChange: current => {
+ this.setState({
+ pageInfo: { ...pageInfo, current }
+ });
+ }
+ }}
+ />
+
From a2c2292e60741391b21e310b3ff03449c502466c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Fri, 11 Aug 2023 16:06:21 +0800
Subject: [PATCH 020/165] =?UTF-8?q?=E6=B1=89=E6=A1=91-=E7=A4=BE=E4=BF=9D?=
=?UTF-8?q?=E7=A6=8F=E5=88=A9=E5=8F=B0=E8=B4=A6=E6=B7=BB=E5=8A=A0=E7=A6=8F?=
=?UTF-8?q?=E5=88=A9=E5=AF=BC=E5=85=A5=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../importDialog/components/impStep1.js | 86 +++++++++++
.../importDialog/components/impStep3.js | 51 ++++++
.../components/importDialog/index.js | 135 ++++++++++++++++
.../components/importDialog/index.less | 145 ++++++++++++++++++
pc4mobx/hrmSalary/index.js | 3 +
.../pages/employeedeclareDetail/index.js | 43 ++++++
.../pages/employeedeclareDetail/index.less | 18 +++
7 files changed, 481 insertions(+)
create mode 100644 pc4mobx/hrmSalary/components/importDialog/components/impStep1.js
create mode 100644 pc4mobx/hrmSalary/components/importDialog/components/impStep3.js
create mode 100644 pc4mobx/hrmSalary/components/importDialog/index.js
create mode 100644 pc4mobx/hrmSalary/components/importDialog/index.less
create mode 100644 pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js
create mode 100644 pc4mobx/hrmSalary/pages/employeedeclareDetail/index.less
diff --git a/pc4mobx/hrmSalary/components/importDialog/components/impStep1.js b/pc4mobx/hrmSalary/components/importDialog/components/impStep1.js
new file mode 100644
index 00000000..9e24dbf5
--- /dev/null
+++ b/pc4mobx/hrmSalary/components/importDialog/components/impStep1.js
@@ -0,0 +1,86 @@
+/*
+ * Author: 黎永顺
+ * name: 导入-步骤一
+ * Description:
+ * Date: 2023/8/11
+ */
+import React, { Component } from "react";
+import { WeaLocaleProvider } from "ecCom";
+import { Icon, Upload, message } from "antd";
+
+const Dragger = Upload.Dragger;
+const { getLabel } = WeaLocaleProvider;
+
+class ImpStep1 extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ fileList: []
+ };
+ }
+
+ handleChange = (data) => {
+ const { fileList, file } = data;
+ if (file.response && typeof (file.response) != "undefined") message.success(getLabel(111, "上传成功"));
+ this.setState({ fileList });
+ };
+
+ render() {
+ const { fileList } = this.state;
+ const dragger = {
+ accept: ".xlsx",
+ name: "file",
+ multiple: false,
+ action: "/api/doc/upload/uploadFile",
+ fileList,
+ onChange: this.handleChange
+ };
+ return (
+ this.step1Ref = dom}/>;
+ break;
+ case 1:
+ CurrentDom = null;
+ if (excludeKey) {
+ CurrentDom = ;
+ }
+ break;
+ case 2:
+ CurrentDom = null;
+ break;
+ default:
+ CurrentDom = null;
+ break;
+ }
+ return CurrentDom;
+ };
+
+ /*
+ * Author: 黎永顺
+ * Description: 下一步
+ * Params:
+ * Date: 2023/8/11
+ */
+ handleNext = () => {
+ const { params } = this.props;
+ const { fileList } = this.step1Ref.state;
+ if (!_.isEmpty(params)) {
+ if (!Object.values(params).every(o => !!o)) {
+ Modal.warning({
+ title: getLabel(131329, "信息确认"),
+ content: getLabel(518702, "必要信息不完整，红色*为必填项！")
+ });
+ return;
+ }
+ }
+ if (_.isEmpty(fileList)) {
+ message.error(getLabel(111, "请先上传EXCEL文件"));
+ return;
+ }
+ const [file] = fileList;
+ const { response } = file;
+ this.props.nextCallback(response.data.fileid);
+ };
+
+ render() {
+ const { current } = this.state;
+ const stepData = [
+ { key: 0, label: getLabel(543202, "上传EXCEL") },
+ { key: 1, label: getLabel(543200, "数据预览") },
+ { key: 2, label: getLabel(502835, "导入数据") }
+ ];
+ const btns = [
+ ,
+ ,
+
+ ];
+ return (
+
+
+ );
+ }
+}
+
+export default Index;
diff --git a/pc4mobx/hrmSalary/components/importDialog/index.less b/pc4mobx/hrmSalary/components/importDialog/index.less
new file mode 100644
index 00000000..8e4dbb53
--- /dev/null
+++ b/pc4mobx/hrmSalary/components/importDialog/index.less
@@ -0,0 +1,145 @@
+.importBox {
+ .importCont {
+ padding: 16px 8px;
+
+ .weapp-batch-impsteps-picker-content-imp-steps {
+ width: 80%;
+ margin: 0 auto;
+ }
+
+ .weapp-batch-impsteps-picker {
+ margin: 16px auto;
+
+ .weapp-batch-impsteps-picker-content-imp-step1 {
+ width: 98%;
+ background-color: #fff;
+ margin: 8px auto;
+ border-radius: 3px;
+ padding: 1px 12px;
+
+ .weapp-batch-impsteps-picker-content-imp-step1 div {
+ color: #111;
+ line-height: 22px;
+ }
+
+ .weapp-salary-tb-border-bottom .weapp-salary-tb-filter.weapp-salary-import-param {
+ box-sizing: border-box;
+ padding: 16px;
+ height: auto;
+ flex-wrap: wrap;
+ width: 100%;
+ }
+
+ .weapp-salary-import-param {
+ border: 1px solid #ebedf0;
+ padding: 8px;
+ margin: 4px 0 14px;
+ }
+
+ .weapp-salary-tb-filter {
+ display: flex;
+ flex-wrap: wrap;
+ align-items: center;
+ height: 46px;
+ }
+
+ .weapp-salary-tb-border-bottom .weapp-salary-tb-filter.weapp-salary-import-param .tbf-item {
+ display: flex;
+ justify-content: flex-start !important;
+ }
+
+ .weapp-salary-tb-filter .tbf-item {
+ padding: 0 20px 0 0;
+ display: flex;
+ align-items: center;
+ font-size: 12px;
+ color: #111;
+ height: 40px;
+ }
+
+ .weapp-salary-tb-filter .tbf-item > .tbfi-label {
+ flex-basis: 100px;
+ flex-shrink: 0;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ padding-right: 10px;
+ color: #666;
+ }
+
+ .draggerUploadWrapper {
+ margin: 16px 0 0;
+
+ .ant-upload-drag-container {
+ padding: 24px 0 16px;
+
+ .iconUpload {
+ i {
+ color: #5d9cec;
+ font-size: 43px;
+ }
+ }
+
+ .uplaod-title {
+ font-size: 14px;
+ color: #333;
+ height: 24px;
+ line-height: 24px;
+ margin-top: 8px;
+ }
+
+ .uplaod-subTitle {
+ height: 22px;
+ font-size: 12px;
+ color: #666;
+ text-align: center;
+ line-height: 22px;
+ }
+ }
+ }
+
+ .bottom-border, .description {
+ margin-top: 12px;
+
+ p {
+ font-size: 12px;
+ color: #666;
+ line-height: 15px;
+ margin: 12px 0;
+ }
+ }
+
+ .bottom-border {
+ border-bottom: 1px solid #e5e5e5;
+
+ .weapp-salary-link {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ color: #5d9cec;
+ }
+ }
+
+ }
+ }
+
+ .weapp-batch-impsteps-picker-content-imp-step3 {
+ .weapp-batch-impsteps-picker-spinText {
+ position: relative;
+ height: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ flex-direction: column;
+ padding-top: 80px;
+ padding-bottom: 80px;
+ text-align: center;
+
+ p {
+ margin: 14px 0;
+ }
+ }
+ }
+
+ }
+}
diff --git a/pc4mobx/hrmSalary/index.js b/pc4mobx/hrmSalary/index.js
index 8e9ff9d6..d584c6e9 100644
--- a/pc4mobx/hrmSalary/index.js
+++ b/pc4mobx/hrmSalary/index.js
@@ -21,6 +21,7 @@ import PayrollGrant from "./pages/payroll/payrollGrant";
import PayrollDetail from "./pages/payroll/payrollDetail";
import Declare from "./pages/declare";
import Employeedeclare from "./pages/employeedeclare";
+import EmployeedeclareDetail from "./pages/employeedeclareDetail";
import TaxRate from "./pages/taxRate";
import TaxAgent from "./pages/taxAgent";
import CalculateDetail from "./pages/calculateDetail";
@@ -90,6 +91,7 @@ const DataAcquisition = (props) => props.children;
// reportView 薪酬报表查看
// externalPersonManage 非系统人员管理
// employeedeclare 人员信息报送
+// employeedeclareDetail 人员信息报送详情
const Routes = (
+
{getLabel(111, "全部报送")},
+ ,
+
+
+
+ ];
+ return (
+
+ ,
+ ,
+
];
+ const topTab = [
+ { title: getLabel(332, "全部"), viewcondition: "0" },
+ { title: getLabel(111, "本月新增"), viewcondition: "1" },
+ { title: getLabel(111, "本月信息变动"), viewcondition: "2" }
+ ];
return (
+
diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.less b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.less
index d303eded..946f67aa 100644
--- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.less
+++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.less
@@ -70,15 +70,92 @@
}
-.ant-calendar-picker-container {
- right: 0 !important;
- left: auto !important;
+//.ant-calendar-picker-container {
+// right: 0 !important;
+// left: auto !important;
+//}
+
+.wea-slide-modal-title {
+ border-bottom: 1px solid #e5e5e5 !important;
+}
+
+.wea-slide-modal-content {
+ height: 100%;
+}
+
+.declareSchemeDialogTitle {
+ border-bottom: 1px solid #e5e5e5;
+
+ .declareSchemeDialogTitle-left {
+ text-align: left;
+ padding-left: 16px;
+
+ .icon-circle-base {
+ background: rgb(241, 74, 45);
+ }
+
+ .title {
+ color: #111;
+ font-weight: 700;
+ }
+ }
+
+ .declareSchemeDialogTitle-right {
+ text-align: right;
+ padding-right: 56px;
+ }
}
.declareSchemeDialog {
height: 100%;
padding: 16px;
overflow-y: auto;
+ background: #f6f6f6;
+
+ .wea-search-group .wea-content {
+ padding: 0;
+ }
+
+ .wea-search-group {
+ border: 1px solid #e5e5e5;
+ border-bottom: none;
+ background: #fff;
+
+ .wea-form-item {
+ padding: 5px 16px;
+ border-bottom: 1px solid #e5e5e5;
+ }
+ }
+
+ .wea-search-group, .wea-form-cell {
+ padding: 0;
+ }
+}
+
+.declareCalcDialog {
+ .declareCalcDialogTitle {
+ display: flex;
+ align-items: center;
+
+ .declareCalcDialogTitle-left {
+ text-align: left;
+
+ .title {
+ color: #111;
+ font-weight: 700;
+ }
+ }
+
+ .declareCalcDialogTitle-right {
+ text-align: right;
+ }
+ }
+
+ .declareCalcDialogContent {
+ height: 100%;
+ padding: 16px;
+ background: #f6f6f6;
+ }
}
.flex {
diff --git a/pc4mobx/hrmSalary/stores/employeeDeclare.js b/pc4mobx/hrmSalary/stores/employeeDeclare.js
index 9566d8c9..d4e9961e 100644
--- a/pc4mobx/hrmSalary/stores/employeeDeclare.js
+++ b/pc4mobx/hrmSalary/stores/employeeDeclare.js
@@ -5,6 +5,7 @@ const { TableStore } = WeaTableNew;
export class EmployeeDeclareStore {
@observable advanceForm = new WeaForm(); //人员信息报送详情页面，高级搜索form实例
+ @observable declareForm = new WeaForm(); //人员信息报送详情页面，新增编辑报送信息form实例
@observable tableStore = new TableStore();
@action("...")
From c58472ad8f511816cabdf63ff8582ea7b5321106 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Wed, 16 Aug 2023 10:21:42 +0800
Subject: [PATCH 024/165] =?UTF-8?q?=E4=B8=AA=E7=A8=8E=E5=AF=B9=E6=8E=A5-?=
=?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=E6=8A=A5=E9=80=81=E8=AF=A6?=
=?UTF-8?q?=E6=83=85=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pc4mobx/hrmSalary/apis/declare.js | 150 +++++--
.../hrmSalary/pages/employeedeclare/index.js | 46 +-
.../pages/employeedeclare/index.less | 3 +
.../components/baseInfo.js | 35 +-
.../employeeDeclareDetailCalcDialog.js | 56 ++-
.../employeeDeclareDetailSchemaEditDialog.js | 190 ++++++++-
.../pages/employeedeclareDetail/constants.js | 244 +++++++++--
.../pages/employeedeclareDetail/index.js | 398 +++++++++++++++---
.../pages/employeedeclareDetail/index.less | 8 +-
.../pages/salary/components/taxAgentSlide.js | 2 +-
10 files changed, 970 insertions(+), 162 deletions(-)
create mode 100644 pc4mobx/hrmSalary/pages/employeedeclare/index.less
diff --git a/pc4mobx/hrmSalary/apis/declare.js b/pc4mobx/hrmSalary/apis/declare.js
index 360c8b62..89c47341 100644
--- a/pc4mobx/hrmSalary/apis/declare.js
+++ b/pc4mobx/hrmSalary/apis/declare.js
@@ -1,68 +1,128 @@
-import { WeaTools } from 'ecCom';
-import { postFetch } from '../util/request';
+import { WeaTools } from "ecCom";
+import { postFetch } from "../util/request";
//个税申报表-个税申报表列表
export const getDeclareList = params => {
- return fetch('/api/bs/hrmsalary/taxdeclaration/list', {
- method: 'POST',
- mode: 'cors',
- headers: {
- 'Content-Type': 'application/json'
- },
- body: JSON.stringify(params)
- }).then(res => res.json())
-}
+ return fetch("/api/bs/hrmsalary/taxdeclaration/list", {
+ method: "POST",
+ mode: "cors",
+ headers: {
+ "Content-Type": "application/json"
+ },
+ body: JSON.stringify(params)
+ }).then(res => res.json());
+};
//个税申报表-个税申报表表单
export const getDeclareForm = params => {
- return WeaTools.callApi('/api/bs/hrmsalary/taxdeclaration/getForm', 'get', params);
-}
+ return WeaTools.callApi("/api/bs/hrmsalary/taxdeclaration/getForm", "get", params);
+};
//个税申报表-个税申报表生成
export const saveDeclare = params => {
- return fetch('/api/bs/hrmsalary/taxdeclaration/save', {
- method: 'POST',
- mode: 'cors',
- headers: {
- 'Content-Type': 'application/json'
- },
- body: JSON.stringify(params)
- }).then(res => res.json())
-}
+ return fetch("/api/bs/hrmsalary/taxdeclaration/save", {
+ method: "POST",
+ mode: "cors",
+ headers: {
+ "Content-Type": "application/json"
+ },
+ body: JSON.stringify(params)
+ }).then(res => res.json());
+};
//个税申报表-个税申报表相关信息
export const getDeclareInfo = params => {
- return WeaTools.callApi('/api/bs/hrmsalary/taxdeclaration/getTaxDeclarationInfo', 'get', params);
-}
+ return WeaTools.callApi("/api/bs/hrmsalary/taxdeclaration/getTaxDeclarationInfo", "get", params);
+};
// 个税申报表详情列表
export const getDetailList = params => {
- return fetch('/api/bs/hrmsalary/taxdeclaration/detail/list', {
- method: 'POST',
- mode: 'cors',
- headers: {
- 'Content-Type': 'application/json'
- },
- body: JSON.stringify(params)
- }).then(res => res.json())
-}
+ return fetch("/api/bs/hrmsalary/taxdeclaration/detail/list", {
+ method: "POST",
+ mode: "cors",
+ headers: {
+ "Content-Type": "application/json"
+ },
+ body: JSON.stringify(params)
+ }).then(res => res.json());
+};
// 个税申报表导出
export const exportSalaryArchive = (id = "") => {
- fetch('/api/bs/hrmsalary/taxdeclaration/export?taxDeclarationId=' + id).then(res => res.blob().then(blob => {
- var filename=`个税申报表.xlsx`
- var a = document.createElement('a');
- var url = window.URL.createObjectURL(blob);
- a.href = url;
- a.download = filename;
- a.click();
- window.URL.revokeObjectURL(url);
- }))
-}
+ fetch("/api/bs/hrmsalary/taxdeclaration/export?taxDeclarationId=" + id).then(res => res.blob().then(blob => {
+ var filename = `个税申报表.xlsx`;
+ var a = document.createElement("a");
+ var url = window.URL.createObjectURL(blob);
+ a.href = url;
+ a.download = filename;
+ a.click();
+ window.URL.revokeObjectURL(url);
+ }));
+};
//个税申报表-撤回申报
export const withDrawTaxDeclaration = (params) => {
- return postFetch('/api/bs/hrmsalary/taxdeclaration/withDrawTaxDeclaration', params);
-}
+ return postFetch("/api/bs/hrmsalary/taxdeclaration/withDrawTaxDeclaration", params);
+};
+//人员信息报送-个税扣缴义务人列表
+export const taxAgentDeclareList = (params) => {
+ return postFetch("/api/bs/hrmsalary/employeedeclare/taxAgentDeclareList", params);
+};
+//人员信息报送-全部人员列表
+export const employeedeclareList = (params) => {
+ return postFetch("/api/bs/hrmsalary/employeedeclare/list", params);
+};
+//人员信息报送-本月新增人员列表
+export const employeedeclareList4Add = (params) => {
+ return postFetch("/api/bs/hrmsalary/employeedeclare/list4Add", params);
+};
+//人员信息报送-本月信息变动列表
+export const employeedeclareList4Update = (params) => {
+ return postFetch("/api/bs/hrmsalary/employeedeclare/list4Update", params);
+};
+//人员信息报送-本月报送失败人员列表
+export const employeedeclareList4Fail = (params) => {
+ return postFetch("/api/bs/hrmsalary/employeedeclare/list4Fail", params);
+};
+
+//人员报送-刷新数据
+export const employeedeclareRefresh = (params) => {
+ return postFetch("/api/bs/hrmsalary/employeedeclare/refresh", params);
+};
+
+//人员报送-获取报送结果反馈
+export const getDeclareFeedback = (params) => {
+ return postFetch("/api/bs/hrmsalary/employeedeclare/getDeclareFeedback", params);
+};
+
+//人员报送-获取整体的报送情况
+export const getEmployeeDeclareInfo = (params) => {
+ return postFetch("/api/bs/hrmsalary/employeedeclare/getDeclareInfo", params);
+};
+
+//人员报送-后端业务逻辑是否已经完成
+export const employeedeclareGetRate = params => {
+ return WeaTools.callApi("/api/bs/hrmsalary/employeedeclare/getRate", "GET", params);
+};
+
+//人员报送-获取新建或编辑的表单
+export const employeedeclareGetForm = params => {
+ return WeaTools.callApi("/api/bs/hrmsalary/employeedeclare/getForm", "GET", params);
+};
+
+//人员报送-新增人员/编辑人员保存
+export const getEmployeeSave = (params) => {
+ return postFetch("/api/bs/hrmsalary/employeedeclare/save", params);
+};
+
+//人员报送-删除
+export const employeeDelete = (params) => {
+ return postFetch("/api/bs/hrmsalary/employeedeclare/delete", params);
+};
+
+//人员报送-全部报送
+export const employeedeclareDeclare = (params) => {
+ return postFetch("/api/bs/hrmsalary/employeedeclare/declare", params);
+};
diff --git a/pc4mobx/hrmSalary/pages/employeedeclare/index.js b/pc4mobx/hrmSalary/pages/employeedeclare/index.js
index 028f5961..deb90613 100644
--- a/pc4mobx/hrmSalary/pages/employeedeclare/index.js
+++ b/pc4mobx/hrmSalary/pages/employeedeclare/index.js
@@ -6,8 +6,11 @@
*/
import React, { Component } from "react";
import { WeaInputSearch, WeaLocaleProvider, WeaTable, WeaTop } from "ecCom";
-import { Col, Row } from "antd";
+import { Col, message, Row } from "antd";
+import { taxAgentDeclareList } from "../../apis/declare";
import TipLabel from "../../components/TipLabel";
+import "./index.less";
+
const { getLabel } = WeaLocaleProvider;
@@ -15,13 +18,35 @@ class Index extends Component {
constructor(props) {
super(props);
this.state = {
- pageInfo: { current: 1, pageSize: 10, total: 0 },
- loading: false
+ dataSource: [], loading: false, taxAgentName: "",
+ pageInfo: { current: 1, pageSize: 10, total: 0 }
};
}
+ componentDidMount() {
+ this.taxAgentDeclareList();
+ }
+
+ taxAgentDeclareList = () => {
+ const { pageInfo, taxAgentName } = this.state;
+ const payload = { ...pageInfo, taxAgentName };
+ this.setState({ loading: true });
+ taxAgentDeclareList(payload).then(({ status, data, errormsg }) => {
+ this.setState({ loading: false });
+ if (status) {
+ const { pageNum: current, pageSize, total, list: dataSource } = data;
+ this.setState({
+ pageInfo: { ...pageInfo, current, pageSize, total },
+ dataSource
+ });
+ } else {
+ message.error(errormsg);
+ }
+ }).catch(() => this.setState({ loading: false }));
+ };
+
render() {
- const { pageInfo } = this.state;
+ const { pageInfo, taxAgentName, dataSource } = this.state;
const tipList = [
getLabel(544290, "1、点击查看详情，管理各个个税扣缴义务人的人员报送信息，如购买了在线报送服务，可在线报送，如未购买在线报送服务，也可导出数据线下报送。")
];
@@ -31,6 +56,8 @@ class Index extends Component {
icon={}
buttons={[
-
{getLabel(111, "变量")}
+ {getLabel(33748, "变量")}
- this.setState({ variableText })}/>
this.setState({ variItemText })}
/>
}
@@ -166,10 +166,10 @@ class CodeAction extends Component {
:
;
diff --git a/pc4mobx/hrmSalary/components/excelEditor/index.js b/pc4mobx/hrmSalary/components/excelEditor/index.js
index 8b0fe4ae..c3a8fefc 100644
--- a/pc4mobx/hrmSalary/components/excelEditor/index.js
+++ b/pc4mobx/hrmSalary/components/excelEditor/index.js
@@ -157,7 +157,7 @@ class ExcelEditor extends Component {
-
{getLabel(111, "函数")}
+ {getLabel(30686, "函数")}
- this.setState({ funcText })}/>
- {!_.isEmpty(funcHoverItem) ? funcHoverItem.name : getLabel(111, "提示")}
+ {!_.isEmpty(funcHoverItem) ? funcHoverItem.name : getLabel(558, "提示")}
-
-
{getLabel(111, "语法")}
+ {getLabel(543403, "语法")}
{formatString}
{description}
{getLabel(111, "参数")}
+ {getLabel(561, "参数")}
{
_.map(paramDescs, it => {
return
@@ -246,9 +246,9 @@ const TipList = (props) => {
;
})
}
- {getLabel(111, "示例")}
+ {getLabel(82159, "示例")}
{example}
- {getLabel(111, "结果")}
+ {getLabel(356, "结果")}
{result}
- {formId ? getLabel(111, "编辑统计维度") : getLabel(111, "新建统计维度")}
-
+ {formId ? getLabel(543407, "编辑统计维度") : getLabel(543314, "新建统计维度")}
+
}
>
{getSearchs(form, condition, 1, false, this.formItemChange)}
{
dimType !== "QUALITATIVE" &&
- {getLabel(111, "暂无数据")}
:
+ _.isEmpty(dataSource) ? {getLabel(83553, "暂无数据")}
:
_.map(dataSource, it => {
const { reportName, dimension, id, dimensionId } = it;
return
{reportName}
-
{getLabel(111, "统计维度")}：
+ {getLabel(506800, "统计维度")}：
{dimension}
+
+
+ {/* 导入选项 */}
+ {
+ this.props.importParams &&
+
+ );
+ }
+}
+
+export default ImpStep1;
diff --git a/pc4mobx/hrmSalary/components/importDialog/components/impStep3.js b/pc4mobx/hrmSalary/components/importDialog/components/impStep3.js
new file mode 100644
index 00000000..481813b4
--- /dev/null
+++ b/pc4mobx/hrmSalary/components/importDialog/components/impStep3.js
@@ -0,0 +1,51 @@
+/*
+ * Author: 黎永顺
+ * name: 导入-步骤3
+ * Description:
+ * Date: 2023/8/11
+ */
+import React, { Component } from "react";
+import { WeaLocaleProvider, WeaTable } from "ecCom";
+import successImg from "../../importModal/success.svg";
+
+const getLabel = WeaLocaleProvider.getLabel;
+
+class ImpStep3 extends Component {
+ render() {
+ const { importResult } = this.props;
+ return (
+
+
+ }
+ {getLabel(543201, "导入选项")}
+ {this.props.importParams}
+ {getLabel(543202, "导入Excel")}
+
+ {getLabel(543203, "点击或将文件拖拽到此区域上传")} {getLabel(543204, "支持单个或批量上传，严禁上传公司内部资料及其他违禁文件")}
+
+
+
+
+ {getLabel(27577, "操作步骤")}
+ + {`1. ${getLabel(30907, "第一步")},${getLabel(543205, "请选择导出的Excel文件或")}`} + {getLabel(543207, "点击这里下载模板")} +
+{`2. ${getLabel(543211, "第二步")},${getLabel(543212, "请一定要确定Excel文档中的格式是模板中的格式")},${getLabel(543213, "没有被修改掉")}；`}
+{`3. ${getLabel(543216, "第三步")},${getLabel(543215, "选择填写好的Excel文档")},${getLabel(543214, "点击“下一步”按钮进行数据预览")}；`}
++ {`4. ${getLabel(543217, "第四步")},${getLabel(543218, "如果以上步骤和Excel文档正确的话")},${getLabel(543219, "导入成功会有提示")},${getLabel(543220, "数据会被正确导入")}。${getLabel(543221, "如果有问题")},${getLabel(543222, "则会提示Excel文档的错误之处")}。`} +
+
+
+
+ {getLabel(543223, "Excel文件说明")}
+ {`1. ${getLabel(543224, "后缀名为xls或者xlsx")};`}
+{`2. ${getLabel(543225, "数据请勿放在合并的单元格中")};`}
+{`3. ${getLabel(543226, "账单月份格式必须为")}:YYYY-MM；`}
+
+ {
+ !_.isEmpty(importResult) ?
+
+ );
+ }
+}
+
+export default ImpStep3;
diff --git a/pc4mobx/hrmSalary/components/importDialog/index.js b/pc4mobx/hrmSalary/components/importDialog/index.js
new file mode 100644
index 00000000..49956e37
--- /dev/null
+++ b/pc4mobx/hrmSalary/components/importDialog/index.js
@@ -0,0 +1,135 @@
+/*
+ * Author: 黎永顺
+ * name: 导入弹框-步骤条
+ * Description:
+ * Date: 2023/8/11
+ */
+import React, { Component } from "react";
+import { Button, message, Modal } from "antd";
+import { WeaDialog, WeaLocaleProvider, WeaSteps } from "ecCom";
+import ImpStep1 from "./components/impStep1";
+import ImpStep3 from "./components/impStep3";
+import "./index.less";
+
+const { getLabel } = WeaLocaleProvider;
+const Step = WeaSteps.Step;
+
+class Index extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ current: 0
+ };
+ }
+
+ componentWillReceiveProps(nextProps, nextContext) {
+ if (JSON.stringify(nextProps.importResult) !== JSON.stringify(this.props.importResult)) {
+ this.setState({
+ current: this.state.current + 1
+ });
+ }
+ if (nextProps.visible !== this.props.visible && !nextProps.visible) this.setState({ current: 0 });
+ }
+
+ renderChildren = () => {
+ const { current } = this.state;
+ const { importParams, link, excludeKey, importResult } = this.props;
+ let CurrentDom = null;
+ switch (current) {
+ case 0:
+ CurrentDom =
+
:
+ + {getLabel(389249, "已导入")} + {importResult.successCount} + {`${getLabel(30690, "条数据")},${getLabel(25009, "失败")}`} + {importResult.errorCount} {getLabel(30690, "条数据")} +
+
+
+ }
+ {
+ !_.isEmpty(importResult.errorData) &&
+ {getLabel(111, "导入失败")}
+
+
+
+
+ {/*this.props.key: 不需要展示的步骤*/}
+ {
+ _.map(_.filter(stepData, item => item.key !== this.props.excludeKey), it => (
+ ))
+ }
+
+
+
+ {
+ this.renderChildren()
+ }
+
+
+
);
}
diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.less b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.less
index 5247c24f..5368ac1a 100644
--- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.less
+++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.less
@@ -15,4 +15,37 @@
color: #57c5f7;
}
}
+
+ .base-info {
+ background: #ebf4ff;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ min-height: 50px;
+ margin-bottom: 8px;
+ border-radius: 4px;
+ padding: 0 16px;
+
+ .right .header-declare-info {
+ display: flex;
+ justify-content: space-around;
+ align-items: center;
+ font-size: 12px;
+ margin-right: 16px;
+
+ .fail {
+ color: #5d9cec;
+ cursor: pointer;
+ margin-right: 10px;
+ }
+ }
+ }
+
+ .listview-com-layout {
+ padding: 0 16px;
+
+ .wea-tab .wea-tab-right, .wea-input-focus {
+ background: transparent;
+ }
+ }
}
From 9cb47f784cf271a60247a42fd7b0461b29546522 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, 14 Aug 2023 14:46:19 +0800
Subject: [PATCH 022/165] =?UTF-8?q?=E4=B8=AA=E7=A8=8E=E5=AF=B9=E6=8E=A5-?=
=?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=E6=8A=A5=E9=80=81=E8=AF=A6?=
=?UTF-8?q?=E6=83=85=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/baseInfo.js | 29 ++++
.../employeeDeclareDetailSchemaEditDialog.js | 35 ++++
.../pages/employeedeclareDetail/constants.js | 160 ++++++++++++++++++
.../pages/employeedeclareDetail/index.js | 92 +++++++---
.../pages/employeedeclareDetail/index.less | 51 ++++++
pc4mobx/hrmSalary/stores/employeeDeclare.js | 13 ++
pc4mobx/hrmSalary/stores/index.js | 4 +-
7 files changed, 361 insertions(+), 23 deletions(-)
create mode 100644 pc4mobx/hrmSalary/pages/employeedeclareDetail/components/baseInfo.js
create mode 100644 pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js
create mode 100644 pc4mobx/hrmSalary/stores/employeeDeclare.js
diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/baseInfo.js b/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/baseInfo.js
new file mode 100644
index 00000000..f8a45616
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/baseInfo.js
@@ -0,0 +1,29 @@
+/*
+ * Author: 黎永顺
+ * name: 人员信息报送-基础信息
+ * Description:
+ * Date: 2023/8/14
+ */
+import React, { Component } from "react";
+import { WeaLocaleProvider } from "ecCom";
+import { getQueryString } from "../../../util/url";
+
+const { getLabel } = WeaLocaleProvider;
+
+class BaseInfo extends Component {
+ render() {
+ return (
+
+
+ {getLabel(537996, "个税扣缴义务人")}：
+
+
+
+ {getLabel(111, "报送失败")}: 0
+ {getLabel(111, "未报送")}: 0
+
+
+ ({ ...it, showname: getLabel(it.lanId, it.showname) }))}/>
+ ]}
+ onChange={key => this.setState({ selectedKey: key })}
+ />
+
+
+
+ );
+ }
+}
+
+export default BaseInfo;
diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js b/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js
new file mode 100644
index 00000000..55f278e7
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js
@@ -0,0 +1,35 @@
+/*
+ * Author: 黎永顺
+ * name: 报送信息-编辑、新增弹框
+ * Description:
+ * Date: 2023/8/14
+ */
+import React, { Component } from "react";
+import { WeaLocaleProvider, WeaSlideModal } from "ecCom";
+import { Button, Col, Row } from "antd";
+
+const { getLabel } = WeaLocaleProvider;
+
+class EmployeeDeclareDetailSchemaEditDialog extends Component {
+ render() {
+ return (
+ {getLabel(537996, "个税扣缴义务人")}：{getQueryString("taxName")}
+
+
+
+ {getLabel(111, "报送失败")}: 0
+ {getLabel(111, "未报送")}: 0
+
+ Content
)}
+ />
+ );
+ }
+}
+
+export default EmployeeDeclareDetailSchemaEditDialog;
diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/constants.js b/pc4mobx/hrmSalary/pages/employeedeclareDetail/constants.js
index 0d821b12..ab5a82c6 100644
--- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/constants.js
+++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/constants.js
@@ -25,3 +25,163 @@ export const submitStatus = [
lanId: 111
}
];
+
+export const advanceConditions = [
+ {
+ items: [
+ {
+ colSpan: 1,
+ conditionType: "INPUT",
+ domkey: ["keyword"],
+ fieldcol: 18,
+ label: "姓名或工号",
+ lanId: 111,
+ labelcol: 6,
+ value: ""
+ },
+ {
+ browserConditionParam: {
+ completeParams: {},
+ conditionDataParams: {},
+ dataParams: {},
+ destDataParams: {},
+ hasAddBtn: false,
+ hasAdvanceSerach: true,
+ idSeparator: ",",
+ isAutoComplete: 1,
+ isDetail: 0,
+ isMultCheckbox: false,
+ isSingle: false,
+ linkUrl: "",
+ pageSize: 10,
+ quickSearchName: "",
+ replaceDatas: [],
+ title: "",
+ type: "57"
+ },
+ colSpan: 1,
+ conditionType: "BROWSER",
+ domkey: ["departmentIds"],
+ fieldcol: 18,
+ label: "部门",
+ lanId: 27511,
+ labelcol: 6
+ },
+ {
+ browserConditionParam: {
+ completeParams: {},
+ conditionDataParams: {},
+ dataParams: {},
+ destDataParams: {},
+ hasAddBtn: false,
+ hasAdvanceSerach: true,
+ idSeparator: ",",
+ isAutoComplete: 1,
+ isDetail: 0,
+ isMultCheckbox: false,
+ isSingle: false,
+ linkUrl: "",
+ pageSize: 10,
+ quickSearchName: "",
+ replaceDatas: [],
+ title: "",
+ type: "278"
+ },
+ colSpan: 1,
+ conditionType: "BROWSER",
+ domkey: ["positionIds"],
+ fieldcol: 18,
+ label: "岗位",
+ lanId: 6086,
+ labelcol: 6
+ },
+ {
+ colSpan: 1,
+ conditionType: "SELECT",
+ domkey: ["employmentStatus"],
+ fieldcol: 18,
+ label: "人员状态",
+ lanId: 382300,
+ labelcol: 6,
+ value: "",
+ options: []
+ },
+ {
+ colSpan: 1,
+ conditionType: "SELECT",
+ domkey: ["employmentType"],
+ fieldcol: 18,
+ label: "任职受雇从业类型",
+ lanId: 111,
+ labelcol: 6,
+ value: "",
+ options: []
+ },
+ {
+ colSpan: 1,
+ conditionType: "RANGEPICKER",
+ domkey: ["fromEmploymentDate", "endEmploymentDate"],
+ fieldcol: 18,
+ label: "任职受雇日期",
+ lanId: 111,
+ labelcol: 6,
+ value: ""
+ },
+ {
+ colSpan: 1,
+ conditionType: "RANGEPICKER",
+ domkey: ["fromDismissDate", "endDismissDate"],
+ fieldcol: 18,
+ label: "离职日期",
+ lanId: 111,
+ labelcol: 6,
+ value: ""
+ },
+ {
+ colSpan: 1,
+ conditionType: "SELECT",
+ domkey: ["disability"],
+ fieldcol: 18,
+ label: "是否残疾",
+ lanId: 111,
+ labelcol: 6,
+ value: "",
+ options: []
+ },
+ {
+ colSpan: 1,
+ conditionType: "SELECT",
+ domkey: ["lonelyOld"],
+ fieldcol: 18,
+ label: "是否孤老",
+ lanId: 111,
+ labelcol: 6,
+ value: "",
+ options: []
+ },
+ {
+ colSpan: 1,
+ conditionType: "SELECT",
+ domkey: ["martyrDependents"],
+ fieldcol: 18,
+ label: "是否是烈属",
+ lanId: 111,
+ labelcol: 6,
+ value: "",
+ options: []
+ },
+ {
+ colSpan: 1,
+ conditionType: "SELECT",
+ domkey: ["deductExpenses"],
+ fieldcol: 18,
+ label: "是否扣除减除费用",
+ lanId: 111,
+ labelcol: 6,
+ value: "",
+ options: []
+ }
+ ],
+ defaultshow: true
+ }
+];
diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js
index a6565b04..10474d27 100644
--- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js
+++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js
@@ -6,30 +6,59 @@
*/
import React, { Component } from "react";
import { WeaDatePicker, WeaLocaleProvider, WeaSelect, WeaTab, WeaTop } from "ecCom";
-import { submitStatus } from "./constants";
-import { Button, Dropdown, Menu } from "antd";
+import { Button, Dropdown, Menu, Spin } from "antd";
+import BaseInfo from "./components/baseInfo";
+import { advanceConditions, submitStatus } from "./constants";
+import { getSearchs } from "../../util";
import { inject, observer } from "mobx-react";
+import { toJS } from "mobx";
import "./index.less";
const { getLabel } = WeaLocaleProvider;
-@inject("taxAgentStore")
+@inject("taxAgentStore", "employeeDeclareStore")
@observer
class Index extends Component {
constructor(props) {
super(props);
this.state = {
- selectedKey: "0"
+ selectedKey: "0",
+ showSearchAd: false,
+ declareStatus: "ALL",
+ taxCycle: new Date()
};
}
componentDidMount() {
+ const { employeeDeclareStore: { advanceForm } } = this.props;
document.title = getLabel(544289, "人员信息报送");
+ advanceForm.initFormFields(advanceConditions);
+ window.addEventListener("message", this.handleReceive, false);
}
+ componentWillUnmount() {
+ window.removeEventListener("message", this.handleReceive, false);
+ }
+
+ handleReceive = ({ data }) => {
+ const { type, payload: { id, params } = {} } = data;
+ if (type === "init") {
+ this.postMessageToChild({});
+ } else if (type === "turn") {
+ if (id === "PAGEINFO") {
+ const { pageNum: current, size: pageSize } = params;
+ this.setState({ pageInfo: { ...pageInfo, current, pageSize } });
+ }
+ }
+ };
+ postMessageToChild = (payload) => {
+ const childFrameObj = document.getElementById("atdTable");
+ childFrameObj && childFrameObj.contentWindow.postMessage(JSON.stringify({}), "*");
+ };
+
render() {
- const { selectedKey } = this.state;
- const { taxAgentStore: { showOperateBtn } } = this.props;
+ const { selectedKey, showSearchAd, declareStatus, taxCycle } = this.state;
+ const { taxAgentStore: { showOperateBtn }, employeeDeclareStore: { advanceForm: form } } = this.props;
const menu = (
-
{/*报送失败数据查看*/}
@@ -47,7 +66,7 @@ class BaseInfo extends Component {
onCancel={() => {
this.setState({
declareCalcDialog: {
- visible: false
+ visible: false, taxCycle: ""
}
});
}}
diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailCalcDialog.js b/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailCalcDialog.js
index 83e88345..f4fa0756 100644
--- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailCalcDialog.js
+++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailCalcDialog.js
@@ -6,13 +6,64 @@
*/
import React, { Component } from "react";
import { WeaDialog, WeaLocaleProvider, WeaTable } from "ecCom";
+import { employeedeclareList4Fail } from "../../../apis/declare";
import { Button, Col, Row } from "antd";
+import { getQueryString } from "../../../util/url";
const { getLabel } = WeaLocaleProvider;
class EmployeeDeclareDetailCalcDialog extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ pageInfo: { current: 1, pageSize: 10, total: 0 },
+ loading: false, columns: [], dataSource: []
+ };
+ }
+
+ componentWillReceiveProps(nextProps, nextContext) {
+ if (nextProps.visible !== this.props.visible && nextProps.visible) this.employeedeclareList4Fail(nextProps);
+ }
+
+ employeedeclareList4Fail = (props) => {
+ const { pageInfo } = this.state;
+ const payload = {
+ ...pageInfo,
+ taxAgentId: getQueryString("id"),
+ taxCycle: props.taxCycle
+ };
+ this.setState({ loading: true });
+ employeedeclareList4Fail(payload).then(({ status, data }) => {
+ this.setState({ loading: false });
+ if (status) {
+ const { columns, list: dataSource, pageNum: current, pageSize, total } = data;
+ this.setState({
+ columns, dataSource,
+ pageInfo: { ...pageInfo, current, pageSize, total }
+ });
+ }
+ }).catch(() => this.setState({ loading: false }));
+ };
render() {
+ const { loading, columns, dataSource, pageInfo } = this.state;
+ const pagination = {
+ ...pageInfo,
+ showTotal: total => `${getLabel(18609, "共")} ${total} ${getLabel(18256, "条")}`,
+ showQuickJumper: true,
+ showSizeChanger: true,
+ pageSizeOptions: ["10", "20", "50", "100"],
+ onShowSizeChange: (current, pageSize) => {
+ this.setState({
+ pageInfo: { ...pageInfo, current, pageSize }
+ }, () => this.employeedeclareList4Fail(this.props));
+ },
+ onChange: current => {
+ this.setState({
+ pageInfo: { ...pageInfo, current }
+ }, () => this.employeedeclareList4Fail(this.props));
+ }
+ };
return (
diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js b/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js
index dc483a65..c65d2ef0 100644
--- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js
+++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js
@@ -6,30 +6,199 @@
*/
import React, { Component } from "react";
import { WeaLocaleProvider, WeaSlideModal } from "ecCom";
-import { Button, Col, Row } from "antd";
+import { Button, Col, message, Modal, Row } from "antd";
import { inject, observer } from "mobx-react";
import { declareConditions } from "../constants";
import { getSearchs } from "../../../util";
+import { getQueryString } from "../../../util/url";
+import { employeedeclareGetForm, getEmployeeSave } from "../../../apis/declare";
const { getLabel } = WeaLocaleProvider;
@inject("employeeDeclareStore")
@observer
class EmployeeDeclareDetailSchemaEditDialog extends Component {
- componentDidMount() {
- const { employeeDeclareStore: { declareForm } } = this.props;
- declareForm.initFormFields(declareConditions);
+ constructor(props) {
+ super(props);
+ this.state = {
+ loading: false,
+ eConditions: []
+ };
}
componentWillReceiveProps(nextProps, nextContext) {
+ if (nextProps.visible !== this.props.visible && nextProps.visible) this.employeedeclareGetForm(nextProps);
}
+ employeedeclareGetForm = (props) => {
+ employeedeclareGetForm(_.pick(props, ["id"])).then(({ status, data }) => {
+ if (status) {
+ this.setState({
+ eConditions: _.map(declareConditions, it => {
+ return {
+ ...it,
+ items: _.map(it.items, child => {
+ if (child.domkey[0] === "employmentStatus") {
+ return {
+ ...child,
+ value: _.take(props.employmentStatusList)[0].enum,
+ options: _.map(props.employmentStatusList, it => ({
+ key: it.enum,
+ showname: getLabel(it.labelId, it.defaultLabel)
+ }))
+ };
+ } else if (child.domkey[0] === "employmentType") {
+ return {
+ ...child,
+ value: _.take(props.employmentTypeList)[0].enum,
+ options: _.map(props.employmentTypeList, it => ({
+ key: it.enum,
+ showname: getLabel(it.labelId, it.defaultLabel)
+ }))
+ };
+ } else if (child.domkey[0] === "gender") {
+ return {
+ ...child,
+ value: "MALE",
+ options: [
+ { key: "MALE", showname: getLabel(111, "男") },
+ { key: "FEMALE", showname: getLabel(111, "女") }
+ ]
+ };
+ } else if (child.domkey[0] === "employeeType") {
+ return {
+ ...child,
+ viewAttr: props.id ? 1 : 3,
+ options: [
+ { key: "ORGANIZATION", showname: getLabel(30042, "人员") }
+ ]
+ };
+ }
+ if (child.conditionType === "SELECT" && child.domkey[0] !== "gender" && child.domkey[0] !== "employmentStatus" && child.domkey[0] !== "employmentType") {
+ return {
+ ...child,
+ options: [
+ { key: "ON", showname: getLabel(538048, "是") },
+ { key: "OFF", showname: getLabel(111, "否") }
+ ]
+ };
+ }
+ return { ...child };
+ })
+ };
+ })
+ }, () => {
+ const { data: result, columns } = data;
+ const { employeeDeclareStore: { declareForm } } = this.props;
+ declareForm.initFormFields(this.state.eConditions);
+ const filedKes = _.map(columns, it => it.dataIndex);
+ _.map(filedKes, item => {
+ if (item === "disability" || item === "lonelyOld" || item === "martyrDependents") {
+ declareForm.updateFields({ [item]: result[item] || "OFF" });
+ } else if (item === "deductExpenses") {
+ declareForm.updateFields({ [item]: result[item] || "ON" });
+ } else if (item === "gender") {
+ declareForm.updateFields({ [item]: result[item] || "MALE" });
+ } else if (item === "employmentStatus") {
+ declareForm.updateFields({ [item]: result[item] || _.take(props.employmentStatusList)[0].enum });
+ } else if (item === "employmentType") {
+ declareForm.updateFields({ [item]: result[item] || _.take(props.employmentTypeList)[0].enum });
+ } else if (item === "cardType") {
+ declareForm.updateFields({ [item]: "居民身份证" });
+ } else if (item === "employee") {
+ declareForm.updateFields({
+ // employeeType: {
+ // value: ["ORGANIZATION", ["13", "郑世珍", [{ id: "13", lastname: "郑世珍" }]]],
+ // valueSpan: ["employeeId"]
+ // }
+ });
+ } else {
+ declareForm.updateFields({ [item]: result[item] || "" });
+ }
+ });
+ });
+ }
+ });
+ };
+ onChange = (res) => {
+ const { eConditions } = this.state;
+ const { employeeDeclareStore: { declareForm } } = this.props;
+ const key = Object.keys(res)[0];
+ const value = res[key].value;
+ switch (key) {
+ case "employmentStatus":
+ this.setState({
+ eConditions: _.map(eConditions, it => {
+ return {
+ ...it,
+ items: _.map(it.items, child => {
+ if (child.domkey[0] === "dismissDate") {
+ return {
+ ...child,
+ viewAttr: value === "ABNORMAL" ? 3 : 2
+ };
+ }
+ return { ...child };
+ })
+ };
+ })
+ }, () => {
+ declareForm.initFormFields(this.state.eConditions);
+ });
+ break;
+ case "employmentType":
+ this.setState({
+ eConditions: _.map(eConditions, it => {
+ return {
+ ...it,
+ items: _.map(it.items, child => {
+ if (child.domkey[0] === "employmentDate") {
+ return {
+ ...child,
+ viewAttr: value !== "OTHER" ? 3 : 2
+ };
+ }
+ return { ...child };
+ })
+ };
+ })
+ }, () => {
+ declareForm.initFormFields(this.state.eConditions);
+ });
+ break;
+ default:
+ break;
+ }
+ };
+
handleSubmit = () => {
const { employeeDeclareStore: { declareForm: form } } = this.props;
form.validateForm().then(f => {
if (f.isValid) {
- const payload = form.getFormParams();
- console.log(payload);
+ const { employmentType, employmentDate, employmentStatus, dismissDate, ...params } = form.getFormParams();
+ if ((employmentType !== "OTHER" && !employmentDate) || (employmentStatus === "ABNORMAL" && !dismissDate)) {
+ Modal.warning({
+ title: getLabel(131329, "信息确认"),
+ content: getLabel(518702, "必要信息不完整，红色*为必填项！")
+ });
+ return;
+ }
+ const payload = {
+ ...form.getFormParams(), id: this.props.id,
+ cardType: "RESIDENT_IDENTITY_CARDS", //暂时写死身份证类型
+ taxAgentId: getQueryString("id"),
+ taxCycle: this.props.taxCycle
+ };
+ this.setState({ loading: true });
+ getEmployeeSave(payload).then(({ status, errormsg }) => {
+ this.setState({ loading: false });
+ if (status) {
+ message.success(getLabel(22619, "保存成功！"));
+ this.props.onClose("true");
+ } else {
+ message.error(errormsg || getLabel(22620, "保存失败！"));
+ }
+ }).catch(() => this.setState({ loading: false }));
} else {
f.showErrors();
}
@@ -37,7 +206,8 @@ class EmployeeDeclareDetailSchemaEditDialog extends Component {
};
render() {
- const { employeeDeclareStore: { declareForm: form } } = this.props;
+ const { eConditions, loading } = this.state;
+ const { employeeDeclareStore: { declareForm: form }, title = "" } = this.props;
return (
({ ...it, showname: getLabel(it.lanId, it.showname) })),
+ ..._.map(declareStatusList, it => ({
+ key: it.enum,
+ showname: getLabel(it.labelId, it.defaultLabel)
+ }))
+ ]}
+ onChange={declareStatus => this.setState({
+ declareStatus,
+ pageInfo: {
+ ...pageInfo,
+ current: 1
+ }
+ }, () => this.queryEmployeeList())}
+ />
+ ];
+ // !showOperateBtn && tabBtns.shift();
return (
- {
- !_.isEmpty(dataList) ?
- _.map(dataList, it => ( this.handleClickItem(it)}>{it.name} )) :
-
-
- }
-
- } trigger="click" placement="right" overlayClassName="income_pop_wrapper"
- visible={record.visible}
- onVisibleChange={(visible) => onChangeSwitch(visible, record.id)}
- >
- alert(1)}
+
+
+ {
+ !_.isEmpty(dataList) ?
+ _.map(dataList, it => ( this.handleClickItem(it)}>{it.name} )) :
+
+
+ }
+
+ } trigger="click" placement="right" overlayClassName="income_pop_wrapper"
+ visible={record.visible}
+ onVisibleChange={(visible) => onChangeSwitch(visible, record.id)}
+ >
+ this.setState({
+ salaryItemSelectDialog: {
+ ...salaryItemSelectDialog,
+ visible: true,
+ salarySobId
+ }
+ })}
+ />
+
+ {
+ this.setState({
+ salaryItemSelectDialog: {
+ ...salaryItemSelectDialog,
+ visible: false,
+ salarySobId: ""
+ }
+ }, () => this.props.onChange([], this.props.record.id));
+ }}
+ onCancel={() => this.setState({
+ salaryItemSelectDialog: {
+ ...salaryItemSelectDialog,
+ visible: false,
+ salarySobId: ""
+ }
+ })}
/>
-
+
);
}
}
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemSelectDialog.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemSelectDialog.js
new file mode 100644
index 00000000..137b8067
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemSelectDialog.js
@@ -0,0 +1,119 @@
+/*
+ * Author: 黎永顺
+ * name: 个税对应字段-薪资项目选择弹框
+ * Description:
+ * Date: 2023/8/17
+ */
+import React, { Component } from "react";
+import { WeaDialog, WeaInputSearch, WeaLocaleProvider } from "ecCom";
+import { Button, Col, Row, Table } from "antd";
+import { commonBrowserData } from "../../../apis";
+
+const { getLabel } = WeaLocaleProvider;
+
+class LedgerSalaryItemSelectDialog extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ pageInfo: { current: 1, pageSize: 10, total: 0 },
+ loading: false, columns: [], dataSource: [],
+ keywords: ""
+ };
+ }
+
+ componentWillReceiveProps(nextProps, nextContext) {
+ if (nextProps.visible !== this.props.visible && nextProps.visible) this.commonBrowserData(nextProps);
+ }
+
+ commonBrowserData = (props) => {
+ const { salarySobId } = props;
+ const { keywords, pageInfo } = this.state;
+ const payload = {
+ type: "salaryItemBrowser",
+ jsonParam: JSON.stringify({ salarySobId, key: keywords }),
+ ...pageInfo
+ };
+ this.setState({ loading: true });
+ commonBrowserData(payload).then(({ status, data }) => {
+ this.setState({ loading: false });
+ if (status) {
+ const { list: dataSource, columns, pageNum: current, pageSize, total } = data;
+ this.setState({
+ dataSource, columns,
+ pageInfo: { ...pageInfo, current, pageSize, total }
+ });
+ }
+ }).catch(() => this.setState({ loading: false }));
+ };
+ handleRowClick = (record) => {
+ this.props.onCancel();
+ this.props.handleClickItem(record);
+ };
+
+ render() {
+ const { loading, columns, dataSource, pageInfo, keywords } = this.state;
+ const pagination = {
+ ...pageInfo,
+ showTotal: total => `${getLabel(18609, "共")} ${total} ${getLabel(18256, "条")}`,
+ showQuickJumper: true,
+ showSizeChanger: true,
+ pageSizeOptions: ["10", "20", "50", "100"],
+ onShowSizeChange: (current, pageSize) => {
+ this.setState({
+ pageInfo: { ...pageInfo, current, pageSize }
+ }, () => this.commonBrowserData(this.props));
+ },
+ onChange: current => {
+ this.setState({
+ pageInfo: { ...pageInfo, current }
+ }, () => this.commonBrowserData(this.props));
+ }
+ };
+ return (
+ {getLabel(111, "清除")}
+ ]}
+ title={(
+
)}
+ style={{
+ width: 600,
+ height: 606.6,
+ minHeight: 200,
+ minWidth: 380,
+ maxHeight: "90%",
+ maxWidth: "90%",
+ overflow: "hidden",
+ transform: "translate(0px, 0px)"
+ }}
+ >
+
+ );
+ }
+}
+
+export default LedgerSalaryItemSelectDialog;
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
index f4d4d850..f416b337 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
@@ -15,6 +15,7 @@ import LedgerSalaryAdjustmentRules from "./ledgerSalaryAdjustmentRules";
import LedgerBackCalculatedSalaryItem from "./ledgerBackCalculatedSalaryItem";
import LedgerSalaryItem from "./ledgerSalaryItem";
import IncomeTaxFields from "./incomeTaxFields";
+import CumulativeFields from "./cumulativeFields";
import { saveAdjustmentRule, saveLedgerBasic, saveLedgerItem, taxreportruleSave } from "../../../apis/ledger";
import "./index.less";
@@ -227,7 +228,8 @@ class LedgerSlide extends Component {
CurrentDom = ;
break;
case 4:
- CurrentDom = null;
+ CurrentDom =
+ this.cumulativeRef = dom} {...this.props} saveSalarySobId={saveSalarySobId}/>;
break;
case 5:
CurrentDom =
From abdc35e134fa2e76369973780dccd72ddf63a559 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 17 Aug 2023 16:52:53 +0800
Subject: [PATCH 030/165] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E8=96=AA=E8=B5=84?=
=?UTF-8?q?=E8=B4=A6=E5=A5=97=E4=B8=AA=E7=A8=8E=E7=94=B3=E6=8A=A5=E5=AD=97?=
=?UTF-8?q?=E6=AE=B5=E5=AF=B9=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pc4mobx/hrmSalary/apis/ledger.js | 4 +
.../ledgerPage/components/cumulativeFields.js | 4 +-
.../ledgerPage/components/incomeTaxFields.js | 4 +-
.../components/ledgerBaseSetting.js | 4 +-
.../ledgerPage/components/ledgerSlide.js | 119 +++++++++++-------
5 files changed, 85 insertions(+), 50 deletions(-)
diff --git a/pc4mobx/hrmSalary/apis/ledger.js b/pc4mobx/hrmSalary/apis/ledger.js
index 32103505..6a4e955f 100644
--- a/pc4mobx/hrmSalary/apis/ledger.js
+++ b/pc4mobx/hrmSalary/apis/ledger.js
@@ -342,6 +342,10 @@ export const addupruleGetForm = params => {
export const taxreportruleSave = params => {
return postFetch("/api/bs/hrmsalary/salarysob/taxreportrule/save", params);
};
+//保存薪资账套下的累计字段对应关系
+export const addupruleSave = params => {
+ return postFetch("/api/bs/hrmsalary/salarysob/adduprule/save", params);
+};
//保存回算薪资项目详情
export const salarysobBackitemSave = params => {
return postFetch("/api/bs/hrmsalary/salarysob/backitem/save", params);
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/cumulativeFields.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/cumulativeFields.js
index ef151183..5c03a3dc 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/cumulativeFields.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/cumulativeFields.js
@@ -27,7 +27,7 @@ class CumulativeFields extends Component {
taxreportruleGetForm = () => {
const { editId, saveSalarySobId } = this.props;
- addupruleGetForm({ id: saveSalarySobId || editId }).then(({ status, data }) => {
+ addupruleGetForm({ id: editId || saveSalarySobId }).then(({ status, data }) => {
if (status && !_.isEmpty(data)) {
this.setState({
tabs: _.map(data, it => ({ viewcondition: it.incomeCategoryId, title: it.incomeCategoryName })),
@@ -103,7 +103,7 @@ class CumulativeFields extends Component {
width: "50%",
dataIndex: "salaryItem",
render: (_, record) => (
- ;
+ CurrentDom = this.setState({ taxableItems: val })}
+ />;
break;
case 1:
CurrentDom = ;
@@ -228,11 +246,14 @@ class LedgerSlide extends Component {
CurrentDom = ;
break;
case 4:
- CurrentDom =
+ CurrentDom = (!editId && taxableItems && taxableItems.toString() !== "1" && taxableItems.toString() !== "489") ?
+ this.incomeRef = dom} {...this.props} saveSalarySobId={saveSalarySobId}/> :
this.cumulativeRef = dom} {...this.props} saveSalarySobId={saveSalarySobId}/>;
break;
case 5:
- CurrentDom =
+ CurrentDom = (!editId && taxableItems && taxableItems.toString() !== "1" && taxableItems.toString() !== "489") ?
+ this.setState({ adjustRules })}/> :
this.incomeRef = dom} {...this.props} saveSalarySobId={saveSalarySobId}/>;
break;
case 6:
@@ -303,13 +324,11 @@ class LedgerSlide extends Component {
type="primary"
loading={loading}
onClick={() => {
- this.setState({ current: current + 1 }, () => {
- console.log("累计字段对应");
- });
+ this.setState({ current: current + 1 }, () => this.addupruleSave());
}}
>保存并进入下一步
] : [
-
+
];
break;
case 5:
@@ -345,8 +364,18 @@ class LedgerSlide extends Component {
};
render() {
+ let tabs = [
+ { key: 0, title: getLabel(82751, "基础设置") },
+ { key: 1, title: getLabel(543467, "关联人员") },
+ { key: 2, title: getLabel(542362, "薪资项目") },
+ { key: 3, title: getLabel(543468, "回算薪资项目") },
+ { key: 4, title: getLabel(111, "累计字段对应") },
+ { key: 5, title: getLabel(111, "个税申报字段对应") },
+ { key: 6, title: getLabel(543469, "调薪计薪规则") }
+ ];
const { title, visible, editId, taxAgentStore: { showOperateBtn } } = this.props;
- const { current } = this.state;
+ const { current, taxableItems } = this.state;
+ (taxableItems && taxableItems.toString() !== "1" && taxableItems.toString() !== "489") && (tabs = _.filter(tabs, o => o.key !== 4));
return (
Date: Fri, 18 Aug 2023 08:57:20 +0800
Subject: [PATCH 031/165] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E8=96=AA=E8=B5=84?=
=?UTF-8?q?=E8=B4=A6=E5=A5=97=E4=B8=AA=E7=A8=8E=E7=94=B3=E6=8A=A5=E5=AD=97?=
=?UTF-8?q?=E6=AE=B5=E5=AF=B9=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ledgerPage/components/cumulativeFields.js | 12 +-
.../ledgerPage/components/incomeTaxFields.js | 6 +-
.../components/ledgerFieldsTable.js | 2 +-
.../ledgerPage/components/ledgerSlide.js | 126 ++++++++++++++----
4 files changed, 111 insertions(+), 35 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/cumulativeFields.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/cumulativeFields.js
index 5c03a3dc..5f074220 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/cumulativeFields.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/cumulativeFields.js
@@ -33,7 +33,7 @@ class CumulativeFields extends Component {
tabs: _.map(data, it => ({ viewcondition: it.incomeCategoryId, title: it.incomeCategoryName })),
selectedKey: _.take(data)[0].incomeCategoryId,
addupruleFields: data
- });
+ }, () => this.props.onSetAdduprule(this.state.addupruleFields, this.state.selectedKey));
}
});
};
@@ -44,7 +44,7 @@ class CumulativeFields extends Component {
if (it.incomeCategoryId === selectedKey) {
return {
...it,
- taxReportRules: _.map(it.taxReportRules, child => {
+ addUpRules: _.map(it.addUpRules, child => {
if (child.id === id) {
return { ...child, visible };
}
@@ -54,7 +54,7 @@ class CumulativeFields extends Component {
}
return { ...it };
})
- });
+ }, () => this.props.onSetAdduprule(this.state.addupruleFields, this.state.selectedKey));
};
handleChangeAddupruleFieldsItem = (salaryItem, recordRuleId) => {
const { addupruleFields, selectedKey } = this.state;
@@ -63,7 +63,7 @@ class CumulativeFields extends Component {
if (it.incomeCategoryId === selectedKey) {
return {
...it,
- taxReportRules: _.map(it.taxReportRules, child => {
+ addUpRules: _.map(it.addUpRules, child => {
if (child.id === recordRuleId) {
return { ...child, visible: false, salaryItem };
}
@@ -73,7 +73,7 @@ class CumulativeFields extends Component {
}
return { ...it };
})
- });
+ }, () => this.props.onSetAdduprule(this.state.addupruleFields, this.state.selectedKey));
};
render() {
@@ -96,7 +96,7 @@ class CumulativeFields extends Component {
{
title: getLabel(111, "往期累计情况字段"),
width: "50%",
- dataIndex: "reportColumnName"
+ dataIndex: "addUpColumnName"
},
{
title: getLabel(111, "对应本账套薪资项目"),
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/incomeTaxFields.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/incomeTaxFields.js
index fc9f811e..84675ec9 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/incomeTaxFields.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/incomeTaxFields.js
@@ -33,7 +33,7 @@ class IncomeTaxFields extends Component {
tabs: _.map(data, it => ({ viewcondition: it.incomeCategoryId, title: it.incomeCategoryName })),
selectedKey: _.take(data)[0].incomeCategoryId,
incomeTaxFields: data
- });
+ }, () => this.props.onSetTaxreportrule(this.state.incomeTaxFields, this.state.selectedKey));
}
});
};
@@ -54,7 +54,7 @@ class IncomeTaxFields extends Component {
}
return { ...it };
})
- });
+ }, () => this.props.onSetTaxreportrule(this.state.incomeTaxFields, this.state.selectedKey));
};
handleChangeIncomeFieldsItem = (salaryItem, recordRuleId) => {
const { incomeTaxFields, selectedKey } = this.state;
@@ -73,6 +73,8 @@ class IncomeTaxFields extends Component {
}
return { ...it };
})
+ }, () => {
+ this.props.onSetTaxreportrule(this.state.incomeTaxFields, this.state.selectedKey);
});
};
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerFieldsTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerFieldsTable.js
index 13a03f01..b2a0a176 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerFieldsTable.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerFieldsTable.js
@@ -18,7 +18,7 @@ class LedgerFieldsTable extends Component {
componentWillReceiveProps(nextProps, nextContext) {
if (nextProps.dataSource !== this.props.dataSource && !_.isEmpty(nextProps.dataSource)) {
this.setState({
- dataSource: _.take(nextProps.dataSource)[0].taxReportRules
+ dataSource: _.take(nextProps.dataSource)[0].taxReportRules || _.take(nextProps.dataSource)[0].addUpRules
});
}
}
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
index 15093c2f..179494da 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
@@ -16,7 +16,13 @@ import LedgerBackCalculatedSalaryItem from "./ledgerBackCalculatedSalaryItem";
import LedgerSalaryItem from "./ledgerSalaryItem";
import IncomeTaxFields from "./incomeTaxFields";
import CumulativeFields from "./cumulativeFields";
-import { saveAdjustmentRule, saveLedgerBasic, saveLedgerItem, taxreportruleSave } from "../../../apis/ledger";
+import {
+ addupruleSave,
+ saveAdjustmentRule,
+ saveLedgerBasic,
+ saveLedgerItem,
+ taxreportruleSave
+} from "../../../apis/ledger";
import "./index.less";
const { getLabel } = WeaLocaleProvider;
@@ -33,6 +39,8 @@ class LedgerSlide extends Component {
baseSettingInfo: {},
adjustRules: [],
empFields: [], itemGroups: [],
+ incomeTaxFields: [], incomeTaxKeys: "", //个税申报字段对应
+ addupruleFields: [], addupruleKeys: "", //累计字段对应
saveSalarySobId: "",
taxableItems: "" //薪资类型 1||489 对应显示个税设置-累计字段对应
};
@@ -146,16 +154,15 @@ class LedgerSlide extends Component {
* Date: 2023/8/16
*/
taxreportruleSave = () => {
- const { taxableItems } = this.state;
- const { editId, saveSalarySobId } = this.props;
+ const { taxableItems, incomeTaxKeys, incomeTaxFields, saveSalarySobId } = this.state;
+ const { editId } = this.props;
if ((!editId && taxableItems && taxableItems.toString() !== "1" && taxableItems.toString() !== "489")) {
this.saveLedgerAdjustRule();
} else {
- const { incomeTaxFields, selectedKey } = this.incomeRef.state;
const payload = {
- salarySobId: saveSalarySobId || editId,
+ salarySobId: editId || saveSalarySobId,
incomeCategoryParams: _.map(incomeTaxFields, it => {
- if (it.incomeCategoryId === selectedKey) {
+ if (it.incomeCategoryId === incomeTaxKeys) {
return {
incomeCategory: it.incomeCategoryId,
taxReportRuleParams: _.map(it.taxReportRules, child => {
@@ -172,17 +179,20 @@ class LedgerSlide extends Component {
};
})
};
- this.setState({ loading: true });
- taxreportruleSave(payload).then(({ status, errormsg }) => {
- this.setState({ loading: false });
- if (status) {
- message.success(getLabel(22619, "保存成功！"));
- } else {
- message.error(errormsg || getLabel(22620, "保存失败！"));
- }
- }).catch(() => this.setState({ loading: false }));
+ this.saveTaxreportrule(payload);
}
};
+ saveTaxreportrule = (payload) => {
+ this.setState({ loading: true });
+ taxreportruleSave(payload).then(({ status, errormsg }) => {
+ this.setState({ loading: false });
+ if (status) {
+ message.success(getLabel(22619, "保存成功！"));
+ } else {
+ message.error(errormsg || getLabel(22620, "保存失败！"));
+ }
+ }).catch(() => this.setState({ loading: false }));
+ };
/*
* Author: 黎永顺
* Description:保存薪资账套下的累计字段对应关系
@@ -190,14 +200,60 @@ class LedgerSlide extends Component {
* Date: 2023/8/17
*/
addupruleSave = () => {
- const { taxableItems } = this.state;
- const { editId, saveSalarySobId } = this.props;
+ const { taxableItems, incomeTaxFields, incomeTaxKeys, addupruleFields, addupruleKeys, saveSalarySobId } = this.state;
+ const { editId } = this.props;
if ((!editId && taxableItems && taxableItems.toString() !== "1" && taxableItems.toString() !== "489")) {
- console.log(this.cumulativeRef);
- console.log(11111);
+ const payload = {
+ salarySobId: editId || saveSalarySobId,
+ incomeCategoryParams: _.map(incomeTaxFields, it => {
+ if (it.incomeCategoryId === incomeTaxKeys) {
+ return {
+ incomeCategory: it.incomeCategoryId,
+ taxReportRuleParams: _.map(it.taxReportRules, child => {
+ return {
+ reportColumnDataIndex: child.reportColumnDataIndex,
+ salaryItemId: _.map(child.salaryItem, o => o.id).join(",")
+ };
+ })
+ };
+ }
+ return {
+ incomeCategory: it.incomeCategoryId,
+ taxReportRuleParams: []
+ };
+ })
+ };
+ this.saveTaxreportrule(payload);
} else {
- console.log(this.cumulativeRef);
- console.log(2222);
+ const payload = {
+ salarySobId: editId || saveSalarySobId,
+ incomeCategoryParams: _.map(addupruleFields, it => {
+ if (it.incomeCategoryId === addupruleKeys) {
+ return {
+ incomeCategory: it.incomeCategoryId,
+ addUpRuleParams: _.map(it.addUpRules, child => {
+ return {
+ addUpColumnDataIndex: child.addUpColumnDataIndex,
+ salaryItemId: _.map(child.salaryItem, o => o.id).join(",")
+ };
+ })
+ };
+ }
+ return {
+ incomeCategory: it.incomeCategoryId,
+ taxReportRuleParams: []
+ };
+ })
+ };
+ this.setState({ loading: true });
+ addupruleSave(payload).then(({ status, errormsg }) => {
+ this.setState({ loading: false });
+ if (status) {
+ message.success(getLabel(22619, "保存成功！"));
+ } else {
+ message.error(errormsg || getLabel(22620, "保存失败！"));
+ }
+ }).catch(() => this.setState({ loading: false }));
}
};
handleChangeSlideTab = (current) => {
@@ -247,14 +303,26 @@ class LedgerSlide extends Component {
break;
case 4:
CurrentDom = (!editId && taxableItems && taxableItems.toString() !== "1" && taxableItems.toString() !== "489") ?
- this.incomeRef = dom} {...this.props} saveSalarySobId={saveSalarySobId}/> :
- this.cumulativeRef = dom} {...this.props} saveSalarySobId={saveSalarySobId}/>;
+ this.setState({
+ incomeTaxFields,
+ incomeTaxKeys: selectedKey
+ })}/> :
+ this.setState({
+ addupruleFields,
+ addupruleKeys: selectedKey
+ })}/>;
break;
case 5:
CurrentDom = (!editId && taxableItems && taxableItems.toString() !== "1" && taxableItems.toString() !== "489") ?
this.setState({ adjustRules })}/> :
- this.incomeRef = dom} {...this.props} saveSalarySobId={saveSalarySobId}/>;
+ this.setState({
+ incomeTaxFields,
+ incomeTaxKeys: selectedKey
+ })}/>;
break;
case 6:
CurrentDom =
@@ -269,7 +337,7 @@ class LedgerSlide extends Component {
};
renderCustomOperate = () => {
const { taxAgentStore: { showOperateBtn }, editId } = this.props;
- const { current, loading } = this.state;
+ const { current, loading, taxableItems } = this.state;
let CurrentDom = [];
//管理员操作权限
if (showOperateBtn) {
@@ -342,7 +410,13 @@ class LedgerSlide extends Component {
onClick={() => {
this.setState({ current: current + 1 }, () => this.taxreportruleSave());
}}
- >保存并进入下一步
+ >
+ {
+ (!editId && taxableItems && taxableItems.toString() !== "1" && taxableItems.toString() !== "489") ?
+ getLabel(555, "完成") :
+ getLabel(33199, "保存并进入下一步")
+ }
+
] : [
];
From 55994f19808520bf5483cab64765122b7f45575e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Fri, 18 Aug 2023 15:27:27 +0800
Subject: [PATCH 032/165] =?UTF-8?q?=E4=B8=AA=E7=A8=8E=E5=AF=B9=E6=8E=A5-?=
=?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=94=B3=E6=8A=A5=E8=AF=A6=E6=83=85=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pc4mobx/hrmSalary/apis/declare.js | 8 ++
pc4mobx/hrmSalary/index.js | 2 +
.../hrmSalary/pages/declare/generateModal.js | 7 +-
pc4mobx/hrmSalary/pages/declare/index.js | 11 +-
.../components/declareResultDialog.js | 82 ++++++++++++
.../components/taxDeclarationInfo.js | 71 ++++++++++
.../hrmSalary/pages/declareDetail/index.js | 122 ++++++++++++++++++
.../hrmSalary/pages/declareDetail/index.less | 84 ++++++++++++
.../ledgerSalaryItemSelectDialog.js | 6 +-
9 files changed, 382 insertions(+), 11 deletions(-)
create mode 100644 pc4mobx/hrmSalary/pages/declareDetail/components/declareResultDialog.js
create mode 100644 pc4mobx/hrmSalary/pages/declareDetail/components/taxDeclarationInfo.js
create mode 100644 pc4mobx/hrmSalary/pages/declareDetail/index.js
create mode 100644 pc4mobx/hrmSalary/pages/declareDetail/index.less
diff --git a/pc4mobx/hrmSalary/apis/declare.js b/pc4mobx/hrmSalary/apis/declare.js
index 89c47341..a7641065 100644
--- a/pc4mobx/hrmSalary/apis/declare.js
+++ b/pc4mobx/hrmSalary/apis/declare.js
@@ -126,3 +126,11 @@ export const employeeDelete = (params) => {
export const employeedeclareDeclare = (params) => {
return postFetch("/api/bs/hrmsalary/employeedeclare/declare", params);
};
+
+//个税在线对接-获取个税申报记录下的个税申报表TAB
+export const getTaxDeclarationTab = params => {
+ return WeaTools.callApi("/api/bs/hrmsalary/taxdeclaration/getTaxDeclarationTab", "GET", params);
+};
+
+
+
diff --git a/pc4mobx/hrmSalary/index.js b/pc4mobx/hrmSalary/index.js
index 008aba13..f5c32c4d 100644
--- a/pc4mobx/hrmSalary/index.js
+++ b/pc4mobx/hrmSalary/index.js
@@ -20,6 +20,7 @@ import Payroll from "./pages/payroll";
import PayrollGrant from "./pages/payroll/payrollGrant";
import PayrollDetail from "./pages/payroll/payrollDetail";
import Declare from "./pages/declare";
+import DeclareDetail from "./pages/declareDetail";
import Employeedeclare from "./pages/employeedeclare";
import EmployeedeclareDetail from "./pages/employeedeclareDetail";
import TaxRate from "./pages/taxRate";
@@ -157,6 +158,7 @@ const Routes = (
component={TemplatePreview}
/>
+
{
+ saveDeclare({
+ salaryMonth: moment(date).startOf("month").format("YYYY-MM-DD"),
+ taxAgentId,
+ description
+ }).then(() => {
this.setState({ loading: false });
this.props.onGenerate();
}).catch(() => {
diff --git a/pc4mobx/hrmSalary/pages/declare/index.js b/pc4mobx/hrmSalary/pages/declare/index.js
index 57e37c37..91b7ea6d 100644
--- a/pc4mobx/hrmSalary/pages/declare/index.js
+++ b/pc4mobx/hrmSalary/pages/declare/index.js
@@ -154,13 +154,10 @@ export default class Declare extends React.Component {
render: (text, record) => {
return (
- {
- window.open(
- "/spa/hrmSalary/static/index.html#/main/hrmSalary/generateDeclarationDetail?id=" +
- record.id
- );
- }}>
+
查看
{
diff --git a/pc4mobx/hrmSalary/pages/declareDetail/components/declareResultDialog.js b/pc4mobx/hrmSalary/pages/declareDetail/components/declareResultDialog.js
new file mode 100644
index 00000000..9b5fa4bf
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/declareDetail/components/declareResultDialog.js
@@ -0,0 +1,82 @@
+/*
+ * Author: 黎永顺
+ * name: 个税申报-异常、失败详情
+ * Description:
+ * Date: 2023/8/18
+ */
+import React, { Component } from "react";
+import { WeaDialog, WeaLocaleProvider, WeaTable } from "ecCom";
+import { Button, Col, Row } from "antd";
+
+const { getLabel } = WeaLocaleProvider;
+
+class DeclareResultDialog extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ pageInfo: { current: 1, pageSize: 10, total: 0 },
+ loading: false, columns: [], dataSource: []
+ };
+ }
+
+ componentWillReceiveProps(nextProps, nextContext) {
+ }
+
+
+ render() {
+ const { loading, columns, dataSource, pageInfo } = this.state;
+ const pagination = {
+ ...pageInfo,
+ showTotal: total => `${getLabel(18609, "共")} ${total} ${getLabel(18256, "条")}`,
+ showQuickJumper: true,
+ showSizeChanger: true,
+ pageSizeOptions: ["10", "20", "50", "100"],
+ onShowSizeChange: (current, pageSize) => {
+ this.setState({
+ pageInfo: { ...pageInfo, current, pageSize }
+ }, () => {
+ });
+ },
+ onChange: current => {
+ this.setState({
+ pageInfo: { ...pageInfo, current }
+ }, () => {
+ });
+ }
+ };
+ return (
+
+
+ );
+ }
+}
+
+export default DeclareResultDialog;
diff --git a/pc4mobx/hrmSalary/pages/declareDetail/components/taxDeclarationInfo.js b/pc4mobx/hrmSalary/pages/declareDetail/components/taxDeclarationInfo.js
new file mode 100644
index 00000000..1717b1a7
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/declareDetail/components/taxDeclarationInfo.js
@@ -0,0 +1,71 @@
+/*
+ * Author: 黎永顺
+ * name: 个税申报表详情-基本信息
+ * Description:
+ * Date: 2023/8/18
+ */
+import React, { Component } from "react";
+import { WeaLocaleProvider } from "ecCom";
+import DeclareResultDialog from "./declareResultDialog";
+
+const { getLabel } = WeaLocaleProvider;
+
+class TaxDeclarationInfo extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ resDialog: {
+ visible: false, title: ""
+ }
+ };
+ }
+
+ handleSeeResult = (type, title) => {
+ this.setState({
+ resDialog: { ...this.state.resDialog, visible: true, title: `${title}${getLabel(111, "详情")}` }
+ });
+ };
+
+ render() {
+ const { resDialog } = this.state;
+ const { declareInfo } = this.props;
+ const infoItem = [
+ { key: "salaryMonth", label: getLabel(542604, "薪资所属月") },
+ { key: "taxAgentName", label: getLabel(537996, "个税扣缴义务人") },
+ { key: "declareTypeDesc", label: getLabel(111, "申报类型") },
+ { key: "declareStatusDesc", label: getLabel(111, "申报状态") },
+ { key: "taxCycle", label: getLabel(542240, "税款所属期") },
+ { key: "taxPaidAmount", label: getLabel(111, "已缴金额") }
+ ];
+ return (
+
@@ -166,13 +166,13 @@ export default class Declare extends React.Component {
href="javascript:void(0);" style={{ marginLeft: 10 }}
onClick={() => {
Modal.confirm({
- title: getLabel(111, "信息确认"),
- content: getLabel(111, "确认撤回该条数据吗?"),
- onOk: () => this.withDrawTaxDeclaration(record.id)
+ title: getLabel(131329, "信息确认"),
+ content: getLabel(388758, "确认要删除吗?"),
+ onOk: () => this.taxdeclarationDelete(record.id)
});
}}
>
- {getLabel(111, "撤回")}
+ {getLabel(535052, "删除")}
}
diff --git a/pc4mobx/hrmSalary/pages/declareDetail/components/declareResultDialog.js b/pc4mobx/hrmSalary/pages/declareDetail/components/declareResultDialog.js
index 9b5fa4bf..5970b68b 100644
--- a/pc4mobx/hrmSalary/pages/declareDetail/components/declareResultDialog.js
+++ b/pc4mobx/hrmSalary/pages/declareDetail/components/declareResultDialog.js
@@ -5,26 +5,64 @@
* Date: 2023/8/18
*/
import React, { Component } from "react";
-import { WeaDialog, WeaLocaleProvider, WeaTable } from "ecCom";
+import { WeaDialog, WeaInputSearch, WeaLocaleProvider, WeaReqTop, WeaTable } from "ecCom";
import { Button, Col, Row } from "antd";
+import {
+ taxdeclarationEmployeeList4Fail,
+ taxdeclarationEmployeeList4NotDeclare,
+ taxdeclarationEmployeeList4NoValue
+} from "../../../apis/declare";
+import { getQueryString } from "../../../util/url";
const { getLabel } = WeaLocaleProvider;
+const APIFox = {
+ list4NotDeclare: taxdeclarationEmployeeList4NotDeclare,
+ list4NoValue: taxdeclarationEmployeeList4NoValue,
+ list4Fail: taxdeclarationEmployeeList4Fail
+};
class DeclareResultDialog extends Component {
constructor(props) {
super(props);
this.state = {
+ keyword: "", selectedKey: "",
pageInfo: { current: 1, pageSize: 10, total: 0 },
loading: false, columns: [], dataSource: []
};
}
componentWillReceiveProps(nextProps, nextContext) {
+ if (nextProps.visible !== this.props.visible && nextProps.visible) {
+ const { type } = nextProps;
+ this.setState({
+ selectedKey: _.head(type).key
+ }, () => this.queryList());
+ }
}
+ queryList = () => {
+ const taxDeclareRecordId = getQueryString("id");
+ const { keyword, pageInfo, selectedKey } = this.state;
+ const payload = {
+ ...pageInfo, keyword, taxDeclareRecordId
+ };
+ this.setState({ loading: true });
+ APIFox[selectedKey](payload).then(({ status, data }) => {
+ this.setState({ loading: false });
+ if (status) {
+ const { columns, list: dataSource, pageNum: current, pageSize, total } = data;
+ this.setState({
+ dataSource, pageInfo: { ...pageInfo, current, pageSize, total }, columns
+ });
+ } else {
+
+ }
+ }).catch(() => this.setState({ loading: false }));
+ };
render() {
- const { loading, columns, dataSource, pageInfo } = this.state;
+ const { type } = this.props;
+ const { loading, columns, dataSource, pageInfo, selectedKey, keyword } = this.state;
const pagination = {
...pageInfo,
showTotal: total => `${getLabel(18609, "共")} ${total} ${getLabel(18256, "条")}`,
@@ -34,28 +72,36 @@ class DeclareResultDialog extends Component {
onShowSizeChange: (current, pageSize) => {
this.setState({
pageInfo: { ...pageInfo, current, pageSize }
- }, () => {
- });
+ }, () => this.queryList());
},
onChange: current => {
this.setState({
pageInfo: { ...pageInfo, current }
- }, () => {
- });
+ }, () => this.queryList());
}
};
return (
{getLabel(537996, "个税扣缴义务人")}：{getQueryString("taxName")}
+
+ {getLabel(537996, "个税扣缴义务人")}：{decodeURIComponent(getQueryString("taxName") || "")}
{getLabel(111, "报送失败")}: 0
- {getLabel(111, "未报送")}: 0
+ onClick={this.handleOpenFailDialog}>{getLabel(111, "报送失败")}: {declareFailSize || 0}
+ {getLabel(111, "未报送")}: {notDeclareSize || 0}
- {getLabel(111, "本月新增数据")}
+ {title || getLabel(111, "本月新增数据")}
{getSearchs(form, declareConditions, 1)}
)}
+ content={({getSearchs(form, eConditions, 1, false, this.onChange)}
)}
/>
);
}
diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/constants.js b/pc4mobx/hrmSalary/pages/employeedeclareDetail/constants.js
index 9134619a..9b3ff734 100644
--- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/constants.js
+++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/constants.js
@@ -2,26 +2,6 @@ export const submitStatus = [
{
key: "ALL",
showname: "全部（报送状态）",
- lanId: 332
- },
- {
- key: "NOT_DECLARE",
- showname: "待报送",
- lanId: 111
- },
- {
- key: "DECLARING",
- showname: "报送中",
- lanId: 111
- },
- {
- key: "DECLARE_FAIL",
- showname: "报送失败",
- lanId: 111
- },
- {
- key: "DECLARE_SUCCESS",
- showname: "报送成功",
lanId: 111
}
];
@@ -197,7 +177,7 @@ export const declareConditions = [
rules: "selectLinkageRequired",
conditionType: "SELECT_LINKAGE",
selectLinkageDatas: {
- "1": {
+ "ORGANIZATION": {
browserConditionParam: {
completeParams: {},
conditionDataParams: {},
@@ -218,18 +198,15 @@ export const declareConditions = [
type: "1"
},
conditionType: "BROWSER",
- domkey: ["INPUT"]
+ domkey: ["employeeId"]
},
- "2": {
- conditionType: "CHECKBOX",
- domkey: ["CHECKBOX"]
+ "EXT_EMPLOYEE": {
+ conditionType: "BROWSER",
+ domkey: ["INPUT2"]
}
},
- options: [
- { key: "1", showname: "今天" },
- { key: "2", showname: "本周" }
- ],
- domkey: ["secleve"],
+ options: [],
+ domkey: ["employeeType"],
label: "系统名称",
lanId: 111,
viewAttr: 3
@@ -237,7 +214,7 @@ export const declareConditions = [
{
colSpan: 1,
conditionType: "INPUT",
- domkey: ["keyword"],
+ domkey: ["employeeName"],
fieldcol: 12,
label: "证件姓名",
lanId: 111,
@@ -245,6 +222,211 @@ export const declareConditions = [
value: "",
rules: "required",
viewAttr: 3
+ },
+ {
+ colSpan: 1,
+ conditionType: "INPUT",
+ domkey: ["jobNum"],
+ fieldcol: 12,
+ label: "工号",
+ lanId: 1933,
+ labelcol: 6,
+ value: "",
+ viewAttr: 2
+ },
+ {
+ colSpan: 1,
+ conditionType: "INPUT",
+ domkey: ["nationality"],
+ fieldcol: 12,
+ label: "国籍",
+ lanId: 111,
+ labelcol: 6,
+ value: "",
+ viewAttr: 1
+ },
+ {
+ colSpan: 1,
+ conditionType: "INPUT",
+ domkey: ["cardType"],
+ fieldcol: 12,
+ label: "证件类型",
+ lanId: 111,
+ labelcol: 6,
+ value: "居民身份证",
+ viewAttr: 1
+ },
+ {
+ colSpan: 1,
+ conditionType: "INPUT",
+ domkey: ["cardNum"],
+ fieldcol: 12,
+ label: "证件号码",
+ lanId: 1839,
+ labelcol: 6,
+ value: "",
+ rules: "required",
+ viewAttr: 3
+ },
+ {
+ colSpan: 1,
+ conditionType: "SELECT",
+ domkey: ["gender"],
+ fieldcol: 12,
+ label: "性别",
+ lanId: 111,
+ labelcol: 6,
+ value: "",
+ viewAttr: 3,
+ rules: "required",
+ options: []
+ },
+ {
+ colSpan: 1,
+ conditionType: "DATEPICKER",
+ domkey: ["birthday"],
+ fieldcol: 12,
+ label: "出生日期",
+ lanId: 111,
+ labelcol: 6,
+ rules: "required",
+ value: "",
+ viewAttr: 3
+ },
+ {
+ colSpan: 1,
+ conditionType: "SELECT",
+ domkey: ["employmentStatus"],
+ fieldcol: 12,
+ label: "状态",
+ lanId: 535101,
+ labelcol: 6,
+ value: "",
+ viewAttr: 3,
+ rules: "required",
+ detailtype: 3,
+ options: []
+ },
+ {
+ colSpan: 1,
+ conditionType: "INPUT",
+ domkey: ["mobile"],
+ fieldcol: 12,
+ label: "手机号码",
+ lanId: 111,
+ labelcol: 6,
+ value: "",
+ rules: "required",
+ viewAttr: 3
+ },
+ {
+ colSpan: 1,
+ conditionType: "SELECT",
+ domkey: ["employmentType"],
+ fieldcol: 12,
+ label: "任职受雇从业类型",
+ lanId: 111,
+ labelcol: 6,
+ value: "",
+ viewAttr: 3,
+ rules: "required",
+ options: []
+ },
+ {
+ colSpan: 1,
+ conditionType: "DATEPICKER",
+ domkey: ["employmentDate"],
+ fieldcol: 12,
+ label: "任职受雇从业日期",
+ lanId: 111,
+ labelcol: 6,
+ value: "",
+ viewAttr: 3
+ },
+ {
+ colSpan: 1,
+ conditionType: "DATEPICKER",
+ domkey: ["dismissDate"],
+ fieldcol: 12,
+ label: "离职日期",
+ lanId: 111,
+ labelcol: 6,
+ value: "",
+ viewAttr: 2
+ },
+ {
+ colSpan: 1,
+ conditionType: "SELECT",
+ domkey: ["disability"],
+ fieldcol: 12,
+ label: "是否残疾",
+ lanId: 111,
+ labelcol: 6,
+ value: "",
+ viewAttr: 2,
+ detailtype: 3,
+ options: []
+ },
+ {
+ colSpan: 1,
+ conditionType: "INPUT",
+ domkey: ["disabilityCardNo"],
+ fieldcol: 12,
+ label: "残疾证号",
+ lanId: 111,
+ labelcol: 6,
+ value: "",
+ viewAttr: 2
+ },
+ {
+ colSpan: 1,
+ conditionType: "SELECT",
+ domkey: ["lonelyOld"],
+ fieldcol: 12,
+ label: "是否孤老",
+ lanId: 111,
+ labelcol: 6,
+ value: "",
+ viewAttr: 2,
+ detailtype: 3,
+ options: []
+ },
+ {
+ colSpan: 1,
+ conditionType: "SELECT",
+ domkey: ["martyrDependents"],
+ fieldcol: 12,
+ label: "是否是烈属",
+ lanId: 111,
+ labelcol: 6,
+ value: "",
+ viewAttr: 2,
+ detailtype: 3,
+ options: []
+ },
+ {
+ colSpan: 1,
+ conditionType: "INPUT",
+ domkey: ["martyrDependentsCardNo"],
+ fieldcol: 12,
+ label: "烈属证号",
+ lanId: 111,
+ labelcol: 6,
+ value: "",
+ viewAttr: 2
+ },
+ {
+ colSpan: 1,
+ conditionType: "SELECT",
+ domkey: ["deductExpenses"],
+ fieldcol: 12,
+ label: "是否扣除减除费用",
+ lanId: 111,
+ labelcol: 6,
+ value: "",
+ viewAttr: 2,
+ detailtype: 3,
+ options: []
}
],
defaultshow: true
diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js
index 022bbf27..74b8d9d2 100644
--- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js
+++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js
@@ -6,16 +6,34 @@
*/
import React, { Component } from "react";
import { WeaDatePicker, WeaLocaleProvider, WeaSelect, WeaTab, WeaTop } from "ecCom";
-import { Button, Dropdown, Menu, Spin } from "antd";
+import { Button, Dropdown, Menu, message, Modal, Spin } from "antd";
import BaseInfo from "./components/baseInfo";
import EmployeeDeclareDetailSchemaEditDialog from "./components/employeeDeclareDetailSchemaEditDialog";
+import { commonEnumList } from "../../apis/payrollFiles";
+import {
+ employeedeclareDeclare,
+ employeedeclareGetRate,
+ employeedeclareList,
+ employeedeclareList4Add,
+ employeedeclareList4Update,
+ employeedeclareRefresh,
+ employeeDelete,
+ getDeclareFeedback
+} from "../../apis/declare";
import { advanceConditions, submitStatus } from "./constants";
+import moment from "moment";
import { getSearchs } from "../../util";
import { inject, observer } from "mobx-react";
import { toJS } from "mobx";
+import { getQueryString } from "../../util/url";
import "./index.less";
const { getLabel } = WeaLocaleProvider;
+const API = {
+ list: employeedeclareList,
+ list4Add: employeedeclareList4Add,
+ list4Update: employeedeclareList4Update
+};
@inject("taxAgentStore", "employeeDeclareStore")
@observer
@@ -23,60 +41,288 @@ class Index extends Component {
constructor(props) {
super(props);
this.state = {
- selectedKey: "0",
- showSearchAd: false,
- declareStatus: "ALL",
- taxCycle: new Date(),
- declareEditDialog: {
- visible: false
- }
+ selectedKey: "list", showSearchAd: false, declareStatus: "ALL",
+ taxCycle: new Date(), loading: { query: false, refresh: false, feedback: false, declare: false },
+ pageInfo: { current: 1, pageSize: 10, total: 0 },
+ declareEditDialog: { visible: false, id: "", title: "" },
+ declareStatusList: [], employmentStatusList: [],
+ employmentTypeList: [], adConditons: [],
+ selectedRowKeys: []
};
+ this.baseInfoRef = null;
}
componentDidMount() {
- const { employeeDeclareStore: { advanceForm } } = this.props;
document.title = getLabel(544289, "人员信息报送");
- advanceForm.initFormFields(advanceConditions);
window.addEventListener("message", this.handleReceive, false);
- this.setCss();
+ this.initEmployeeDeclare().then(r => {
+ });
}
+ initEmployeeDeclare = async () => {
+ const { employeeDeclareStore: { advanceForm } } = this.props;
+ const [declareStatusList, employmentStatusList, employmentTypeList] = await Promise.all([this.commonEnumList("DeclareStatusEnum"), this.commonEnumList("EmploymentStatusEnum"), this.commonEnumList("EmploymentTypeEnum")]);
+ if (declareStatusList.status && employmentStatusList.status && employmentTypeList.status) {
+ this.setState({
+ declareStatusList: declareStatusList.data,
+ employmentStatusList: employmentStatusList.data,
+ employmentTypeList: employmentTypeList.data,
+ adConditons: _.map(advanceConditions, it => {
+ return {
+ ...it,
+ items: _.map(it.items, child => {
+ if (child.domkey[0] === "employmentStatus") {
+ return {
+ ...child,
+ options: _.map(employmentStatusList.data, it => ({
+ key: it.enum,
+ showname: getLabel(it.labelId, it.defaultLabel)
+ }))
+ };
+ } else if (child.domkey[0] === "employmentType") {
+ return {
+ ...child,
+ options: _.map(employmentTypeList.data, it => ({
+ key: it.enum,
+ showname: getLabel(it.labelId, it.defaultLabel)
+ }))
+ };
+ }
+ if (child.conditionType === "SELECT" && child.domkey[0] !== "employmentStatus" && child.domkey[0] !== "employmentType") {
+ return {
+ ...child,
+ options: [
+ { key: "ON", showname: getLabel(538048, "是") },
+ { key: "OFF", showname: getLabel(111, "否") }
+ ]
+ };
+ }
+ return { ...child };
+ })
+ };
+ })
+ }, () => {
+ advanceForm.initFormFields(this.state.adConditons);
+ });
+ }
+ };
+
componentWillUnmount() {
window.removeEventListener("message", this.handleReceive, false);
}
- setCss = () => {
- $($("head")[0]).append("");
- };
-
handleReceive = ({ data }) => {
const { type, payload: { id, params } = {} } = data;
if (type === "init") {
- this.postMessageToChild({});
+ this.queryEmployeeList();
} else if (type === "turn") {
if (id === "PAGEINFO") {
const { pageNum: current, size: pageSize } = params;
this.setState({ pageInfo: { ...pageInfo, current, pageSize } });
+ } else if (id === "EDIT") {
+ this.setState({
+ declareEditDialog: {
+ ...this.state.declareEditDialog,
+ visible: true, id: params.id, title: params.employeeName
+ }
+ });
+ } else if (id === "DELETE") {
+ this.handleDeleteDeclare([params.id]);
+ } else if (id === "ROWSELECT") {
+ const { selectedRowKeys } = params;
+ this.setState({ selectedRowKeys });
}
}
};
- postMessageToChild = (payload) => {
+ postMessageToChild = (payload = {}) => {
+ const i18n = {
+ "总计": getLabel(523, "总计"), "编辑": getLabel(501169, "编辑"),
+ "操作": getLabel(30585, "操作"), "删除": getLabel(535052, "删除"),
+ "共": getLabel(83698, "共"), "条": getLabel(18256, "条"),
+ "加载中": getLabel(83698, "加载中")
+ };
const childFrameObj = document.getElementById("atdTable");
- childFrameObj && childFrameObj.contentWindow.postMessage(JSON.stringify({}), "*");
+ childFrameObj && childFrameObj.contentWindow.postMessage(JSON.stringify({ ...payload, i18n }), "*");
+ };
+ commonEnumList = (key) => {
+ const payload = { enumClass: `com.engine.salary.enums.employeedeclare.${key}` };
+ return commonEnumList(payload);
+ };
+ /*
+ * Author: 黎永顺
+ * Description: 报送列表查询
+ * Params:
+ * Date: 2023/8/14
+ */
+ queryEmployeeList = () => {
+ const { employeeDeclareStore: { advanceForm: form } } = this.props;
+ const { pageInfo, declareStatus, taxCycle, selectedKey, selectedRowKeys } = this.state;
+ const { departmentIds, positionIds, ...formParams } = form.getFormParams();
+ const payload = {
+ ...formParams, ...pageInfo,
+ declareStatus,
+ taxAgentId: getQueryString("id"),
+ taxCycle: moment(taxCycle).startOf("month").format("YYYY-MM-DD"),
+ departmentIds: departmentIds ? departmentIds.split(",") : [],
+ positionIds: positionIds ? positionIds.split(",") : []
+ };
+ this.setState({ loading: { ...this.state.loading, query: true } });
+ API[selectedKey](payload).then(({ status, data }) => {
+ this.setState({ loading: { ...this.state.loading, query: false } });
+ if (status) {
+ const { pageInfo: result } = data;
+ const { columns, list: dataSource, pageNum: current, pageSize, total } = result;
+ this.baseInfoRef.getEmployeeDeclareInfo();
+ this.setState({
+ pageInfo: { ...pageInfo, current, pageSize, total }
+ }, () => {
+ const payload = {
+ dataSource, selectedRowKeys,
+ pageInfo: this.state.pageInfo,
+ columns: _.map(columns, it => {
+ if (it.dataIndex === "employeeName" || it.dataIndex === "subCompanyName") {
+ return { ...it, width: 150, fixed: "left" };
+ }
+ if (it.dataIndex === "declareStatusDesc") {
+ return { ...it, width: 150, fixed: "right" };
+ }
+ return { ...it, width: 150 };
+ })
+ };
+ this.postMessageToChild(payload);
+ });
+ }
+ }).then(() => this.setState({ loading: { ...this.state.loading, query: false } }));
+ };
+ /*
+ * Author: 黎永顺
+ * Description: 刷新数据
+ * Params:
+ * Date: 2023/8/14
+ */
+ employeedeclareRefresh = () => {
+ const payload = {
+ taxAgentId: getQueryString("id"),
+ taxCycle: moment(this.state.taxCycle).startOf("month").format("YYYY-MM-DD")
+ };
+ this.setState({ loading: { ...this.state.loading, refresh: true } });
+ employeedeclareRefresh(payload).then(async ({ status, data, errormsg }) => {
+ this.setState({ loading: { ...this.state.loading, refresh: false } });
+ if (status) {
+ const { status, data: result } = await employeedeclareGetRate({ index: data });
+ const { msg } = result || {};
+ (status && !msg) ? message.success(getLabel(111, "刷新成功！")) : message.warning(msg || getLabel(111, "刷新失败！"));
+ this.queryEmployeeList();
+ } else {
+ message.error(errormsg);
+ }
+ }).catch(() => this.setState({ loading: { ...this.state.loading, refresh: false } }));
+ };
+ /*
+ * Author: 黎永顺
+ * Description:获取报送结果反馈
+ * Params:
+ * Date: 2023/8/15
+ */
+ getDeclareFeedback = () => {
+ const payload = {
+ taxAgentId: getQueryString("id"),
+ taxCycle: moment(this.state.taxCycle).startOf("month").format("YYYY-MM-DD")
+ };
+ this.setState({ loading: { ...this.state.loading, feedback: true } });
+ getDeclareFeedback(payload).then(async ({ status, data, errormsg }) => {
+ this.setState({ loading: { ...this.state.loading, feedback: false } });
+ if (status) {
+ const { status, data: result } = await employeedeclareGetRate({ index: data });
+ const { msg } = result || {};
+ (status && !msg) ? message.success(getLabel(111, "获取报送结果成功！")) : message.warning(msg || "");
+ this.queryEmployeeList();
+ } else {
+ message.error(errormsg);
+ }
+ }).catch(() => this.setState({ loading: { ...this.state.loading, feedback: false } }));
+ };
+ /*
+ * Author: 黎永顺
+ * Description: 删除个税申报人员信息
+ * Params:
+ * Date: 2023/8/15
+ */
+ handleDeleteDeclare = (paylaod) => {
+ const { selectedRowKeys } = this.state;
+ Modal.confirm({
+ title: getLabel(131329, "信息确认"),
+ content: getLabel(543548, "确认删除吗？"),
+ onOk: () => {
+ employeeDelete(paylaod).then(({ status, errormsg }) => {
+ if (status) {
+ message.success(getLabel(502230, "删除成功！"));
+ this.setState({
+ selectedRowKeys: _.xorWith(selectedRowKeys, paylaod, _.isEqual)
+ });
+ this.queryEmployeeList();
+ } else {
+ message.error(errormsg || getLabel(20462, "删除失败！"));
+ }
+ });
+ }
+ });
+ };
+ /*
+ * Author: 黎永顺
+ * Description: 全部报送
+ * Params:
+ * Date: 2023/8/15
+ */
+ employeedeclareDeclare = () => {
+ const payload = {
+ taxAgentId: getQueryString("id"),
+ taxCycle: moment(this.state.taxCycle).startOf("month").format("YYYY-MM-DD")
+ };
+ this.setState({ loading: { ...this.state.loading, declare: true } });
+ employeedeclareDeclare(payload).then(async ({ status, data, errormsg }) => {
+ this.setState({ loading: { ...this.state.loading, declare: false } });
+ if (status) {
+ const { status, data: result } = await employeedeclareGetRate({ index: data });
+ const { msg } = result || {};
+ (status && !msg) ? message.success(getLabel(111, "全部报送成功！")) : message.warning(msg || "");
+ this.queryEmployeeList();
+ } else {
+ message.error(errormsg);
+ }
+ }).catch(() => this.setState({ loading: { ...this.state.loading, declare: false } }));
};
handleAdd = () => {
this.setState({
declareEditDialog: {
+ ...this.state.declareEditDialog,
visible: true
}
});
};
+ handleMenuClick = ({ key }) => {
+ const { selectedRowKeys } = this.state;
+ switch (key) {
+ case "1":
+ if (_.isEmpty(selectedRowKeys)) {
+ message.warning(getLabel(111, "请先选择需要删除的人员！"));
+ return;
+ }
+ this.handleDeleteDeclare(selectedRowKeys);
+ break;
+ default:
+ break;
+ }
+ };
render() {
- const { selectedKey, showSearchAd, declareStatus, taxCycle, declareEditDialog } = this.state;
- const { taxAgentStore: { showOperateBtn }, employeeDeclareStore: { advanceForm: form } } = this.props;
+ const {
+ selectedKey, showSearchAd, declareStatus, declareStatusList, taxCycle, declareEditDialog, loading,
+ pageInfo, adConditons, employmentTypeList, employmentStatusList
+ } = this.state;
+ const { taxAgentStore: { showOperateBtn }, employeeDeclareStore: { advanceForm: form, declareForm } } = this.props;
const menu = (
-
+ }
+ type="primary">{getLabel(1421, "新增")},
+
{/*基础信息*/}
- this.baseInfoRef = dom}
+ taxCycle={moment(taxCycle).startOf("month").format("YYYY-MM-DD")}
+ />
{/*列表数据*/}
this.setState({ showSearchAd: bool })}
- advanceHeight={300} searchsAd={getSearchs(form, toJS(advanceConditions), 2)}
- buttons={[
-
- {getLabel(32935, "导入")}
-
- }
- type="primary">{getLabel(1421, "新增")} ,
- ({ ...it, showname: getLabel(it.lanId, it.showname) }))}
- onChange={declareStatus => this.setState({ declareStatus })}
- />
- ]} searchsBaseValue={form.getFormParams().keyword}
+ advanceHeight={300} searchsAd={getSearchs(form, toJS(adConditons), 2)}
+ buttons={tabBtns} searchsBaseValue={form.getFormParams().keyword}
onSearchChange={(v) => form.updateFields({ keyword: v })}
- onChange={key => this.setState({ selectedKey: key })}
+ onChange={key => this.setState({
+ selectedKey: key,
+ pageInfo: { ...pageInfo, current: 1 }
+ }, () => this.queryEmployeeList())}
onAdReset={() => form.resetForm()}
+ onSearch={() => this.setState({
+ pageInfo: { ...pageInfo, current: 1 }
+ }, () => this.queryEmployeeList())}
+ onAdSearch={() => this.setState({
+ pageInfo: {
+ ...pageInfo,
+ current: 1
+ }
+ }, () => this.queryEmployeeList())}
/>
+ {getLabel(111, "个税申报表字段")}
+
+ {
+ !_.isEmpty(dataList) ?
+ _.map(dataList, it => ( this.handleClickItem(it)}>{it.name} )) :
+
+
+ }
+
+ } trigger="click" placement="right" overlayClassName="income_pop_wrapper"
+ visible={record.visible}
+ onVisibleChange={(visible) => onChangeSwitch(visible, record.id)}
+ >
+
+ onChangeSwitch(true, record.id)} style={{ width: "auto" }}
+ onChange={(e) => this.setState({ keywords: e.target.value }, () => this.handleSearch())}
+ />
+
+
+ {/* this.setState({ keywords: visible ? "" : salaryItemName }, () => onChangeSwitch(visible, record.id))}*/}
+ {/* value={keywords} onChange={(keywords) => this.setState({ keywords }, () => this.handleSearch())}*/}
+ {/*/>*/}
+
+ );
+ }
+}
+
+export default LedgerFieldsItemPopver;
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerFieldsTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerFieldsTable.js
new file mode 100644
index 00000000..13a03f01
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerFieldsTable.js
@@ -0,0 +1,35 @@
+/*
+ * Author: 黎永顺
+ * name: 个税申报-字段对应查看列表
+ * Description:
+ * Date: 2023/8/16
+ */
+import React, { Component } from "react";
+import { WeaTable } from "ecCom";
+
+class LedgerFieldsTable extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ dataSource: []
+ };
+ }
+
+ componentWillReceiveProps(nextProps, nextContext) {
+ if (nextProps.dataSource !== this.props.dataSource && !_.isEmpty(nextProps.dataSource)) {
+ this.setState({
+ dataSource: _.take(nextProps.dataSource)[0].taxReportRules
+ });
+ }
+ }
+
+ render() {
+ const { columns } = this.props;
+ const { dataSource } = this.state;
+ return (
+ ;
+ CurrentDom =
+ this.incomeRef = dom} {...this.props} saveSalarySobId={saveSalarySobId}/>;
break;
case 6:
CurrentDom =
@@ -278,13 +319,11 @@ class LedgerSlide extends Component {
type="primary"
loading={loading}
onClick={() => {
- this.setState({ current: current + 1 }, () => {
- console.log("个税申报字段对应");
- });
+ this.setState({ current: current + 1 }, () => this.taxreportruleSave());
}}
>保存并进入下一步
] : [
-
+
];
break;
case 6:
From acadba0946b06cdc97252fd0fa658cb9917b9870 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 17 Aug 2023 10:16:29 +0800
Subject: [PATCH 028/165] =?UTF-8?q?=E4=B8=AA=E7=A8=8E=E5=AF=B9=E6=8E=A5-?=
=?UTF-8?q?=E8=96=AA=E8=B5=84=E8=B4=A6=E5=A5=97=E4=B8=AA=E7=A8=8E=E7=94=B3?=
=?UTF-8?q?=E6=8A=A5=E5=AD=97=E6=AE=B5=E5=AF=B9=E5=BA=94=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ledgerPage/components/incomeTaxFields.js | 4 +-
.../components/ledgerFieldsItemPopver.js | 42 +++++++++++--------
2 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/incomeTaxFields.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/incomeTaxFields.js
index be71c342..4d41561a 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/incomeTaxFields.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/incomeTaxFields.js
@@ -17,7 +17,7 @@ class IncomeTaxFields extends Component {
super(props);
this.state = {
selectedKey: "", tabs: [],
- incomeTaxFields: [],
+ incomeTaxFields: []
};
}
@@ -65,7 +65,7 @@ class IncomeTaxFields extends Component {
...it,
taxReportRules: _.map(it.taxReportRules, child => {
if (child.id === recordRuleId) {
- return { ...child, visible: false, salaryItem: [salaryItem] };
+ return { ...child, visible: false, salaryItem };
}
return { ...child, visible: false };
})
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerFieldsItemPopver.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerFieldsItemPopver.js
index 1d206a80..74c28141 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerFieldsItemPopver.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerFieldsItemPopver.js
@@ -5,12 +5,11 @@
* Date: 2023/8/16
*/
import React, { Component } from "react";
-import { Button, Icon, Input, Popover } from "antd";
-import { WeaLocaleProvider } from "ecCom";
+import { Icon, Popover } from "antd";
+import { WeaInputSearch, WeaLocaleProvider } from "ecCom";
import { commonBrowserData } from "../../../apis";
const { getLabel } = WeaLocaleProvider;
-const InputGroup = Input.Group;
class LedgerFieldsItemPopver extends Component {
constructor(props) {
@@ -26,10 +25,24 @@ class LedgerFieldsItemPopver extends Component {
if (nextProps.record !== this.props.record && nextProps.record.visible) {
this.commonBrowserData(nextProps);
} else {
- this.setState({ dataList: [] });
+ const { record } = nextProps;
+ const salaryItemName = record.salaryItem[0] ? record.salaryItem[0].name : "";
+ this.setState({ dataList: [], keywords: salaryItemName });
}
}
+ handleFocusChange = (visible) => {
+ const { keywords } = this.state;
+ const { record, onChangeSwitch } = this.props;
+ visible && onChangeSwitch(visible, record.id);
+ if (visible && keywords) {
+ this.setState({ keywords: "" });
+ }
+ };
+ handleChange = (keywords) => {
+ this.setState({ keywords }, () => this.handleSearch());
+ !keywords && this.props.onChange([], this.props.record.id);
+ };
commonBrowserData = (props) => {
const { salarySobId } = props;
const { keywords } = this.state;
@@ -56,13 +69,12 @@ class LedgerFieldsItemPopver extends Component {
handleClickItem = (item) => {
this.setState({
keywords: item.name
- }, () => this.props.onChange(item, this.props.record.id));
+ }, () => this.props.onChange([item], this.props.record.id));
};
render() {
const { keywords, dataList } = this.state;
const { record, onChangeSwitch } = this.props;
- const salaryItemName = record.salaryItem[0] ? record.salaryItem[0].name : "";
return (
@@ -79,18 +91,12 @@ class LedgerFieldsItemPopver extends Component {
visible={record.visible}
onVisibleChange={(visible) => onChangeSwitch(visible, record.id)}
>
-
- onChangeSwitch(true, record.id)} style={{ width: "auto" }}
- onChange={(e) => this.setState({ keywords: e.target.value }, () => this.handleSearch())}
- />
-
-
- {/* this.setState({ keywords: visible ? "" : salaryItemName }, () => onChangeSwitch(visible, record.id))}*/}
- {/* value={keywords} onChange={(keywords) => this.setState({ keywords }, () => this.handleSearch())}*/}
- {/*/>*/}
+ alert(1)}
+ />
);
}
From acc4654e767181964c5390e5ea4b60650a1a226c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 17 Aug 2023 11:46:45 +0800
Subject: [PATCH 029/165] =?UTF-8?q?=E4=B8=AA=E7=A8=8E=E5=AF=B9=E6=8E=A5-?=
=?UTF-8?q?=E8=96=AA=E8=B5=84=E8=B4=A6=E5=A5=97=E4=B8=AA=E7=A8=8E=E7=94=B3?=
=?UTF-8?q?=E6=8A=A5=E5=AD=97=E6=AE=B5=E5=AF=B9=E5=BA=94=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pc4mobx/hrmSalary/apis/ledger.js | 6 +-
.../ledgerPage/components/cumulativeFields.js | 120 ++++++++++++++++++
.../ledgerPage/components/incomeTaxFields.js | 16 ++-
.../pages/ledgerPage/components/index.less | 25 ++++
.../components/ledgerFieldsItemPopver.js | 80 ++++++++----
.../ledgerSalaryItemSelectDialog.js | 119 +++++++++++++++++
.../ledgerPage/components/ledgerSlide.js | 4 +-
7 files changed, 341 insertions(+), 29 deletions(-)
create mode 100644 pc4mobx/hrmSalary/pages/ledgerPage/components/cumulativeFields.js
create mode 100644 pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemSelectDialog.js
diff --git a/pc4mobx/hrmSalary/apis/ledger.js b/pc4mobx/hrmSalary/apis/ledger.js
index fc2e5f43..32103505 100644
--- a/pc4mobx/hrmSalary/apis/ledger.js
+++ b/pc4mobx/hrmSalary/apis/ledger.js
@@ -330,10 +330,14 @@ export const getAggregate = params => {
export const getBackitemForm = params => {
return WeaTools.callApi("/api/bs/hrmsalary/salarysob/backitem/getForm", "GET", params);
};
-//薪资账套下的个税申报表规则的详情
+//薪资账套下的个税申报表-申报字段对应
export const taxreportruleGetForm = params => {
return WeaTools.callApi("/api/bs/hrmsalary/salarysob/taxreportrule/getForm", "GET", params);
};
+//薪资账套下的个税申报-累计字段对应
+export const addupruleGetForm = params => {
+ return WeaTools.callApi("/api/bs/hrmsalary/salarysob/adduprule/getForm", "GET", params);
+};
//保存薪资账套下的个税申报表规则
export const taxreportruleSave = params => {
return postFetch("/api/bs/hrmsalary/salarysob/taxreportrule/save", params);
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/cumulativeFields.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/cumulativeFields.js
new file mode 100644
index 00000000..ef151183
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/cumulativeFields.js
@@ -0,0 +1,120 @@
+/*
+ * Author: 黎永顺
+ * name: 个税对接-累计字段对应
+ * Description:
+ * Date: 2023/8/17
+ */
+import React, { Component } from "react";
+import { WeaLocaleProvider, WeaSearchGroup, WeaTab } from "ecCom";
+import LedgerFieldsItemPopver from "./ledgerFieldsItemPopver";
+import { addupruleGetForm } from "../../../apis/ledger";
+import LedgerFieldsTable from "./ledgerFieldsTable";
+
+const { getLabel } = WeaLocaleProvider;
+
+class CumulativeFields extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ selectedKey: "", tabs: [],
+ addupruleFields: []
+ };
+ }
+
+ componentDidMount() {
+ this.taxreportruleGetForm();
+ }
+
+ taxreportruleGetForm = () => {
+ const { editId, saveSalarySobId } = this.props;
+ addupruleGetForm({ id: saveSalarySobId || editId }).then(({ status, data }) => {
+ if (status && !_.isEmpty(data)) {
+ this.setState({
+ tabs: _.map(data, it => ({ viewcondition: it.incomeCategoryId, title: it.incomeCategoryName })),
+ selectedKey: _.take(data)[0].incomeCategoryId,
+ addupruleFields: data
+ });
+ }
+ });
+ };
+ handleChangeSwitch = (visible, id) => {
+ const { addupruleFields, selectedKey } = this.state;
+ this.setState({
+ addupruleFields: _.map(addupruleFields, it => {
+ if (it.incomeCategoryId === selectedKey) {
+ return {
+ ...it,
+ taxReportRules: _.map(it.taxReportRules, child => {
+ if (child.id === id) {
+ return { ...child, visible };
+ }
+ return { ...child, visible: false };
+ })
+ };
+ }
+ return { ...it };
+ })
+ });
+ };
+ handleChangeAddupruleFieldsItem = (salaryItem, recordRuleId) => {
+ const { addupruleFields, selectedKey } = this.state;
+ this.setState({
+ addupruleFields: _.map(addupruleFields, it => {
+ if (it.incomeCategoryId === selectedKey) {
+ return {
+ ...it,
+ taxReportRules: _.map(it.taxReportRules, child => {
+ if (child.id === recordRuleId) {
+ return { ...child, visible: false, salaryItem };
+ }
+ return { ...child, visible: false };
+ })
+ };
+ }
+ return { ...it };
+ })
+ });
+ };
+
+ render() {
+ const { editId, saveSalarySobId } = this.props;
+ const { selectedKey, tabs, addupruleFields } = this.state;
+ const dataSource = _.takeWhile(addupruleFields, it => it.incomeCategoryId === selectedKey);
+ return (
+
+
+ }
+ >
+ (
+ this.setState({ keywords: val })}
/>
}
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less b/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less
index 3d1d5d05..269bc4fd 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less
@@ -299,3 +299,28 @@
line-height: 28px;
}
}
+
+.incomeDialog {
+ .incomeDialogTitle {
+ display: flex;
+ align-items: center;
+
+ .incomeDialogTitle-left {
+ text-align: left;
+
+ .title {
+ color: #111;
+ font-weight: 700;
+ }
+ }
+
+ .incomeDialogTitle-right {
+ text-align: right;
+ }
+ }
+
+ .incomeDialogContent {
+ height: 100%;
+ padding: 16px;
+ }
+}
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerFieldsItemPopver.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerFieldsItemPopver.js
index 74c28141..022c1b3b 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerFieldsItemPopver.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerFieldsItemPopver.js
@@ -8,6 +8,7 @@ import React, { Component } from "react";
import { Icon, Popover } from "antd";
import { WeaInputSearch, WeaLocaleProvider } from "ecCom";
import { commonBrowserData } from "../../../apis";
+import LedgerSalaryItemSelectDialog from "./ledgerSalaryItemSelectDialog";
const { getLabel } = WeaLocaleProvider;
@@ -16,7 +17,10 @@ class LedgerFieldsItemPopver extends Component {
super(props);
this.state = {
dataList: [],
- keywords: ""
+ keywords: "",
+ salaryItemSelectDialog: {
+ visible: false, salarySobId: ""
+ }
};
this.handleDebounce = null;
}
@@ -73,31 +77,59 @@ class LedgerFieldsItemPopver extends Component {
};
render() {
- const { keywords, dataList } = this.state;
- const { record, onChangeSwitch } = this.props;
+ const { keywords, dataList, salaryItemSelectDialog } = this.state;
+ const { record, onChangeSwitch, salarySobId } = this.props;
return (
-
-
+
{/*新增编辑报送信息*/}
{
+ taxCycle={moment(taxCycle).startOf("month").format("YYYY-MM-DD")}
+ employmentStatusList={employmentStatusList}
+ employmentTypeList={employmentTypeList}
+ onClose={(isFresh) => {
this.setState({
declareEditDialog: {
- visible: false
+ ...declareEditDialog,
+ visible: false, id: "", title: ""
}
+ }, () => {
+ declareForm.resetForm();
+ isFresh === "true" && this.queryEmployeeList();
});
}}
/>
diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.less b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.less
index 946f67aa..9d69d1fa 100644
--- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.less
+++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.less
@@ -70,10 +70,10 @@
}
-//.ant-calendar-picker-container {
-// right: 0 !important;
-// left: auto !important;
-//}
+.declareTable {
+ background: #FFF;
+}
+
.wea-slide-modal-title {
border-bottom: 1px solid #e5e5e5 !important;
diff --git a/pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js b/pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js
index b3647225..e218995d 100644
--- a/pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js
+++ b/pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js
@@ -144,7 +144,7 @@ class TaxAgentSlide extends Component {
API.saveAndCheck(_.omitBy(payload, val => _.isNil(val))).then(({ status, errormsg }) => {
this.setState({ verifyLoading: false });
if (status) {
- message.error(errormsg || getLabel(22619, "保存成功！"));
+ message.success(getLabel(22619, "保存成功！"));
jumpAll ? this.props.onCancel(true) : this.props.onOk();
} else {
message.error(errormsg || getLabel(22620, "保存失败！"));
From 42a334ad7f13ba6b686a98b383d5f3504cda40d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Wed, 16 Aug 2023 11:20:06 +0800
Subject: [PATCH 025/165] =?UTF-8?q?=E4=B8=AA=E7=A8=8E=E5=AF=B9=E6=8E=A5-?=
=?UTF-8?q?=E6=8A=A5=E9=80=81=E4=BF=A1=E6=81=AF=E8=AF=A6=E6=83=85=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../employeeDeclareDetailSchemaEditDialog.js | 14 +++++++++-----
.../hrmSalary/pages/employeedeclareDetail/index.js | 1 +
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js b/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js
index c65d2ef0..8684eaf2 100644
--- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js
+++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js
@@ -106,11 +106,15 @@ class EmployeeDeclareDetailSchemaEditDialog extends Component {
} else if (item === "cardType") {
declareForm.updateFields({ [item]: "居民身份证" });
} else if (item === "employee") {
- declareForm.updateFields({
- // employeeType: {
- // value: ["ORGANIZATION", ["13", "郑世珍", [{ id: "13", lastname: "郑世珍" }]]],
- // valueSpan: ["employeeId"]
- // }
+ const [employeeData] = result[item] || [];
+ !_.isEmpty(employeeData) && declareForm.updateFields({
+ employeeType: {
+ value: [employeeData._entityType, [employeeData.id, employeeData.name, [{
+ id: employeeData.id,
+ lastname: employeeData.name
+ }]]],
+ valueSpan: ["employeeId"]
+ }
});
} else {
declareForm.updateFields({ [item]: result[item] || "" });
diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js
index 74b8d9d2..56b8402b 100644
--- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js
+++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js
@@ -382,6 +382,7 @@ class Index extends Component {
/>
];
// !showOperateBtn && tabBtns.shift();
+ selectedKey !== "list" && tabBtns.shift();
return (
Date: Wed, 16 Aug 2023 14:03:43 +0800
Subject: [PATCH 026/165] =?UTF-8?q?=E4=B8=AA=E7=A8=8E=E5=AF=B9=E6=8E=A5-?=
=?UTF-8?q?=E8=96=AA=E8=B5=84=E8=B4=A6=E5=A5=97=E4=B8=AA=E7=A8=8E=E7=94=B3?=
=?UTF-8?q?=E6=8A=A5=E5=AD=97=E6=AE=B5=E5=AF=B9=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pc4mobx/hrmSalary/apis/ledger.js | 12 ++++---
.../ledgerPage/components/incomeTaxFields.js | 17 +++++-----
.../ledgerPage/components/ledgerSlide.js | 34 +++++++++++++++----
3 files changed, 45 insertions(+), 18 deletions(-)
diff --git a/pc4mobx/hrmSalary/apis/ledger.js b/pc4mobx/hrmSalary/apis/ledger.js
index 22231913..fc2e5f43 100644
--- a/pc4mobx/hrmSalary/apis/ledger.js
+++ b/pc4mobx/hrmSalary/apis/ledger.js
@@ -172,7 +172,7 @@ export const getLedgerItemGroupForm = params => {
//保存薪资帐套薪资项目
export const saveLedgerItem = params => {
- const { itemGroups, items, ...extra } = params;
+ const { itemGroups, items, ...extra } = params;
const payload = {
itemGroups: _.map(itemGroups, item => {
return {
@@ -330,9 +330,13 @@ export const getAggregate = params => {
export const getBackitemForm = params => {
return WeaTools.callApi("/api/bs/hrmsalary/salarysob/backitem/getForm", "GET", params);
};
-//查询个税映射规则
-export const getMappingFields = params => {
- return WeaTools.callApi("/api/bs/hrmsalary/salarysob/tax/getMappingFields", "GET", params);
+//薪资账套下的个税申报表规则的详情
+export const taxreportruleGetForm = params => {
+ return WeaTools.callApi("/api/bs/hrmsalary/salarysob/taxreportrule/getForm", "GET", params);
+};
+//保存薪资账套下的个税申报表规则
+export const taxreportruleSave = params => {
+ return postFetch("/api/bs/hrmsalary/salarysob/taxreportrule/save", params);
};
//保存回算薪资项目详情
export const salarysobBackitemSave = params => {
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/incomeTaxFields.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/incomeTaxFields.js
index 1d828d94..e72d81db 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/incomeTaxFields.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/incomeTaxFields.js
@@ -5,8 +5,10 @@
* Date: 2023/2/16
*/
import React, { Component } from "react";
-import { WeaSearchGroup } from "ecCom";
-import { getMappingFields } from "../../../apis/ledger";
+import { WeaLocaleProvider, WeaSearchGroup } from "ecCom";
+import { taxreportruleGetForm } from "../../../apis/ledger";
+
+const { getLabel } = WeaLocaleProvider;
class IncomeTaxFields extends Component {
constructor(props) {
@@ -15,13 +17,12 @@ class IncomeTaxFields extends Component {
}
componentDidMount() {
- this.getMappingFields();
+ this.taxreportruleGetForm();
}
- getMappingFields = () => {
- const { editId: salarySobId } = this.props;
- const payload = { salarySobId };
- getMappingFields(payload).then(({ status, data }) => {
+ taxreportruleGetForm = () => {
+ const { editId, saveSalarySobId } = this.props;
+ taxreportruleGetForm({ id: saveSalarySobId || editId }).then(({ status, data }) => {
if (status) {
console.log(data);
}
@@ -30,7 +31,7 @@ class IncomeTaxFields extends Component {
render() {
return (
-
+ 个税申报字段对应} showGroup needTigger={false}>
);
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
index 60a2de02..8711b5b9 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
@@ -24,8 +24,9 @@ const tabs = [
{ key: 1, title: "关联人员" },
{ key: 2, title: "薪资项目" },
{ key: 3, title: "回算薪资项目" },
- { key: 4, title: "个税申报字段对应" },
- { key: 5, title: "调薪计薪规则" }
+ { key: 4, title: "累计字段对应" },
+ { key: 5, title: "个税申报字段对应" },
+ { key: 6, title: "调薪计薪规则" }
];
@inject("taxAgentStore")
@@ -186,9 +187,12 @@ class LedgerSlide extends Component {
CurrentDom = ;
break;
case 4:
- CurrentDom = ;
+ CurrentDom = null;
break;
case 5:
+ CurrentDom = ;
+ break;
+ case 6:
CurrentDom =
this.setState({ adjustRules })}/>;
@@ -257,15 +261,33 @@ class LedgerSlide extends Component {
loading={loading}
onClick={() => {
this.setState({ current: current + 1 }, () => {
- console.log("个税申报")
+ console.log("累计字段对应");
});
}}
>保存并进入下一步
] : [
-
+
];
break;
case 5:
+ CurrentDom = !editId ?
+ [
+ ,
+ ,
+
+ ] : [
+
+ ];
+ break;
+ case 6:
CurrentDom = !editId ?
[
,
@@ -289,7 +311,7 @@ class LedgerSlide extends Component {
className="slideOuterWrapper"
visible={visible}
top={0}
- width={65}
+ width={100}
height={100}
direction="right"
measure="%"
From bfc9f1363c5f4c3c592d7e9f9c32b795ea477b04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 17 Aug 2023 08:33:21 +0800
Subject: [PATCH 027/165] =?UTF-8?q?=E4=B8=AA=E7=A8=8E=E5=AF=B9=E6=8E=A5-?=
=?UTF-8?q?=E8=96=AA=E8=B5=84=E8=B4=A6=E5=A5=97=E4=B8=AA=E7=A8=8E=E7=94=B3?=
=?UTF-8?q?=E6=8A=A5=E5=AD=97=E6=AE=B5=E5=AF=B9=E5=BA=94=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pc4mobx/hrmSalary/apis/index.js | 6 ++
.../ledgerPage/components/incomeTaxFields.js | 98 ++++++++++++++++--
.../pages/ledgerPage/components/index.less | 57 ++++++++++-
.../components/ledgerFieldsItemPopver.js | 99 +++++++++++++++++++
.../components/ledgerFieldsTable.js | 35 +++++++
.../ledgerPage/components/ledgerSlide.js | 53 ++++++++--
6 files changed, 334 insertions(+), 14 deletions(-)
create mode 100644 pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerFieldsItemPopver.js
create mode 100644 pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerFieldsTable.js
diff --git a/pc4mobx/hrmSalary/apis/index.js b/pc4mobx/hrmSalary/apis/index.js
index 854c9bf6..bec52975 100644
--- a/pc4mobx/hrmSalary/apis/index.js
+++ b/pc4mobx/hrmSalary/apis/index.js
@@ -1,4 +1,5 @@
import { WeaTools } from "ecCom";
+import { postFetch } from "../util/request";
// form基础数据
export const getBaseForm = (params) => {
@@ -19,3 +20,8 @@ export const getCondition = (params) => {
export const getTableDatas = (params) => {
return WeaTools.callApi("/api/demo03/weatableDemo", "GET", params);
};
+
+// 薪资账套-浏览按钮数据
+export const commonBrowserData = (params) => {
+ return postFetch("/api/bs/hrmsalary/common/browser/data", params);
+};
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/incomeTaxFields.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/incomeTaxFields.js
index e72d81db..be71c342 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/incomeTaxFields.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/incomeTaxFields.js
@@ -5,15 +5,20 @@
* Date: 2023/2/16
*/
import React, { Component } from "react";
-import { WeaLocaleProvider, WeaSearchGroup } from "ecCom";
+import { WeaHelpfulTip, WeaLocaleProvider, WeaSearchGroup, WeaTab } from "ecCom";
+import LedgerFieldsItemPopver from "./ledgerFieldsItemPopver";
import { taxreportruleGetForm } from "../../../apis/ledger";
+import LedgerFieldsTable from "./ledgerFieldsTable";
const { getLabel } = WeaLocaleProvider;
class IncomeTaxFields extends Component {
constructor(props) {
super(props);
- this.state = {};
+ this.state = {
+ selectedKey: "", tabs: [],
+ incomeTaxFields: [],
+ };
}
componentDidMount() {
@@ -23,16 +28,97 @@ class IncomeTaxFields extends Component {
taxreportruleGetForm = () => {
const { editId, saveSalarySobId } = this.props;
taxreportruleGetForm({ id: saveSalarySobId || editId }).then(({ status, data }) => {
- if (status) {
- console.log(data);
+ if (status && !_.isEmpty(data)) {
+ this.setState({
+ tabs: _.map(data, it => ({ viewcondition: it.incomeCategoryId, title: it.incomeCategoryName })),
+ selectedKey: _.take(data)[0].incomeCategoryId,
+ incomeTaxFields: data
+ });
}
});
};
+ handleChangeSwitch = (visible, id) => {
+ const { incomeTaxFields, selectedKey } = this.state;
+ this.setState({
+ incomeTaxFields: _.map(incomeTaxFields, it => {
+ if (it.incomeCategoryId === selectedKey) {
+ return {
+ ...it,
+ taxReportRules: _.map(it.taxReportRules, child => {
+ if (child.id === id) {
+ return { ...child, visible };
+ }
+ return { ...child, visible: false };
+ })
+ };
+ }
+ return { ...it };
+ })
+ });
+ };
+ handleChangeIncomeFieldsItem = (salaryItem, recordRuleId) => {
+ const { incomeTaxFields, selectedKey } = this.state;
+ this.setState({
+ incomeTaxFields: _.map(incomeTaxFields, it => {
+ if (it.incomeCategoryId === selectedKey) {
+ return {
+ ...it,
+ taxReportRules: _.map(it.taxReportRules, child => {
+ if (child.id === recordRuleId) {
+ return { ...child, visible: false, salaryItem: [salaryItem] };
+ }
+ return { ...child, visible: false };
+ })
+ };
+ }
+ return { ...it };
+ })
+ });
+ };
render() {
+ const { editId, saveSalarySobId } = this.props;
+ const { selectedKey, tabs, incomeTaxFields, visible } = this.state;
+ const dataSource = _.takeWhile(incomeTaxFields, it => it.incomeCategoryId === selectedKey);
return (
- 个税申报字段对应} showGroup needTigger={false}>
-
+
+
+ }
+ >
+ {getLabel(83553, "暂无数据")}
+{getLabel(83553, "暂无数据")}
-{getLabel(83553, "暂无数据")}
+
+ this.setState({ keywords: val })}
+ onSearch={() => this.commonBrowserData(this.props)}
+ />
+
+
+
+
+
+
+ );
+ }
+}
+
+export default TaxDeclarationInfo;
diff --git a/pc4mobx/hrmSalary/pages/declareDetail/index.js b/pc4mobx/hrmSalary/pages/declareDetail/index.js
new file mode 100644
index 00000000..f483dff9
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/declareDetail/index.js
@@ -0,0 +1,122 @@
+/*
+ * Author: 黎永顺
+ * name: 个税查看详情页面
+ * Description:
+ * Date: 2023/8/18
+ */
+import React, { Component } from "react";
+import { WeaLocaleProvider, WeaTab, WeaTable } from "ecCom";
+import { Button } from "antd";
+import TaxDeclarationInfo from "./components/taxDeclarationInfo";
+import { getDeclareInfo, getDetailList, getTaxDeclarationTab } from "../../apis/declare";
+import { getQueryString } from "../../util/url";
+import "./index.less";
+
+const { getLabel } = WeaLocaleProvider;
+
+class Index extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ tabs: [], selectedKey: "", columns: [],
+ loading: { query: false }, dataSource: [],
+ declareInfo: {}, pageInfo: { current: 0, pageSize: 10, total: 0 }
+ };
+ }
+
+
+ componentDidMount() {
+ const promise = this.init();
+ }
+
+ init = async () => {
+ const [tabsResult, infoResult] = await Promise.all([this.getTaxDeclarationTab(), this.getDeclareInfo()]);
+ const { data: tabDataSource, status: tabStatus } = tabsResult;
+ const { data: infoDataSource, status: infoStatus } = infoResult;
+ this.setState({
+ tabs: tabStatus ? _.map(tabDataSource, it => ({
+ viewcondition: `${it.incomeCategory}%%${it.taxDeclarationId}`,
+ title: it.tabName
+ })) : this.state.tabs,
+ selectedKey: tabStatus ? `${_.take(tabDataSource)[0].incomeCategory}%%${_.take(tabDataSource)[0].taxDeclarationId}` : this.state.selectedKey,
+ declareInfo: infoStatus ? infoDataSource : this.state.declareInfo
+ });
+ this.getDetailList();
+ };
+ refresh = async () => {
+ };
+ getTaxDeclarationTab = () => {
+ return getTaxDeclarationTab({ id: getQueryString("id") });
+ };
+ getDeclareInfo = () => {
+ return getDeclareInfo({ id: getQueryString("id") });
+ };
+ getDetailList = () => {
+ const { loading, pageInfo, selectedKey } = this.state;
+ const [incomeCategory, taxDeclarationId] = selectedKey.split("%%");
+ const payload = {
+ ...pageInfo, incomeCategory, taxDeclarationId,
+ taxDeclareRecordId: getQueryString("id")
+ };
+ this.setState({ loading: { ...loading, query: true } });
+ getDetailList(payload).then(({ status, data }) => {
+ this.setState({ loading: { ...loading, query: false } });
+ if (status) {
+ const { columns, list: dataSource, pageNum: current, pageSize, total } = data;
+ this.setState({
+ dataSource, pageInfo: { ...pageInfo, current, pageSize, total },
+ columns: _.map(columns, (it, idx) => {
+ if (idx <= 1) {
+ return { ...it, width: 150, fixed: "left" };
+ }
+ return { ...it, width: 150 };
+ })
+ });
+ }
+ }).catch(() => this.setState({ loading: { ...loading, query: false } }));
+ };
+
+ render() {
+ const { tabs, selectedKey, columns, pageInfo, dataSource, loading, declareInfo } = this.state;
+ const pagination = {
+ ...pageInfo,
+ showTotal: total => `${getLabel(18609, "共")} ${total} ${getLabel(18256, "条")}`,
+ showQuickJumper: true,
+ showSizeChanger: true,
+ pageSizeOptions: ["10", "20", "50", "100"],
+ onShowSizeChange: (current, pageSize) => {
+ this.setState({
+ pageInfo: { ...pageInfo, current, pageSize }
+ }, () => this.getDetailList());
+ },
+ onChange: current => {
+ this.setState({
+ pageInfo: { ...pageInfo, current }
+ }, () => this.getDetailList());
+ }
+ };
+ return (
+
+ {
+ _.map(infoItem, item => {
+ return
+
+ {item["label"]}
+ {declareInfo[item["key"]]}
+
;
+ })
+ }
+
+ this.handleSeeResult("abnormal", getLabel(111, "申报校验异常"))}>{getLabel(111, "申报校验异常")}（0）
+ this.handleSeeResult("fail", getLabel(111, "申报失败数据"))}>{getLabel(111, "申报失败数据")}（0）
+ {
+ this.setState({
+ resDialog: { ...resDialog, visible: false, title: "" }
+ });
+ }}
+ />
+
+
+
+
+ );
+ }
+}
+
+export default Index;
diff --git a/pc4mobx/hrmSalary/pages/declareDetail/index.less b/pc4mobx/hrmSalary/pages/declareDetail/index.less
new file mode 100644
index 00000000..fc345f7d
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/declareDetail/index.less
@@ -0,0 +1,84 @@
+.declareDetail-layout {
+ .declareDetail-layout-content {
+ padding: 0 16px;
+ }
+}
+
+.taxDeclarationInfo_layout {
+ border-bottom: 1px solid #e5e5e5;
+ height: 48px;
+ padding: 0 16px;
+ font-size: 12px;
+ color: #111;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+
+ .base-info {
+ display: flex;
+ align-items: center;
+ justify-content: flex-start;
+
+ .info-item {
+ margin-right: 25px;
+
+ .label {
+ color: #666;
+ }
+
+ .value {
+ color: #111;
+ }
+ }
+ }
+
+ .weapp-salary-btn-flex {
+ display: flex;
+ align-items: center;
+ justify-content: flex-end;
+ cursor: auto;
+ }
+
+ .tools-line {
+ font-size: 12px;
+ display: flex;
+ align-items: center;
+ color: #111;
+
+ .item {
+ margin-left: 8px;
+ cursor: pointer;
+ }
+ }
+}
+
+.declareResultDialog {
+ .declareResultDialogTitle {
+ display: flex;
+ align-items: center;
+
+ .declareResultDialogTitle-left {
+ text-align: left;
+
+ .title {
+ color: #111;
+ font-weight: 700;
+ }
+ }
+
+ .declareResultDialogTitle-right {
+ text-align: right;
+ }
+ }
+
+ .declareResultDialogContent {
+ height: 100%;
+ padding: 16px;
+ background: #f6f6f6;
+
+ .declareTable {
+ background: #FFF;
+ }
+
+ }
+}
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemSelectDialog.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemSelectDialog.js
index 137b8067..424f3294 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemSelectDialog.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemSelectDialog.js
@@ -15,7 +15,7 @@ class LedgerSalaryItemSelectDialog extends Component {
constructor(props) {
super(props);
this.state = {
- pageInfo: { current: 1, pageSize: 10, total: 0 },
+ pageInfo: { current: 1, pageSize: 20, total: 0 },
loading: false, columns: [], dataSource: [],
keywords: ""
};
@@ -57,7 +57,7 @@ class LedgerSalaryItemSelectDialog extends Component {
showTotal: total => `${getLabel(18609, "共")} ${total} ${getLabel(18256, "条")}`,
showQuickJumper: true,
showSizeChanger: true,
- pageSizeOptions: ["10", "20", "50", "100"],
+ pageSizeOptions: ["20", "50", "100"],
onShowSizeChange: (current, pageSize) => {
this.setState({
pageInfo: { ...pageInfo, current, pageSize }
@@ -89,7 +89,7 @@ class LedgerSalaryItemSelectDialog extends Component {
)}
style={{
- width: 600,
+ width: 850,
height: 606.6,
minHeight: 200,
minWidth: 380,
From 796d11466e126387eb772a607206edb49f79c6ee 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, 21 Aug 2023 10:43:08 +0800
Subject: [PATCH 033/165] =?UTF-8?q?=E4=B8=AA=E7=A8=8E=E5=AF=B9=E6=8E=A5-?=
=?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=94=B3=E6=8A=A5=E8=AF=A6=E6=83=85=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pc4mobx/hrmSalary/apis/declare.js | 30 +++++++
.../hrmSalary/pages/declare/generateModal.js | 29 ++++++-
pc4mobx/hrmSalary/pages/declare/index.js | 20 ++---
.../components/declareResultDialog.js | 84 +++++++++++++++----
.../components/taxDeclarationInfo.js | 21 +++--
.../hrmSalary/pages/declareDetail/index.js | 74 ++++++++++++++--
.../hrmSalary/pages/declareDetail/index.less | 31 +++++++
.../pages/employeedeclareDetail/index.less | 1 +
pc4mobx/hrmSalary/stores/declare.js | 9 +-
9 files changed, 253 insertions(+), 46 deletions(-)
diff --git a/pc4mobx/hrmSalary/apis/declare.js b/pc4mobx/hrmSalary/apis/declare.js
index a7641065..a6d4dd2a 100644
--- a/pc4mobx/hrmSalary/apis/declare.js
+++ b/pc4mobx/hrmSalary/apis/declare.js
@@ -132,5 +132,35 @@ export const getTaxDeclarationTab = params => {
return WeaTools.callApi("/api/bs/hrmsalary/taxdeclaration/getTaxDeclarationTab", "GET", params);
};
+//个税在线对接-个税申报表是否已经生成
+export const taxdeclarationGetRate = params => {
+ return WeaTools.callApi("/api/bs/hrmsalary/taxdeclaration/getRate", "GET", params);
+};
+
+//人员报送-刷新数据
+export const taxdeclarationRefreshData = (params) => {
+ return postFetch("/api/bs/hrmsalary/taxdeclaration/refreshData", params);
+};
+
+//人员报送-在线申报
+export const taxdeclarationDeclare = (params) => {
+ return postFetch("/api/bs/hrmsalary/taxdeclaration/declare", params);
+};
+//个税申报表申报数据-人员未报送列表
+export const taxdeclarationEmployeeList4NotDeclare = (params) => {
+ return postFetch("/api/bs/hrmsalary/taxdeclaration/employee/list4NotDeclare", params);
+};
+//个税申报表申报数据-报送人员无申报数据列表
+export const taxdeclarationEmployeeList4NoValue = (params) => {
+ return postFetch("/api/bs/hrmsalary/taxdeclaration/employee/list4NoValue", params);
+};
+//个税申报表申报数据-申报失败列表
+export const taxdeclarationEmployeeList4Fail = (params) => {
+ return postFetch("/api/bs/hrmsalary/taxdeclaration/employee/list4Fail", params);
+};
+//个税申报表申报数据-删除个税申报表
+export const taxdeclarationDelete = (params) => {
+ return postFetch("/api/bs/hrmsalary/taxdeclaration/delete", params);
+};
diff --git a/pc4mobx/hrmSalary/pages/declare/generateModal.js b/pc4mobx/hrmSalary/pages/declare/generateModal.js
index d813c2d2..8157c487 100644
--- a/pc4mobx/hrmSalary/pages/declare/generateModal.js
+++ b/pc4mobx/hrmSalary/pages/declare/generateModal.js
@@ -9,8 +9,9 @@ import {
WeaSelect,
WeaTextarea
} from "ecCom";
-import { Button } from "antd";
+import { Button, message } from "antd";
import { inject, observer } from "mobx-react";
+import { taxdeclarationGetRate } from "../../apis/declare";
import moment from "moment";
import "./index.less";
@@ -26,6 +27,7 @@ export default class GenerateModal extends React.Component {
description: "",
loading: false
};
+ this.timer = null;
}
// 生成申报表
@@ -52,13 +54,34 @@ export default class GenerateModal extends React.Component {
salaryMonth: moment(date).startOf("month").format("YYYY-MM-DD"),
taxAgentId,
description
- }).then(() => {
+ }).then((data) => {
this.setState({ loading: false });
- this.props.onGenerate();
+ this.props.onCancel();
+ message.destroy();
+ message.loading(getLabel(22619, "正在生成中..."), 0);
+ this.timer = setInterval(async () => {
+ const { status: resStatus, data: result } = await this.taxdeclarationGetRate(data);
+ const { status: rateStatus, finish, msg } = result;
+ if (resStatus && rateStatus) {
+ if (finish) {
+ message.destroy();
+ clearInterval(this.timer);
+ message.success(msg || getLabel(22619, "保存成功！"));
+ this.props.onGenerate();
+ }
+ } else {
+ message.warning(msg || getLabel(111, "生成申报表失败！"));
+ }
+ }, 800);
}).catch(() => {
+ message.destroy();
+ clearInterval(this.timer);
this.setState({ loading: false });
});
};
+ taxdeclarationGetRate = (index) => {
+ return taxdeclarationGetRate({ index });
+ };
render() {
const { taxAgentStore: { taxAgentAdminOption } } = this.props;
diff --git a/pc4mobx/hrmSalary/pages/declare/index.js b/pc4mobx/hrmSalary/pages/declare/index.js
index 91b7ea6d..a42a3b3f 100644
--- a/pc4mobx/hrmSalary/pages/declare/index.js
+++ b/pc4mobx/hrmSalary/pages/declare/index.js
@@ -5,7 +5,7 @@ import { WeaLocaleProvider, WeaNewScroll, WeaTop } from "ecCom";
import CustomTab from "../../components/customTab";
import CustomTable from "../../components/customTable";
import GenerateModal from "./generateModal";
-import { getDeclareList, withDrawTaxDeclaration } from "../../apis/declare";
+import { getDeclareList, taxdeclarationDelete } from "../../apis/declare";
import { sysConfCodeRule } from "../../apis/ruleconfig";
import moment from "moment";
@@ -65,13 +65,13 @@ export default class Declare extends React.Component {
if (status && data === "1") this.setState({ showWithDrawBtn: data === "1" });
});
};
- withDrawTaxDeclaration = (taxDeclarationId) => {
- withDrawTaxDeclaration({ taxDeclarationId }).then(({ status, errormsg }) => {
+ taxdeclarationDelete = (taxDeclarationId) => {
+ taxdeclarationDelete([taxDeclarationId]).then(({ status, errormsg }) => {
if (status) {
- message.success(getLabel(111, "撤回成功"));
+ message.success(getLabel(502230, "删除成功"));
this.getDeclareList();
} else {
- message.error(errormsg || getLabel(111, "撤回失败"));
+ message.error(errormsg || getLabel(20462, "删除失败"));
}
});
};
@@ -129,7 +129,7 @@ export default class Declare extends React.Component {
onClick={() => {
this.setState({ declarationModalVisible: true });
}}>
- 生成申报单
+ {getLabel(111, "生成申报表")}
}
+ {getLabel(17416, "导出")},
+ ,
+
+ ]}
+ />
+
+
+ {
+ type.length !== 1 &&
+ < div className="declareNoSearchBox">
+ this.setState({ keyword: val })}
+ onSearch={this.queryList}
+ />
+
+ }
- {item["label"]}
+ {item["label"]}：
{declareInfo[item["key"]]}
;
})
@@ -51,14 +53,21 @@ class TaxDeclarationInfo extends Component {
this.handleSeeResult("abnormal", getLabel(111, "申报校验异常"))}>{getLabel(111, "申报校验异常")}（0）
+ onClick={() => this.handleSeeResult([
+ { key: "list4NotDeclare", title: getLabel(111, "待报送") },
+ { key: "list4NoValue", title: getLabel(111, "缺申报数据") }
+ ], getLabel(111, "申报校验异常"))}>
+ {getLabel(111, "申报校验异常")}（{abnormalSize || 0}）
+
this.handleSeeResult("fail", getLabel(111, "申报失败数据"))}>{getLabel(111, "申报失败数据")}（0）
+ onClick={() => this.handleSeeResult([{ key: "list4Fail" }], getLabel(111, "申报失败数据"))}>
+ {getLabel(111, "申报失败数据")}（{declareFailSize || 0}）
+
{
this.setState({
- resDialog: { ...resDialog, visible: false, title: "" }
+ resDialog: { ...resDialog, visible: false, title: "", type: [] }
});
}}
/>
diff --git a/pc4mobx/hrmSalary/pages/declareDetail/index.js b/pc4mobx/hrmSalary/pages/declareDetail/index.js
index f483dff9..d4b0015c 100644
--- a/pc4mobx/hrmSalary/pages/declareDetail/index.js
+++ b/pc4mobx/hrmSalary/pages/declareDetail/index.js
@@ -6,9 +6,16 @@
*/
import React, { Component } from "react";
import { WeaLocaleProvider, WeaTab, WeaTable } from "ecCom";
-import { Button } from "antd";
+import { Button, message } from "antd";
import TaxDeclarationInfo from "./components/taxDeclarationInfo";
-import { getDeclareInfo, getDetailList, getTaxDeclarationTab } from "../../apis/declare";
+import {
+ getDeclareInfo,
+ getDetailList,
+ getTaxDeclarationTab,
+ taxdeclarationDeclare,
+ taxdeclarationGetRate,
+ taxdeclarationRefreshData
+} from "../../apis/declare";
import { getQueryString } from "../../util/url";
import "./index.less";
@@ -18,8 +25,8 @@ class Index extends Component {
constructor(props) {
super(props);
this.state = {
- tabs: [], selectedKey: "", columns: [],
- loading: { query: false }, dataSource: [],
+ tabs: [], selectedKey: "", columns: [], dataSource: [],
+ loading: { query: false, refresh: false, declare: false },
declareInfo: {}, pageInfo: { current: 0, pageSize: 10, total: 0 }
};
}
@@ -43,7 +50,13 @@ class Index extends Component {
});
this.getDetailList();
};
- refresh = async () => {
+ declare = async () => {
+ const [infoResult] = await Promise.all([this.getDeclareInfo()]);
+ const { data: infoDataSource, status: infoStatus } = infoResult;
+ this.setState({
+ declareInfo: infoStatus ? infoDataSource : this.state.declareInfo
+ });
+ this.getDetailList();
};
getTaxDeclarationTab = () => {
return getTaxDeclarationTab({ id: getQueryString("id") });
@@ -51,6 +64,9 @@ class Index extends Component {
getDeclareInfo = () => {
return getDeclareInfo({ id: getQueryString("id") });
};
+ taxdeclarationGetRate = (index) => {
+ return taxdeclarationGetRate({ index });
+ };
getDetailList = () => {
const { loading, pageInfo, selectedKey } = this.state;
const [incomeCategory, taxDeclarationId] = selectedKey.split("%%");
@@ -75,6 +91,46 @@ class Index extends Component {
}
}).catch(() => this.setState({ loading: { ...loading, query: false } }));
};
+ taxdeclarationRefreshData = () => {
+ this.setState({ loading: { ...this.state.loading, refresh: true } });
+ taxdeclarationRefreshData({ taxDeclareRecordId: getQueryString("id") }).then(async ({ status, data, errormsg }) => {
+ this.setState({ loading: { ...this.state.loading, refresh: false } });
+ if (status) {
+ const { status: resStatus, data: result } = await this.taxdeclarationGetRate(data);
+ if (resStatus) {
+ const { status: rateStatus, msg } = result;
+ if (rateStatus) {
+ message.success(getLabel(111, "刷新数据成功！"));
+ const promise = this.init();
+ } else {
+ message.warning(msg || getLabel(111, "刷新数据失败！"));
+ }
+ }
+ } else {
+ message.warning(errormsg);
+ }
+ }).catch(() => this.setState({ loading: { ...this.state.loading, refresh: false } }));
+ };
+ taxdeclarationDeclare = () => {
+ this.setState({ loading: { ...this.state.loading, declare: true } });
+ taxdeclarationDeclare({ taxDeclareRecordId: getQueryString("id") }).then(async ({ status, data, errormsg }) => {
+ this.setState({ loading: { ...this.state.loading, declare: false } });
+ if (status) {
+ const { status: resStatus, data: result } = await this.taxdeclarationGetRate(data);
+ if (resStatus) {
+ const { status: rateStatus, msg } = result;
+ if (rateStatus) {
+ message.success(getLabel(111, "在线申报成功！"));
+ const promise = this.declare();
+ } else {
+ message.warning(msg || getLabel(111, "在线申报失败！"));
+ }
+ }
+ } else {
+ message.warning(errormsg);
+ }
+ }).catch(() => this.setState({ loading: { ...this.state.loading, declare: false } }));
+ };
render() {
const { tabs, selectedKey, columns, pageInfo, dataSource, loading, declareInfo } = this.state;
@@ -103,15 +159,17 @@ class Index extends Component {
datas={tabs} keyParam="viewcondition" selectedKey={selectedKey}
buttons={[
,
- ,
-
+ ,
+
]}
/>
+ {getSearchs(taxfillInfoForm, taxFillCondition, 1)}
+
+
+
,
+ onOk: () => {
+ taxPaymentTaxAmount({ taxDeclareRecordId: getQueryString("id") })
+ .then(({ status, data, errormsg }) => {
+ if (status) {
+ const { paymentDialog } = this.state;
+ this.setState({
+ paymentDialog: {
+ ...paymentDialog, visible: true,
+ title: getLabel(111, "应缴纳"), taxAmount: data.amount,
+ buttons: [
+
+ ],
+ conditions: _.map(paymentTripartiteConditions, item => {
+ return {
+ ...item,
+ items: _.map(item.items, it => {
+ const key = it["domkey"][0];
+ return {
+ ...it,
+ value: data[key]
+ };
+ })
+ };
+ })
+ }
+ });
+ } else {
+ message.error(errormsg);
+ }
+ });
+ }
+ });
+ };
+ taxPaymentgetAgreement = () => {
+ const { taxCycle: taxYearMonth, taxAgentId } = this.props.declareInfo;
+ const payload = {
+ taxDeclareRecordId: getQueryString("id"),
+ taxAgentId, taxYearMonth
+ };
+ this.setState({
+ paymentDialog: {
+ ...this.state.paymentDialog,
+ buttons: [
+
+ ]
+ }
+ });
+ taxPaymentgetAgreement(payload).then(({ status, data, errormsg }) => {
+ if (status) {
+ this.handleCancel();
+ this.getBankAccountInfo({ ...payload, requestId: data });
+ } else {
+ this.setState({
+ paymentDialog: {
+ ...this.state.paymentDialog,
+ buttons: [
+
+ ]
+ }
+ });
+ message.error(errormsg);
+ }
+ }).catch(() => {
+ this.setState({
+ paymentDialog: {
+ ...this.state.paymentDialog,
+ buttons: [
+
+ ]
+ }
+ });
+ });
+ };
+ getBankAccountInfo = (payload) => {
+ let loop = () => {
+ clearTimeout(this.timer);
+ this.timer = setTimeout(async () => {
+ let response = await taxPaymentgetAgreementFeedback(payload);
+ const { data, status, errormsg } = response;
+ if (status) {
+ const { finish, form } = data;
+ if (finish) {
+ const { feedbacks, bankForm } = form;
+ const { paymentDialog } = this.state;
+ this.setState({
+ paymentDialog: {
+ ...paymentDialog, visible: true,
+ title: getLabel(111, "银行账号信息"),
+ buttons: [
+
+ ],
+ conditions: _.map(paymentBankConditions, item => {
+ return {
+ ...item,
+ items: _.map(item.items, it => {
+ const key = it["domkey"][0];
+ if (key === "protocolNumber") {
+ return {
+ ...it,
+ value: !_.isEmpty(bankForm) ? bankForm.bank : "",
+ options: _.map(feedbacks, o => ({ key: o.sfxyh, showname: o.yhhbmc }))
+ };
+ } else if (key === "count") {
+ return {
+ ...it,
+ value: !_.isEmpty(bankForm) ? bankForm.bank : "",
+ options: _.map(feedbacks, o => ({ key: o.sfxyh, showname: o.khhhh }))
+ };
+ }
+ return { ...it };
+ })
+ };
+ })
+ }
+ });
+ } else {
+ loop();
+ }
+ } else {
+ message.warning(errormsg);
+ clearTimeout(this.timer);
+ }
+ }, 800);
+ };
+ loop();
+ };
+ taxPaymentAgreemenPay = () => {
+ const { paymentDialog } = this.state;
+ const { taxAmount } = paymentDialog;
+ const { declareStore: { paymentForm } } = this.props;
+ const { taxCycle: taxYearMonth, taxAgentId } = this.props.declareInfo;
+ paymentForm.validateForm().then(f => {
+ if (f.isValid) {
+ const { protocolNumber } = paymentForm.getFormParams();
+ const payload = {
+ taxDeclareRecordId: getQueryString("id"),
+ taxAgentId, taxYearMonth, taxAmount, protocolNumber
+ };
+ this.setState({
+ paymentDialog: {
+ ...this.state.paymentDialog,
+ buttons: [
+
+ ]
+ }
+ });
+ taxPaymentAgreemenPay(payload).then(({ status, errormsg }) => {
+ this.setState({
+ paymentDialog: {
+ ...this.state.paymentDialog,
+ buttons: [
+
+ ]
+ }
+ });
+ if (status) {
+ message.success(getLabel(111, "缴款处理中，请稍后点击缴款反馈按钮获取缴款信息"));
+ this.handleCancel();
+ } else {
+ message.error(errormsg);
+ }
+ }).catch(() => this.setState({
+ paymentDialog: {
+ ...this.state.paymentDialog,
+ buttons: [
+
+ ]
+ }
+ }));
+ } else {
+ f.showErrors();
+ }
+ });
+ };
+ handleCancel = () => {
+ const { paymentDialog } = this.state;
+ this.setState({
+ paymentDialog: {
+ ...paymentDialog, visible: false,
+ title: "", buttons: [], conditions: []
+ }
+ });
+ };
+
+ render() {
+ const { paymentDialog } = this.state;
+ return (
+ {getLabel(111, "确定要进行三方缴款吗？")}
+ {getLabel(111, "若申请过银行缴款，点击确定，将自动作废银行缴款凭证。并进行三方缴款。 ")}
+
+ {!_.isEmpty(conditions) && getSearchs(paymentForm, conditions, 1, false, this.handleChange)}
+
+
+
+ {getLabel(111, "缴款成功")}
+
+
+ {getLabel(111, "状态:")}
+ {getLabel(111, "申报成功，已缴款")}
+
+
+ {getLabel(111, "实缴金额:")}
+ {showData.payAmount} {parseFloat(showData.otherAmount) > 0 ? `(含滞纳金等{${showData.otherAmount}元)` : ""}
+
+
+ {getLabel(111, "申报人数:")}
+ {showData.personNum}
+
{item["label"]}：
{declareInfo[item["key"]]}
+ {
+ item.key === "taxPaidAmount" &&
+ {getLabel(111, "元")}
+ }
;
})
}
diff --git a/pc4mobx/hrmSalary/pages/declareDetail/index.js b/pc4mobx/hrmSalary/pages/declareDetail/index.js
index c47d1fcc..9c8b0ccc 100644
--- a/pc4mobx/hrmSalary/pages/declareDetail/index.js
+++ b/pc4mobx/hrmSalary/pages/declareDetail/index.js
@@ -8,25 +8,48 @@ import React, { Component } from "react";
import { WeaLocaleProvider, WeaTab, WeaTable } from "ecCom";
import { Button, message } from "antd";
import TaxDeclarationInfo from "./components/taxDeclarationInfo";
+import { apiflowBillingConfigStatus } from "../../apis/intelligentCalculateSalarySettings";
+import PaymentBtn from "./components/paymentBtn";
+import PaymentFeedbackBtn from "./components/paymentFeedbackBtn";
import {
getDeclareInfo,
getDetailList,
getTaxDeclarationTab,
+ taxdeclaratioGetCancelFeedback,
taxdeclarationDeclare,
+ taxdeclarationGetDeclareFeedback,
taxdeclarationGetRate,
- taxdeclarationRefreshData
+ taxdeclarationRefreshData,
+ taxdeclaratioUpdateCancel,
+ taxdeclaratioUpdateDeclare,
+ taxPaymentVoucherStatusSync,
+ taxPaymentWithheldVoucherGet
} from "../../apis/declare";
-import { getQueryString } from "../../util/url";
+import { convertToUrlString, getQueryString } from "../../util/url";
import "./index.less";
const { getLabel } = WeaLocaleProvider;
+const APIFox = {
+ refresh: taxdeclarationRefreshData, //刷新数据
+ declare: taxdeclarationDeclare, //在线申报
+ feedback: taxdeclarationGetDeclareFeedback,//申报反馈
+ correct: taxdeclaratioUpdateDeclare,//更正申报
+ cancel: taxdeclaratioUpdateCancel,//作废申报
+ cancelFeedback: taxdeclaratioGetCancelFeedback//作废反馈
+};
+
class Index extends Component {
constructor(props) {
super(props);
this.state = {
tabs: [], selectedKey: "", columns: [], dataSource: [],
- loading: { query: false, refresh: false, declare: false },
+ loading: {
+ query: false, refresh: false, declare: false, feedback: false,
+ correct: false, cancel: false, cancelFeedback: false, refreshingPay: false,
+ issuance: false
+ },
+ intelCalcSalaryStatus: false, //智能算薪 总开关是否开启
declareInfo: {}, pageInfo: { current: 0, pageSize: 10, total: 0 }
};
this.timer = null;
@@ -37,16 +60,18 @@ class Index extends Component {
}
init = async () => {
- const [tabsResult, infoResult] = await Promise.all([this.getTaxDeclarationTab(), this.getDeclareInfo()]);
+ const [tabsResult, infoResult, calcResult] = await Promise.all([this.getTaxDeclarationTab(), this.getDeclareInfo(), this.apiflowBillingConfigStatus()]);
const { data: tabDataSource, status: tabStatus } = tabsResult;
const { data: infoDataSource, status: infoStatus } = infoResult;
+ const { data: calcSalaryStatus, status: calcStatus } = calcResult;
this.setState({
tabs: tabStatus ? _.map(tabDataSource, it => ({
viewcondition: `${it.incomeCategory}%%${it.taxDeclarationId}`,
title: it.tabName
})) : this.state.tabs,
selectedKey: tabStatus ? `${_.take(tabDataSource)[0].incomeCategory}%%${_.take(tabDataSource)[0].taxDeclarationId}` : this.state.selectedKey,
- declareInfo: infoStatus ? infoDataSource : this.state.declareInfo
+ declareInfo: infoStatus ? infoDataSource : this.state.declareInfo,
+ intelCalcSalaryStatus: calcStatus && calcSalaryStatus
});
this.getDetailList();
};
@@ -64,6 +89,9 @@ class Index extends Component {
getDeclareInfo = () => {
return getDeclareInfo({ id: getQueryString("id") });
};
+ apiflowBillingConfigStatus = () => {
+ return apiflowBillingConfigStatus();
+ };
taxdeclarationGetRate = (index) => {
return taxdeclarationGetRate({ index });
};
@@ -91,84 +119,116 @@ class Index extends Component {
}
}).catch(() => this.setState({ loading: { ...loading, query: false } }));
};
- taxdeclarationRefreshData = () => {
- this.setState({ loading: { ...this.state.loading, refresh: true } });
- taxdeclarationRefreshData({ taxDeclareRecordId: getQueryString("id") }).then(async ({ status, data, errormsg }) => {
- this.setState({ loading: { ...this.state.loading, refresh: false } });
- if (status) {
- message.destroy();
- message.loading(getLabel(111, "刷新中..."), 0);
- this.timer = setInterval(async () => {
- const { status: resStatus, data: result } = await this.taxdeclarationGetRate(data);
- const { status: rateStatus, finish, msg } = result;
- if (resStatus && rateStatus) {
- if (finish) {
+ handleOperateDeclare = (type) => {
+ const loadingTxt = {
+ refresh: getLabel(111, "刷新中..."), //刷新数据
+ declare: getLabel(111, "申报中..."), //在线申报
+ feedback: getLabel(111, "反馈中..."),//申报反馈
+ correct: getLabel(111, "更正申报中..."),//更正申报
+ cancel: getLabel(111, "作废申报中..."),//作废申报
+ cancelFeedback: getLabel(111, "作废反馈中...")//作废反馈
+ }, successTxt = {
+ refresh: getLabel(111, "刷新数据成功！"), //刷新数据
+ declare: getLabel(111, "在线申报成功！"), //在线申报
+ feedback: getLabel(111, "申报反馈成功！"),//申报反馈
+ correct: getLabel(111, "更正申报成功！"),//更正申报
+ cancel: getLabel(111, "作废申报成功！"),//作废申报
+ cancelFeedback: getLabel(111, "作废反馈成功！")//作废反馈
+ }, failTxt = {
+ refresh: getLabel(111, "刷新数据失败！"), //刷新数据
+ declare: getLabel(111, "在线申报失败！"), //在线申报
+ feedback: getLabel(111, "申报反馈失败！"),//申报反馈
+ correct: getLabel(111, "更正申报失败！"),//更正申报
+ cancel: getLabel(111, "作废申报失败！"),//作废申报
+ cancelFeedback: getLabel(111, "作废反馈失败！")//作废反馈
+ };
+ this.setState({ loading: { ...this.state.loading, [type]: true } });
+ APIFox[type]({ taxDeclareRecordId: getQueryString("id") })
+ .then(async ({ status, data, errormsg }) => {
+ if (status) {
+ message.destroy();
+ message.loading(loadingTxt[type], 0);
+ this.timer = setInterval(async () => {
+ const { status: resStatus, data: result } = await this.taxdeclarationGetRate(data);
+ const { status: rateStatus, finish, msg } = result;
+ if (resStatus && rateStatus) {
+ if (finish) {
+ this.setState({ loading: { ...this.state.loading, [type]: false } });
+ clearInterval(this.timer);
+ message.destroy();
+ message.success(successTxt[type]);
+ const promise = type === "refresh" ? await this.init() : await this.declare();
+ }
+ } else {
+ this.setState({ loading: { ...this.state.loading, [type]: false } });
clearInterval(this.timer);
message.destroy();
- message.success(getLabel(111, "刷新数据成功！"));
- const promise = this.init();
+ message.warning(msg || failTxt[type]);
+ const promise = type === "refresh" ? await this.init() : await this.declare();
}
- } else {
- clearInterval(this.timer);
- message.destroy();
- message.warning(msg || getLabel(111, "刷新数据失败！"));
- const promise = this.init();
- }
- }, 1000);
- } else {
- clearInterval(this.timer);
- message.destroy();
- message.warning(errormsg);
- }
- }).catch(() => {
+ }, 1000);
+ } else {
+ this.setState({ loading: { ...this.state.loading, [type]: false } });
+ clearInterval(this.timer);
+ message.destroy();
+ message.warning(errormsg);
+ }
+ }).catch(() => {
message.destroy();
clearInterval(this.timer);
- this.setState({ loading: { ...this.state.loading, refresh: false } });
+ this.setState({ loading: { ...this.state.loading, [type]: false } });
});
};
- taxdeclarationDeclare = () => {
- this.setState({ loading: { ...this.state.loading, declare: true } });
- taxdeclarationDeclare({ taxDeclareRecordId: getQueryString("id") }).then(async ({ status, data, errormsg }) => {
- this.setState({ loading: { ...this.state.loading, declare: false } });
+ taxPaymentVoucherStatusSync = () => {
+ const { taxAgentId, taxCycle: taxYearMonth } = this.state.declareInfo;
+ const payload = {
+ taxDeclareRecordId: getQueryString("id"),
+ taxAgentId, taxYearMonth
+ };
+ this.setState({ loading: { ...this.state.loading, refreshingPay: true } });
+ taxPaymentVoucherStatusSync(payload).then(({ status, errormsg }) => {
+ this.setState({ loading: { ...this.state.loading, refreshingPay: false } });
if (status) {
- message.destroy();
- message.loading(getLabel(111, "申报中..."), 0);
- this.timer = setInterval(async () => {
- const { status: resStatus, data: result } = await this.taxdeclarationGetRate(data);
- const { status: rateStatus, finish, msg } = result;
- if (resStatus && rateStatus) {
- if (finish) {
- clearInterval(this.timer);
- message.destroy();
- message.success(getLabel(111, "在线申报成功！"));
- const promise = this.declare();
- }
- } else {
- clearInterval(this.timer);
- message.destroy();
- message.warning(msg || getLabel(111, "在线申报失败！"));
- const promise = this.declare();
- }
- }, 1000);
+ message.success(getLabel(111, "刷新成功！"));
+ const promise = this.declare();
} else {
- clearInterval(this.timer);
- message.destroy();
- message.warning(errormsg);
+ message.error(errormsg || getLabel(111, "刷新失败！"));
}
- }).catch(() => {
- message.destroy();
- clearInterval(this.timer);
- this.setState({ loading: { ...this.state.loading, declare: false } });
- });
+ }).catch(() => this.setState({ loading: { ...this.state.loading, refreshingPay: false } }));
+ };
+ getEnterprisePayCertificate = () => {
+ const { taxAgentId, taxCycle: taxYearMonth } = this.state.declareInfo;
+ const payload = {
+ taxDeclareRecordId: getQueryString("id"),
+ taxAgentId, taxYearMonth
+ };
+ this.setState({ loading: { ...this.state.loading, issuance: true } });
+ taxPaymentWithheldVoucherGet(payload).then(({ status, data, errormsg }) => {
+ this.setState({ loading: { ...this.state.loading, issuance: false } });
+ if (status && !_.isEmpty(data.vouchers)) {
+ window.open(`${window.ecologyContentPath || ""}/spa/hrmSalary/static/index.html#/main/hrmSalary/enterprisePayCertificationDetail?${convertToUrlString(payload)}`);
+ } else {
+ message.error(errormsg || "");
+ }
+ }).catch(() => this.setState({ loading: { ...this.state.loading, issuance: false } }));
};
render() {
- const { tabs, selectedKey, columns, pageInfo, dataSource, loading, declareInfo } = this.state;
+ const {
+ tabs,
+ selectedKey,
+ columns,
+ pageInfo,
+ dataSource,
+ loading,
+ declareInfo,
+ intelCalcSalaryStatus
+ } = this.state;
let btns = [
,
- ,
-
];
const pagination = {
@@ -188,8 +248,54 @@ class Index extends Component {
}, () => this.getDetailList());
}
};
+ //申报状态：作废中
+ declareInfo.declareStatus === "DECLARE_CANCELLING" && (btns.splice(1, 2, ));
+ //申报状态：申报中
declareInfo.declareStatus === "DECLARING" && (btns.splice(1, 2, ));
+ type="ghost" loading={loading.feedback}
+ onClick={() => this.handleOperateDeclare("feedback")}>{getLabel(111, "申报反馈")}));
+ //申报状态：缴款中
+ declareInfo.declareStatus === "DECLARE_SUCCESS_PAYING" && (btns.splice(1, 2));
+ //申报状态：已缴款
+ declareInfo.declareStatus === "DECLARE_SUCCESS_PAID" && (btns.splice(1, 2,
+ ));
+ //申报状态：申报成功，无需缴款
+ declareInfo.declareStatus === "DECLARE_SUCCESS_NO_PAY" &&
+ (btns.splice(1, 2,
+ ,
+
+ ));
+ //申报状态：申报成功，未缴款
+ declareInfo.declareStatus === "DECLARE_SUCCESS_UNPAID" &&
+ (btns.splice(1, 2,
+ ,
+ ,
+
+ ));
+ if (!intelCalcSalaryStatus) {
+ if (["NOT_DECLARE", "DECLARE_FAIL"].includes(declareInfo.declareStatus)) {
+ btns.splice(1, 1);
+ }
+ }
+ if (intelCalcSalaryStatus && (declareInfo.declareStatus === "DECLARE_SUCCESS_UNPAID")) {
+ btns.push(
+ {
+ !_.isEmpty(dataSource) &&
+
+ }
+
+ );
+ }
+}
+
+export default Index;
diff --git a/pc4mobx/hrmSalary/stores/declare.js b/pc4mobx/hrmSalary/stores/declare.js
index 7ec47c17..b5b4484e 100644
--- a/pc4mobx/hrmSalary/stores/declare.js
+++ b/pc4mobx/hrmSalary/stores/declare.js
@@ -7,6 +7,9 @@ import * as API from "../apis/declare"; // 引入API接口文件
const { TableStore } = WeaTableNew;
export class DeclareStore {
+ @observable paymentForm = new WeaForm(); // declareDetail----在线申报-缴款Form
+
+
@observable tableStore = new TableStore(); // new table
@observable form = new WeaForm(); // nrew 一个form
@observable condition = []; // 存储后台得到的form数据
@@ -26,6 +29,7 @@ export class DeclareStore {
@observable datailColumns = [];
@observable detailPageInfo = {};
+ @action changePaymentForm = () => this.paymentForm = new WeaForm();
@action setPageinfo = pageinfo => this.pageInfo = pageinfo;
// 初始化操作
@action
From 89b28b1d2e8b07d6fb2a73ef8048c1635257fb92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 24 Aug 2023 13:43:01 +0800
Subject: [PATCH 036/165] =?UTF-8?q?=E4=B8=AA=E7=A8=8E=E5=9C=A8=E7=BA=BF?=
=?UTF-8?q?=E7=94=B3=E6=8A=A5-=E7=94=B3=E6=8A=A5=E8=A1=A8=E5=AF=BC?=
=?UTF-8?q?=E5=87=BA=E5=8A=9F=E8=83=BD=E7=9A=84=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pc4mobx/hrmSalary/apis/declare.js | 15 +
pc4mobx/hrmSalary/index.js | 3 +
.../pages/bankVoucherDetail/index.js | 494 ++++++++++++++++++
.../pages/bankVoucherDetail/index.less | 30 ++
.../components/declareResultDialog.js | 25 +-
.../declareDetail/components/paymentBtn.js | 99 +++-
.../components/paymentFeedbackBtn.js | 45 +-
.../hrmSalary/pages/declareDetail/index.js | 27 +-
.../enterprisePayCertificationDetail/index.js | 46 +-
.../index.less | 54 ++
pc4mobx/hrmSalary/util/index.js | 15 +
11 files changed, 826 insertions(+), 27 deletions(-)
create mode 100644 pc4mobx/hrmSalary/pages/bankVoucherDetail/index.js
create mode 100644 pc4mobx/hrmSalary/pages/bankVoucherDetail/index.less
create mode 100644 pc4mobx/hrmSalary/pages/enterprisePayCertificationDetail/index.less
diff --git a/pc4mobx/hrmSalary/apis/declare.js b/pc4mobx/hrmSalary/apis/declare.js
index 8a0e3e08..314cf1cc 100644
--- a/pc4mobx/hrmSalary/apis/declare.js
+++ b/pc4mobx/hrmSalary/apis/declare.js
@@ -218,4 +218,19 @@ export const taxPaymentWithheldVoucherGet = (params) => {
return postFetch("/api/bs/hrmsalary/taxPayment/withheldVoucher/get", params);
};
+//个税申报表申报数据-作废缴款凭证
+export const taxPaymentVoucherCancel = (params) => {
+ return postFetch("/api/bs/hrmsalary/taxPayment/voucher/cancel", params);
+};
+
+//个税申报表申报数据-缴款凭证打印
+export const taxPaymentVoucherPrint = (params) => {
+ return postFetch("/api/bs/hrmsalary/taxPayment/voucher/print", params);
+};
+
+//个税申报表申报数据-缴款凭证打印反馈
+export const taxPaymentVoucherPrintFeedback = (params) => {
+ return postFetch("/api/bs/hrmsalary/taxPayment/voucher/print/feedback", params);
+};
+
diff --git a/pc4mobx/hrmSalary/index.js b/pc4mobx/hrmSalary/index.js
index 2da05983..cb13a5ee 100644
--- a/pc4mobx/hrmSalary/index.js
+++ b/pc4mobx/hrmSalary/index.js
@@ -23,6 +23,7 @@ import Declare from "./pages/declare";
import DeclareDetail from "./pages/declareDetail";
import Employeedeclare from "./pages/employeedeclare";
import EnterprisePayCertificationDetail from "./pages/enterprisePayCertificationDetail";
+import BankVoucherDetail from "./pages/bankVoucherDetail";
import EmployeedeclareDetail from "./pages/employeedeclareDetail";
import TaxRate from "./pages/taxRate";
import TaxAgents from "./pages/taxAgent";
@@ -163,6 +164,8 @@ const Routes = (
+
+
;
+ }
+ return (
+
+
+ );
+ }
+}
+
+export default Index;
diff --git a/pc4mobx/hrmSalary/pages/bankVoucherDetail/index.less b/pc4mobx/hrmSalary/pages/bankVoucherDetail/index.less
new file mode 100644
index 00000000..3dc296ac
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/bankVoucherDetail/index.less
@@ -0,0 +1,30 @@
+.loading-layout {
+ width: 100%;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+
+.printBankLayout {
+ width: 100%;
+ height: 100%;
+ overflow-y: auto;
+
+ .print-bank-voucher-container {
+ font-size: 14px;
+
+ #header_print_btn {
+ display: flex;
+ padding: calc(16 * 1px) calc(32 * 1px) 0;
+ justify-content: flex-end;
+ }
+
+ .content {
+ padding: calc(32 * 1px) 0 calc(16 * 1px);
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ }
+ }
+}
diff --git a/pc4mobx/hrmSalary/pages/declareDetail/components/declareResultDialog.js b/pc4mobx/hrmSalary/pages/declareDetail/components/declareResultDialog.js
index 5970b68b..a462a426 100644
--- a/pc4mobx/hrmSalary/pages/declareDetail/components/declareResultDialog.js
+++ b/pc4mobx/hrmSalary/pages/declareDetail/components/declareResultDialog.js
@@ -12,7 +12,7 @@ import {
taxdeclarationEmployeeList4NotDeclare,
taxdeclarationEmployeeList4NoValue
} from "../../../apis/declare";
-import { getQueryString } from "../../../util/url";
+import { convertToUrlString, getQueryString } from "../../../util/url";
const { getLabel } = WeaLocaleProvider;
const APIFox = {
@@ -59,6 +59,25 @@ class DeclareResultDialog extends Component {
}
}).catch(() => this.setState({ loading: false }));
};
+ errorExport = () => {
+ let exportUrl = "";
+ const { selectedKey, keyword } = this.state;
+ const payload = {
+ taxDeclareRecordId: getQueryString("id"), keyword
+ };
+ if (selectedKey === "list4NotDeclare") {
+ exportUrl = "/api/bs/hrmsalary/taxdeclaration/employee/export4NotDeclare";
+ } else if (selectedKey === "list4NoValue") {
+ exportUrl = "/api/bs/hrmsalary/taxdeclaration/employee/export4NoValue";
+ }
+ window.open(`${window.ecologyContentPath || ""}${exportUrl}?${convertToUrlString(payload)}`, "_blank");
+ };
+ failExport = () => {
+ const payload = {
+ taxDeclareRecordId: getQueryString("id")
+ };
+ window.open(`${window.ecologyContentPath || ""}/api/bs/hrmsalary/taxdeclaration/employee/export4Fail?${convertToUrlString(payload)}`, "_blank");
+ };
render() {
const { type } = this.props;
@@ -91,13 +110,13 @@ class DeclareResultDialog extends Component {
{this.props.title}
+
+
+
+
+
+
+
+
+ {getLabel(111, "银行端查询缴税凭证")}
+
+
+
+
+
+ {getLabel(111, "银行端查询缴税凭证号：")}
+ {bankVoucherDetail.voucherNo || ""}
+ {bankVoucherDetail.firstPrintDate}
+
+
+
+
+
+
+
+ {getLabel(111, "纳税人识别码")}
+ {bankVoucherDetail.taxCode || ""}
+
+
+ {getLabel(111, "税务机关代码")}
+ {bankVoucherDetail.taxAuthoritiesNo || ""}
+
+
+
+
+
+ {getLabel(111, "纳税人名称")}
+ {bankVoucherDetail.taxAgentName || ""}
+
+
+ {getLabel(111, "税务机关名称")}
+ {bankVoucherDetail.taxAuthoritiesName}
+
+
+
+
+
+ {getLabel(111, "付款人名称")}
+ {}
+
+
+ {getLabel(111, "开户银行名称")}
+ {}
+
+
+
+
+
+ {getLabel(111, "付款人账号")}
+ {}
+
+
+ {getLabel(111, "税款限缴日期")}
+ {bankVoucherDetail.deadline || ""}
+
+
+
+
+ {getLabel(111, "征收顶目名称")}
+ {getLabel(111, "征收品目名称")}
+ {getLabel(111, "应繳税额")}
+
+ {
+ !_.isEmpty(bankVoucherDetail.details) ? bankVoucherDetail.details.map((row, index) => (
+
+
+
+ )) : null
+ }
+ {row.paymentCode}
+ {row.paymentItem}
+ {row.payAmount}
+ {getLabel(111, "金额合计（小写）：")} {bankVoucherDetail.lowerFormatAmount}
+ {getLabel(111, "金额合计（大写）：")} {bankVoucherDetail.upperFormatAmount}
+
+
+
+
+
+ {getLabel(111, "付款人 （签章）")}
+ {getLabel(111, "经办人 （签章）")}
+
+
+ {getLabel(111, "银行记账员")}
+ {getLabel(111, "（签章）")}
+
+
+ {getLabel(111, "备注：")}
+ {bankVoucherDetail.remark}
+
+
;
+ }
return (
- {getLabel(83553, "暂无数据")}
+{enterprisePayCertifiTipMsg || getLabel(111, "暂无企业完税证明相关信息")}
+
- {
- !_.isEmpty(dataSource) &&
-