From b8f941d575af9cac30edf7dfab4c453d0c4b083d 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, 7 Feb 2023 15:18:30 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9A=84=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/index.js | 1 + .../pages/fieldManagement/components/fieldSlide.js | 6 +++++- pc4mobx/hrmSalary/pages/fieldManagement/index.less | 13 +++++++++++-- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/pc4mobx/hrmSalary/index.js b/pc4mobx/hrmSalary/index.js index 9faba78d..b59a534a 100644 --- a/pc4mobx/hrmSalary/index.js +++ b/pc4mobx/hrmSalary/index.js @@ -77,6 +77,7 @@ const DataAcquisition = (props) => props.children; // sysconfig 系統配置 // sysconfig-1 规则配置 // appconfig 应用配置 +// fieldManagement 字段管理 const Routes = ( this.handleChangeFields("name", value)}/> @@ -232,6 +233,7 @@ class FieldSlide extends Component { this.handleChangeFields("roundingMode", value)} /> @@ -239,12 +241,14 @@ class FieldSlide extends Component { this.handleChangeFields("pattern", value)} /> this.handleChangeFields("description", value)} /> diff --git a/pc4mobx/hrmSalary/pages/fieldManagement/index.less b/pc4mobx/hrmSalary/pages/fieldManagement/index.less index be964427..33e962a8 100644 --- a/pc4mobx/hrmSalary/pages/fieldManagement/index.less +++ b/pc4mobx/hrmSalary/pages/fieldManagement/index.less @@ -1,7 +1,16 @@ .slideOuterWrapper { - .wea-form-item-group{ - padding: 56px 80px; + .wea-form-item-group { + margin: 16px; + border: 1px solid #e5e5e5; + border-bottom: none; + + & > div { + border-bottom: 1px solid #e5e5e5; + margin-bottom: 0; + padding: 5px 16px + } } + .wea-slide-modal-title { height: initial; line-height: initial; From 7d5c026611aa1af7d01832d8bda0d1836d011141 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 Feb 2023 10:46:16 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=A0=B8=E7=AE=97?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E5=88=97=E8=A1=A8bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/calculateDetail/placeOnFileDetail.js | 16 +++++++++++++++- .../pages/calculateDetail/salaryDetail.js | 2 +- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js b/pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js index e7e207a1..7034d970 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js +++ b/pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js @@ -42,6 +42,20 @@ export default class PlaceOnFileDetail extends React.Component { if (type === "PR") { if (id === "BATCHDELETE") { this.setState({ selectedRowKeys: record }); + }else if (id === "PAGEINFO") { + const { pageNum: current, size: pageSize } = record; + this.pageInfo = { current, pageSize }; + const payload = { + type: "PR", + listType: "", + url: "/api/bs/hrmsalary/salaryacct/acctresult/list", + queryParams: { + salaryAcctRecordId, + employeeName: this.state.searchValue, + current, pageSize + } + }; + childFrameObj.contentWindow.postMessage(JSON.stringify(payload), "*"); } } else { const payload = { @@ -54,7 +68,7 @@ export default class PlaceOnFileDetail extends React.Component { employeeName: this.state.searchValue } }; - childFrameObj.contentWindow.postMessage(JSON.stringify(payload), "*"); + type && childFrameObj.contentWindow.postMessage(JSON.stringify(payload), "*"); } }; diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js b/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js index 749c7be0..6c018985 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js +++ b/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js @@ -111,7 +111,7 @@ export default class SalaryDetail extends React.Component { employeeName: this.props.employeeName } }; - childFrameObj.contentWindow.postMessage(JSON.stringify(payload), "*"); + type && childFrameObj.contentWindow.postMessage(JSON.stringify(payload), "*"); } }; From 0d70495c4f78bb2302c50e6c18a6afd18cbcc075 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 Feb 2023 17:54:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=96=AA=E8=B5=84=E8=B4=A6=E5=A5=97?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE=E9=A1=B9?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/pages/calculate/index.less | 16 +++++++++---- .../ledgerPage/components/ledgerSalaryItem.js | 24 +++++++++++-------- .../components/ledgerSalaryItemAddModal.js | 2 +- .../components/ledgerSalaryItemNormal.js | 12 +++++----- pc4mobx/hrmSalary/pages/taxAgent/columns.js | 5 ++++ 5 files changed, 38 insertions(+), 21 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/calculate/index.less b/pc4mobx/hrmSalary/pages/calculate/index.less index 59c90584..cec45959 100644 --- a/pc4mobx/hrmSalary/pages/calculate/index.less +++ b/pc4mobx/hrmSalary/pages/calculate/index.less @@ -1,11 +1,13 @@ .dataList-wrapper { - .ant-modal-body{ + .ant-modal-body { padding: 16px 120px } + .formItem { .wea-select, .ant-select { width: 100%; } + .ant-select-selection { width: 100%; height: 30px; @@ -14,15 +16,21 @@ } } -.salarySobNameWrapper{ +.salarySobNameWrapper { display: flex; align-items: center; justify-content: space-between; width: 100%; - .salarySobNameTagWrapper{ + + & > span { + flex: 1; + } + + .salarySobNameTagWrapper { display: flex; align-items: center; - i{ + + i { color: #5d9cec; margin-right: 10px; cursor: pointer; diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItem.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItem.js index 7620ab0a..1819a321 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItem.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItem.js @@ -38,7 +38,7 @@ class LedgerSalaryItem extends Component { if (status) { const { empFields, itemGroups, items, incomeCategories } = data; const obj = { - id: itemGroups.length, + uuid: itemGroups.length.toString(), itemHide: null, items, name: "未分类", @@ -48,7 +48,7 @@ class LedgerSalaryItem extends Component { this.setState({ empFields, incomeCategoriesTitleName: incomeCategories[0].name, - itemGroups: [...itemGroups, obj] + itemGroups: [..._.map(itemGroups, it => ({ ...it, uuid: it.id })), obj] }, () => { const { empFields, itemGroups } = this.state; const { onSaveSalaryItem } = this.props; @@ -81,15 +81,19 @@ class LedgerSalaryItem extends Component { if (payload.id) { this.setState({ itemGroups: _.map(itemGroups, it => { - if (it.id === payload.id) { + if (it.uuid === payload.id) { return { ...it, name: payload.name }; } return { ...it }; }) + }, () => { + const { empFields, itemGroups } = this.state; + const { onSaveSalaryItem } = this.props; + onSaveSalaryItem(empFields, itemGroups); }); } else { const obj = { - id: new Date().getTime(), + uuid: new Date().getTime().toString(), itemHide: null, items: [], name: payload.name @@ -112,7 +116,7 @@ class LedgerSalaryItem extends Component { handleDeleteCategroy = (id) => { const { itemGroups } = this.state; this.setState({ - itemGroups: _.filter(itemGroups, it => it.id !== id) + itemGroups: _.filter(itemGroups, it => it.uuid !== id) }, () => { const { empFields, itemGroups } = this.state; const { onSaveSalaryItem } = this.props; @@ -129,7 +133,7 @@ class LedgerSalaryItem extends Component { const { itemGroups } = this.state; this.setState({ itemGroups: _.map(itemGroups, item => { - if (item.id === id) { + if (item.uuid === id) { return { ...item, items: _.filter(item.items, it => !selectedRowKeys.includes(it.id)), @@ -204,7 +208,7 @@ class LedgerSalaryItem extends Component { const { itemGroups } = this.state; this.setState({ itemGroups: _.map(itemGroups, it => { - if (filed.id === it.id) { + if (filed.uuid === it.uuid) { return { ...it, items: _.map(data, (child, childIndex) => { @@ -233,7 +237,7 @@ class LedgerSalaryItem extends Component { const { itemGroups } = this.state; this.setState({ itemGroups: _.map(itemGroups, it => { - if (filed.id === it.id) { + if (filed.uuid === it.uuid) { return { ...it, selectedRowKeys: data }; } return { ...it }; @@ -254,7 +258,7 @@ class LedgerSalaryItem extends Component { const { itemGroups } = this.state; this.setState({ itemGroups: _.map(itemGroups, it => { - if (id === it.id) { + if (id === it.uuid) { return { ...it, items: [...it.items, ...items] }; } return { ...it }; @@ -275,7 +279,7 @@ class LedgerSalaryItem extends Component { const { itemGroups } = this.state; this.setState({ itemGroups: _.map(itemGroups, it => { - if (id === it.id) { + if (id === it.uuid) { return { ...it, items }; } return { ...it }; diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js index 84a8f199..0403e365 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js @@ -82,7 +82,7 @@ export default class LedgerSalaryItemAddModal extends React.Component { handleAdd = () => { const { dataSource, selectedRowKeys } = this.state; const { onAddSalaryItems, id, onCancel, itemGroups } = this.props; - const arrItems = _.find(itemGroups, it => it.id === id).items || []; + const arrItems = _.find(itemGroups, it => it.uuid === id).items || []; let selectItems = []; dataSource.map((item) => { item = { ...item }; diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js index 578d63a4..153a05ec 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js @@ -66,7 +66,7 @@ class LedgerSalaryItemNormal extends Component { } return { ...it }; }); - onSaveFormnul(formnulField.id, formnulData); + onSaveFormnul(formnulField.uuid, formnulData); }; handleAddCategory = (name = "", id = "") => { const { categoryModal } = this.state; @@ -214,7 +214,7 @@ export default LedgerSalaryItemNormal; const TitleNormalComp = (props) => { const { name, onEditCategory, onDeleteCategory, - sortedIndex, dataSourceLen, id, onUpgo, + sortedIndex, dataSourceLen, uuid, onUpgo, onDowngo, selectedRowKeys = [], onDeleteCategoryItems, onAddCategoryItems } = props; @@ -223,11 +223,11 @@ const TitleNormalComp = (props) => { {name} { name !== "未分类" && - onEditCategory(name, id)}/> + onEditCategory(name, uuid)}/> } { name !== "未分类" && - onDeleteCategory(id)}/> + onDeleteCategory(uuid)}/> } { sortedIndex !== 0 && @@ -240,8 +240,8 @@ const TitleNormalComp = (props) => {
onDeleteCategoryItems(id, selectedRowKeys)}/> - onAddCategoryItems(id)}/> + onClick={() => onDeleteCategoryItems(uuid, selectedRowKeys)}/> + onAddCategoryItems(uuid)}/>
; }; diff --git a/pc4mobx/hrmSalary/pages/taxAgent/columns.js b/pc4mobx/hrmSalary/pages/taxAgent/columns.js index d185263e..c9326873 100644 --- a/pc4mobx/hrmSalary/pages/taxAgent/columns.js +++ b/pc4mobx/hrmSalary/pages/taxAgent/columns.js @@ -41,6 +41,11 @@ export const importEmployColumns = [ dataIndex: "mobile", key: "mobile" }, + { + title: "员工状态", + dataIndex: "employeeStatus", + key: "employeeStatus" + }, ];