From dfcd27771f73b621ae346216794a98c9242e0976 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Mon, 19 Aug 2024 15:01:53 +0800 Subject: [PATCH 1/7] =?UTF-8?q?feature/2.15.1.2407.01-=E7=A4=BE=E4=BF=9D?= =?UTF-8?q?=E6=A1=A3=E6=A1=88=E4=BF=9D=E5=AD=98=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baseValidateDialog.js | 74 ++++++++++++++++ .../components/welfarePlanEditSlide/index.js | 39 ++++++-- .../welfarePlan/index.js | 1 - .../welfarePlan/index.less | 88 +++++++++++++++++++ 4 files changed, 193 insertions(+), 9 deletions(-) create mode 100644 pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/baseValidateDialog.js diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/baseValidateDialog.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/baseValidateDialog.js new file mode 100644 index 00000000..51ec9e1b --- /dev/null +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/baseValidateDialog.js @@ -0,0 +1,74 @@ +/* + * 方案信息确认 + * 保存并自动修改基数，仅保存方案设置 + * @Author: 黎永顺 + * @Date: 2024/8/19 + * @Wechat: + * @Email: 971387674@qq.com + * @description: +*/ +import React, { Component } from "react"; +import { WeaDialog, WeaLocaleProvider, WeaTransfer } from "ecCom"; +import { Alert, Button } from "antd"; + +const getLabel = WeaLocaleProvider.getLabel; +const WeaTransferList = WeaTransfer.list; + +class BaseValidateDialog extends Component { + constructor(props) { + super(props); + this.state = { dataSource: [] }; + } + + componentWillReceiveProps(nextProps, nextContext) { + if (nextProps.visible !== this.props.visible && nextProps.visible) { + this.setState({ + dataSource: _.map(nextProps.baseChangeInfo.split("\n"), (g, gi) => ({ id: gi + 1, name: g })) + }); + } + if (nextProps.visible !== this.props.visible && !nextProps.visible) this.setState({ + dataSource: [] + }); + } + + render() { + const { dataSource } = this.state, { onCancel } = this.props; + const scrollHeight = this.baseChangeRef ? this.baseChangeRef.state.height - 118 : 606.6; + const buttons = [ + , + + ]; + return ( + this.baseChangeRef = dom} + title={getLabel(131329, "信息确认")} buttons={buttons} + style={{ + width: 750, height: 606.6, minHeight: 200, minWidth: 380, + maxHeight: "90%", maxWidth: "90%", overflow: "hidden", transform: "translate(0px, 0px)" + }} + > +
+ + { + !_.isEmpty(dataSource) ? (
+
{it.id}
+
{it.name}
+
)} + height={scrollHeight} checkedCb={() => ({})} checkedKeys={[]} + /> :
{getLabel(111, "无数据变更记录")}
+ } +
+ + ); + } +} + +export default BaseValidateDialog; diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/index.js index d97654e6..8553fb97 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/index.js @@ -12,6 +12,7 @@ import { Button, message, Modal } from "antd"; import * as API from "../../../../../apis/welfareScheme"; import { getTaxAgentSelectListAsAdmin } from "../../../../../apis/taxAgent"; import { getConditionDomkeys, getSearchs } from "../../../../../util"; +import BaseValidateDialog from "./baseValidateDialog"; import { planConditons } from "../../config"; import cs from "classnames"; @@ -24,7 +25,10 @@ class Index extends Component { constructor(props) { super(props); this.state = { - loading: false, conditions: [], selectedKey: "2", planDatas: [] + loading: false, conditions: [], selectedKey: "2", planDatas: [], + baseValidateDialog: { + visible: false, baseChangeInfo: [], validatePayload: { validate: true, changeData: false } + } }; } @@ -86,21 +90,32 @@ class Index extends Component { if (planForm.getFormParams().sharedType === "1" && _.isEmpty(planForm.getFormParams().taxAgentIds)) { planForm.showError("taxAgentIds", getLabel(111, "\"可见范围\"未填写")); } else { - const { planDatas } = this.state; - const payload = { + const { planDatas, baseValidateDialog } = this.state; + const { validatePayload } = baseValidateDialog; + let payload = { insuranceScheme: { ...planForm.getFormParams(), welfareType: welfareTypeEnum, id, paymentArea: planForm.getFormParams().paymentType }, insuranceSchemeDetailList: planDatas }; + id && (payload = { ...payload, ...validatePayload }); this.setState({ loading: true }); - API[id ? "updateScheme" : "createScheme"](payload).then(({ status, errormsg }) => { + API[id ? "updateScheme" : "createScheme"](payload).then(({ status, data, errormsg }) => { this.setState({ loading: false }); if (status) { - message.success(getLabel(30700, "操作成功！")); - setHasBeenModify(false); - this.props.onClose(true); + if (data.indexOf("\n") !== -1 && id) { + this.setState({ + baseValidateDialog: { + visible: true, baseChangeInfo: data, + validatePayload: { ...baseValidateDialog.validatePayload, validate: false } + } + }); + } else { + message.success(getLabel(30700, "操作成功！")); + setHasBeenModify(false); + this.props.onClose(true); + } } else { message.error(errormsg); } @@ -194,7 +209,7 @@ class Index extends Component { render() { - const { conditions, planDatas, selectedKey } = this.state; + const { conditions, planDatas, selectedKey, baseValidateDialog } = this.state; const { programmeStore: { planForm }, showOperateBtn } = this.props; return ( + {/* */} + this.setState({ + baseValidateDialog: { + visible: false, baseChangeInfo: [], + validatePayload: { validate: true, changeData: false, ...validatePayload } + } + }, () => !_.isEmpty(validatePayload) && this.save())}/> } /> ); diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.js index 20d50c88..4f7028ad 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.js @@ -13,7 +13,6 @@ import WelfarePlanList from "./components/welfarePlanList"; import LogDialog from "../../../components/logViewModal"; import cs from "classnames"; import "./index.less"; -import { tabList } from "../welfareArchive/config"; const getLabel = WeaLocaleProvider.getLabel; diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.less b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.less index 5a057203..5566cc8e 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.less +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.less @@ -269,3 +269,91 @@ } } + +//方案基数变化 +.baseChangeDialog { + .wea-dialog-body { + overflow-y: hidden; + } + + .baseChangeContent { + background: #F6F6F6; + padding: 16px; + width: 100%; + height: 100%; + + .empty { + width: 100%; + display: flex; + height: 100%; + justify-content: center; + align-items: center; + background: #ffff; + } + + .wea-search-group { + padding: 0; + margin-bottom: 10px; + background: #FFF; + + .wea-form-cell { + padding: 0; + + .wea-form-item { + padding: 10px; + } + } + } + + .logTable { + background: #FFFFFF; + } + + .wea-transfer-list-wrapper { + border: none; + + .ant-tree-switcher { + display: none; + } + + .transfer-tree { + background: #FFF; + border: 1px solid #dadada; + padding: 0; + + & > li:not(:last-child) { + .detailBox .content { + border-bottom: 1px solid #dadada; + } + } + + & > li { + margin: 0 !important; + + .detailBox { + display: flex; + align-items: center; + + .order { + width: 35px; + color: #999; + text-align: center; + } + + .content { + position: relative; + flex: 1; + min-height: 40px; + line-height: 40px; + color: #000; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + } + } + } + } + } +} + From 55d39d652351a13a2c4c6832f8cb83dcf53715af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Mon, 19 Aug 2024 16:37:46 +0800 Subject: [PATCH 2/7] =?UTF-8?q?feature/2.15.1.2407.01-=E7=A4=BE=E4=BF=9D?= =?UTF-8?q?=E6=A1=A3=E6=A1=88=E4=BF=9D=E5=AD=98=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../welfarePlan/components/welfarePlanEditSlide/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/index.js index 8553fb97..3f2c44f3 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/index.js @@ -104,7 +104,7 @@ class Index extends Component { API[id ? "updateScheme" : "createScheme"](payload).then(({ status, data, errormsg }) => { this.setState({ loading: false }); if (status) { - if (data.indexOf("\n") !== -1 && id) { + if (id && Object.prototype.toString.call(data) === "[object String]" && data.indexOf("\n") !== -1) { this.setState({ baseValidateDialog: { visible: true, baseChangeInfo: data, From c0b517201fce3ca86d8a47b0bb2d5c0b83982cf8 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, 20 Aug 2024 10:07:29 +0800 Subject: [PATCH 3/7] =?UTF-8?q?feature/2.15.1.2407.01-=E7=A4=BE=E4=BF=9D?= =?UTF-8?q?=E6=A1=A3=E6=A1=88=E4=BF=9D=E5=AD=98=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/welfarePlanEditSlide/baseValidateDialog.js | 4 +++- .../welfarePlan/components/welfarePlanEditSlide/index.js | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/baseValidateDialog.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/baseValidateDialog.js index 51ec9e1b..631ef2ee 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/baseValidateDialog.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/baseValidateDialog.js @@ -23,7 +23,9 @@ class BaseValidateDialog extends Component { componentWillReceiveProps(nextProps, nextContext) { if (nextProps.visible !== this.props.visible && nextProps.visible) { this.setState({ - dataSource: _.map(nextProps.baseChangeInfo.split("\n"), (g, gi) => ({ id: gi + 1, name: g })) + dataSource: _.filter(_.map(nextProps.baseChangeInfo.split("\n"), (g, gi) => ({ + id: gi + 1, name: g + })), k => !!k.name) }); } if (nextProps.visible !== this.props.visible && !nextProps.visible) this.setState({ diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/index.js index 3f2c44f3..da42ac66 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/index.js @@ -115,6 +115,11 @@ class Index extends Component { message.success(getLabel(30700, "操作成功！")); setHasBeenModify(false); this.props.onClose(true); + this.setState({ + baseValidateDialog: { + ...baseValidateDialog, baseChangeInfo: [], validatePayload: { validate: true, changeData: false } + } + }); } } else { message.error(errormsg); From 4810a09f295e8bd191caf4be94652e4a4283d9da 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, 28 Aug 2024 14:57:34 +0800 Subject: [PATCH 4/7] hotfix/2.15.1.2407.01 --- .../doCalc/components/salaryEditCalc/editCalcTable.js | 3 +++ .../pages/calculate/doCalc/components/salaryEditCalc/index.js | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js index 9ac53398..96e717fe 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js @@ -271,6 +271,9 @@ class EditCalcTable extends Component { } }).catch(() => this.setState({ loading: false })); }; + handleQuery = () => { + this.setState({ pageInfo: { ...this.state.pageInfo, current: 1 } }, () => this.queryCalcResultList()); + }; handleBatchEditing = () => { }; diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js index 54081da1..6bfa4ca9 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js @@ -28,7 +28,7 @@ class Index extends Component { openAdvanceSearch = () => this.setState({ showSearchAd: !this.state.showSearchAd }); onAdSearch = (bool = true) => { - this.calcTableRef.wrappedInstance.queryCalcResultList(); + this.calcTableRef.wrappedInstance.handleQuery(); bool && this.openAdvanceSearch(); }; init = async () => { From 21ead59420c36f27a8d013c2860ba0dc078fb33a 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, 29 Aug 2024 15:21:37 +0800 Subject: [PATCH 5/7] hotfix/2.15.1.2407.01 --- .../components/salaryCalcPersonConfirm/index.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryCalcPersonConfirm/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryCalcPersonConfirm/index.js index 68b7245f..5a3f9abc 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryCalcPersonConfirm/index.js +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryCalcPersonConfirm/index.js @@ -242,13 +242,21 @@ class Index extends Component { this.setState({ selectedKey: v }, () => this.queryPCList())} + onChange={v => this.setState({ + selectedKey: v, + pageInfo: { ...pageInfo, current: 1 } + }, () => this.queryPCList())} + onSearch={v => this.setState({ + pageInfo: { ...pageInfo, current: 1 } + }, () => this.queryPCList())} + onAdSearch={v => this.setState({ + pageInfo: { ...pageInfo, current: 1 } + }, () => this.queryPCList())} buttons={this.renderTabBtns()} searchType={["base", "advanced"]} advanceHeight={220} showSearchAd={showSearchAd} setShowSearchAd={bool => this.setState({ showSearchAd: bool })} searchsAd={getSearchs(PCSearchForm, searchConditions, 2, false)} onSearchChange={(v) => PCSearchForm.updateFields({ employeeName: v })} searchsBaseValue={PCSearchForm.getFormParams().employeeName} - onSearch={this.queryPCList} onAdSearch={this.queryPCList} onAdReset={() => PCSearchForm.resetForm()} autoCalculateWidth /> Date: Fri, 30 Aug 2024 13:42:21 +0800 Subject: [PATCH 6/7] =?UTF-8?q?hotfix/2.15.1.2407.01=20=E8=96=AA=E9=85=AC?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=E6=95=B0=E6=8D=AE=E7=A9=BF?= =?UTF-8?q?=E9=80=8F=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reportView/components/povitpivotChartModal.js | 8 ++++---- .../pages/reportView/components/reportContent.js | 15 ++++++++++----- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js b/pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js index 6a80e8fb..aa5f1bed 100644 --- a/pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js +++ b/pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js @@ -36,8 +36,8 @@ class PovitpivotChartModal extends Component { componentWillReceiveProps(nextProps, nextContext) { if (nextProps.visible !== this.props.visible && nextProps.visible) { - const { id, dimensionId, dimensionValue, isShare } = nextProps; - this.getDataPerspective({ id, dimensionId, dimensionValue, isShare }); + const { id, dimensionId, dimensionValue, isShare, salaryStartMonth, salaryEndMonth } = nextProps; + this.getDataPerspective({ id, dimensionId, dimensionValue, isShare, salaryStartMonth, salaryEndMonth }); } else { this.setState({ dataSource: [], @@ -64,11 +64,11 @@ class PovitpivotChartModal extends Component { }); } else if (type === "turn") { if (id === "PAGEINFO") { - const { id, dimensionId, dimensionValue, isShare } = this.props; + const { id, dimensionId, dimensionValue, isShare, salaryStartMonth, salaryEndMonth } = this.props; const { pageNum: current, size: pageSize } = params; this.setState({ pageInfo: { ...pageInfo, current, pageSize } }, () => this.getDataPerspective({ - id, dimensionId, dimensionValue, isShare + id, dimensionId, dimensionValue, isShare, salaryStartMonth, salaryEndMonth })); } } diff --git a/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js b/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js index 7509d3df..9716234a 100644 --- a/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js +++ b/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js @@ -29,8 +29,8 @@ class ReportContent extends Component { chartsType: "0", chartsInfo: {}, povitView: { - visible: false, id: "", isShare: false, - dimensionId: "", dimensionValue: "" + visible: false, id: "", isShare: false, dimensionId: "", dimensionValue: "", salaryStartMonth: "", + salaryEndMonth: "" }, rangSet: { visible: false, reportId: "", @@ -69,10 +69,15 @@ class ReportContent extends Component { if (id === "PIVOTCHART") { const { record } = params; const { dimension: dimensionValue } = record; - const { id: pivotId, dimensionId, isShare } = this.props.report; + const { + id: pivotId, dimensionId, isShare, timeType, salaryEndMonth: end, salaryStartMonth: start + } = this.props.report; + const [salaryStartMonth, salaryEndMonth] = getSalaryMonthValue(timeType); + this.setState({ povitView: { - visible: true, id: pivotId, dimensionId, dimensionValue, isShare + visible: true, id: pivotId, dimensionId, dimensionValue, isShare, + salaryStartMonth: (salaryStartMonth || start) + "-01", salaryEndMonth: (salaryEndMonth || end) + "-01" } }); } else if (id === "PAGEINFO_REPORT") { @@ -282,7 +287,7 @@ class ReportContent extends Component { onCancel={() => this.setState({ povitView: { visible: false, id: "", dimensionId: "", dimensionValue: "", - isShare: false + isShare: false, salaryStartMonth: "", salaryEndMonth: "" } })} /> From 76da4dd1e12ee66de17dfa6c69db4af6e327918e 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, 5 Sep 2024 10:13:03 +0800 Subject: [PATCH 7/7] hotfix/2.15.1.2407.01 --- .../hrmSalary/pages/ledgerPage/components/ledgerSlide.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js index d7229b5d..ab4af5ba 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js @@ -110,7 +110,8 @@ class LedgerSlide extends Component { return { ...item, items: _.map(item.items, it => { - // delete it.formulaContent; + delete it.originFormulaContent; + delete it.originSqlContent; // if (it.id && it.id.length > 4) delete it.id; return { ...it }; }) @@ -118,7 +119,8 @@ class LedgerSlide extends Component { }), items: _.map(_.find(itemGroups, it => it.name === "未分类").items, child => { // if (child.id && child.id.length > 4) delete child.id; - // delete child.formulaContent; + delete child.originFormulaContent; + delete child.originSqlContent; return { ...child }; }) || [], salarySobId: salarySobId || saveSalarySobId