{
- _.map(dataSource, field => {
- const { items } = field;
+ _.map(newDateSource, field => {
+ const { items, id, uuid } = field;
return
childItem.id === id || childItem.uuid === uuid).items}
+ salarySobId={editId || saveSalarySobId}
selectedRowKeys={field.selectedRowKeys || []}
onDropCategoryItem={(data) => onDropCategoryItem(field, data)}
onHandleItemhide={(data) => onHandleItemhide(field, data)}
@@ -240,12 +253,17 @@ const TitleNormalComp = (props) => {
};
const TitleComp = (props) => {
- const { onAddCategory, titleName, showOperateBtn } = props;
+ const { onAddCategory, titleName, showOperateBtn, salaryItemKeywords, onChange } = props;
return
{titleName}
- {
- showOperateBtn &&
-
- }
+
+ {
+ showOperateBtn &&
+
+ }
+
+
;
};
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
index f770a873..706e219e 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
@@ -88,8 +88,8 @@ class LedgerSalaryItemTable extends Component {
const {
itemHide: hideDefault,
valueType, name, description,
- roundingMode, formulaId, dataType,
- pattern, canEdit, formulaContent
+ roundingMode, formulaId, dataType, useInEmployeeSalary,
+ pattern, canEdit, formulaContent, originFormulaContent, originSqlContent
} = _.find(dataSource, it => it.salaryItemId === salaryItemId);
const { data: userStatusList } = await commonEnumList({ enumClass: "com.engine.salary.enums.sicategory.SharedTypeEnum" });
if (id) {
@@ -101,6 +101,7 @@ class LedgerSalaryItemTable extends Component {
visible: true,
request: {
...data,
+ useInEmployeeSalary: !_.isNil(data.useInEmployeeSalary) ? data.useInEmployeeSalary : "0",
hideDefault: _.isNil(hideDefault) ? "0" : hideDefault,
valueType,
roundingMode,
@@ -121,9 +122,9 @@ class LedgerSalaryItemTable extends Component {
canEdit, dataType, description,
formulaContent, formulaId, name,
hideDefault: _.isNil(hideDefault) ? "0" : hideDefault,
- valueType,
- roundingMode,
- pattern
+ valueType, roundingMode, pattern,
+ originFormulaContent, originSqlContent,
+ useInEmployeeSalary: !_.isNil(useInEmployeeSalary) ? useInEmployeeSalary : "0"
},
record,
userStatusList: _.map(userStatusList, it => ({ key: it.value.toString(), showname: it.defaultLabel }))
@@ -221,6 +222,7 @@ class LedgerSalaryItemTable extends Component {
render() {
const { salaryItemPayload, editFormulModal } = this.state;
const {
+ tableData,
dataSource,
onDropCategoryItem,
onChangeSelectedRowKeys,
@@ -236,7 +238,7 @@ class LedgerSalaryItemTable extends Component {
disabled: !record.canDelete
})
};
- const checkValue = (!_.isEmpty(dataSource) && _.every(dataSource, it => it.itemHide && it.itemHide === "1")) ? "1" : "0";
+ const checkValue = (!_.isEmpty(tableData) && _.every(tableData, it => it.itemHide && it.itemHide === "1")) ? "1" : "0";
const columns = [
{
title: "名称",
@@ -296,7 +298,7 @@ class LedgerSalaryItemTable extends Component {
record.id || record.key}
rowSelection={rowSelection}
- dataSource={dataSource}
+ dataSource={tableData}
columns={columns}
onRow={(record, index) => ({
index,
@@ -304,7 +306,7 @@ class LedgerSalaryItemTable extends Component {
})}
pagination={false}
onDrop={onDropCategoryItem}
- draggable={true}
+ draggable={dataSource.length === tableData.length}
/>
{
const { key } = item;
@@ -56,18 +67,19 @@ class SalaryItemForm extends Component {
case "hideDefault":
return {
...item,
- viewAttr: 2
+ viewAttr: 2,
+ tip: isLedger ? getLabel(111, "开启后，薪资核算不会展示该项目，但是不影响该项目的核算值") : item.tip
};
case "valueType":
return {
...item,
- viewAttr: (isLedger && record.canEdit) || (editable && record.canEdit) || isAdd ? 2 : 1
+ viewAttr: (useInEmployeeSalary.toString() === "0" && ((isLedger && record.canEdit) || (editable && record.canEdit) || isAdd)) ? 2 : 1
};
case "formulaContent":
return {
...item,
key: valueType.toString() === "3" ? "originSqlContent" : "originFormulaContent",
- display: valueType && (valueType.toString() === "2" || valueType.toString() === "3"),
+ display: useInEmployeeSalary.toString() === "0" && valueType && (valueType.toString() === "2" || valueType.toString() === "3"),
viewAttr: (isLedger && record.canEdit) || (editable && record.canEdit) || isAdd ? 2 : 1
};
default:
From 868a546dd650a09448274be3c67e4a106e95958f 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 09:08:57 +0800
Subject: [PATCH 09/24] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E8=96=AA=E8=B5=84?=
=?UTF-8?q?=E8=B4=A6=E5=A5=97=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE=E9=A1=B9?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BC=96=E8=BE=91=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js b/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js
index 4cfea586..58808c61 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js
@@ -43,7 +43,10 @@ export default class FormalFormModal extends React.Component {
const { salaryAcctImportTemplateParam, setSearchFields, detailFormual } = salaryItemStore;
setSearchFields([]);
if (!!this.props.formulaId && this.props.formulaId != 0) {
- detailFormual({ formulaId, returnType: valueType.toString() === "2" ? "formula" : "sql" }).then(data => {
+ detailFormual({
+ formulaId,
+ returnType: (valueType.toString() === "2" || valueType.toString() === "FORMULA") ? "formula" : "sql"
+ }).then(data => {
this.parameters = data.parameters;
this.referenceType = data.referenceType;
this.extendParam = data.extendParam;
From 8071a62ec88106d0cc656d240d9fe0352decfa09 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 14:58:32 +0800
Subject: [PATCH 10/24] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E7=A4=BE=E4=BF=9D?=
=?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=96=B9=E6=A1=88=E8=87=AA=E5=AE=9A=E4=B9=89?=
=?UTF-8?q?=E6=96=B9=E6=A1=88=E6=B7=BB=E5=8A=A0=E5=88=A0=E9=99=A4=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pc4mobx/hrmSalary/apis/welfareScheme.js | 159 +++++++++---------
.../hrmSalary/components/customForm/index.js | 2 +-
.../socialSecurityBenefits/archives/index.js | 6 +-
.../programme/customBenefitsTable.js | 44 ++++-
pc4mobx/hrmSalary/stores/archives.js | 8 +-
pc4mobx/hrmSalary/stores/programme.js | 5 +-
6 files changed, 133 insertions(+), 91 deletions(-)
diff --git a/pc4mobx/hrmSalary/apis/welfareScheme.js b/pc4mobx/hrmSalary/apis/welfareScheme.js
index e7d1f3e7..cd5aab94 100644
--- a/pc4mobx/hrmSalary/apis/welfareScheme.js
+++ b/pc4mobx/hrmSalary/apis/welfareScheme.js
@@ -1,107 +1,108 @@
-import { WeaTools } from 'ecCom';
+import { WeaTools } from "ecCom";
+import { postFetch } from "../util/request";
export const getForm = params => {
- return WeaTools.callApi('/api/bs/hrmsalary/scheme/getForm', 'get', params);
+ return WeaTools.callApi("/api/bs/hrmsalary/scheme/getForm", "get", params);
};
export const getTable = params => {
- // return WeaTools.callApi('/api/bs/hrmsalary/scheme/getTable', 'get', params);
- return fetch('/api/bs/hrmsalary/scheme/getTable', {
- method: 'POST',
- mode: 'cors',
- headers: {
- 'Content-Type': 'application/json'
- },
- body: JSON.stringify(params)
- }).then(res => res.json())
+ // return WeaTools.callApi('/api/bs/hrmsalary/scheme/getTable', 'get', params);
+ return fetch("/api/bs/hrmsalary/scheme/getTable", {
+ method: "POST",
+ mode: "cors",
+ headers: {
+ "Content-Type": "application/json"
+ },
+ body: JSON.stringify(params)
+ }).then(res => res.json());
};
export const createScheme = params => {
- return fetch('/api/bs/hrmsalary/scheme/insert', {
- method: 'POST',
- mode: 'cors',
- headers: {
- 'Content-Type': 'application/json'
- },
- body: JSON.stringify(params)
- }).then(res => res.json())
+ return fetch("/api/bs/hrmsalary/scheme/insert", {
+ method: "POST",
+ mode: "cors",
+ headers: {
+ "Content-Type": "application/json"
+ },
+ body: JSON.stringify(params)
+ }).then(res => res.json());
};
export const updateScheme = params => {
- return fetch('/api/bs/hrmsalary/scheme/update', {
- method: 'POST',
- mode: 'cors',
- headers: {
- 'Content-Type': 'application/json'
- },
- body: JSON.stringify(params)
- }).then(res => res.json())
+ return fetch("/api/bs/hrmsalary/scheme/update", {
+ method: "POST",
+ mode: "cors",
+ headers: {
+ "Content-Type": "application/json"
+ },
+ body: JSON.stringify(params)
+ }).then(res => res.json());
};
export const getCopyForm = params => {
- return WeaTools.callApi('/api/bs/hrmsalary/scheme/copyForm', 'get', params);
+ return WeaTools.callApi("/api/bs/hrmsalary/scheme/copyForm", "get", params);
};
export const copyScheme = params => {
- return fetch(`/api/bs/hrmsalary/scheme/copyScheme?id=${params.id}&schemeName=${params.schemeName}`, {
- method: 'GET',
- mode: 'cors',
- headers: {
- 'Content-Type': 'application/json'
- },
- }).then(res => res.json())
+ return fetch(`/api/bs/hrmsalary/scheme/copyScheme?id=${params.id}&schemeName=${params.schemeName}`, {
+ method: "GET",
+ mode: "cors",
+ headers: {
+ "Content-Type": "application/json"
+ }
+ }).then(res => res.json());
};
export const deleteScheme = params => {
- return fetch('/api/bs/hrmsalary/scheme/delete', {
- method: 'POST',
- mode: 'cors',
- headers: {
- 'Content-Type': 'application/json'
- },
- body: JSON.stringify(params)
- }).then(res => res.json())
+ return fetch("/api/bs/hrmsalary/scheme/delete", {
+ method: "POST",
+ mode: "cors",
+ headers: {
+ "Content-Type": "application/json"
+ },
+ body: JSON.stringify(params)
+ }).then(res => res.json());
};
export const getCustomCategoryForm = params => {
- return WeaTools.callApi('/api/bs/hrmsalary/sicategory/customCategoryForm', 'get', params);
+ return WeaTools.callApi("/api/bs/hrmsalary/sicategory/customCategoryForm", "get", params);
};
export const getCustomCategoryList = params => {
- // return WeaTools.callApi('/api/bs/hrmsalary/sicategory/customCategoryList', 'get', params);
- return fetch('/api/bs/hrmsalary/sicategory/customCategoryList', {
- method: 'POST',
- mode: 'cors',
- headers: {
- 'Content-Type': 'application/json'
- },
- body: JSON.stringify(params)
- }).then(res => res.json())
+ // return WeaTools.callApi('/api/bs/hrmsalary/sicategory/customCategoryList', 'get', params);
+ return fetch("/api/bs/hrmsalary/sicategory/customCategoryList", {
+ method: "POST",
+ mode: "cors",
+ headers: {
+ "Content-Type": "application/json"
+ },
+ body: JSON.stringify(params)
+ }).then(res => res.json());
};
export const createSICategory = params => {
- return fetch('/api/bs/hrmsalary/sicategory/createSICategory', {
- method: 'POST',
- mode: 'cors',
- headers: {
- 'Content-Type': 'application/json'
- },
- body: JSON.stringify(params)
- }).then(res => res.json())
+ return fetch("/api/bs/hrmsalary/sicategory/createSICategory", {
+ method: "POST",
+ mode: "cors",
+ headers: {
+ "Content-Type": "application/json"
+ },
+ body: JSON.stringify(params)
+ }).then(res => res.json());
};
export const updateCustomCategory = params => {
- return fetch('/api/bs/hrmsalary/sicategory/updateCustomCategoryName', {
- method: 'POST',
- mode: 'cors',
- headers: {
- 'Content-Type': 'application/json'
- },
- body: JSON.stringify(params)
- }).then(res => res.json())
+ return fetch("/api/bs/hrmsalary/sicategory/updateCustomCategoryName", {
+ method: "POST",
+ mode: "cors",
+ headers: {
+ "Content-Type": "application/json"
+ },
+ body: JSON.stringify(params)
+ }).then(res => res.json());
};
-export const deleteCustomCategory = params => {
- return WeaTools.callApi('/api/bs/hrmsalary/sicategory/deleteCustomCategory', 'post', params);
+export const deleteCustomCategory = (params) => {
+ return postFetch("/api/bs/hrmsalary/sicategory/deleteCustomCategory", params);
};
export const updateCustomCategoryStatus = params => {
- return fetch('/api/bs/hrmsalary/sicategory/updateCustomCategoryStatus', {
- method: 'POST',
- mode: 'cors',
- headers: {
- 'Content-Type': 'application/json'
- },
- body: JSON.stringify(params)
- }).then(res => res.json())
+ return fetch("/api/bs/hrmsalary/sicategory/updateCustomCategoryStatus", {
+ method: "POST",
+ mode: "cors",
+ headers: {
+ "Content-Type": "application/json"
+ },
+ body: JSON.stringify(params)
+ }).then(res => res.json());
};
diff --git a/pc4mobx/hrmSalary/components/customForm/index.js b/pc4mobx/hrmSalary/components/customForm/index.js
index 5041a53d..4348762d 100644
--- a/pc4mobx/hrmSalary/components/customForm/index.js
+++ b/pc4mobx/hrmSalary/components/customForm/index.js
@@ -45,7 +45,7 @@ export default class CustomForm extends React.Component {
item.options &&
({ showname: o.showname, key: o.key }))}
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
index c0111c45..8b078187 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
@@ -251,7 +251,7 @@ export default class Archives extends React.Component {
});
return;
}
- save("SOCIAL_SECURITY").then(() => {
+ save("SOCIAL_SECURITY", this.record.paymentOrganization).then(() => {
this.query();
});
} else if (selectedTab == 2) {
@@ -264,7 +264,7 @@ export default class Archives extends React.Component {
});
return;
}
- save("ACCUMULATION_FUND").then(() => {
+ save("ACCUMULATION_FUND", this.record.paymentOrganization).then(() => {
this.query();
});
} else if (selectedTab == 3) {
@@ -277,7 +277,7 @@ export default class Archives extends React.Component {
});
return;
}
- save("OTHER").then(() => {
+ save("OTHER", this.record.paymentOrganization).then(() => {
this.query();
});
}
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/customBenefitsTable.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/customBenefitsTable.js
index ab5cb070..fe4bc74c 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/customBenefitsTable.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/customBenefitsTable.js
@@ -5,9 +5,11 @@
* Date: 2023/3/2
*/
import React, { Component } from "react";
-import { WeaCheckbox, WeaTable } from "ecCom";
+import { WeaCheckbox, WeaLocaleProvider, WeaTable } from "ecCom";
import { message, Modal } from "antd";
-import { getCustomCategoryList, updateCustomCategoryStatus } from "../../../apis/welfareScheme";
+import { deleteCustomCategory, getCustomCategoryList, updateCustomCategoryStatus } from "../../../apis/welfareScheme";
+
+const { getLabel } = WeaLocaleProvider;
class CustomBenefitsTable extends Component {
constructor(props) {
@@ -77,7 +79,11 @@ class CustomBenefitsTable extends Component {
return (
);
@@ -98,6 +104,38 @@ class CustomBenefitsTable extends Component {
message.error(errormsg || "操作失败");
}
});
+ },
+ onCancel: () => {
+ this.setState({
+ dataSource: _.map(this.state.dataSource, item => {
+ if (item.id === id) {
+ return {
+ ...item, isUse: item.isUse
+ };
+ }
+ return { ...item };
+ })
+ });
+ }
+ });
+ };
+ deleteCustomCategory = (id) => {
+ Modal.confirm({
+ title: getLabel(131329, "信息确认"),
+ content: getLabel(543231, "确认删除本条数据吗?"),
+ onOk: () => {
+ message.destroy();
+ message.loading("正在删除中...", 0);
+ const payload = { id };
+ deleteCustomCategory(payload).then(({ status, errormsg }) => {
+ message.destroy();
+ if (status) {
+ message.success(getLabel(502230, "删除成功"));
+ this.getCustomCategoryList();
+ } else {
+ message.error(errormsg || getLabel(30651, "操作失败"));
+ }
+ }).catch(() => message.destroy());
}
});
};
diff --git a/pc4mobx/hrmSalary/stores/archives.js b/pc4mobx/hrmSalary/stores/archives.js
index 7ba4e492..56bd3b12 100644
--- a/pc4mobx/hrmSalary/stores/archives.js
+++ b/pc4mobx/hrmSalary/stores/archives.js
@@ -244,11 +244,11 @@ export class ArchivesStore {
// 保存表单
@action
- save = (welfareType) => {
+ save = (welfareType, paymentOrganization) => {
let baseForm = "";
let paymentForm = "";
if (welfareType === "SOCIAL_SECURITY") {
- baseForm = JSON.stringify(this.socialSecurityForm.data);
+ baseForm = JSON.stringify({ ...this.socialSecurityForm.data, paymentOrganization });
if (this.socialSecurityForm.data.socialSchemeId) {
const socialSecurityPaymentData = toJS(this.socialSecurityPaymentForm).data;
const socialSecurityPaymentItems = toJS(this.socialSecurityPaymentForm).items[0].items;
@@ -259,7 +259,7 @@ export class ArchivesStore {
paymentForm = JSON.stringify(payload);
}
} else if (welfareType === "ACCUMULATION_FUND") {
- baseForm = JSON.stringify(this.accumulationFundForm.data);
+ baseForm = JSON.stringify({ ...this.accumulationFundForm.data, paymentOrganization });
if (this.accumulationFundForm.data.fundSchemeId) {
const accumulationFundPaymentData = toJS(this.accumulationFundPaymentForm).data;
const accumulationFundPaymentItems = toJS(this.accumulationFundPaymentForm).items[0].items;
@@ -270,7 +270,7 @@ export class ArchivesStore {
paymentForm = JSON.stringify(payload);
}
} else if (welfareType === "OTHER") {
- baseForm = JSON.stringify(this.otherForm.data);
+ baseForm = JSON.stringify({ ...this.otherForm.data, paymentOrganization });
if (this.otherForm.data.otherSchemeId) {
const otherPaymentData = toJS(this.otherPaymentForm).data;
const otherPaymentItems = toJS(this.otherPaymentForm).items[0].items;
diff --git a/pc4mobx/hrmSalary/stores/programme.js b/pc4mobx/hrmSalary/stores/programme.js
index b6d994d0..3cbc9c91 100644
--- a/pc4mobx/hrmSalary/stores/programme.js
+++ b/pc4mobx/hrmSalary/stores/programme.js
@@ -325,7 +325,10 @@ export class ProgrammeStore {
@action
updateCustomCategory = (params) => {
return new Promise((resolve, reject) => {
- API.updateCustomCategory(_.pick(params, ["id", "insuranceName"])).then(res => {
+ API.updateCustomCategory({
+ ..._.pick(params, ["id", "insuranceName"]),
+ paymentScope: _.pick(params, ["paymentScope"]).paymentScope.split(",")
+ }).then(res => {
if (res.status) {
message.success("编辑成功");
resolve();
From fb40c1a998a276022ead358ea38b7cea34bf1046 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 16:28:27 +0800
Subject: [PATCH 11/24] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E8=96=AA=E8=B5=84?=
=?UTF-8?q?=E8=B4=A6=E5=A5=97=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/ledgerSalaryItemTable.js | 15 ++++------
.../pages/salaryItem/customSalaryItemSlide.js | 3 +-
pc4mobx/hrmSalary/pages/salaryItem/index.js | 3 +-
pc4mobx/hrmSalary/stores/salaryItem.js | 29 +++++++++++++++++--
4 files changed, 35 insertions(+), 15 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
index 706e219e..1dcbf1b5 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
@@ -93,6 +93,7 @@ class LedgerSalaryItemTable extends Component {
} = _.find(dataSource, it => it.salaryItemId === salaryItemId);
const { data: userStatusList } = await commonEnumList({ enumClass: "com.engine.salary.enums.sicategory.SharedTypeEnum" });
if (id) {
+ console.log("96", record, _.find(dataSource, it => it.salaryItemId === salaryItemId));
getSalaryItemForm({ salarySobId, salaryItemId }).then(({ status, data }) => {
if (status) {
this.setState({
@@ -103,9 +104,7 @@ class LedgerSalaryItemTable extends Component {
...data,
useInEmployeeSalary: !_.isNil(data.useInEmployeeSalary) ? data.useInEmployeeSalary : "0",
hideDefault: _.isNil(hideDefault) ? "0" : hideDefault,
- valueType,
- roundingMode,
- pattern
+ valueType, roundingMode, pattern
},
record,
userStatusList: _.map(userStatusList, it => ({ key: it.value.toString(), showname: it.defaultLabel }))
@@ -146,14 +145,10 @@ class LedgerSalaryItemTable extends Component {
});
const { salaryItemId } = record;
const {
- hideDefault,
- roundingMode,
- pattern,
- valueType,
- originFormulaContent,
- originSqlContent,
- formulaId
+ hideDefault, roundingMode, pattern, valueType,
+ originFormulaContent, originSqlContent, formulaId
} = request;
+ console.log("152", salaryItemPayload);
this.handleChangeSalaryItem({
itemHide: hideDefault.toString(),
roundingMode,
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js b/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
index 97e5fb64..fe601cc5 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
@@ -13,8 +13,7 @@ export default class CustomSalaryItemSlide extends React.Component {
}
handleChange = (params) => {
- let request = { ...this.props.request, ...params };
- this.props.onChange(request);
+ this.props.onChange({ ...this.props.request, ...params });
};
handleShowFormal = () => {
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/index.js b/pc4mobx/hrmSalary/pages/salaryItem/index.js
index a07c33b2..eb857912 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/index.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/index.js
@@ -274,6 +274,7 @@ export default class SalaryItem extends React.Component {
// 新建和修改保存的回调
const handleSlideSave = (continueFlag) => {
const { salaryItemStore: { saveItem, request, getTableDatas } } = this.props;
+ const payload = _.cloneDeep(request);
const { name, sharedType, taxAgentIds } = request;
if (!name || (sharedType === "1" && !taxAgentIds)) {
Modal.warning({
@@ -282,7 +283,7 @@ export default class SalaryItem extends React.Component {
});
return;
}
- saveItem(request, continueFlag).then(() => {
+ saveItem(payload, continueFlag).then(() => {
getTableDatas({ ...this.state.searchParams }).then(res => {
this.setState({
searchParams: {
diff --git a/pc4mobx/hrmSalary/stores/salaryItem.js b/pc4mobx/hrmSalary/stores/salaryItem.js
index 775c464a..a8222a45 100644
--- a/pc4mobx/hrmSalary/stores/salaryItem.js
+++ b/pc4mobx/hrmSalary/stores/salaryItem.js
@@ -272,9 +272,34 @@ export class SalaryItemStore {
@action
saveItem = (params, continueFlag) => {
return new Promise((resolve, reject) => {
- if (!this.validateForm(params)) {
- return;
+ const { valueType, formulaId, originFormulaContent, originSqlContent, ...extra } = params;
+ let payload = { ...extra, valueType };
+ if (valueType === "1") {
+ payload = {
+ ...payload,
+ formulaContent: "",
+ formulaId: "",
+ originSqlContent: "",
+ originFormulaContent: ""
+ };
+ } else if (valueType === "2") {
+ payload = {
+ ...payload,
+ formulaContent: originFormulaContent ? originFormulaContent : "",
+ formulaId: originFormulaContent ? formulaId : "",
+ originSqlContent: "",
+ originFormulaContent
+ };
+ } else if (valueType === "3") {
+ payload = {
+ ...payload,
+ formulaContent: originSqlContent ? originSqlContent : "",
+ formulaId: originSqlContent ? formulaId : "",
+ originFormulaContent: "",
+ originSqlContent
+ };
}
+ if (!this.validateForm(payload)) return;
API.saveItem(params).then(res => {
if (res.status) {
if (!continueFlag) {
From 600d73f858154d11a67f8ae133295c28f92fe814 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, 31 Jul 2023 10:51:10 +0800
Subject: [PATCH 12/24] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E8=96=AA=E8=B5=84?=
=?UTF-8?q?=E8=B4=A6=E5=A5=97=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE=E7=BC=96?=
=?UTF-8?q?=E8=BE=91=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/ledgerSalaryItemTable.js | 58 ++++++++++++-------
1 file changed, 37 insertions(+), 21 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
index 1dcbf1b5..c2195539 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
@@ -18,6 +18,7 @@ class LedgerSalaryItemTable extends Component {
super(props);
this.state = {
selectedRowKeys: [],
+ originRecord: {},
salaryItemPayload: {
visible: false, record: {},
request: {}, isLedger: true,
@@ -93,18 +94,21 @@ class LedgerSalaryItemTable extends Component {
} = _.find(dataSource, it => it.salaryItemId === salaryItemId);
const { data: userStatusList } = await commonEnumList({ enumClass: "com.engine.salary.enums.sicategory.SharedTypeEnum" });
if (id) {
- console.log("96", record, _.find(dataSource, it => it.salaryItemId === salaryItemId));
getSalaryItemForm({ salarySobId, salaryItemId }).then(({ status, data }) => {
if (status) {
this.setState({
+ originRecord: _.find(dataSource, it => it.salaryItemId === salaryItemId),
salaryItemPayload: {
...this.state.salaryItemPayload,
visible: true,
request: {
...data,
useInEmployeeSalary: !_.isNil(data.useInEmployeeSalary) ? data.useInEmployeeSalary : "0",
- hideDefault: _.isNil(hideDefault) ? "0" : hideDefault,
- valueType, roundingMode, pattern
+ hideDefault: _.isNil(hideDefault) ? "0" : hideDefault, valueType, roundingMode, pattern,
+ formulaContent: formulaContent ? formulaContent : data.formulaContent,
+ originFormulaContent: originFormulaContent ? originFormulaContent : data.originFormulaContent,
+ originSqlContent: originSqlContent ? originSqlContent : data.originSqlContent,
+ formulaId: formulaId ? formulaId : data.formulaId
},
record,
userStatusList: _.map(userStatusList, it => ({ key: it.value.toString(), showname: it.defaultLabel }))
@@ -127,7 +131,8 @@ class LedgerSalaryItemTable extends Component {
},
record,
userStatusList: _.map(userStatusList, it => ({ key: it.value.toString(), showname: it.defaultLabel }))
- }
+ },
+ originRecord: _.find(dataSource, it => it.salaryItemId === salaryItemId)
});
}
};
@@ -148,25 +153,24 @@ class LedgerSalaryItemTable extends Component {
hideDefault, roundingMode, pattern, valueType,
originFormulaContent, originSqlContent, formulaId
} = request;
- console.log("152", salaryItemPayload);
this.handleChangeSalaryItem({
itemHide: hideDefault.toString(),
- roundingMode,
- pattern,
- valueType,
+ roundingMode, pattern, valueType,
formulaContent: valueType.toString() === "2" ? originFormulaContent : originSqlContent,
- formulaId: ((valueType.toString() === "3" && !originSqlContent) || valueType.toString() === "1") ? "" : formulaId
+ formulaId: ((valueType.toString() === "3" && !originSqlContent) || valueType.toString() === "1") ? "" : formulaId,
+ //不能改成其他空值
+ originFormulaContent: ((valueType.toString() === "3" && (!originSqlContent) || originSqlContent === " ") || (valueType.toString() === "1") || (valueType.toString() === "3" && originSqlContent)) ? " " : originFormulaContent,
+ originSqlContent: ((valueType.toString() === "2" && (!originFormulaContent || originFormulaContent === " ")) || (valueType.toString() === "1") || (valueType.toString() === "2" && originFormulaContent)) ? " " : originSqlContent
}, salaryItemId);
};
handleEditFormnul = () => {
const { salaryItemPayload, editFormulModal } = this.state;
const { record } = salaryItemPayload;
- const { valueType, formulaId, dateType: dataType } = record;
+ const { valueType, formulaId, dateType: dataType, originFormulaContent, originSqlContent } = record;
this.setState({
editFormulModal: {
- ...editFormulModal,
- visible: true,
- valueType, formulaId, dataType
+ ...editFormulModal, visible: true, valueType, dataType,
+ formulaId: ((valueType.toString() === "2" && (originFormulaContent || originFormulaContent !== " ")) || valueType.toString() === "3" && (originSqlContent || originSqlContent === " ")) ? formulaId : ""
}
});
};
@@ -206,6 +210,12 @@ class LedgerSalaryItemTable extends Component {
formulaId: data.id,
originFormulaContent: data.referenceType === "formula" ? data.formula : "",
originSqlContent: data.referenceType === "sql" ? data.formula : ""
+ },
+ record: {
+ ...salaryItemPayload.record,
+ formulaId: data.id,
+ originFormulaContent: data.referenceType === "formula" ? data.formula : "",
+ originSqlContent: data.referenceType === "sql" ? data.formula : ""
}
}
}, () => {
@@ -215,14 +225,11 @@ class LedgerSalaryItemTable extends Component {
};
render() {
- const { salaryItemPayload, editFormulModal } = this.state;
+ const { salaryItemPayload, editFormulModal, originRecord } = this.state;
+ const { onHandleItemhide } = this.props;
const {
- tableData,
- dataSource,
- onDropCategoryItem,
- onChangeSelectedRowKeys,
- selectedRowKeys,
- onMoveTo
+ tableData, dataSource, onDropCategoryItem,
+ onChangeSelectedRowKeys, selectedRowKeys, onMoveTo
} = this.props;
const rowSelection = {
selectedRowKeys,
@@ -308,7 +315,8 @@ class LedgerSalaryItemTable extends Component {
onUpdateRequest={(request, key) => {
this.setState({
salaryItemPayload: {
- ...salaryItemPayload, request,
+ ...salaryItemPayload,
+ request,
record: key === "valueType" ? {
...salaryItemPayload.record,
[key]: request[key]
@@ -322,6 +330,14 @@ class LedgerSalaryItemTable extends Component {
salaryItemPayload: {
...salaryItemPayload, visible: false
}
+ }, () => {
+ const result = _.map(_.cloneDeep(dataSource), it => {
+ if (it.salaryItemId === originRecord.salaryItemId) {
+ return { ...originRecord };
+ }
+ return { ...it };
+ });
+ onHandleItemhide(result);
})}
/>
{/*公式编辑*/}
From 223effab98e35a1fb99405d2013eec390bdcc0a5 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, 31 Jul 2023 11:20:14 +0800
Subject: [PATCH 13/24] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E5=B7=A5=E8=B5=84?=
=?UTF-8?q?=E5=8D=95=E6=A8=A1=E6=9D=BF=E6=B7=BB=E5=8A=A0=E5=8F=91=E6=94=BE?=
=?UTF-8?q?=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js | 2 ++
pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js | 2 +-
pc4mobx/hrmSalary/pages/payroll/stepForm/tmplateSettingForm.js | 1 +
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
index 0e5803e5..cb3e598c 100644
--- a/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
+++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
@@ -125,6 +125,7 @@ class SalaryItemSettings extends Component {
};
getAvailableSalaryItemSet = (record, title) => {
const payload = {
+ salaryTemplateId: this.props.salaryTemplateId,
salarySobId: this.props.salarySobId,
existSalaryItemIds: _.map(record.items, it => it.id),
groupId: record.groupId,
@@ -149,6 +150,7 @@ class SalaryItemSettings extends Component {
const { dataList } = this.state;
const payload = {
salarySobId,
+ salaryTemplateId: this.props.salaryTemplateId,
existSalaryGroupIds: _.map(dataList, it => it.groupId),
isReplenish: this.props.isReplenish
};
diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js
index 7cfd9404..03740472 100644
--- a/pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js
+++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js
@@ -148,7 +148,7 @@ export default class ShowSettingForm extends React.Component {
>
this.salaryItemSettingsRef = dom}
- dataSource={salaryItemSet}
+ dataSource={salaryItemSet} salaryTemplateId={this.props.id || ""}
onChangeSalaryItem={this.handleChangeSalaryItem}
onChangeSalaryItemShowNamesetting={this.handleChangeSalaryItemShowNamesetting}
salarySobId={toJS(templateBaseData).salarySob}
diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/tmplateSettingForm.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/tmplateSettingForm.js
index ce64f1e4..1636a0da 100644
--- a/pc4mobx/hrmSalary/pages/payroll/stepForm/tmplateSettingForm.js
+++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/tmplateSettingForm.js
@@ -44,6 +44,7 @@ export default class TemplateSettingForm extends React.Component {
onChangeSalaryItem={this.handleChangeSalaryItem}
onChangeSalaryItemShowNamesetting={this.handleChangeSalaryItemShowNamesetting}
salarySobId={toJS(templateBaseData).salarySob}
+ salaryTemplateId={this.props.id || ""}
isReplenish={true} salaryBillItemNameSet={salaryBillItemNameSet}
/>
From db53fc8942e394643bb71330a8412319f114c8bd 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, 31 Jul 2023 11:50:30 +0800
Subject: [PATCH 14/24] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E8=96=AA=E8=B5=84?=
=?UTF-8?q?=E8=B4=A6=E5=A5=97=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE=E9=A1=B9?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BC=96=E8=BE=91=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../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 c2195539..8a12923e 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
@@ -157,7 +157,7 @@ class LedgerSalaryItemTable extends Component {
itemHide: hideDefault.toString(),
roundingMode, pattern, valueType,
formulaContent: valueType.toString() === "2" ? originFormulaContent : originSqlContent,
- formulaId: ((valueType.toString() === "3" && !originSqlContent) || valueType.toString() === "1") ? "" : formulaId,
+ formulaId: ((valueType.toString() === "3" && (!originSqlContent || originSqlContent === " ")) || (valueType.toString() === "2" && (!originFormulaContent || originFormulaContent === " ")) || valueType.toString() === "1") ? "" : formulaId,
//不能改成其他空值
originFormulaContent: ((valueType.toString() === "3" && (!originSqlContent) || originSqlContent === " ") || (valueType.toString() === "1") || (valueType.toString() === "3" && originSqlContent)) ? " " : originFormulaContent,
originSqlContent: ((valueType.toString() === "2" && (!originFormulaContent || originFormulaContent === " ")) || (valueType.toString() === "1") || (valueType.toString() === "2" && originFormulaContent)) ? " " : originSqlContent
From 33641790e3cc72b973089fd533cddee22bedfb18 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, 31 Jul 2023 19:08:07 +0800
Subject: [PATCH 15/24] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E5=B7=A5=E8=B5=84?=
=?UTF-8?q?=E5=8D=95=E6=A8=A1=E6=9D=BF=E6=B7=BB=E5=8A=A0=E5=8F=91=E6=94=BE?=
=?UTF-8?q?=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pc4mobx/hrmSalary/stores/payroll.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pc4mobx/hrmSalary/stores/payroll.js b/pc4mobx/hrmSalary/stores/payroll.js
index 6c2e7d34..67eac1f0 100644
--- a/pc4mobx/hrmSalary/stores/payroll.js
+++ b/pc4mobx/hrmSalary/stores/payroll.js
@@ -232,7 +232,7 @@ export class payrollStore {
if (id !== "") {
this.salaryItemSet = res.data.salaryTemplateSalaryItemSet;
this.salaryBillItemNameSet = res.data.salaryBillItemNameSet;
- this.replenishSalaryTemplateSalaryItemSet = res.data.salaryTemplateSalaryItemSet;
+ this.replenishSalaryTemplateSalaryItemSet = res.data.replenishSalaryTemplateSalaryItemSet;
}
this.salaryTemplateShowSet = { ...res.data.salaryTemplateShowSet.data, ...JSON.parse(salaryTemplateShowSetStorage) };
} else {
From ce87730349a5890651ace699d89a2783b2489b2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Tue, 1 Aug 2023 13:37:35 +0800
Subject: [PATCH 16/24] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E5=B7=A5=E8=B5=84?=
=?UTF-8?q?=E5=8D=95=E6=A8=A1=E6=9D=BF=E6=B7=BB=E5=8A=A0=E5=8F=91=E6=94=BE?=
=?UTF-8?q?=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
index cb3e598c..95246437 100644
--- a/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
+++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
@@ -255,7 +255,7 @@ class SalaryItemSettings extends Component {
...item,
items: _.map(item.items, child => {
if (child.salaryItemId === salaryItemId) {
- return { ...child, salaryItemShowName: name, name };
+ return { ...child, salaryItemShowName: name, name: name ? name : child.originName };
}
return { ...child };
})
From b03c1939273b9f066264abc07399fbc0a9acf686 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Tue, 1 Aug 2023 15:51:02 +0800
Subject: [PATCH 17/24] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E5=B7=A5=E8=B5=84?=
=?UTF-8?q?=E5=8D=95=E6=A8=A1=E6=9D=BF=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/payroll/stepForm/salaryItemSettings.js | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
index 95246437..ff2829d7 100644
--- a/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
+++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
@@ -268,7 +268,17 @@ class SalaryItemSettings extends Component {
salaryItemShowName: originName === name ? "" : name
}], itemShowNamesetting, "salaryItemId")
}, () => {
- this.props.onChangeSalaryItem(this.state.dataList);
+ const modifySalaryItemids = _.reduce(this.state.itemShowNamesetting, (pre, cur) => [...pre, cur.salaryItemId], []);
+ const convertDataList = _.map(this.state.dataList, it => {
+ return {
+ ...it,
+ items: _.map(it.items, item => {
+ if (modifySalaryItemids.includes(item.salaryItemId)) return { ...item };
+ return { ...item, name: item.salaryItemShowName };
+ })
+ };
+ });
+ this.props.onChangeSalaryItem(convertDataList);
this.props.onChangeSalaryItemShowNamesetting(this.state.itemShowNamesetting);
});
};
From a433de7671024deacea759e7fda43d8e6c031314 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Tue, 1 Aug 2023 16:03:48 +0800
Subject: [PATCH 18/24] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E5=B7=A5=E8=B5=84?=
=?UTF-8?q?=E5=8D=95=E6=A8=A1=E6=9D=BF=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/externalPersonManage/index.js | 16 ++++++++++++++--
.../pages/payroll/stepForm/salaryItemSettings.js | 2 --
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/externalPersonManage/index.js b/pc4mobx/hrmSalary/pages/externalPersonManage/index.js
index 2f01ecd2..cecd0b15 100644
--- a/pc4mobx/hrmSalary/pages/externalPersonManage/index.js
+++ b/pc4mobx/hrmSalary/pages/externalPersonManage/index.js
@@ -6,7 +6,7 @@
*/
import React, { Component } from "react";
import { inject, observer } from "mobx-react";
-import { WeaTab, WeaTable, WeaTop } from "ecCom";
+import { WeaHelpfulTip, WeaLocaleProvider, WeaTab, WeaTable, WeaTop } from "ecCom";
import ExternalPersonManageEditSlide from "./components/externalPersonManageEditSlide";
import { Button, message, Modal } from "antd";
import { getSearchs } from "../../util";
@@ -14,6 +14,8 @@ import { condition, searchCondition } from "./conditions";
import { deleteExtEmp, listPage } from "../../apis/externalPersonManage";
import "./index.less";
+const getLabel = WeaLocaleProvider.getLabel;
+
@inject("externalPersonManageStore", "taxAgentStore")
@observer
class Index extends Component {
@@ -132,8 +134,18 @@ class Index extends Component {
,
+ ,
- ] : []}
+ ] : [
+
+ ]}
searchType={["base", "advanced"]} showSearchAd={showSearchAd}
setShowSearchAd={(showSearchAd) => this.setState({ showSearchAd })}
searchsAd={getSearchs(form, searchCondition, 2)}
diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
index d316745a..0e5803e5 100644
--- a/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
+++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
@@ -217,8 +217,6 @@ class SalaryItemSettings extends Component {
}
};
handleEditSalaryItemName = (item, field, viewAttr) => {
- //暂时关闭
- return
const { groupId } = item, { salaryItemId } = field, { dataList } = this.state;
if (groupId === "111111111111111111") return;
this.setState({
From 5eec7139d600376be4813f16a9afb1d419a82e6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Tue, 1 Aug 2023 16:09:23 +0800
Subject: [PATCH 19/24] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E5=B7=A5=E8=B5=84?=
=?UTF-8?q?=E5=8D=95=E6=A8=A1=E6=9D=BF=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
index ff2829d7..0113ecd5 100644
--- a/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
+++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
@@ -270,6 +270,7 @@ class SalaryItemSettings extends Component {
}, () => {
const modifySalaryItemids = _.reduce(this.state.itemShowNamesetting, (pre, cur) => [...pre, cur.salaryItemId], []);
const convertDataList = _.map(this.state.dataList, it => {
+ if (it.groupId === "111111111111111111") return { ...it };
return {
...it,
items: _.map(it.items, item => {
From bc12a120972658405aff1a3f1d4487e8b8c10046 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Tue, 1 Aug 2023 17:44:59 +0800
Subject: [PATCH 20/24] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E9=9D=9E=E7=B3=BB?=
=?UTF-8?q?=E7=BB=9F=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../hrmSalary/apis/externalPersonManage.js | 10 ++++
.../components/externalPersonImport.js | 60 +++++++++++++++++++
.../pages/externalPersonManage/index.js | 43 ++++++++++++-
3 files changed, 111 insertions(+), 2 deletions(-)
create mode 100644 pc4mobx/hrmSalary/pages/externalPersonManage/components/externalPersonImport.js
diff --git a/pc4mobx/hrmSalary/apis/externalPersonManage.js b/pc4mobx/hrmSalary/apis/externalPersonManage.js
index 91854ebb..0d8bcf67 100644
--- a/pc4mobx/hrmSalary/apis/externalPersonManage.js
+++ b/pc4mobx/hrmSalary/apis/externalPersonManage.js
@@ -21,6 +21,16 @@ export const deleteExtEmp = (params) => {
return postFetch("/api/bs/hrmsalary/extEmp/delete", params);
};
+//非系统人员-导入预览
+export const extEmpPreview = (params) => {
+ return postFetch("/api/bs/hrmsalary/extEmp/preview", params);
+};
+
+//非系统人员-导入
+export const importExtEmp = (params) => {
+ return postFetch("/api/bs/hrmsalary/extEmp/importExtEmp", params);
+};
+
//非系统人员-详情
export const detail = params => {
return WeaTools.callApi("/api/bs/hrmsalary/extEmp/detail", "get", params);
diff --git a/pc4mobx/hrmSalary/pages/externalPersonManage/components/externalPersonImport.js b/pc4mobx/hrmSalary/pages/externalPersonManage/components/externalPersonImport.js
new file mode 100644
index 00000000..63b630c4
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/externalPersonManage/components/externalPersonImport.js
@@ -0,0 +1,60 @@
+/*
+ * Author: 黎永顺
+ * name: 非系统人员导入
+ * Description:
+ * Date: 2023/8/1
+ */
+import React, { Component } from "react";
+import ImportModal from "../../../components/importModal";
+import { extEmpPreview, importExtEmp } from "../../../apis/externalPersonManage";
+
+class ExternalPersonImport extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ previewDataSource: [],
+ previewColumns: [],
+ importResult: {}
+ };
+ }
+
+ extEmpPreview = (params) => {
+ extEmpPreview(params).then(({ status, data }) => {
+ if (status) {
+ const { headers, list } = data;
+ this.setState({
+ previewColumns: _.map(headers, (it, dataIndex) => ({ title: it, dataIndex })),
+ previewDataSource: _.map(list, item => {
+ return _.reduce(item, (pre, cur, key) => (_.assign(pre, { [key]: cur })), {});
+ })
+ });
+ }
+ });
+ };
+ handleImportFile = (params) => {
+ importExtEmp(params).then(({ status, data }) => {
+ if (status) {
+ this.setState({
+ importResult: data
+ });
+ }
+ });
+ };
+
+ render() {
+ const { previewDataSource, previewColumns, importResult } = this.state;
+ return (
+
+ );
+ }
+}
+
+export default ExternalPersonImport;
diff --git a/pc4mobx/hrmSalary/pages/externalPersonManage/index.js b/pc4mobx/hrmSalary/pages/externalPersonManage/index.js
index cecd0b15..4ba1ed22 100644
--- a/pc4mobx/hrmSalary/pages/externalPersonManage/index.js
+++ b/pc4mobx/hrmSalary/pages/externalPersonManage/index.js
@@ -8,6 +8,7 @@ import React, { Component } from "react";
import { inject, observer } from "mobx-react";
import { WeaHelpfulTip, WeaLocaleProvider, WeaTab, WeaTable, WeaTop } from "ecCom";
import ExternalPersonManageEditSlide from "./components/externalPersonManageEditSlide";
+import ExternalPersonImport from "./components/externalPersonImport";
import { Button, message, Modal } from "antd";
import { getSearchs } from "../../util";
import { condition, searchCondition } from "./conditions";
@@ -28,6 +29,9 @@ class Index extends Component {
showSearchAd: false,
externalPersonManagePayload: {
visible: false, title: "新建", id: ""
+ },
+ externalPersonImportPayload: {
+ visiable: false, step: 0
}
};
}
@@ -101,7 +105,10 @@ class Index extends Component {
};
render() {
- const { showSearchAd, externalPersonManagePayload, loading, pageInfo, selectedRowKeys, dataSource } = this.state;
+ const {
+ showSearchAd, externalPersonManagePayload, loading,
+ pageInfo, selectedRowKeys, dataSource, externalPersonImportPayload
+ } = this.state;
const {
externalPersonManageStore: { form, addForm },
taxAgentStore: { showOperateBtn, showSalaryItemBtn }
@@ -138,7 +145,13 @@ class Index extends Component {
title={getLabel(111, "非系统人员，且需要缴纳社保福利以及代发工资的人员，需在本表维护人员信息")}
placement="topRight"
/>,
- ,
+ ,
] : [
+ {
+ externalPersonImportPayload.visiable &&
+ {
+ this.setState({ externalPersonImportPayload: { ...externalPersonImportPayload, step } });
+ }}
+ onCancel={() => {
+ this.setState({
+ externalPersonImportPayload: {
+ ...externalPersonImportPayload,
+ visiable: false,
+ step: 0
+ }
+ });
+ }}
+ onFinish={() => {
+ this.setState({
+ externalPersonImportPayload: {
+ ...externalPersonImportPayload,
+ visiable: false, step: 0
+ }
+ }, () => this.listPage());
+ }}
+ />
+ }