diff --git a/pc4mobx/hrmSalary/index.js b/pc4mobx/hrmSalary/index.js index a20908e8..8351f046 100644 --- a/pc4mobx/hrmSalary/index.js +++ b/pc4mobx/hrmSalary/index.js @@ -54,6 +54,7 @@ import WatermarkPreview from "./pages/payroll/watermarkPreview"; import IntelligentCalculateSalarySettings from "./pages/intelligentCalculateSalarySettings"; import ExternalPersonManage from "./pages/externalPersonManage"; import AdjustSalaryManage from "./pages/adjustSalaryManage"; +import TopologyMap from "./pages/topologyMap"; import stores from "./stores"; import "./style/index"; @@ -190,6 +191,7 @@ const Routes = ( + ); diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js index 5a3e2aa3..4aa67eaa 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js @@ -59,13 +59,23 @@ class EditCalcTable extends Component { salaryCalcSlide: { visible: true, id: salaryCalcId } }); break; + case "DIAGRAM": + const { salarySobId } = this.props; + const { salaryItemId: itemid, acctEmpId } = params; + window.open(`/spa/hrmSalary/static/index.html#/main/hrmSalary/topologyView/${salarySobId}/${itemid}?acctEmpId=${acctEmpId}`, "_blank"); + break; default: break; } } }; updateLockStatus = (payload) => { - const { lockStatus } = payload; + const { salarySobId } = this.props; + const { lockStatus, salaryItemId } = payload; + if (lockStatus === "DIAGRAM") { + window.open(`/spa/hrmSalary/static/index.html#/main/hrmSalary/topologyView/${salarySobId}/${salaryItemId}`, "_blank"); + return; + } Modal.confirm({ title: getLabel(131329, "信息确认"), content:
@@ -125,7 +135,7 @@ class EditCalcTable extends Component { "当前状态未锁定,点击锁定": getLabel(111, "当前状态未锁定,点击锁定"), "共": getLabel(18609, "共"), "条": getLabel(18256, "条"), "总计": getLabel(523, "总计"), "批量解锁": getLabel(111, "批量解锁"), - "批量锁定": getLabel(111, "批量锁定") + "批量锁定": getLabel(111, "批量锁定"), "查看拓扑图": getLabel(111, "查看拓扑图") }; const childFrameObj = document.getElementById("atdTable"); childFrameObj.contentWindow.postMessage(JSON.stringify({ ...payload, i18n }), "*"); diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js index 8618f667..034d86f8 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js @@ -81,7 +81,7 @@ class Index extends Component { onAdSearch={this.onAdSearch} />
- this.calcTableRef = dom} + this.calcTableRef = dom} salarySobId={salarySobCycle.salarySobId} {...this.props} showTotalCell={showTotalCell} onShowFormulaTd={this.handleShowFormulaTa}/> diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js index 3d8b690a..81a4326b 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js @@ -246,7 +246,13 @@ class LedgerSalaryItemTable extends Component { { title: "名称", dataIndex: "name", - key: "name" + key: "name", + render: (text, record) => { + const { salarySobId, salaryItemId } = record; + return {text}; + } }, { title: diff --git a/pc4mobx/hrmSalary/pages/salaryItemDiagram/index.js b/pc4mobx/hrmSalary/pages/salaryItemDiagram/index.js new file mode 100644 index 00000000..710a6387 --- /dev/null +++ b/pc4mobx/hrmSalary/pages/salaryItemDiagram/index.js @@ -0,0 +1,22 @@ +/* + * Author: 黎永顺 + * name: 薪资档案拓扑图 + * Description: + * Date: 2023/10/19 + */ +import React, { Component } from "react"; + +class Index extends Component { + render() { + return ( +