From ca5b60f6aa0cfec2791d51e9e07fe79212effd82 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, 12 Oct 2023 13:57:14 +0800 Subject: [PATCH 01/29] =?UTF-8?q?feature/2.9.42310.01-=E4=B8=AA=E7=A8=8E?= =?UTF-8?q?=E7=94=B3=E6=8A=A5=E8=A1=A8=E9=A1=B5=E9=9D=A2=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/index.js | 3 +- pc4mobx/hrmSalary/pages/declare/columns.js | 37 ----- .../components/declareDialog/condition.js | 43 ++++++ .../declare/components/declareDialog/index.js | 92 +++++++++++ .../declare/components/declareQuery/index.js | 34 +++++ .../components/declareTablelist/index.js | 144 ++++++++++++++++++ pc4mobx/hrmSalary/pages/declare/declare.js | 81 ++++++++++ pc4mobx/hrmSalary/pages/declare/index.less | 64 ++++++++ pc4mobx/hrmSalary/stores/declare.js | 11 +- 9 files changed, 470 insertions(+), 39 deletions(-) delete mode 100644 pc4mobx/hrmSalary/pages/declare/columns.js create mode 100644 pc4mobx/hrmSalary/pages/declare/components/declareDialog/condition.js create mode 100644 pc4mobx/hrmSalary/pages/declare/components/declareDialog/index.js create mode 100644 pc4mobx/hrmSalary/pages/declare/components/declareQuery/index.js create mode 100644 pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js create mode 100644 pc4mobx/hrmSalary/pages/declare/declare.js diff --git a/pc4mobx/hrmSalary/index.js b/pc4mobx/hrmSalary/index.js index ca8f7464..80199485 100644 --- a/pc4mobx/hrmSalary/index.js +++ b/pc4mobx/hrmSalary/index.js @@ -20,7 +20,8 @@ import Calculate from "./pages/calculate/calculate"; //重构的薪资核算页 import Payroll from "./pages/payroll"; import PayrollGrant from "./pages/payroll/payrollGrant"; import PayrollDetail from "./pages/payroll/payrollDetail"; -import Declare from "./pages/declare"; +// import Declare from "./pages/declare"; +import Declare from "./pages/declare/declare"; //重构的个税申报表 import TaxRate from "./pages/taxRate"; import TaxAgent from "./pages/taxAgent"; import CalculateDetail from "./pages/calculateDetail"; diff --git a/pc4mobx/hrmSalary/pages/declare/columns.js b/pc4mobx/hrmSalary/pages/declare/columns.js deleted file mode 100644 index cb5e65d3..00000000 --- a/pc4mobx/hrmSalary/pages/declare/columns.js +++ /dev/null @@ -1,37 +0,0 @@ -export const columns = [ - { - title: "姓名", - dataIndex: 'title', - key: 'title', - }, - { - title: "个税扣缴义务人", - dataIndex: 'title', - key: 'title', - }, - { - title: "部门", - dataIndex: 'title', - key: 'title', - }, - { - title: "手机号", - dataIndex: 'title', - key: 'title', - }, - { - title: "员工状态", - dataIndex: 'title', - key: 'title', - }, - { - title: "基本工资", - dataIndex: 'title', - key: 'title', - }, - { - title: "操作", - dataIndex: 'cz', - key: 'cz', - } -] diff --git a/pc4mobx/hrmSalary/pages/declare/components/declareDialog/condition.js b/pc4mobx/hrmSalary/pages/declare/components/declareDialog/condition.js new file mode 100644 index 00000000..d880c3f1 --- /dev/null +++ b/pc4mobx/hrmSalary/pages/declare/components/declareDialog/condition.js @@ -0,0 +1,43 @@ +export const declareConditions = [ + { + items: [ + { + colSpan: 1, + conditionType: "MONTHPICKER", + domkey: ["salaryMonthStr"], + fieldcol: 14, + label: "薪资所属月", + lanId: 542604, + labelcol: 6, + value: "", + rules: "required|string", + viewAttr: 3 + }, + { + colSpan: 1, + conditionType: "SELECT", + domkey: ["taxAgentId"], + fieldcol: 14, + label: "个税扣缴义务人", + lanId: 537996, + labelcol: 6, + options: [], + rules: "required|string", + viewAttr: 3, + }, + { + colSpan: 1, + conditionType: "INPUT", + domkey: ["description"], + fieldcol: 14, + label: "备注", + lanId: 536726, + labelcol: 6, + value: "", + viewAttr: 2 + } + ], + defaultshow: true, + title: "" + } +]; diff --git a/pc4mobx/hrmSalary/pages/declare/components/declareDialog/index.js b/pc4mobx/hrmSalary/pages/declare/components/declareDialog/index.js new file mode 100644 index 00000000..a2ce2936 --- /dev/null +++ b/pc4mobx/hrmSalary/pages/declare/components/declareDialog/index.js @@ -0,0 +1,92 @@ +/* + * Author: 黎永顺 + * name: 个税申报重构- 申报 + * Description: + * Date: 2023/10/12 + */ +import React, { Component } from "react"; +import { inject, observer } from "mobx-react"; +import { WeaDialog, WeaLocaleProvider, WeaTools } from "ecCom"; +import { Button, message } from "antd"; +import { getSearchs } from "../../../../util"; +import { getTaxAgentSelectListAsAdmin } from "../../../../apis/taxAgent"; +import { saveDeclare } from "../../../../apis/declare"; +import { declareConditions } from "./condition"; + +const getKey = WeaTools.getKey; +const getLabel = WeaLocaleProvider.getLabel; + +@inject("declareStore") +@observer +class Index extends Component { + constructor(props) { + super(props); + this.state = { + conditions: [], loading: false + }; + } + + componentWillReceiveProps(nextProps, nextContext) { + if (nextProps.visible !== this.props.visible && nextProps.visible) this.getTaxAgentSelectListAsAdmin(nextProps); + if (nextProps.visible !== this.props.visible && !nextProps.visible) this.props.declareStore.initDeclareForm(); + } + + getTaxAgentSelectListAsAdmin = (props) => { + const { declareStore: { declareForm } } = props; + getTaxAgentSelectListAsAdmin().then(({ status, data }) => { + if (status) { + this.setState({ + conditions: _.map(declareConditions, item => ({ + ...item, + items: _.map(item.items, o => { + if (getKey(o) === "taxAgentId") { + return { + ...o, options: _.map(data, g => ({ key: g.id, showname: g.content })) + // helpfulTitle: getLabel(563420, "提示：可选择单个个税扣缴义务人进行申报，若不选择，则批量对管理下的所有个税扣缴义务人进行申报；") + }; + } + return { ...o }; + }) + })) + }, () => declareForm.initFormFields(this.state.conditions)); + } + }); + }; + save = () => { + const { declareStore: { declareForm } } = this.props; + declareForm.validateForm().then(f => { + if (f.isValid) { + const payload = declareForm.getFormParams(); + this.setState({ loading: true }); + saveDeclare({ ...payload }).then(({ status, errormsg }) => { + this.setState({ loading: false }); + if (status) { + message.success(getLabel(30700, "操作成功")); + this.props.onCancel("refresh"); + } else { + message.error(errormsg); + } + }).catch(() => this.setState({ loading: false })); + } else { + f.showErrors(); + } + }); + }; + + render() { + const { conditions, loading } = this.state; + const { declareStore: { declareForm } } = this.props; + return ( + {getLabel(543618, "生成申报表")} + ]} + > +
{getSearchs(declareForm, conditions, 1, false)}
+ + ); + } +} + +export default Index; diff --git a/pc4mobx/hrmSalary/pages/declare/components/declareQuery/index.js b/pc4mobx/hrmSalary/pages/declare/components/declareQuery/index.js new file mode 100644 index 00000000..f5627a0c --- /dev/null +++ b/pc4mobx/hrmSalary/pages/declare/components/declareQuery/index.js @@ -0,0 +1,34 @@ +/* + * Author: 黎永顺 + * name: 个税申报表重构-查询 + * Description: + * Date: 2023/10/12 + */ +import React, { Component } from "react"; +import { WeaInputSearch, WeaLocaleProvider } from "ecCom"; +import { MonthRangePicker } from "../../../reportView/components/statisticalMicroSettingsSlide"; + +const getLabel = WeaLocaleProvider.getLabel; + +class Index extends Component { + render() { + const { queryParams } = this.props; + const { dateRange, name } = queryParams; + return ( +
+
+ {getLabel(543549, "薪资所属月：")} + this.props.onChange({ dateRange: v })}/> +
+ this.props.onChange({ taxAgentName: v })} + onSearch={this.props.onSearch} + /> +
+ ); + } +} + +export default Index; diff --git a/pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js b/pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js new file mode 100644 index 00000000..5ee8b1b4 --- /dev/null +++ b/pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js @@ -0,0 +1,144 @@ +/* + * Author: 黎永顺 + * name: 个税申报重构-列表 + * Description: + * Date: 2023/10/12 + */ +import React, { Component } from "react"; +import { WeaLocaleProvider, WeaTable } from "ecCom"; +import { message, Modal } from "antd"; +import { getDeclareList, withDrawTaxDeclaration } from "../../../../apis/declare"; +import { sysConfCodeRule } from "../../../../apis/ruleconfig"; + +const getLabel = WeaLocaleProvider.getLabel; + +class Index extends Component { + constructor(props) { + super(props); + this.state = { + loading: false, columns: [], dataSource: [], showWithDrawBtn: false, + pageInfo: { current: 1, pageSize: 10, total: 0 } + }; + } + + componentDidMount() { + this.getDeclareList(this.props); + this.sysConfCodeRule(); + } + + componentWillReceiveProps(nextProps, nextContext) { + if (nextProps.isRefresh !== this.props.isRefresh) this.getDeclareList(nextProps); + } + + sysConfCodeRule = () => { + sysConfCodeRule({ code: "WITHDRAW_TAX_DECLARATION" }).then(({ status, data }) => { + if (status && data === "1") this.setState({ showWithDrawBtn: data === "1" }); + }); + }; + getDeclareList = (props) => { + const { pageInfo } = this.state; + const { queryParams } = props; + const { dateRange, ...extra } = queryParams; + const [fromSalaryMonthStr, endSalaryMonthStr] = dateRange || []; + const params = { fromSalaryMonthStr, endSalaryMonthStr, ...extra }; + const payload = { ...pageInfo, ...params }; + this.setState({ loading: true }); + getDeclareList(payload).then(({ status, data }) => { + this.setState({ loading: false }); + if (status) { + const { columns, list: dataSource, pageNum, pageSize, total } = data; + this.setState({ + dataSource, pageInfo: { ...pageInfo, pageNum, pageSize, total }, + columns: _.map(columns, o => { + const { dataIndex } = o; + let width = ""; + switch (dataIndex) { + case "taxAgentName": + case "operateTime": + width = "15%"; + break; + case "description": + width = "20%"; + break; + default: + width = "10%"; + break; + } + return { ...o, width }; + }) + }); + } + }).catch(() => this.setState({ loading: false })); + }; + taxdeclarationDelete = (taxDeclarationId) => { + withDrawTaxDeclaration({ taxDeclarationId }).then(({ status, errormsg }) => { + if (status) { + message.success(getLabel(505793, "撤回成功")); + this.getDeclareList(this.props); + } else { + message.error(errormsg); + } + }); + }; + + render() { + const { loading, dataSource, columns, pageInfo, showWithDrawBtn } = this.state; + const pagination = { + ...pageInfo, + showTotal: total => `${getLabel(18609, "共")} ${total} ${getLabel(18256, "条")}`, + showQuickJumper: true, + showSizeChanger: true, + pageSizeOptions: ["10", "20", "50", "100"], + onShowSizeChange: (current, pageSize) => { + this.setState({ + pageInfo: { ...pageInfo, current, pageSize } + }, () => this.getDeclareList(this.props)); + }, + onChange: current => { + this.setState({ + pageInfo: { ...pageInfo, current } + }, () => this.getDeclareList(this.props)); + } + }; + return ( + { + const { id } = record; + return + + {getLabel(83110, "查看详情")} + + { + showWithDrawBtn && + { + Modal.confirm({ + title: getLabel(131329, "信息确认"), + content: getLabel(543848, "确认撤回该条数据吗?"), + onOk: () => this.taxdeclarationDelete(id) + }); + }} + > + {getLabel(32025, "撤回")} + + } + ; + } + } + ]} + /> + ); + } +} + +export default Index; diff --git a/pc4mobx/hrmSalary/pages/declare/declare.js b/pc4mobx/hrmSalary/pages/declare/declare.js new file mode 100644 index 00000000..0fa5dc90 --- /dev/null +++ b/pc4mobx/hrmSalary/pages/declare/declare.js @@ -0,0 +1,81 @@ +/* + * Author: 黎永顺 + * name: 个税申报表-重构页面 + * Description: + * Date: 2023/10/12 + */ +import React, { Component } from "react"; +import { inject, observer } from "mobx-react"; +import { WeaHelpfulTip, WeaLocaleProvider, WeaTop } from "ecCom"; +import { Button } from "antd"; +import moment from "moment"; +import DeclareQuery from "./components/declareQuery"; +import DeclareTablelist from "./components/declareTablelist"; +import DeclareDialog from "./components/declareDialog"; +import "./index.less"; + +const getLabel = WeaLocaleProvider.getLabel; + +@inject("taxAgentStore") +@observer +class Calculate extends Component { + constructor(props) { + super(props); + this.state = { + queryParams: { + taxAgentName: "", + dateRange: [ + moment(new Date()).startOf("year").format("YYYY-MM"), + moment(new Date()).startOf("month").format("YYYY-MM") + ] + }, isRefresh: false, + declareDaialog: { visible: false, title: "" } + }; + this.handleDebounce = null; + } + + renderCalculateOpts = () => { + const { taxAgentStore: { showOperateBtn } } = this.props; + const { queryParams, isRefresh } = this.state; + let calculateOpts = [ + , + this.setState({ + isRefresh: _.keys(v)[0] === "taxAgentName" ? isRefresh : !isRefresh, + queryParams: { ...queryParams, ...v } + })} onSearch={() => this.setState({ isRefresh: !isRefresh })}/> + ]; + return !showOperateBtn ? calculateOpts.slice(1) : calculateOpts; + }; + + render() { + const { queryParams, isRefresh, declareDaialog } = this.state; + return ( + } iconBgcolor="#F14A2D" + buttons={this.renderCalculateOpts()} className="declare-main-layout" + > +
+ + this.setState({ + declareDaialog: { ...declareDaialog, visible: false }, + isRefresh: bool === "refresh" ? !isRefresh : isRefresh + })} + /> +
+ + ); + } +} + +export default Calculate; diff --git a/pc4mobx/hrmSalary/pages/declare/index.less b/pc4mobx/hrmSalary/pages/declare/index.less index 81e72b6f..52564e0a 100644 --- a/pc4mobx/hrmSalary/pages/declare/index.less +++ b/pc4mobx/hrmSalary/pages/declare/index.less @@ -24,3 +24,67 @@ } } } + +//个税申报表页面-重构 +.declare-main-layout { + .wea-new-top-content { + overflow-y: hidden; + } + + .declare-body { + height: 100%; + width: 100%; + padding: 16px; + overflow-y: auto; + + .wea-new-table { + background: #fff; + } + + .ant-table-tbody { + td { + width: 100%; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + } + + } +} + +.declare-dialog-layout { + background: #f6f6f6; + + .wea-search-group { + padding: 16px; + } + + .wea-select, .ant-select-selection, .ant-select { + width: 100%; + } + + .wea-select { + display: inline-block; + position: relative; + } + + .ant-select-selection { + height: 30px; + border-radius: 0; + } + + .wea-content { + padding: 0; + + .wea-form-cell-wrapper { + background: #FFF; + border: 1px solid #e5e5e5; + border-bottom: none; + + .wea-form-cell { + border-bottom: 1px solid #e5e5e5; + } + } + } +} diff --git a/pc4mobx/hrmSalary/stores/declare.js b/pc4mobx/hrmSalary/stores/declare.js index cf80a323..e1691486 100644 --- a/pc4mobx/hrmSalary/stores/declare.js +++ b/pc4mobx/hrmSalary/stores/declare.js @@ -7,13 +7,22 @@ import * as API from "../apis/declare"; // 引入API接口文件 const { TableStore } = WeaTableNew; export class DeclareStore { + @observable declareForm = new WeaForm(); //薪资核算重构-核算form + // ** 薪资核算重构-初始化核算form ** + @action + initDeclareForm = () => this.declareForm = new WeaForm(); + + + + + + @observable tableStore = new TableStore(); // new table @observable form = new WeaForm(); // nrew 一个form @observable condition = []; // 存储后台得到的form数据 @observable hasRight = true; // 判断用户是有权限查看当前页面： 没有权限渲染无权限页面，有权限渲染数据 @observable showSearchAd = false; // 高级搜索面板显示 @observable loading = true; // 数据加载状态 - // 列表 @observable listDataSource = []; @observable listColumns = []; From d0aa6e93a01a5b5712ff14f652075588ce125aaf 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, 20 Oct 2023 10:27:00 +0800 Subject: [PATCH 02/29] =?UTF-8?q?feature/2.9.42310.01-=E8=96=AA=E8=B5=84?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=8B=93=E6=89=91=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/index.js | 3 +++ .../pages/salaryItemDiagram/index.js | 22 +++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 pc4mobx/hrmSalary/pages/salaryItemDiagram/index.js diff --git a/pc4mobx/hrmSalary/index.js b/pc4mobx/hrmSalary/index.js index af5bbfb0..3311b26c 100644 --- a/pc4mobx/hrmSalary/index.js +++ b/pc4mobx/hrmSalary/index.js @@ -42,6 +42,7 @@ import MySalaryView from "./pages/mySalary/mySalaryView"; import WatermarkPreview from "./pages/payroll/watermarkPreview"; import ExternalPersonManage from "./pages/externalPersonManage"; import AdjustSalaryManage from "./pages/adjustSalaryManage"; +import SalaryItemDiagram from "./pages/salaryItemDiagram"; import stores from "./stores"; import "./style/index"; @@ -95,6 +96,7 @@ const DataAcquisition = (props) => props.children; // reportView 薪酬报表查看 // externalPersonManage 非系统人员管理 // adjustSalaryManage 档案管理 +// salaryItemDiagram 薪资档案拓扑图 const Routes = ( + + ); + } +} + +export default Index; From 235e7cc6f02de3efb09dea2966c051ab4202a782 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, 27 Oct 2023 10:43:23 +0800 Subject: [PATCH 03/29] =?UTF-8?q?feature/2.9.42310.01-=E8=96=AA=E8=B5=84?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=8B=93=E6=89=91=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/index.js | 3 - .../components/salaryEditCalc/diagramModal.js | 59 +++++++++++++++++++ .../salaryEditCalc/editCalcTable.js | 25 ++++++-- .../doCalc/components/salaryEditCalc/index.js | 2 +- .../pages/salaryItemDiagram/index.js | 2 +- 5 files changed, 82 insertions(+), 9 deletions(-) create mode 100644 pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/diagramModal.js diff --git a/pc4mobx/hrmSalary/index.js b/pc4mobx/hrmSalary/index.js index 3311b26c..af5bbfb0 100644 --- a/pc4mobx/hrmSalary/index.js +++ b/pc4mobx/hrmSalary/index.js @@ -42,7 +42,6 @@ import MySalaryView from "./pages/mySalary/mySalaryView"; import WatermarkPreview from "./pages/payroll/watermarkPreview"; import ExternalPersonManage from "./pages/externalPersonManage"; import AdjustSalaryManage from "./pages/adjustSalaryManage"; -import SalaryItemDiagram from "./pages/salaryItemDiagram"; import stores from "./stores"; import "./style/index"; @@ -96,7 +95,6 @@ const DataAcquisition = (props) => props.children; // reportView 薪酬报表查看 // externalPersonManage 非系统人员管理 // adjustSalaryManage 档案管理 -// salaryItemDiagram 薪资档案拓扑图 const Routes = ( - { + const { type } = data; + if (type === "initDiagram") this.postMessageToChild(this.props); + }; + + componentWillUnmount() { + window.removeEventListener("message", this.handleReceive, false); + } + + postMessageToChild = (payload = {}) => { + const { width, height } = this.diagramRef.state.style; + const i18n = { + "公式": getLabel(18125, "公式") + }; + const childFrameObj = document.getElementById("topologyDiagram"); + childFrameObj.contentWindow.postMessage(JSON.stringify({ ...payload, width, height, i18n }), "*"); + }; + + render() { + return ( + this.diagramRef = dom} + scalable hasScroll className="diagramDialog" initLoadCss + title={getLabel(111, "拓扑图")} + style={{ + width: 1150, + height: 850, + minHeight: 200, + minWidth: 380, + maxHeight: "90%", + maxWidth: "90%", + overflow: "hidden", + transform: "translate(0px, 0px)" + }} + > + + + ); + } +} + +export default DiagramModal; diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js index 36198c34..a09a5052 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js @@ -11,6 +11,7 @@ import { inject, observer } from "mobx-react"; import { acctResultList, updateLockStatus } from "../../../../../apis/calculate"; import ProgressModal from "../../../../../components/progressModal"; import EditSalaryCalcSlide from "./editSalaryCalcSlide"; +import DiagramModal from "./diagramModal"; const getLabel = WeaLocaleProvider.getLabel; @@ -22,7 +23,8 @@ class EditCalcTable extends Component { this.state = { loading: false, pageInfo: { current: 1, pageSize: 10, total: 0 }, selectedRowKeys: [], progressVisible: false, progress: 0, - salaryCalcSlide: { visible: false, id: "" } + salaryCalcSlide: { visible: false, id: "" }, + diagramModal: { visible: false, salaryItemId: "", salarySobId: "" } }; this.timerLock = null; } @@ -59,13 +61,24 @@ class EditCalcTable extends Component { salaryCalcSlide: { visible: true, id: salaryCalcId } }); break; + case "DIAGRAM": + const { salarySobId } = this.props; + const { diagramModal } = this.state; + this.setState({ diagramModal: { ...diagramModal, ...params, visible: true, salarySobId } }); + break; default: break; } } }; updateLockStatus = (payload) => { - const { lockStatus } = payload; + const { salarySobId } = this.props; + const { diagramModal } = this.state; + const { lockStatus, salaryItemId } = payload; + if (lockStatus === "DIAGRAM") { + this.setState({ diagramModal: { ...diagramModal, visible: true, salarySobId, salaryItemId } }); + return; + } Modal.confirm({ title: getLabel(131329, "信息确认"), content:
@@ -125,7 +138,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 }), "*"); @@ -160,7 +173,7 @@ class EditCalcTable extends Component { }; render() { - const { loading, progressVisible, progress, salaryCalcSlide } = this.state; + const { loading, progressVisible, progress, salaryCalcSlide, diagramModal } = this.state; return (
@@ -177,6 +190,10 @@ class EditCalcTable extends Component { id: "" } }, () => isFresh === "true" && this.queryCalcResultList())}/> + { + diagramModal.visible && + this.setState({ diagramModal: { visible: false } })}/> + } { progressVisible &&
- this.calcTableRef = dom} + this.calcTableRef = dom} salarySobId={salarySobCycle.salarySobId} {...this.props} showTotalCell={showTotalCell} onShowFormulaTd={this.handleShowFormulaTa}/>
diff --git a/pc4mobx/hrmSalary/pages/salaryItemDiagram/index.js b/pc4mobx/hrmSalary/pages/salaryItemDiagram/index.js index 6de256d3..51e16088 100644 --- a/pc4mobx/hrmSalary/pages/salaryItemDiagram/index.js +++ b/pc4mobx/hrmSalary/pages/salaryItemDiagram/index.js @@ -13,7 +13,7 @@ class Index extends Component { style={{ border: 0, width: "100%", height: "100%" }} src="http://localhost:7607/#/salaryItemDiagram" // src="/spa/hrmSalary/hrmSalaryCalculateDetail/index.html#/salaryItemDiagram" - id="atdTable" + id="topologyDiagram" /> ); } From eed8d3a5bdd97143c31281aa32e6e98241cbcc1a 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, 27 Oct 2023 16:14:59 +0800 Subject: [PATCH 04/29] =?UTF-8?q?feature/2.9.42310.01-=E8=96=AA=E8=B5=84?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=8B=93=E6=89=91=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/index.js | 2 + .../components/salaryEditCalc/diagramModal.js | 59 ------------------- .../salaryEditCalc/editCalcTable.js | 17 ++---- .../components/ledgerSalaryItemTable.js | 8 ++- .../ledgerPage/components/ledgerSlide.js | 2 +- .../pages/salaryItemDiagram/index.js | 4 +- pc4mobx/hrmSalary/pages/topologyMap/index.js | 45 ++++++++++++++ 7 files changed, 62 insertions(+), 75 deletions(-) delete mode 100644 pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/diagramModal.js create mode 100644 pc4mobx/hrmSalary/pages/topologyMap/index.js diff --git a/pc4mobx/hrmSalary/index.js b/pc4mobx/hrmSalary/index.js index af5bbfb0..115db668 100644 --- a/pc4mobx/hrmSalary/index.js +++ b/pc4mobx/hrmSalary/index.js @@ -42,6 +42,7 @@ import MySalaryView from "./pages/mySalary/mySalaryView"; import WatermarkPreview from "./pages/payroll/watermarkPreview"; import ExternalPersonManage from "./pages/externalPersonManage"; import AdjustSalaryManage from "./pages/adjustSalaryManage"; +import TopologyMap from "./pages/topologyMap"; import stores from "./stores"; import "./style/index"; @@ -168,6 +169,7 @@ const Routes = ( + ); diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/diagramModal.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/diagramModal.js deleted file mode 100644 index 8f74a8c1..00000000 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/diagramModal.js +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Author: 黎永顺 - * name: 薪资项目拓扑图-查看 - * Description: - * Date: 2023/10/26 - */ -import React, { Component } from "react"; -import { WeaDialog, WeaLocaleProvider } from "ecCom"; -import SalaryItemDiagram from "../../../../salaryItemDiagram"; - -const getLabel = WeaLocaleProvider.getLabel; - -class DiagramModal extends Component { - componentDidMount() { - window.addEventListener("message", this.handleReceive, false); - } - - handleReceive = async ({ data }) => { - const { type } = data; - if (type === "initDiagram") this.postMessageToChild(this.props); - }; - - componentWillUnmount() { - window.removeEventListener("message", this.handleReceive, false); - } - - postMessageToChild = (payload = {}) => { - const { width, height } = this.diagramRef.state.style; - const i18n = { - "公式": getLabel(18125, "公式") - }; - const childFrameObj = document.getElementById("topologyDiagram"); - childFrameObj.contentWindow.postMessage(JSON.stringify({ ...payload, width, height, i18n }), "*"); - }; - - render() { - return ( - this.diagramRef = dom} - scalable hasScroll className="diagramDialog" initLoadCss - title={getLabel(111, "拓扑图")} - style={{ - width: 1150, - height: 850, - minHeight: 200, - minWidth: 380, - maxHeight: "90%", - maxWidth: "90%", - overflow: "hidden", - transform: "translate(0px, 0px)" - }} - > - - - ); - } -} - -export default DiagramModal; diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js index a09a5052..9a460c53 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js @@ -11,7 +11,6 @@ import { inject, observer } from "mobx-react"; import { acctResultList, updateLockStatus } from "../../../../../apis/calculate"; import ProgressModal from "../../../../../components/progressModal"; import EditSalaryCalcSlide from "./editSalaryCalcSlide"; -import DiagramModal from "./diagramModal"; const getLabel = WeaLocaleProvider.getLabel; @@ -23,8 +22,7 @@ class EditCalcTable extends Component { this.state = { loading: false, pageInfo: { current: 1, pageSize: 10, total: 0 }, selectedRowKeys: [], progressVisible: false, progress: 0, - salaryCalcSlide: { visible: false, id: "" }, - diagramModal: { visible: false, salaryItemId: "", salarySobId: "" } + salaryCalcSlide: { visible: false, id: "" } }; this.timerLock = null; } @@ -63,8 +61,8 @@ class EditCalcTable extends Component { break; case "DIAGRAM": const { salarySobId } = this.props; - const { diagramModal } = this.state; - this.setState({ diagramModal: { ...diagramModal, ...params, visible: true, salarySobId } }); + const { salaryItemId: itemid, acctEmpId } = params; + window.open(`/spa/hrmSalary/static/index.html#/main/hrmSalary/topologyView/${salarySobId}/${itemid}?acctEmpId=${acctEmpId}`, "_blank"); break; default: break; @@ -73,10 +71,9 @@ class EditCalcTable extends Component { }; updateLockStatus = (payload) => { const { salarySobId } = this.props; - const { diagramModal } = this.state; const { lockStatus, salaryItemId } = payload; if (lockStatus === "DIAGRAM") { - this.setState({ diagramModal: { ...diagramModal, visible: true, salarySobId, salaryItemId } }); + window.open(`/spa/hrmSalary/static/index.html#/main/hrmSalary/topologyView/${salarySobId}/${salaryItemId}`, "_blank"); return; } Modal.confirm({ @@ -173,7 +170,7 @@ class EditCalcTable extends Component { }; render() { - const { loading, progressVisible, progress, salaryCalcSlide, diagramModal } = this.state; + const { loading, progressVisible, progress, salaryCalcSlide } = this.state; return (
@@ -190,10 +187,6 @@ class EditCalcTable extends Component { id: "" } }, () => isFresh === "true" && this.queryCalcResultList())}/> - { - diagramModal.visible && - this.setState({ diagramModal: { visible: false } })}/> - } { progressVisible && { + const { salarySobId, salaryItemId } = record; + return {text}; + } }, { title: diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js index 8b2e350e..cb768c92 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js @@ -266,7 +266,7 @@ class LedgerSlide extends Component { className="slideOuterWrapper" visible={visible} top={0} - width={65} + width={100} height={100} direction="right" measure="%" diff --git a/pc4mobx/hrmSalary/pages/salaryItemDiagram/index.js b/pc4mobx/hrmSalary/pages/salaryItemDiagram/index.js index 51e16088..710a6387 100644 --- a/pc4mobx/hrmSalary/pages/salaryItemDiagram/index.js +++ b/pc4mobx/hrmSalary/pages/salaryItemDiagram/index.js @@ -11,8 +11,8 @@ class Index extends Component { return (