From 2e9d4490cc3640bb14c1161aa7ecdbee275df80a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Wed, 8 Mar 2023 15:42:10 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=96=AA=E8=B5=84=E8=B4=A6=E5=A5=97-?= =?UTF-8?q?=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE=E6=96=B0=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ledgerPage/components/ledgerSalaryItemTable.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js index 2ca2ed78..66d39328 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js @@ -99,10 +99,20 @@ class LedgerSalaryItemTable extends Component { , dataIndex: "itemHide", key: "itemHide", + width: 80, render: (text, record) => this.handleChangeItem(value, record.id)} /> + }, + { + title: "操作", + dataIndex: "operate", + key: "operate", + width: 100, + render: (text, record) => ( + + ) } ]; return ( From 96ae39c241b46e8903ad9989b94eefb911c35d19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Wed, 8 Mar 2023 16:15:04 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=96=AA=E8=B5=84=E8=B4=A6=E5=A5=97-?= =?UTF-8?q?=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE=E7=A7=BB=E5=8A=A8=E5=88=B0?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ledgerSalaryItemNormal.js | 15 ++++++++++++++- .../components/ledgerSalaryItemTable.js | 6 +++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js index 6873a769..997ddd23 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js @@ -35,7 +35,11 @@ class LedgerSalaryItemNormal extends Component { }, //公式保存数据 formnulField: {}, - formnulId: "" + formnulId: "", + moveModalPayload:{ + visible: false, title: "", + dataList:[] + } }; } @@ -139,6 +143,14 @@ class LedgerSalaryItemNormal extends Component { formnulId: "" }); }; + handleMoveTo=()=>{ + const {}= this.props; + console.log(this.props); + this.setState({ + visible: true, title: "移动到", + dataList:[] + }) + } render() { const { @@ -184,6 +196,7 @@ class LedgerSalaryItemNormal extends Component { onHandleItemhide={(data) => onHandleItemhide(field, data)} onChangeSelectedRowKeys={(data) => onChangeSelectedRowKeys(field, data)} onEditFormnul={(data) => this.handleEditFormnul(field, data)} + onMoveTo={this.handleMoveTo} /> ; }) diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js index 66d39328..28508dce 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js @@ -48,7 +48,7 @@ class LedgerSalaryItemTable extends Component { }; render() { - const { dataSource, onDropCategoryItem, onChangeSelectedRowKeys, onEditFormnul, selectedRowKeys } = this.props; + const { dataSource, onDropCategoryItem, onChangeSelectedRowKeys, onEditFormnul, selectedRowKeys, onMoveTo } = this.props; const rowSelection = { selectedRowKeys, onChange: (selectedRowKeys) => this.setState({ selectedRowKeys }, () => { @@ -110,8 +110,8 @@ class LedgerSalaryItemTable extends Component { dataIndex: "operate", key: "operate", width: 100, - render: (text, record) => ( - + render: (_, record) => ( + onMoveTo(record)}>移动到 ) } ]; From f166ae83fad8f251cf328a97130d72e5e60cc086 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Wed, 8 Mar 2023 17:12:17 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=96=AA=E8=B5=84=E8=B4=A6=E5=A5=97-?= =?UTF-8?q?=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE=E7=A7=BB=E5=8A=A8=E5=88=B0?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/ledgerPage/components/index.less | 15 +++++- .../ledgerPage/components/ledgerMovoTo.js | 38 +++++++++++++ .../ledgerPage/components/ledgerSalaryItem.js | 34 ++++++++++++ .../components/ledgerSalaryItemNormal.js | 54 +++++++++++++++---- 4 files changed, 130 insertions(+), 11 deletions(-) create mode 100644 pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerMovoTo.js diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less b/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less index 00a620c0..b0f3e1b0 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less @@ -220,7 +220,8 @@ font-size: 20px; line-height: 20px; } -.icon-coms-leading-in-btn:hover, .icon-coms-leading-in-btn:active{ + +.icon-coms-leading-in-btn:hover, .icon-coms-leading-in-btn:active { background: transparent; } @@ -231,3 +232,15 @@ .icon-coms-leading-in-btn.ant-btn-primary { color: #55a1f8; } + + +.moveModalWrapper { + .ant-radio-group { + display: flex; + flex-direction: column; + + .ant-radio-wrapper { + margin: 4px 16px; + } + } +} diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerMovoTo.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerMovoTo.js new file mode 100644 index 00000000..e0b20c93 --- /dev/null +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerMovoTo.js @@ -0,0 +1,38 @@ +/* + * Author: 黎永顺 + * name: 薪资账套-薪资项目移动到的功能 + * Description: + * Date: 2023/3/8 + */ +import React, { Component } from "react"; +import { WeaDialog, WeaSearchGroup, WeaSelect } from "ecCom"; +import { Button } from "antd"; +import "./index.less"; + +class LedgerMovoTo extends Component { + render() { + const { dataList, value, onChangeMoveVal, onSubmitMoveTo, ...extraProps } = this.props; + const buttons = [ + , + + ]; + return ( + + + + + + ); + } +} + +export default LedgerMovoTo; + diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItem.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItem.js index c9329afa..8adfdc11 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItem.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItem.js @@ -295,6 +295,39 @@ class LedgerSalaryItem extends Component { onSaveSalaryItem(empFields, itemGroups); }); }; + /* + * Author: 黎永顺 + * Description:确认移动薪资项目项 + * Params: + * Date: 2023/3/8 + */ + handleMoveSalaryItem = (moveToItemId, items) => { + const { itemGroups } = this.state; + const { salaryItemGroupId: deleteItemId } = items; + if (moveToItemId === deleteItemId) return; + + this.setState({ + itemGroups: _.map(itemGroups, it => { + if (moveToItemId === it.uuid) { + return { + ...it, + items: [...it.items, items] + }; + } + if (deleteItemId === it.uuid) { + return { + ...it, + items: _.unionWith(it.items, [items], _.isEqual) + }; + } + return { ...it }; + }) + }, () => { + const { empFields, itemGroups } = this.state; + const { onSaveSalaryItem } = this.props; + onSaveSalaryItem(empFields, itemGroups); + }); + }; /* * Author: 黎永顺 @@ -334,6 +367,7 @@ class LedgerSalaryItem extends Component { onChangeSelectedRowKeys={this.handleChangeSelectedRowKeys} onAddSalaryItems={this.handleAddSalaryItems} onSaveFormnul={this.handleSaveFormnul} + onMoveSalaryItem={this.handleMoveSalaryItem} /> ); diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js index 997ddd23..f21053f7 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js @@ -12,6 +12,7 @@ import CategoryAddModal from "./categoryAddModal"; import LedgerSalaryItemAddModal from "./ledgerSalaryItemAddModal"; import LedgerSalaryItemTable from "./ledgerSalaryItemTable"; import FormalFormModal from "../../salaryItem/formalFormModal"; +import LedgerMovoTo from "./ledgerMovoTo"; import "./index.less"; @inject("ledgerStore") @@ -36,9 +37,9 @@ class LedgerSalaryItemNormal extends Component { //公式保存数据 formnulField: {}, formnulId: "", - moveModalPayload:{ + moveModalPayload: { visible: false, title: "", - dataList:[] + dataList: [], record: null, value: "" } }; } @@ -143,14 +144,41 @@ class LedgerSalaryItemNormal extends Component { formnulId: "" }); }; - handleMoveTo=()=>{ - const {}= this.props; - console.log(this.props); + handleCancelMove = () => { this.setState({ - visible: true, title: "移动到", - dataList:[] - }) - } + moveModalPayload: { + visible: false, title: "", + dataList: [], value: "", + record: null + } + }); + }; + handleChangeMoveVal = (value) => { + const { moveModalPayload } = this.state; + this.setState({ + moveModalPayload: { + ...moveModalPayload, value + } + }); + }; + handleMoveTo = (record) => { + const { salaryItemGroupId } = record; + const { dataSource } = this.props; + this.setState({ + moveModalPayload: { + visible: true, title: "移动到", + value: salaryItemGroupId, record, + dataList: _.map(dataSource, item => ({ key: item.id || item.uuid, showname: item.name })) + } + }); + }; + handleSubmitMoveTo = () => { + const { onMoveSalaryItem } = this.props; + const { moveModalPayload } = this.state; + const { record, value }=moveModalPayload; + this.handleCancelMove(); + onMoveSalaryItem(value, record) + }; render() { const { @@ -164,7 +192,7 @@ class LedgerSalaryItemNormal extends Component { taxAgentStore } = this.props; const { showOperateBtn } = taxAgentStore; - const { categoryModal, addCategoryItemsVisible, editFormulModal } = this.state; + const { categoryModal, addCategoryItemsVisible, editFormulModal, moveModalPayload } = this.state; return ( ; }) } + Date: Wed, 8 Mar 2023 17:35:24 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E8=96=AA=E8=B5=84=E8=B4=A6=E5=A5=97-?= =?UTF-8?q?=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE=E7=A7=BB=E5=8A=A8=E5=88=B0?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/ledgerPage/components/ledgerSalaryItem.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItem.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItem.js index 8adfdc11..eca16277 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItem.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItem.js @@ -262,7 +262,7 @@ class LedgerSalaryItem extends Component { return { ...it, items: [...it.items, ..._.map(items, child => { const { id: itemsId, ...extraItems } = child; - return { ...extraItems }; + return { ...extraItems, salaryItemGroupId: it.uuid }; })] }; } @@ -303,9 +303,8 @@ class LedgerSalaryItem extends Component { */ handleMoveSalaryItem = (moveToItemId, items) => { const { itemGroups } = this.state; - const { salaryItemGroupId: deleteItemId } = items; + const { salaryItemGroupId: deleteItemId, id, key } = items; if (moveToItemId === deleteItemId) return; - this.setState({ itemGroups: _.map(itemGroups, it => { if (moveToItemId === it.uuid) { @@ -317,7 +316,7 @@ class LedgerSalaryItem extends Component { if (deleteItemId === it.uuid) { return { ...it, - items: _.unionWith(it.items, [items], _.isEqual) + items: _.filter(it.items, filterItem => (filterItem.id !== id || filterItem.key !== key)) }; } return { ...it }; From 2457f659c44d52777a973b421c5c690a5f58c3e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Wed, 8 Mar 2023 18:01:36 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E8=96=AA=E8=B5=84=E8=B4=A6=E5=A5=97-?= =?UTF-8?q?=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE=E9=A1=B9=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E5=88=B0=E5=A4=A7=E7=B1=BB=E6=96=B0=E5=8A=9F=E8=83=BD=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ledgerPage/components/ledgerSalaryItemNormal.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js index f21053f7..d1017f60 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js @@ -166,8 +166,10 @@ class LedgerSalaryItemNormal extends Component { const { dataSource } = this.props; this.setState({ moveModalPayload: { - visible: true, title: "移动到", - value: salaryItemGroupId, record, + visible: true, + title: "移动到", + value: salaryItemGroupId !== "0" ? salaryItemGroupId : (_.find(dataSource, it => it.name === "未分类").id || _.find(dataSource, it => it.name === "未分类").uuid), + record, dataList: _.map(dataSource, item => ({ key: item.id || item.uuid, showname: item.name })) } }); @@ -175,9 +177,9 @@ class LedgerSalaryItemNormal extends Component { handleSubmitMoveTo = () => { const { onMoveSalaryItem } = this.props; const { moveModalPayload } = this.state; - const { record, value }=moveModalPayload; + const { record, value } = moveModalPayload; this.handleCancelMove(); - onMoveSalaryItem(value, record) + onMoveSalaryItem(value, record); }; render() { From 3d7850431ad8a88abd130b2d2312110b00edcae4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Wed, 8 Mar 2023 18:58:22 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=96=AA=E8=B5=84=E8=B4=A6=E5=A5=97-?= =?UTF-8?q?=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE=E7=A7=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/ledgerPage/components/ledgerSalaryItem.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItem.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItem.js index eca16277..b341b4ce 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItem.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItem.js @@ -308,9 +308,14 @@ class LedgerSalaryItem extends Component { this.setState({ itemGroups: _.map(itemGroups, it => { if (moveToItemId === it.uuid) { + const { id: moveId, ...extraItems } = items; return { ...it, - items: [...it.items, items] + items: [...it.items, { + ...extraItems, + key: moveId, + sortedIndex: !_.isEmpty(it.items) ? it.items[it.items.length - 1].sortedIndex + 1 : 0 + }] }; } if (deleteItemId === it.uuid) {