@@ -87,6 +95,10 @@ class Index extends Component {
this.calcTableRef = dom} salarySobId={salarySobCycle.salarySobId}
{...this.props} showTotalCell={showTotalCell}
onShowFormulaTd={this.handleShowFormulaTa}/>
+ this.setState({
+ perAbnormalDialog: { ...perAbnormalDialog, visible: false }
+ })}/>
);
}
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less
index 3d23810b..0514dc38 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less
@@ -14,6 +14,11 @@
padding-bottom: 0;
height: 46px;
margin-bottom: 0;
+
+ .abnormal-text {
+ color: #ef9502;
+ cursor: pointer;
+ }
}
.formula-detail-area {
@@ -28,6 +33,15 @@
display: flex;
align-items: center;
width: 100%;
+
+ & > span:first-child {
+ display: inline-block;
+ min-width: 44px;
+ }
+
+ & > span:last-child {
+ flex: 1;
+ }
}
}
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/personAbnormalDialog.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/personAbnormalDialog.js
new file mode 100644
index 00000000..1498fc02
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/personAbnormalDialog.js
@@ -0,0 +1,84 @@
+/*
+ * Author: 黎永顺
+ * name: 薪资核算-人员异常
+ * Description:
+ * Date: 2023/8/18
+ */
+import React, { Component } from "react";
+import { WeaDialog, WeaLocaleProvider, WeaTable } from "ecCom";
+import { listPage4NotDeclare } from "../../../../../apis/calculate";
+
+const { getLabel } = WeaLocaleProvider;
+
+class PersonAbnormalDialog 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.queryList(nextProps);
+ }
+
+ queryList = (props) => {
+ const { salaryAcctRecordId } = props, { pageInfo } = this.state;
+ const payload = { ...pageInfo, recordId: salaryAcctRecordId };
+ this.setState({ loading: true });
+ listPage4NotDeclare(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 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.queryList(this.props));
+ },
+ onChange: current => {
+ this.setState({
+ pageInfo: { ...pageInfo, current }
+ }, () => this.queryList(this.props));
+ }
+ };
+ return (
+
+
+
+
+
+ );
+ }
+}
+
+export default PersonAbnormalDialog;
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
index 17d4b09e..213c802b 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
@@ -9,7 +9,7 @@ import { WeaLocaleProvider, WeaReqTop } from "ecCom";
import { Button, Dropdown, Menu, message, Modal } from "antd";
import { inject, observer } from "mobx-react";
import Layout from "./layout";
-import { acctresultAccounting, getCalculateProgress, getExportField } from "../../../apis/calculate";
+import * as API from "../../../apis/calculate";
import AdvanceInputBtn from "./components/advanceInputBtn";
import SalaryCalcPersonConfirm from "./components/salaryCalcPersonConfirm";
import SalaryEditCalc from "./components/salaryEditCalc";
@@ -29,7 +29,7 @@ class Index extends Component {
constructor(props) {
super(props);
this.state = {
- selectedKey: "person", progressVisible: false, progress: 0,
+ selectedKey: "person", progressVisible: false, progress: 0, loading: { calcTax: false, feedback: false },
customExpDialog: { visible: false, salaryAcctRecordId: "", checkItems: [], itemsByGroup: [] },
salaryImpDialog: { visible: false, title: "", salaryAcctRecordId: "" },
accountExceptInfo: "" //核算报错信息,
@@ -61,11 +61,11 @@ class Index extends Component {
this.setState({ progress: 0 });
let payload = { salaryAcctRecordId };
if (key === "calc_selected") payload = _.assign(payload, { ids: selectedRowKeys });
- acctresultAccounting(payload).then(() => {
+ API.acctresultAccounting(payload).then(() => {
this.setState({ progressVisible: true });
if (this.timer) clearInterval(this.timer);
this.timer = setInterval(() => {
- getCalculateProgress(salaryAcctRecordId).then(({ data }) => {
+ API.getCalculateProgress(salaryAcctRecordId).then(({ data }) => {
let progress = data.progress;
if (progress === 1 && this.timer) {
clearInterval(this.timer);
@@ -105,7 +105,7 @@ class Index extends Component {
window.open(`${window.ecologyContentPath || ""}${url}`, "_blank");
break;
case "export_custom":
- getExportField({ salaryAcctRecordId }).then(({ status, data }) => {
+ API.getExportField({ salaryAcctRecordId }).then(({ status, data }) => {
if (status) {
const { checkItems, itemsByGroup } = data;
this.setState({
@@ -133,8 +133,71 @@ class Index extends Component {
break;
}
};
+ acctresultCalcTax = () => {
+ const { routeParams: { salaryAcctRecordId } } = this.props;
+ this.setState({ loading: { ...this.state.loading, calcTax: true } });
+ API.acctresultCalcTax({ salaryAcctRecordId }).then(({ status, errormsg }) => {
+ this.setState({ loading: { ...this.state.loading, calcTax: false } });
+ if (status) {
+ message.success(getLabel(111, "操作成功！"));
+ this.calc.onAdSearch(false);
+ } else {
+ message.error(errormsg);
+ }
+ }).catch(() => this.setState({ loading: { ...this.state.loading, calcTax: false } }));
+ };
+ calcTaxFeedback = () => {
+ const { routeParams: { salaryAcctRecordId } } = this.props;
+ this.setState({ loading: { ...this.state.loading, feedback: true } });
+ API.calcTaxFeedback({ salaryAcctRecordId }).then(({ status, errormsg }) => {
+ this.setState({ loading: { ...this.state.loading, feedback: false } });
+ if (status) {
+ this.calc.onAdSearch(false);
+ Modal.confirm({
+ title: getLabel(131329, "信息确认"),
+ content: getLabel(111, "成功获取个税信息，是否继续计算税后工资？"),
+ onOk: () => this.afterTaxAccounting()
+ });
+ } else {
+ message.error(errormsg);
+ }
+ }).catch(() => this.setState({ loading: { ...this.state.loading, feedback: false } }));
+ };
+ afterTaxAccounting = () => {
+ const { routeParams: { salaryAcctRecordId } } = this.props;
+ this.setState({ progress: 0 });
+ let payload = { salaryAcctRecordId };
+ API.afterTaxAccounting(payload).then(() => {
+ this.setState({ progressVisible: true });
+ if (this.timer) clearInterval(this.timer);
+ this.timer = setInterval(() => {
+ API.getAfterTaxAccountingProgress(salaryAcctRecordId).then(({ data }) => {
+ let progress = data.progress;
+ if (progress === 1 && this.timer) {
+ clearInterval(this.timer);
+ this.timer = null;
+ this.setState({
+ progressVisible: false,
+ accountExceptInfo: data.message
+ });
+ message.success(getLabel(111, "操作完成"));
+ this.calc.onAdSearch(false);
+ } else if (!data.status) {
+ clearInterval(this.timer);
+ this.timer = null;
+ this.setState({
+ progressVisible: false,
+ accountExceptInfo: data.message
+ });
+ message.error(data.message);
+ }
+ this.setState({ progress: Number(progress) * 100 });
+ });
+ }, 1000);
+ });
+ };
renderReqBtns = () => {
- const { selectedKey, accountExceptInfo } = this.state;
+ const { selectedKey, accountExceptInfo, loading } = this.state;
let reqBtns = [];
switch (selectedKey) {
case "calc":
@@ -155,6 +218,10 @@ class Index extends Component {
this.doCacl("ALL")} overlay={menu} type="primary">
{getLabel(543545, "核算所有人")}
,
+
,
+
,
,
this.calc.openAdvanceSearch()}
onAdvanceSearch={() => this.calc.onAdSearch(false)}/>
diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/payrollItemsTable.js b/pc4mobx/hrmSalary/pages/calculateDetail/payrollItemsTable.js
index 33a90a08..9d2ddfce 100644
--- a/pc4mobx/hrmSalary/pages/calculateDetail/payrollItemsTable.js
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/payrollItemsTable.js
@@ -40,7 +40,7 @@ class PayrollItemsTable extends Component {
const { canEdit, dataType, pattern } = record;
return dataType === "number" ? onChangeIssueReissueValue(record.salaryItemId, value, "itemsByGroup", salarySobItemGroupId)}
/> : ({ ...o, width: 150, fixed: null }))
+ columns: _.map(columns, o => ({ ...o, width: 150, fixed: null }))
});
}
}).catch(() => this.setState({ loading: { ...loading, query: false } }));
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceRefrenceDataModal.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceRefrenceDataModal.js
index 14de4956..c8fdb4b9 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceRefrenceDataModal.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceRefrenceDataModal.js
@@ -55,7 +55,7 @@ class AttendanceRefrenceDataModal extends Component {
...item,
items: _.map(items, child => {
const { domkey } = child;
- if (domkey[0] === "salarySobId") {
+ if (domkey[0] === "salarySobIds") {
return { ...child, options: _.map(data, it => ({ key: it.id, showname: it.content })) };
}
return { ...child };
@@ -77,19 +77,23 @@ class AttendanceRefrenceDataModal extends Component {
refenceform.validateForm().then(f => {
if (f.isValid) {
const payload = refenceform.getFormParams();
- const checkPayload = { salaryYearMonthStr: payload.salaryYearMonth, salarySobId: payload.salarySobId };
+ const checkPayload = {
+ salaryYearMonthStr: payload.salaryYearMonth,
+ salarySobIds: payload.salarySobIds.split(",")
+ };
this.setState({ loading: true });
checkOperation(checkPayload).then(({ status, errormsg: errormessage }) => {
if (status) {
- syncAttendanceRefer(payload).then(({ status, errormsg }) => {
- this.setState({ loading: false });
- if (status) {
- message.success("同步成功");
- onCancel(true);
- } else {
- message.error(errormsg || "同步失败");
- }
- }).catch(() => this.setState({ loading: false }));
+ syncAttendanceRefer({ ...payload, salarySobIds: payload.salarySobIds.split(",") })
+ .then(({ status, errormsg }) => {
+ this.setState({ loading: false });
+ if (status) {
+ message.success("同步成功");
+ onCancel(true);
+ } else {
+ message.error(errormsg || "同步失败");
+ }
+ }).catch(() => this.setState({ loading: false }));
} else {
this.setState({ loading: false });
message.error(errormessage);
@@ -212,9 +216,9 @@ class AttendanceRefrenceDataModal extends Component {
];
return (
-
+
- {getSearchs(refenceform, condition, 1)}
+ {getSearchs(refenceform, condition, 1, false, null, "", "multiple_select")}
{/* 表头设置 */}
this.setState({ targetid: "" })}
>
this.setState({
cumTaxPeriodDialog: { ...cumTaxPeriodDialog, visible: false, title: "", type: "" }
})}
diff --git a/pc4mobx/hrmSalary/pages/declareDetail/components/constants.js b/pc4mobx/hrmSalary/pages/declareDetail/components/constants.js
index cb9ce2fe..7a9046ba 100644
--- a/pc4mobx/hrmSalary/pages/declareDetail/components/constants.js
+++ b/pc4mobx/hrmSalary/pages/declareDetail/components/constants.js
@@ -86,6 +86,18 @@ export const paymentBankConditions = [
value: "",
viewAttr: 1,
options: []
+ },
+ {
+ colSpan: 1,
+ conditionType: "SELECT",
+ domkey: ["paymentNumber"],
+ fieldcol: 12,
+ label: "缴款帐号",
+ lanId: 111,
+ labelcol: 6,
+ value: "",
+ viewAttr: 1,
+ options: []
}
],
defaultshow: true
diff --git a/pc4mobx/hrmSalary/pages/declareDetail/components/paymentBtn.js b/pc4mobx/hrmSalary/pages/declareDetail/components/paymentBtn.js
index 4f6ad59f..6fca282a 100644
--- a/pc4mobx/hrmSalary/pages/declareDetail/components/paymentBtn.js
+++ b/pc4mobx/hrmSalary/pages/declareDetail/components/paymentBtn.js
@@ -5,9 +5,9 @@
* Date: 2023/8/22
*/
import React, { Component } from "react";
-import { WeaLocaleProvider } from "ecCom";
+import { WeaLocaleProvider, WeaLoadingGlobal } from "ecCom";
import { inject, observer } from "mobx-react";
-import { Button, Dropdown, Menu, message, Modal } from "antd";
+import { Button, message, Modal } from "antd";
import PaymentDialog from "./paymentDialog";
import {
taxPaymentAgreemenPay,
@@ -122,6 +122,7 @@ class PaymentBtn extends Component {
};
getBankAccountInfo = (payload) => {
let loop = () => {
+ WeaLoadingGlobal.start({ tip: getLabel(111, "获取三方信息中...") });
clearTimeout(this.timer);
this.timer = setTimeout(async () => {
let response = await taxPaymentgetAgreementFeedback(payload);
@@ -129,6 +130,7 @@ class PaymentBtn extends Component {
if (status) {
const { finish, form } = data;
if (finish) {
+ WeaLoadingGlobal.destroy();
const { feedbacks, bankForm } = form;
const { paymentDialog } = this.state;
this.setState({
@@ -155,6 +157,12 @@ class PaymentBtn extends Component {
value: !_.isEmpty(bankForm) ? bankForm.bank : "",
options: _.map(feedbacks, o => ({ key: o.sfxyh, showname: o.khhhh }))
};
+ } else if (key === "paymentNumber") {
+ return {
+ ...it,
+ value: !_.isEmpty(bankForm) ? bankForm.bank : "",
+ options: _.map(feedbacks, o => ({ key: o.sfxyh, showname: o.jkzh }))
+ };
}
return { ...it };
})
@@ -168,6 +176,7 @@ class PaymentBtn extends Component {
} else {
message.warning(errormsg);
clearTimeout(this.timer);
+ WeaLoadingGlobal.destroy();
}
}, 800);
};
@@ -176,15 +185,16 @@ class PaymentBtn extends Component {
taxPaymentAgreemenPay = () => {
const { paymentDialog } = this.state;
const { taxAmount } = paymentDialog;
- const { declareStore: { paymentForm } } = this.props;
+ const { declareStore: { paymentForm }, reportType } = this.props;
const { taxCycle: taxYearMonth, taxAgentId } = this.props.declareInfo;
paymentForm.validateForm().then(f => {
if (f.isValid) {
- const { protocolNumber } = paymentForm.getFormParams();
+ const { protocolNumber, paymentNumber } = paymentForm.getFormDatas();
const payload = {
taxDeclareRecordId: getQueryString("id"),
taxYearMonth: taxYearMonth + "-01",
- taxAgentId, taxAmount, protocolNumber
+ taxAgentId, taxAmount, protocolNumber: protocolNumber.value,
+ reportType, paymentNumber: paymentNumber.valueSpan
};
this.setState({
paymentDialog: {
@@ -332,15 +342,16 @@ class PaymentBtn extends Component {
const { paymentDialog } = this.state;
return (
-
- {getLabel(111, "银行端凭证缴款")}
- {getLabel(111, "作废缴款凭证")}
-
- }
- type="ghost">{getLabel(111, "三方缴款")}
+
+ {/**/}
+ {/* {getLabel(111, "银行端凭证缴款")}*/}
+ {/* {getLabel(111, "作废缴款凭证")}*/}
+ {/* */}
+ {/* }*/}
+ {/* type="ghost">{getLabel(111, "三方缴款")}*/}
-
+ {/*个税接口改造*/}
+ {/**/}
+
{
const [__, taxDeclarationId] = this.state.selectedKey.split("%%");
- window.open(`${window.location.origin}/spa/hrmSalary/static/index.html#/main/hrmSalary/declareDetail/${taxDeclarationId}`, "_target");
+ window.open(`${window.location.origin}/spa/hrmSalary/static/index.html#/main/hrmSalary/declareDetail/${taxDeclarationId}`, "_blank");
};
handleTabEdit = (tabKey, type) => {
if (type === "remove") {
@@ -388,9 +388,9 @@ class Index extends Component {
,
-
+ //
));
if (!intelCalcSalaryStatus) {
if (["NOT_DECLARE", "DECLARE_FAIL"].includes(declareInfo.declareStatus)) {
diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js
index ed7805cf..f9783c57 100644
--- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js
+++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js
@@ -21,7 +21,8 @@ import {
employeedeclareList4Add,
employeedeclareList4Update,
employeedeclareRefresh,
- employeeDelete, employeeInvalid,
+ employeeDelete,
+ employeeInvalid,
getDeclareFeedback
} from "../../apis/declare";
import { advanceConditions, submitStatus } from "./constants";
@@ -146,7 +147,8 @@ class Index extends Component {
"总计": getLabel(523, "总计"), "编辑": getLabel(501169, "编辑"),
"操作": getLabel(30585, "操作"), "删除": getLabel(535052, "删除"),
"共": getLabel(83698, "共"), "条": getLabel(18256, "条"),
- "加载中": getLabel(83698, "加载中"), "作废": getLabel(111, "作废")
+ "加载中": getLabel(83698, "加载中")
+ // "作废": getLabel(111, "作废")
};
const childFrameObj = document.getElementById("atdTable");
childFrameObj && childFrameObj.contentWindow.postMessage(JSON.stringify({ ...payload, i18n }), "*");
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/incomeTaxFieldsCorresponding.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/incomeTaxFieldsCorresponding.js
new file mode 100644
index 00000000..3df66b4c
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/incomeTaxFieldsCorresponding.js
@@ -0,0 +1,148 @@
+/*
+ *
+ * 个税字段对应
+ * @Author: 黎永顺
+ * @Date: 2024/6/17
+ * @Wechat:
+ * @Email: 971387674@qq.com
+ * @description:
+*/
+import React, { Component } from "react";
+import { WeaLocaleProvider, WeaSearchGroup, WeaTab } from "ecCom";
+import LedgerFieldsItemPopver from "./ledgerFieldsItemPopver";
+import { taxruleGetForm } from "../../../apis/ledger";
+import LedgerFieldsTable from "./ledgerFieldsTable";
+import uuidV4 from "uuid/v4";
+
+const { getLabel } = WeaLocaleProvider;
+
+class IncomeTaxFields extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ selectedKey: "", tabs: [],
+ incomeTaxFields: [], keywords: ""
+ };
+ }
+
+ componentDidMount() {
+ this.taxruleGetForm();
+ }
+
+ taxruleGetForm = () => {
+ const { editId, saveSalarySobId } = this.props;
+ taxruleGetForm({ id: editId || saveSalarySobId }).then(({ status, data }) => {
+ if (status && !_.isEmpty(data)) {
+ this.setState({
+ tabs: _.map(data, it => ({ viewcondition: it.incomeCategoryId, title: it.incomeCategoryName })),
+ selectedKey: _.take(data)[0].incomeCategoryId,
+ incomeTaxFields: _.map(data, it => ({
+ ...it, taxReportRules: _.map(it.taxRules, o => ({
+ ...o, canEdit: o.canEdit, id: uuidV4(), reportColumnDataIndex: o.taxIndex, reportColumnName: o.name,
+ salaryItem: [{ id: o.salaryItemId, name: o.salaryItemName }]
+ }))
+ }))
+ }, () => this.props.onSetTaxreportrule(this.state.incomeTaxFields, this.state.selectedKey));
+ }
+ });
+ };
+ 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 };
+ })
+ }, () => this.props.onSetTaxreportrule(this.state.incomeTaxFields, this.state.selectedKey));
+ };
+ 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 };
+ }
+ return { ...child, visible: false };
+ })
+ };
+ }
+ return { ...it };
+ })
+ }, () => {
+ this.props.onSetTaxreportrule(this.state.incomeTaxFields, this.state.selectedKey);
+ });
+ };
+
+ render() {
+ const { editId, saveSalarySobId } = this.props;
+ const { selectedKey, tabs, incomeTaxFields, keywords } = this.state;
+ const list = _.map(incomeTaxFields, it => {
+ if (it.incomeCategoryId === selectedKey) {
+ return {
+ ...it,
+ taxReportRules: _.filter(it.taxReportRules, item => item.reportColumnName.indexOf(keywords) !== -1)
+ };
+ }
+ return { ...it };
+ });
+ const dataSource = _.takeWhile(list, it => it.incomeCategoryId === selectedKey);
+ return (
+
+ this.setState({ keywords: val })}
+ />
+
+ }
+ >
+