-
}
- iconBgcolor="#F14A2D" buttons={showOperateBtn ? rightBtns : []}
- showDropIcon onDropMenuClick={this.onDropMenuClick}
- dropMenuDatas={[
- {
- key: "log", icon:
,
- content: getLabel(545781, "操作日志")
- }
- ]}
- >
-
- {
- this.setState({
- queryForm: { ...queryForm, ...payload }
- }, () => this.wfListRef.wrappedInstance.getWelfareRecordList());
- }}
- onPutAccountOptions={options => this.setState({ accountDialog: { ...accountDialog, options } })}
- />
- this.wfListRef = dom} queryForm={queryForm}
- onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)}/>
-
-
this.setState({
- accountDialog: { ...accountDialog, visible: false, title: "", loading: false }
- })} onOk={this.handleAccount}
- />
- {/*操作日志*/}
- this.setState({ logDialogVisible: false })}/>
- {/*核算进度条*/}
- {
- this.state.progressVisible &&
- {
- this.setState({ progressVisible: false, progress: 0 }, () => clearInterval(this.timer));
- }}
- />
- }
-
+ return (}
+ iconBgcolor="#F14A2D" buttons={showOperateBtn ? rightBtns : []} className="salary-welfare-record"
+ showDropIcon onDropMenuClick={this.onDropMenuClick}
+ dropMenuDatas={[
+ {
+ key: "log", icon: ,
+ content: getLabel(545781, "操作日志")
+ }
+ ]}>
+
+ {
+ this.setState({
+ queryForm: { ...queryForm, ...payload }
+ }, () => this.wfListRef.wrappedInstance.getWelfareRecordList());
+ }}
+ onPutAccountOptions={options => this.setState({ accountDialog: { ...accountDialog, options } })}
+ />
+ this.wfListRef = dom} queryForm={queryForm}
+ onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)}/>
- );
+ this.setState({
+ accountDialog: { ...accountDialog, visible: false, title: "", loading: false }
+ })} onOk={this.handleAccount}
+ />
+ {/*操作日志*/}
+ this.setState({ logDialogVisible: false })}/>
+ {/*核算进度条*/}
+ {
+ this.state.progressVisible &&
+ {
+ this.setState({ progressVisible: false, progress: 0 }, () => clearInterval(this.timer));
+ }}
+ />
+ }
+ );
}
}
From f407d8520d6c5a8a87238205047626da12d38f52 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Thu, 17 Oct 2024 11:18:53 +0800
Subject: [PATCH 02/23] release/2.16.1.2410.01
---
.../hrmSalary/pages/fieldManagement/components/fieldTable.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldTable.js b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldTable.js
index f966e4c3..840da963 100644
--- a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldTable.js
+++ b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldTable.js
@@ -127,7 +127,7 @@ class FieldTable extends Component {
pagination={pagination}
loading={loading}
columns={this.getColumns()}
- scroll={{ y: "calc(100vh - 160px)" }}
+ scroll={{ y: "calc(100vh - 175px)" }}
/>
);
}
From 8c5b0acffaca2a1f4c2a2e5f781448d0e42989f4 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Fri, 18 Oct 2024 11:51:06 +0800
Subject: [PATCH 03/23] =?UTF-8?q?feature/2.16.1.2410.01-=E8=96=AA=E8=B5=84?=
=?UTF-8?q?=E6=A0=B8=E7=AE=97=E5=8D=95=E5=85=83=E6=A0=BC=E9=94=81=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../doCalc/components/salaryEditCalc/editCalcTable.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
index 96e717fe..4f45965a 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
@@ -285,8 +285,8 @@ class EditCalcTable extends Component {
Date: Fri, 18 Oct 2024 14:26:00 +0800
Subject: [PATCH 04/23] =?UTF-8?q?feature/2.16.1.2410.01-=E8=96=AA=E8=B5=84?=
=?UTF-8?q?=E6=A0=B8=E7=AE=97=E5=8D=95=E5=85=83=E6=A0=BC=E9=94=81=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pc4mobx/hrmSalary/apis/calculate.js | 4 +++
.../salaryEditCalc/editCalcTable.js | 28 ++++++++++++-------
2 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/pc4mobx/hrmSalary/apis/calculate.js b/pc4mobx/hrmSalary/apis/calculate.js
index a41a7c07..b953fa9b 100644
--- a/pc4mobx/hrmSalary/apis/calculate.js
+++ b/pc4mobx/hrmSalary/apis/calculate.js
@@ -235,6 +235,10 @@ export const updateLockStatus = (params) => {
export const updateLockEmpStatus = (params) => {
return postFetch("/api/bs/hrmsalary/salaryacct/acctresult/lockEmp", params);
};
+// 单元格锁定
+export const updateLockEmpCellStatus = (params) => {
+ return postFetch("/api/bs/hrmsalary/salaryacct/acctresult/lock", params);
+};
// 导入薪资核算添加表头字段缓存
export const cacheImportField = (params) => {
return postFetch("/api/bs/hrmsalary/salaryacct/acctresult/cacheImportField", params);
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
index 4f45965a..56303e05 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
@@ -8,7 +8,12 @@ import React, { Component } from "react";
import { WeaLocaleProvider, WeaTools } from "ecCom";
import { message, Modal, Spin } from "antd";
import { inject, observer } from "mobx-react";
-import { acctResultList, updateLockEmpStatus, updateLockStatus } from "../../../../../apis/calculate";
+import {
+ acctResultList,
+ updateLockEmpCellStatus,
+ updateLockEmpStatus,
+ updateLockStatus
+} from "../../../../../apis/calculate";
import ProgressModal from "../../../../../components/progressModal";
import BatchUpdateSalaryItemValDialog from "./batchUpdateSalaryItemValDialog";
import EditSalaryCalcSlide from "./editSalaryCalcSlide";
@@ -135,7 +140,7 @@ class EditCalcTable extends Component {
});
};
updateEmpLockStatus = (payload) => {
- const { lockStatus } = payload;
+ const { lockStatus, salaryItemId } = payload;
Modal.confirm({
title: getLabel(131329, "信息确认"),
content:
@@ -166,13 +171,16 @@ class EditCalcTable extends Component {
}, 500);
});
const { routeParams: { salaryAcctRecordId } } = this.props;
- updateLockEmpStatus({ ...payload, salaryAcctRecordId }).then(({ status, errormsg }) => {
+ const params = salaryItemId ? payload : { ...payload, salaryAcctRecordId };
+ const APIFunction = salaryItemId ? updateLockEmpCellStatus : updateLockEmpStatus;
+ APIFunction(params).then(({ status, errormsg }) => {
+ clearInterval(this.timerLock);
+ this.setState({
+ progressVisible: false,
+ progress: 0
+ });
if (status) {
- clearInterval(this.timerLock);
- this.setState({
- progressVisible: false,
- progress: 0
- }, () => this.queryCalcResultList());
+ this.queryCalcResultList();
} else {
message.error(errormsg);
}
@@ -285,8 +293,8 @@ class EditCalcTable extends Component {
Date: Fri, 18 Oct 2024 16:49:52 +0800
Subject: [PATCH 05/23] =?UTF-8?q?release/2.16.1.2410.01-=E4=B8=AA=E7=A8=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../doCalc/components/salaryEditCalc/editCalcTable.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
index 56303e05..d7ffbc62 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
@@ -232,8 +232,8 @@ class EditCalcTable extends Component {
"点击锁定所有解锁的项目值": getLabel(543649, "点击锁定所有解锁的项目值"),
"点击解锁所有锁定的项目值": getLabel(543648, "点击解锁所有锁定的项目值"),
"锁定的项目值": getLabel(543647, "锁定的项目值"),
- "当前状态锁定，点击解锁": getLabel(111, "当前状态锁定，点击解锁"),
- "当前状态未锁定，点击锁定": getLabel(111, "当前状态未锁定，点击锁定"),
+ "当前状态锁定，右击解锁": getLabel(111, "当前状态锁定，右击解锁"),
+ "当前状态未锁定，右击锁定": getLabel(111, "当前状态未锁定，右击锁定"),
"共": getLabel(18609, "共"), "条": getLabel(18256, "条"),
"总计": getLabel(523, "总计"), "批量解锁": getLabel(111, "批量解锁"),
"批量锁定": getLabel(111, "批量锁定"), "批量更新": getLabel(111, "批量更新"),
From cfdc0cd5a057edbc8438bf075fd1bb3452c71de4 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Tue, 22 Oct 2024 14:53:36 +0800
Subject: [PATCH 06/23] release/2.16.1.2410.01
---
.../mySalaryBenefits/components/payrollTable/index.js | 2 +-
pc4mobx/hrmSalary/pages/payroll/index.less | 5 +++++
.../hrmSalary/pages/payroll/templateBaseSettings.js | 10 +++++++++-
pc4mobx/hrmSalary/pages/payrollRelease/index.less | 1 +
4 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/mySalaryBenefits/components/payrollTable/index.js b/pc4mobx/hrmSalary/pages/mySalaryBenefits/components/payrollTable/index.js
index 4e746a70..16f992b3 100644
--- a/pc4mobx/hrmSalary/pages/mySalaryBenefits/components/payrollTable/index.js
+++ b/pc4mobx/hrmSalary/pages/mySalaryBenefits/components/payrollTable/index.js
@@ -46,7 +46,7 @@ class Index extends Component {
if (it.column === "salaryYearMonth" || it.column === "sendTime") {
return {
dataIndex: it.column, title: it.text, width: it.width,
- render: (__, record) => ({moment(record[it["column"]]).format("YYYY-MM")})
+ render: (__, record) => ({record[it["column"]]})
};
}
return {
diff --git a/pc4mobx/hrmSalary/pages/payroll/index.less b/pc4mobx/hrmSalary/pages/payroll/index.less
index e0f417dd..f3809e53 100644
--- a/pc4mobx/hrmSalary/pages/payroll/index.less
+++ b/pc4mobx/hrmSalary/pages/payroll/index.less
@@ -26,6 +26,11 @@
padding: 5px 16px;
border-bottom: 1px solid #e5e5e5;
+ .wea-select {
+ width: 120px !important;
+ margin-left: 10px;
+ }
+
.wea-input-number {
width: 80px !important;
margin: 0 10px;
diff --git a/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js b/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js
index 9eaa2ece..7d2edc9c 100644
--- a/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js
+++ b/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js
@@ -106,7 +106,7 @@ class TemplateBaseSettings extends Component {
render() {
const { watermarkStatus, watermark, watermarkSet, ackFeedbackSetting, salaryBillViewingLimitSetting } = this.state;
const { ackStatus, feedbackStatus, autoAckDays, feedBackUrl, mobileFeedbackUrl } = ackFeedbackSetting;
- const { limitMonth, burningAfterReadingMin } = salaryBillViewingLimitSetting;
+ const { monthType = "SALARY_DATE", limitMonth, burningAfterReadingMin } = salaryBillViewingLimitSetting;
return (
@@ -204,6 +204,14 @@ class TemplateBaseSettings extends Component {
{getLabel(111, "仅可查看")}
+
this.setState({
+ salaryBillViewingLimitSetting: { ...salaryBillViewingLimitSetting, monthType }
+ })}
+ options={[
+ { key: "SALARY_DATE", showname: getLabel(111, "薪资所属月"), selected: true },
+ { key: "SEND_DATE", showname: getLabel(111, "发放日期") }
+ ]}/>
this.setState({
salaryBillViewingLimitSetting: {
diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/index.less b/pc4mobx/hrmSalary/pages/payrollRelease/index.less
index 245c991f..0caebb48 100644
--- a/pc4mobx/hrmSalary/pages/payrollRelease/index.less
+++ b/pc4mobx/hrmSalary/pages/payrollRelease/index.less
@@ -27,6 +27,7 @@
.salary-payroll-content {
padding: 8px 16px;
height: 100%;
+ overflow-y: auto;
& > .wea-search-group {
background: #FFF;
From 02ff34c2021defda8f380f8e83cb65c88845ca84 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Wed, 23 Oct 2024 09:51:02 +0800
Subject: [PATCH 07/23] release/2.16.1.2410.01
---
.../calculate/doCalc/components/salaryEditCalc/editCalcTable.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
index d7ffbc62..aa6baf65 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
@@ -332,7 +332,7 @@ const traverse = (arr, calcDetail) => {
return _.map(arr, item => {
if (!_.isEmpty(item.children)) {
return {
- title: item.text, width: item.width + "px", ellipsis: true,
+ title: item.text, width: item.width + "px", ellipsis: true, calcDetail,
dataIndex: item.column, children: traverse(item.children, calcDetail),
fixed: item.fixed || false, dataType: item.dataType, align: "center"
};
From 444c9b19abefa048470bd922c6ef96238f3385a0 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Fri, 25 Oct 2024 17:04:45 +0800
Subject: [PATCH 08/23] =?UTF-8?q?release/2.16.1.2410.01=20=E5=B7=A5?=
=?UTF-8?q?=E8=B5=84=E5=8D=95=E6=A8=A1=E6=9D=BF=E8=AE=BE=E7=BD=AE=E6=B7=BB?=
=?UTF-8?q?=E5=8A=A0=E8=96=AA=E8=B5=84=E6=89=80=E5=B1=9E=E5=B9=B4=E7=9A=84?=
=?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pc4mobx/hrmSalary/pages/payroll/templatePreview/tmpPreview.js | 3 ++-
.../hrmSalary/pages/payrollRelease/components/conditions.js | 2 +-
.../components/payrollTempNormalSet/formRender.js | 2 ++
pc4mobx/hrmSalary/pages/payrollRelease/index.less | 2 +-
4 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/payroll/templatePreview/tmpPreview.js b/pc4mobx/hrmSalary/pages/payroll/templatePreview/tmpPreview.js
index d6d410d1..90db1ebb 100644
--- a/pc4mobx/hrmSalary/pages/payroll/templatePreview/tmpPreview.js
+++ b/pc4mobx/hrmSalary/pages/payroll/templatePreview/tmpPreview.js
@@ -37,7 +37,8 @@ class TmpPreview extends Component {
}
const data = JSON.parse(dataStr);
let theme = data.theme || "";
- theme = theme.replaceAll("${salaryMonth}", moment().format("YYYY-MM"));
+ theme = theme.replaceAll("${salaryMonth}", moment().format("YYYY年MM月"));
+ theme = theme.replaceAll("${salaryYear}", moment().format("YYYY年"));
this.setState({
theme, tip: data.textContent || "",
background: data.background || "",
diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/components/conditions.js b/pc4mobx/hrmSalary/pages/payrollRelease/components/conditions.js
index 1bbae152..30c63a43 100644
--- a/pc4mobx/hrmSalary/pages/payrollRelease/components/conditions.js
+++ b/pc4mobx/hrmSalary/pages/payrollRelease/components/conditions.js
@@ -253,7 +253,7 @@ export const tempNormalSetConditions = [
colSpan: 1,
conditionType: "INPUT",
domkey: ["theme"],
- fieldcol: 10,
+ fieldcol: 8,
label: "工资单标题",
lanId: 543588,
labelcol: 6,
diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempNormalSet/formRender.js b/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempNormalSet/formRender.js
index 50df1c24..2556e25a 100644
--- a/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempNormalSet/formRender.js
+++ b/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempNormalSet/formRender.js
@@ -46,6 +46,8 @@ export const payrollTempNormalSetForm = (form, condition, background, onChange =
{getLabel(500143, "插入变量")}：
insertVar("theme", "${companyName}")}>{getLabel(1976, "公司名称")}
+ insertVar("theme", "${salaryYear}")}>{getLabel(111, "薪资所属年")}
insertVar("theme", "${salaryMonth}")}>{getLabel(542604, "薪资所属月")}
diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/index.less b/pc4mobx/hrmSalary/pages/payrollRelease/index.less
index 0caebb48..634a44e4 100644
--- a/pc4mobx/hrmSalary/pages/payrollRelease/index.less
+++ b/pc4mobx/hrmSalary/pages/payrollRelease/index.less
@@ -158,7 +158,7 @@
margin-left: 10px;
position: absolute;
top: 25%;
- right: -208px;
+ right: -262px;
margin-top: -2px;
.sftv-item {
From 8488f54aac84b820f1fad6451f3c05be856b0fa9 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Tue, 29 Oct 2024 09:21:38 +0800
Subject: [PATCH 09/23] release/2.16.1.2410.01
---
.../pages/ledgerPage/components/ledgerSalaryItemTable.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
index 838f44a0..7c160168 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
@@ -173,7 +173,7 @@ class LedgerSalaryItemTable extends Component {
this.setState({
editFormulModal: {
...editFormulModal, visible: true, valueType, dataType, name: salaryItemName,
- formulaId: ((valueType.toString() === "2" && (originFormulaContent || originFormulaContent !== " ")) || valueType.toString() === "3" && (originSqlContent || originSqlContent === " ")) ? formulaId : ""
+ formulaId: ((valueType.toString() === "2" && (originFormulaContent || originFormulaContent !== " ")) || valueType.toString() === "3" && (originSqlContent || originSqlContent !== " ")) ? formulaId : ""
}
});
};
From 1f7fe615beb61cbe4d079ae5aa08557585ec4164 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Fri, 1 Nov 2024 14:50:37 +0800
Subject: [PATCH 10/23] 1release/2.16.1.2410.01
---
pc4mobx/hrmSalary/apis/ledger.js | 4 +
pc4mobx/hrmSalary/apis/taxAgent.js | 4 +
.../components/PersonalScopeModal/index.js | 73 +++++------
.../components/PersonalScopeTable/index.js | 5 +-
.../components/ledgerAssociatedPersonnel.js | 14 ++-
.../pages/taxAgent/addTaxAgentModal.js | 28 ++++-
.../hrmSalary/pages/taxAgent/personalScope.js | 42 +++----
.../pages/taxAgent/slideTaxagentUser.js | 113 ++++--------------
8 files changed, 118 insertions(+), 165 deletions(-)
diff --git a/pc4mobx/hrmSalary/apis/ledger.js b/pc4mobx/hrmSalary/apis/ledger.js
index 487181bc..71e0b3db 100644
--- a/pc4mobx/hrmSalary/apis/ledger.js
+++ b/pc4mobx/hrmSalary/apis/ledger.js
@@ -57,6 +57,10 @@ export const deleteLedgerPersonExtRange = params => {
export const saveLedgerPersonRange = params => {
return postFetch("/api/bs/hrmsalary/salarysob/range/save", params);
};
+//编辑薪资帐套人员范围
+export const editLedgerPersonRange = params => {
+ return postFetch("/api/bs/hrmsalary/salarysob/range/edit", params);
+};
//删除薪资帐套人员范围
export const deleteLedgerPersonRange = params => {
diff --git a/pc4mobx/hrmSalary/apis/taxAgent.js b/pc4mobx/hrmSalary/apis/taxAgent.js
index f3c527b1..4e38cf8d 100644
--- a/pc4mobx/hrmSalary/apis/taxAgent.js
+++ b/pc4mobx/hrmSalary/apis/taxAgent.js
@@ -48,6 +48,10 @@ export const deleteTaxAgent = (params) => {
export const taxAgentRangeSave = (params) => {
return postFetch("/api/bs/hrmsalary/taxAgent/range/save", params);
};
+//编辑人员范围
+export const taxAgentRangeEdit = (params) => {
+ return postFetch("/api/bs/hrmsalary/taxAgent/range/edit", params);
+};
//非系统人员范围查询
export const taxAgentRangelistExt = (params) => {
return postFetch("/api/bs/hrmsalary/taxAgent/range/listExt", params);
diff --git a/pc4mobx/hrmSalary/components/PersonalScopeModal/index.js b/pc4mobx/hrmSalary/components/PersonalScopeModal/index.js
index d0718a2f..a13fe88e 100644
--- a/pc4mobx/hrmSalary/components/PersonalScopeModal/index.js
+++ b/pc4mobx/hrmSalary/components/PersonalScopeModal/index.js
@@ -39,47 +39,33 @@ class PersonalScopeModal extends Component {
}
componentDidMount() {
- const { isTaxgent = true } = this.props;
- if (isTaxgent) {
- this.getTaxAgentRangeForm();
- } else {
- this.commonEnumList();
- // const employeeStatus = [
- // { key: "TRIAL", showname: "试用" },
- // { key: "FORMAL", showname: "正式" },
- // { key: "TEMPORARY", showname: "临时" },
- // { key: "DELAY", showname: "试用延期" },
- // { key: "FIRE", showname: "解雇" },
- // { key: "DEPARTURE", showname: "离职" },
- // { key: "RETIRED", showname: "退休" }
- // ];
- // const targetTypeList = [
- // {
- // key: "EMPLOYEE",
- // showname: "人员",
- // selected: false
- // },
- // {
- // key: "SUBCOMPANY",
- // showname: "分部",
- // selected: false
- // },
- // {
- // key: "DEPT",
- // showname: "部门",
- // selected: false
- // },
- // {
- // key: "POSITION",
- // showname: "岗位",
- // selected: false
- // }
- // ];
- // this.setState({ targetTypeList, employeeStatus });
+
+ }
+
+ componentWillReceiveProps(nextProps, nextContext) {
+ if (nextProps.visible !== this.props.visible && nextProps.visible) {
+ const { isTaxgent = true } = nextProps;
+ if (isTaxgent) {
+ this.getTaxAgentRangeForm();
+ } else {
+ this.commonEnumList(nextProps);
+ }
+ if (!_.isEmpty(nextProps.record)) {
+ this.setState({
+ targetType: nextProps.record.targetTypeName,
+ targetTypeIds: nextProps.record.target,
+ targetTypeIdsNames: nextProps.record.targetName,
+ status: nextProps.record.status,
+ statusAll: ""
+ });
+ } else {
+ this.handleReset();
+ }
}
}
- commonEnumList = () => {
+ commonEnumList = (props) => {
+ const { record } = props;
commonEnumList({ enumClass: "com.engine.salary.enums.UserStatusEnum" }).then(({ status, data }) => {
if (status) {
const targetTypeList = [
@@ -112,6 +98,11 @@ class PersonalScopeModal extends Component {
this.setState({
targetTypeList,
employeeStatus: _.map(_.filter(data, o => o.value !== 7), it => ({ key: it.enum, showname: it.defaultLabel }))
+ }, () => {
+ if (!_.isEmpty(record)) {
+ const bool = _.every(_.map(this.state.employeeStatus, it => it.key), item => record.status.split(",").includes(item));
+ this.setState({ statusAll: bool ? "0" : "" });
+ }
});
}
});
@@ -129,7 +120,7 @@ class PersonalScopeModal extends Component {
};
handleSubmit = () => {
const { status, targetTypeIds, targetType } = this.state;
- const { includeType, saveKeyVal, onSuccess, onCancel, APISaveFox } = this.props;
+ const { includeType, saveKeyVal, onSuccess, onCancel, APISaveFox, record } = this.props;
if (_.isEmpty(status) || _.isEmpty(targetTypeIds)) {
Modal.warning({
title: "信息确认",
@@ -139,14 +130,14 @@ class PersonalScopeModal extends Component {
}
const payload = {
employeeStatus: status.split(","),
- includeType,
+ includeType, id: record.id,
targetParams: targetType !== "SQL" ?
_.map(targetTypeIds.split(","), it => ({ targetType, targetId: it, target: "" })) :
[{ targetType, targetId: "0", target: targetTypeIds }],
[saveKeyVal["key"]]: saveKeyVal["value"]
};
this.setState({ loading: true });
- APISaveFox["save"](payload).then(({ status, errormsg }) => {
+ APISaveFox[_.isEmpty(record) ? "save" : "edit"](payload).then(({ status, errormsg }) => {
this.setState({ loading: false });
if (status) {
message.success("保存成功");
diff --git a/pc4mobx/hrmSalary/components/PersonalScopeTable/index.js b/pc4mobx/hrmSalary/components/PersonalScopeTable/index.js
index 8b38ba01..21a55e0d 100644
--- a/pc4mobx/hrmSalary/components/PersonalScopeTable/index.js
+++ b/pc4mobx/hrmSalary/components/PersonalScopeTable/index.js
@@ -59,7 +59,10 @@ class PersonalScopeTable extends Component {
columns: _.map(columns, item => {
return {
...item,
- render: (text) => {
+ render: (text, record) => {
+ if (record.targetTypeName === "SQL" && item.dataIndex === "targetName") {
+ return this.props.onEditScope(record)}>{text};
+ }
return {text};
}
};
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAssociatedPersonnel.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAssociatedPersonnel.js
index 8b7af5a4..92d65289 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAssociatedPersonnel.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAssociatedPersonnel.js
@@ -13,6 +13,7 @@ import PersonalScopeModal from "../../../components/PersonalScopeModal";
import {
deleteLedgerPersonExtRange,
deleteLedgerPersonRange,
+ editLedgerPersonRange,
getLedgerPersonRangeExclude,
getLedgerPersonRangeExtList,
getLedgerPersonRangeInclude,
@@ -32,7 +33,8 @@ const APIFox = {
externalList: getLedgerPersonRangeExtList
};
const APISaveFox = {
- save: saveLedgerPersonRange
+ save: saveLedgerPersonRange,
+ edit: editLedgerPersonRange
};
@inject("taxAgentStore")
@@ -55,7 +57,8 @@ class LedgerAssociatedPersonnel extends Component {
personalAddModal: {
visible: false,
title: "关联人员",
- includeType: ""
+ includeType: "",
+ record: {}
},
extEmpsWitch: "1" //非系统人员开关， 1： 开启， 0：关闭
};
@@ -157,7 +160,7 @@ class LedgerAssociatedPersonnel extends Component {
* Params:
* Date: 2022/11/30
*/
- handleAddPersonal = () => {
+ handleAddPersonal = (record = {}) => {
const { personalAddModal, selectedKey } = this.state;
if (selectedKey === "externalList") {
this.setState({ externalPersonModalVisible: true });
@@ -165,7 +168,7 @@ class LedgerAssociatedPersonnel extends Component {
this.setState({
personalAddModal: {
...personalAddModal,
- visible: true,
+ visible: true, record,
includeType: selectedKey === "listInclude" ? 1 : 0
}
});
@@ -256,7 +259,7 @@ class LedgerAssociatedPersonnel extends Component {
disabled={_.isEmpty(rowKeys)}
onClick={this.taxAgentRangeDelete}
/>,
- ,
+ this.handleAddPersonal()}/>,
this.setState({ rowKeys })}
+ onEditScope={this.handleAddPersonal}
/>
{/*关联人员范围导入*/}
{importParams.visible && (
diff --git a/pc4mobx/hrmSalary/pages/taxAgent/addTaxAgentModal.js b/pc4mobx/hrmSalary/pages/taxAgent/addTaxAgentModal.js
index fae1b5c6..93dbc6d3 100644
--- a/pc4mobx/hrmSalary/pages/taxAgent/addTaxAgentModal.js
+++ b/pc4mobx/hrmSalary/pages/taxAgent/addTaxAgentModal.js
@@ -25,6 +25,24 @@ export default class AddTaxAgentModal extends React.Component {
};
}
+ componentWillReceiveProps(nextProps, nextContext) {
+ if (nextProps.visible !== this.props.visible && nextProps.visible) {
+ if (!_.isEmpty(nextProps.scopeRecord)) {
+ const { employeeStatus } = nextProps;
+ const checked = _.map(employeeStatus, it => it.id);
+ const bool = _.every(checked, it => nextProps.scopeRecord.status.indexOf(it) !== -1);
+ this.setState({
+ selectedKey: nextProps.scopeRecord.targetType,
+ checkboxValue: nextProps.scopeRecord.status,
+ checkAll: bool ? "1" : "0",
+ ids: nextProps.scopeRecord.target
+ });
+ } else {
+ this.handleReset();
+ }
+ }
+ }
+
onCheckboxChange = (checkboxValue) => {
const { employeeStatus } = this.props;
const checked = _.map(employeeStatus, it => it.id);
@@ -45,7 +63,7 @@ export default class AddTaxAgentModal extends React.Component {
// 保存
handleSave = () => {
- const { onTaxAgentSave } = this.props;
+ const { onTaxAgentSave, scopeRecord } = this.props;
const { checkboxValue, ids, selectedKey } = this.state;
const payload = {
employeeStatus: checkboxValue.split(","),
@@ -67,13 +85,13 @@ export default class AddTaxAgentModal extends React.Component {
this.refs.weaError1.showError();
return;
}
- onTaxAgentSave && onTaxAgentSave(payload);
+ onTaxAgentSave && onTaxAgentSave({ ...payload, id: scopeRecord.id });
};
// 重置
handleReset = () => {
this.setState({
- selectedKey: "EMPLOYEE",
+ selectedKey: !_.isEmpty(this.props.scopeRecord) ? "SQL" : "EMPLOYEE",
checkboxValue: "",
checkAll: "0",
ids: ""
@@ -81,7 +99,7 @@ export default class AddTaxAgentModal extends React.Component {
};
render() {
- const { employeeStatus, targetTypeList, visible, onCancel, loading } = this.props;
+ const { employeeStatus, targetTypeList, visible, onCancel, loading, scopeRecord } = this.props;
return (
({
...it,
key: it.id,
diff --git a/pc4mobx/hrmSalary/pages/taxAgent/personalScope.js b/pc4mobx/hrmSalary/pages/taxAgent/personalScope.js
index da0bd2bb..81e8fb55 100644
--- a/pc4mobx/hrmSalary/pages/taxAgent/personalScope.js
+++ b/pc4mobx/hrmSalary/pages/taxAgent/personalScope.js
@@ -8,6 +8,7 @@ import React, { Component } from "react";
import { message, Modal } from "antd";
import { inject, observer } from "mobx-react";
import SlideTaxagentUser from "./slideTaxagentUser";
+import { taxAgentRangeEdit } from "../../apis/taxAgent";
import "./index.less";
const personScopeWarrper = {};
@@ -199,7 +200,7 @@ export default class PersonalScope extends Component {
taxAgentRangeSave = (module) => {
const { taxAgentId } = this.props;
const { pageObj } = this.state;
- const { includeType } = module;
+ const { includeType, id } = module;
const { taxAgentRangeSave, taxAgentRangeExtSave } = this.props.taxAgentStore;
this.setState({ submitLoading: true });
if (includeType === "2") {
@@ -214,26 +215,25 @@ export default class PersonalScope extends Component {
}
});
} else {
- taxAgentRangeSave({ ...module, taxAgentId }).then(
- ({ status, errormsg }) => {
- this.setState({ submitLoading: false });
- if (status) {
- this.tagAgentRef.closeModal();
- message.success("新增成功");
- includeType == "1"
- ? this.getTaxAgentRangeListInclude({
- current: pageObj.current,
- pageSize: pageObj.pageSize
- })
- : this.getTaxAgentRangeListExclude({
- current: pageObj.current,
- pageSize: pageObj.pageSize
- });
- } else {
- message.error(errormsg || "新增失败");
- }
+ const API= id ? taxAgentRangeEdit : taxAgentRangeSave;
+ API({ ...module, taxAgentId }).then(({ status, errormsg }) => {
+ this.setState({ submitLoading: false });
+ if (status) {
+ this.tagAgentRef.closeModal();
+ message.success("操作成功");
+ includeType == "1"
+ ? this.getTaxAgentRangeListInclude({
+ current: pageObj.current,
+ pageSize: pageObj.pageSize
+ })
+ : this.getTaxAgentRangeListExclude({
+ current: pageObj.current,
+ pageSize: pageObj.pageSize
+ });
+ } else {
+ message.error(errormsg);
}
- );
+ });
}
};
@@ -285,7 +285,7 @@ export default class PersonalScope extends Component {
onTaxAngetSearch={({ targetName, targetWorkcode, tab }) => {
tab == "1"
? this.getTaxAgentRangeListInclude({ targetName, targetWorkcode })
- : tab == "0" ? this.getTaxAgentRangeListExclude({ targetName, targetWorkcode }):
+ : tab == "0" ? this.getTaxAgentRangeListExclude({ targetName, targetWorkcode }) :
this.taxAgentRangelistExt({ targetName, targetWorkcode });
}}
onChangeTab={(tab) => {
diff --git a/pc4mobx/hrmSalary/pages/taxAgent/slideTaxagentUser.js b/pc4mobx/hrmSalary/pages/taxAgent/slideTaxagentUser.js
index d60cc7f4..4f842810 100644
--- a/pc4mobx/hrmSalary/pages/taxAgent/slideTaxagentUser.js
+++ b/pc4mobx/hrmSalary/pages/taxAgent/slideTaxagentUser.js
@@ -15,6 +15,7 @@ export default class SlideTaxagentUser extends React.Component {
showSearchAd: false,
externalPersonModalVisible: false, //外部人员关联弹框
addTaxagentModalVisible: false,
+ scopeRecord: {},
includeType: "1",
selectedRowKeys: [],
searchValue: "",
@@ -131,7 +132,8 @@ export default class SlideTaxagentUser extends React.Component {
externalPersonModalVisible,
importParams,
previewDataSource,
- showSearchAd, extEmpsWitch
+ showSearchAd, extEmpsWitch,
+ scopeRecord
} = this.state;
const {
submitLoading,
@@ -224,106 +226,33 @@ export default class SlideTaxagentUser extends React.Component {
onSearchChange={searchValue => this.setState({ searchValue })}
onChange={v => this.setState({ includeType: v }, () => onChangeTab && onChangeTab(this.state.includeType))}
/>
- {/**/}
- {/* */}
- {/* {*/}
- {/* this.handleTabClick(1);*/}
- {/* }}>*/}
- {/* 人员范围*/}
- {/* | {*/}
- {/* this.handleTabClick(0);*/}
- {/* }}>*/}
- {/* 从范围中排除*/}
- {/* */}
- {/* */}
- {/* */}
- {/*
*/}
- {/* {*/}
- {/* (hideIconInTax || showSalaryItemBtn) && */}
- {/* {*/}
- {/* includeType == "1" &&*/}
- {/*
{*/}
- {/* this.setState({ importParams: { ...importParams, visible: true, step: 0 } });*/}
- {/* }}*/}
- {/* >*/}
- {/* }*/}
- {/* */}
- {/* */}
- {/* */}
- {/*
*/}
- {/*