@@ -91,7 +88,7 @@ class Index extends Component {
{...this.props} showTotalCell={showTotalCell}
onShowFormulaTd={this.handleShowFormulaTa}/>
- );
+ );
}
}
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less
index 77f3e425..3d23810b 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less
@@ -207,3 +207,39 @@
}
}
}
+
+.infoConfirmDialog {
+ .confirm-content {
+ width: 100%;
+ height: 100%;
+ padding: 16px;
+ overflow: auto;
+ position: relative;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+
+ .contract {
+ text-align: center;
+ flex-grow: 1;
+ flex-shrink: 1;
+ }
+
+ .confirm-container {
+ flex-grow: 0;
+ flex-shrink: 0;
+ margin-top: 8px;
+ width: 100%;
+
+ }
+ }
+}
+
+.loadingLayout {
+ width: 100%;
+ height: 100%;
+ text-align: center;
+ border-radius: 4px;
+ padding: 30px 50px;
+ margin: 20px 0;
+}
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/salaryCalcLayout.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/salaryCalcLayout.js
new file mode 100644
index 00000000..c95f07b0
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/salaryCalcLayout.js
@@ -0,0 +1,96 @@
+/*
+ * Author: 黎永顺
+ * name: 薪资核算-layout
+ * Description:
+ * Date: 2024/4/26
+ */
+import React, { Component } from "react";
+import { WeaCheckbox, WeaDialog, WeaLocaleProvider } from "ecCom";
+import { Button, message, Spin } from "antd";
+import * as API from "../../../../../apis/calculate";
+import "./index.less";
+
+const getLabel = WeaLocaleProvider.getLabel;
+
+class SalaryCalcLayout extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ fieldInformationConfirm: { visible: false, data: {} }, userConfirmed: "0", show: false
+ };
+ }
+
+ componentDidMount() {
+ this.getCompareSobConfig();
+ }
+
+ getCompareSobConfig = () => {
+ const { fieldInformationConfirm } = this.state;
+ const { routeParams: { salaryAcctRecordId: id } } = this.props;
+ API.getCompareSobConfig({ id }).then(({ status, data }) => {
+ if (status && data) {
+ this.setState({
+ fieldInformationConfirm: { ...fieldInformationConfirm, visible: data }
+ });
+ } else {
+ this.setState({ show: true }, () => this.props.init());
+ }
+ }).catch(() => this.setState({ show: true }, () => this.props.init()));
+ };
+ onOk = () => {
+ const { fieldInformationConfirm } = this.state;
+ const { routeParams: { salaryAcctRecordId: id } } = this.props;
+ API.updateSobConfig({ id }).then(({ status, errormsg }) => {
+ if (status) {
+ message.success(getLabel(30700, "操作成功！"));
+ this.setState({
+ show: true,
+ fieldInformationConfirm: { ...fieldInformationConfirm, visible: false }
+ }, () => {
+ this.props.init();
+ this.props.onConfirm();
+ });
+ } else {
+ message.error(errormsg);
+ }
+ });
+ };
+
+ render() {
+ const { fieldInformationConfirm, userConfirmed, show } = this.state;
+ const buttons = [
+
,
+
+ ];
+ return (
+
+ {
+ show ? this.props.children :
+ }
+
+ this.setState({
+ show: true,
+ fieldInformationConfirm: { ...fieldInformationConfirm, visible: false }
+ }, () => this.props.init())}>
+
+
+ {getLabel("111", "账套发生变更，是否需要更新账套设置？更新后核算将按照最新的账套进行核算，请谨慎操作。")}
+
+
+ this.setState({ userConfirmed: v })}/>
+
+
+ );
+ }
+}
+
+export default SalaryCalcLayout;
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
index 535f7c7e..17d4b09e 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
@@ -233,23 +233,17 @@ class Index extends Component {
/>
}
{/* 薪资核算-自定义导出*/}
-
{
- this.setState({
- customExpDialog: { ...customExpDialog, visible: false }
- });
- }}
- />
+ {
+ this.setState({
+ customExpDialog: { ...customExpDialog, visible: false }
+ });
+ }}/>
{/* 薪资核算-导入*/}
- {
- this.setState({
- salaryImpDialog: { ...salaryImpDialog, visible: false }
- }, () => isFresh && this.calc.onAdSearch(false));
- }}
- />
+ {
+ this.setState({
+ salaryImpDialog: { ...salaryImpDialog, visible: false }
+ }, () => isFresh && this.calc.onAdSearch(false));
+ }}/>
diff --git a/pc4mobx/hrmSalary/pages/calculate/index.less b/pc4mobx/hrmSalary/pages/calculate/index.less
index 98cfc21f..bc3f7755 100644
--- a/pc4mobx/hrmSalary/pages/calculate/index.less
+++ b/pc4mobx/hrmSalary/pages/calculate/index.less
@@ -83,10 +83,10 @@
.ant-table-tbody {
.ant-table-row-indent {
- display: none;
+ display: none!important;
}
- td {
+ td:not(.ant-table-selection-column) {
span {
width: 100%;
overflow: hidden;
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js
index 4e2735aa..634d36fe 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js
@@ -40,7 +40,8 @@ class AttendanceDataViewSlide extends Component {
const { columns, list: dataSource, pageNum: current, pageSize, total } = data.pageInfo;
this.setState({
pageInfo: { ...pageInfo, current, pageSize, total }, dataSource,
- columns: _.map(columns, o => ({ ...o, width: 150, fixed: o.dataIndex === "username" ? "left" : null }))
+ // o.dataIndex === "username" ? "left" :
+ columns: _.map(columns, o => ({ ...o, width: 150, fixed: null }))
});
}
}).catch(() => this.setState({ loading: { ...loading, query: false } }));
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js
index 219240ec..b3124f6d 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js
@@ -550,6 +550,17 @@ export const cumTaxPeriodCondition = [
value: "",
rules: "required",
viewAttr: 3
+ },{
+ colSpan: 1,
+ conditionType: "SELECT",
+ domkey: ["taxAgentIds"],
+ multiple: true,
+ fieldcol: 18,
+ label: "个税扣缴义务人",
+ lanId: 537996,
+ labelcol: 6,
+ value: "",
+ viewAttr: 2
}],
title: "数据采集",
defaultshow: true,
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/components/salaryCumDeductChooseTaxPeriodDialog.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/components/salaryCumDeductChooseTaxPeriodDialog.js
index 7e0c76f4..5947b8da 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/components/salaryCumDeductChooseTaxPeriodDialog.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/components/salaryCumDeductChooseTaxPeriodDialog.js
@@ -6,7 +6,8 @@
*/
import React, { Component } from "react";
import { inject, observer } from "mobx-react";
-import { WeaDialog, WeaLocaleProvider } from "ecCom";
+import { toJS } from "mobx";
+import { WeaDialog, WeaLocaleProvider, WeaTools } from "ecCom";
import { Button, message } from "antd";
import { getSearchs } from "../../../../util";
import { cumTaxPeriodCondition } from "../columns";
@@ -14,6 +15,7 @@ import { onlineRequest } from "../../../../apis/cumDeduct";
import { onlineActualAddUpAdvanceTax } from "../../../../apis/cumSituation";
const getLabel = WeaLocaleProvider.getLabel;
+const getKey = WeaTools.getKey;
const APIFox = {
online: onlineRequest,
advance: onlineActualAddUpAdvanceTax
@@ -25,13 +27,23 @@ class SalaryCumDeductChooseTaxPeriodDialog extends Component {
constructor(props) {
super(props);
this.state = {
- loading: false
+ loading: false, conditions: []
};
}
componentWillReceiveProps(nextProps, nextContext) {
const { cumDeductStore: { cumTaxPeriodForm, changeCumTaxPeriodForm } } = nextProps;
if (nextProps.visible !== this.props.visible && nextProps.visible) {
+ this.setState({
+ conditions: _.map(cumTaxPeriodCondition, item => ({
+ ...item, items: _.map(item.items, o => {
+ if (getKey(o) === "taxAgentIds") {
+ return { ...o, lable: getLabel(o.lanId, o.label), options: toJS(nextProps.taxAgentOption) };
+ }
+ return { ...o, lable: getLabel(o.lanId, o.label) };
+ })
+ }))
+ });
cumTaxPeriodForm.initFormFields(cumTaxPeriodCondition);
}
if (nextProps.visible !== this.props.visible && !nextProps.visible) {
@@ -43,18 +55,19 @@ class SalaryCumDeductChooseTaxPeriodDialog extends Component {
save = () => {
const { cumDeductStore: { cumTaxPeriodForm }, type } = this.props;
cumTaxPeriodForm.validateForm().then(f => {
- const { declareMonth } = cumTaxPeriodForm.getFormParams();
+ const { declareMonth, taxAgentIds } = cumTaxPeriodForm.getFormParams();
if (f.isValid) {
this.setState({ loading: true });
- APIFox[type]({ declareMonth: declareMonth + "-01" }).then(({ status, errormsg }) => {
- this.setState({ loading: false });
- if (status) {
- message.success(getLabel(111, "获取成功！"));
- this.props.onCancel();
- } else {
- message.error(errormsg);
- }
- }).catch(() => this.setState({ loading: false }));
+ APIFox[type]({ declareMonth: declareMonth + "-01", taxAgentIds: taxAgentIds ? taxAgentIds.split(",") : [] })
+ .then(({ status, errormsg }) => {
+ this.setState({ loading: false });
+ if (status) {
+ message.success(getLabel(111, "获取成功！"));
+ this.props.onCancel();
+ } else {
+ message.error(errormsg);
+ }
+ }).catch(() => this.setState({ loading: false }));
} else {
f.showErrors();
}
@@ -62,17 +75,17 @@ class SalaryCumDeductChooseTaxPeriodDialog extends Component {
};
render() {
- const { loading } = this.state;
+ const { loading, conditions } = this.state;
const { cumDeductStore: { cumTaxPeriodForm } } = this.props;
return (
{getLabel(33703, "确认")}]}
bottomLeft={getLabel(111, "点击保存后，稍后请点击【获取结果下载】下载获取结果。获取的数据将覆盖列表原本数据（有则覆盖无则新增）。")}
>
- {getSearchs(cumTaxPeriodForm, cumTaxPeriodCondition, 1, false)}
+ {getSearchs(cumTaxPeriodForm, conditions, 1, false)}
);
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
index 0c8a25cf..06aa7d03 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
@@ -69,7 +69,7 @@ class Index extends Component {
exportPayloadType: false,
advanceCondition: null,
cumTaxPeriodDialog: {
- visible: false, title: "", type: ""
+ visible: false, title: "", type: "", taxAgentOption: []
},
feedbackLoading: false,
incomeTaxStatus: false,
@@ -97,17 +97,18 @@ class Index extends Component {
* Date: 2023/2/17
*/
autoAddAll = () => {
- const { declareMonth } = this.state;
+ const { declareMonth, taxAgentId } = this.state;
this.setState({ addAllLoading: true });
- autoAddAll({ yearMonth: declareMonth }).then(({ status, data, errormsg }) => {
- this.setState({ addAllLoading: false });
- if (status) {
- message.success(data || "操作成功");
- this.tableRef.getTableDate();
- } else {
- message.error(errormsg || "操作失败");
- }
- }).catch(() => this.setState({ addAllLoading: false }));
+ autoAddAll({ yearMonth: declareMonth, taxAgentIds: taxAgentId ? taxAgentId.split(",") : [] })
+ .then(({ status, data, errormsg }) => {
+ this.setState({ addAllLoading: false });
+ if (status) {
+ message.success(data || "操作成功");
+ this.tableRef.getTableDate();
+ } else {
+ message.error(errormsg || "操作失败");
+ }
+ }).catch(() => this.setState({ addAllLoading: false }));
};
/*
* Author: 黎永顺
@@ -376,8 +377,8 @@ class Index extends Component {
label: "个税扣缴义务人",
value: taxAgentId,
onChange: this.screenChange,
- options: [{ key: "", showname: "全部" }, ...taxAgentOption],
- key: "taxAgentId"
+ options: taxAgentOption,
+ key: "taxAgentId", multiple: true
})
}
];
@@ -400,6 +401,7 @@ class Index extends Component {
*/
getTopBtns = () => {
const { addAllLoading, cumTaxPeriodDialog, feedbackLoading, incomeTaxStatus } = this.state;
+ const { taxAgentStore: { taxAgentOption } } = this.props;
const commonBtns = [
,
,
@@ -420,7 +422,7 @@ class Index extends Component {
const incomeTaxBtns = [
));
//申报状态：申报成功，无需缴款
declareInfo.declareStatus === "DECLARE_SUCCESS_NO_PAY" &&
(btns.splice(1, 2,
,
+ onClick={() => confirmDialog("correct", () => this.handleOperateDeclare("correct", { reportType }))}>{getLabel(111, "更正申报")},
+ onClick={() => confirmDialog("cancel", () => this.handleOperateDeclare("cancel", { reportType }))}>{getLabel(111, "作废申报")}
));
//申报状态：申报成功，未缴款
declareInfo.declareStatus === "DECLARE_SUCCESS_UNPAID" &&
(btns.splice(1, 2,
,
+ onClick={() => confirmDialog("correct", () => this.handleOperateDeclare("correct", { reportType }))}>{getLabel(111, "更正申报")},
,
+ onClick={() => confirmDialog("cancel", () => this.handleOperateDeclare("cancel", { reportType }))}>{getLabel(111, "作废申报")},
@@ -404,7 +413,7 @@ class Index extends Component {
}
if (intelCalcSalaryStatus && (declareInfo.declareStatus === "DECLARE_SUCCESS_UNPAID")) {
btns.push(
-
,
+ ,
);
}
@@ -413,41 +422,49 @@ class Index extends Component {
onClick={this.getEnterprisePayCertificate}>{getLabel(111, "开具企业完税证明")});
}
return (
-
-
this[fun]()}/>
-
- this.setState({ selectedKey: v }, () => this.getDetailList())}
- searchType={["base"]} searchsBasePlaceHolder={getLabel(26919, "请输入姓名")}
- onSearchChange={keyword => this.setState({ keyword })}
- onSearch={this.getDetailList}
- />
- {/*个税申报表-新增编辑框*/}
- this.handleTaxDescPerSlide({ visible: false, id: "", callback })}
- />
- {/*个税申报表导入*/}
- this.taxDeclareRef = dom}
- onSuccess={this.declare}
- />
- {/*个税申报表-新增tab弹框*/}
- this.setState({ editTabVisible: false }, () => isRefresh && this.init(false))}/>
-
-