From 99a011722d9a88494afd63e720095b9dd2a8a8c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Sat, 12 Oct 2024 17:22:15 +0800 Subject: [PATCH 01/12] =?UTF-8?q?custom/custom/=E9=B9=B0=E5=9B=BE=E8=BD=AF?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lingyue/historyVouncherSummary/index.js | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/custom-pages/lingyue/historyVouncherSummary/index.js b/pc4mobx/hrmSalary/pages/custom-pages/lingyue/historyVouncherSummary/index.js index 657e1bf2..bf91c023 100644 --- a/pc4mobx/hrmSalary/pages/custom-pages/lingyue/historyVouncherSummary/index.js +++ b/pc4mobx/hrmSalary/pages/custom-pages/lingyue/historyVouncherSummary/index.js @@ -10,12 +10,12 @@ import React, { Component } from "react"; import { inject, observer } from "mobx-react"; import { WeaDatePicker, WeaFormItem, WeaInputSearch, WeaLocaleProvider, WeaSelect, WeaTable, WeaTop } from "ecCom"; -import { message, Modal } from "antd"; -import HistoryVouncherDetail from "./historyVouncherDetail"; import * as API from "../../../../apis/custom-apis/lingyue"; import { deleteHistoryVoucher } from "../../../../apis/custom-apis/lingyue"; -import moment from "moment"; import { commonEnumList } from "../../../../apis/ruleconfig"; +import HistoryVouncherDetail from "./historyVouncherDetail"; +import { message, Modal, Tooltip } from "antd"; +import moment from "moment"; const getLabel = WeaLocaleProvider.getLabel; @@ -56,7 +56,21 @@ class Index extends Component { this.setState({ dataSource, pageInfo: { ...pageInfo, current, pageSize, total }, columns: [ - ...columns, { + ..._.map(columns, k => { + if (k.dataIndex === "errorMsg") { + return { + ...k, + render: txt => ( + } + overlayStyle={{ width: 250, height: 300, overflow: "auto", wordWrap: "break-word" }}> + 300) ? txt.slice(0, 300) + "..." : txt }}/> + ) + }; + } + return { ...k }; + }), + { dataIndex: "options", title: getLabel(111, "操作"), width: 160, render: (__, record) => ( this.setState({ From 0a447773b851f14fc5b4f7853143464dba15625f Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Wed, 16 Oct 2024 14:42:57 +0800 Subject: [PATCH 02/12] feature/2.15.2.2409.01 --- .../components/salaryFileList/index.js | 89 ++++++++++--------- .../hrmSalary/pages/variableSalary/index.js | 2 +- 2 files changed, 49 insertions(+), 42 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js index 01969697..11ab542d 100644 --- a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js +++ b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js @@ -24,14 +24,18 @@ const WeaTableComx = WeaTableNew.WeaTable; const getLabel = WeaLocaleProvider.getLabel; const getKey = WeaTools.getKey; -@inject("baseTableStore") -@observer +@inject("baseTableStore") @observer class Index extends Component { constructor(props) { super(props); this.state = { - pageInfo: { current: 1, pageSize: 10, total: 0 }, loading: false, dataSource: [], columns: [], - selectedRowKeys: [], condtions: [], showSearchAd: false + pageInfo: { current: 1, pageSize: 10, total: 0 }, + loading: false, + dataSource: [], + columns: [], + selectedRowKeys: [], + condtions: [], + showSearchAd: false }; } @@ -43,7 +47,8 @@ class Index extends Component { ...item, items: _.map(item.items, child => { if (getKey(child) === "taxAgentIds") { return { - ...child, label: getLabel(child.lanId, child.label), + ...child, + label: getLabel(child.lanId, child.label), options: _.map(taxAgentOption, o => ({ key: o.id, showname: o.content })) }; } @@ -112,9 +117,8 @@ class Index extends Component { const { pageInfo: result } = data; const { list: dataSource, pageNum: current, pageSize, total } = result; this.setState({ - pageInfo: { ...pageInfo, current, pageSize, total }, dataSource - } - ); + pageInfo: { ...pageInfo, current, pageSize, total }, dataSource + }); } }); }; @@ -125,9 +129,7 @@ class Index extends Component { }; handleDelete = (ids) => { Modal.confirm({ - title: getLabel(111, "信息确认"), - content: getLabel(111, "确认删除吗?"), - onOk: () => { + title: getLabel(111, "信息确认"), content: getLabel(111, "确认删除吗?"), onOk: () => { API.deleteVariableSalary({ ids }).then(({ status, errormsg }) => { if (status) { message.success(getLabel(111, "删除成功")); @@ -142,21 +144,27 @@ class Index extends Component { getColumns = () => { const { baseTableStore: { SFTableStore }, showOperateBtn } = this.props; const columns = _.map(_.filter(toJS(SFTableStore.columns), (item) => item.display === "true"), (it, idx) => ({ - dataIndex: it.dataIndex, title: it.title, align: "left", - width: 150, ellipsis: true + dataIndex: it.dataIndex, title: it.title, align: "left", width: 150, ellipsis: true })); if (!_.isEmpty(columns)) { this.postMessageToChild({ - columns, showOperateBtn, dataSource: this.state.dataSource, scrollHeight: 95, - pageInfo: this.state.pageInfo, unitTableType: "variableSalary", selectedRowKeys: this.state.selectedRowKeys + columns, + showOperateBtn, + dataSource: this.state.dataSource, + scrollHeight: 95, + pageInfo: this.state.pageInfo, + unitTableType: "variableSalary", + selectedRowKeys: this.state.selectedRowKeys }); } return columns; }; postMessageToChild = (payload = {}) => { const i18n = { - "操作": getLabel(30585, "操作"), "编辑": getLabel(111, "编辑"), - "共": getLabel(18609, "共"), "条": getLabel(18256, "条"), + "操作": getLabel(30585, "操作"), + "编辑": getLabel(111, "编辑"), + "共": getLabel(18609, "共"), + "条": getLabel(18256, "条"), "删除": getLabel(111, "删除") }; const childFrameObj = document.getElementById("unitTable"); @@ -172,30 +180,29 @@ class Index extends Component { if (dom && dataSource.length > 0) { height = (parseFloat(dom.style.height) > 620 && dataSource.length === 10) ? dataSource.length * 46 + 108 : dataSource.length < 10 ? dataSource.length * 46 + 108 : parseFloat(dom.style.height) - 62; } - return ( - -
- {getSearchs(VExtraSalryForm, condtions, 2, false, () => this.getVariableSalaryList())} - this.openAdvanceSearch()} - onAdvanceSearch={() => this.getVariableSalaryList()}/> -
-
- this.setState({ showSearchAd: false })} onAdSearch={this.handleAdvanceSearch}/> -
-
- -