From c04cc1de7611ff5e5f7072a5c36eb6e201d96be6 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Mon, 23 Dec 2024 15:28:05 +0800 Subject: [PATCH 01/21] release/2.18.2.2412.02 --- .../welfareArchive/components/welfareEditArchiveSlide/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js index e2342e93..e00b4f83 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js @@ -116,7 +116,7 @@ class Index extends Component { } else if (getKey(g).indexOf("StartTime") !== -1) { return { ...g, label: getLabel(g.lanId, g.label), - viewAttr: (formData[o["typename"]][`${o.title}Name`] && showOperateBtn) ? 3 : g.viewAttr + viewAttr: (runStatuses === "4,5" || !showOperateBtn) ? 1 : (formData[o["typename"]][`${o.title}Name`] && showOperateBtn) ? 3 : g.viewAttr }; } return { From cec22dc89f59a65969d12107e32b8e3965e59253 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Tue, 24 Dec 2024 15:41:15 +0800 Subject: [PATCH 02/21] release/2.18.2.2412.02 --- .../hrmSalary/components/FormInfo/index.js | 96 +++++++++++++++++++ .../pages/adjustSalaryManage/index.js | 4 +- 2 files changed, 98 insertions(+), 2 deletions(-) create mode 100644 pc4mobx/hrmSalary/components/FormInfo/index.js diff --git a/pc4mobx/hrmSalary/components/FormInfo/index.js b/pc4mobx/hrmSalary/components/FormInfo/index.js new file mode 100644 index 00000000..5c14f828 --- /dev/null +++ b/pc4mobx/hrmSalary/components/FormInfo/index.js @@ -0,0 +1,96 @@ +import React, { Component } from "react"; +import { WeaCheckbox, WeaFormItem, WeaSearchGroup } from "ecCom"; +import { observer } from "mobx-react"; +import { WeaSwitch } from "comsMobx"; + +@observer +export default class FormInfo extends Component { + renderForm = () => { + const { + formFields, form, colCount, itemRender, onSelectedChangeHandle, + showLabel, multiColumn, custLabelCol, childrenComponents + } = this.props; + + let groupArr = []; + const formParams = form.getFormParams(); + const labelVisible = showLabel == null || showLabel == true; + const col = colCount ? colCount : 1; + const labelCol = labelVisible ? (custLabelCol || `${window.HrmEngineLabelCol}`) : 0; + const itemProps = { + ratio1to2: labelVisible && custLabelCol == null, + style: { marginLeft: 0 }, + tipPosition: "bottom", + labelCol: { span: labelCol }, + wrapperCol: { span: 24 - labelCol } + }; + const textAreaProps = { minRows: 4, maxRows: 4 }; + + formFields.map((fields, i) => { + let formItems = []; + fields.items.map((field, j) => { + const customerRender = itemRender != null ? itemRender[field.domkey[0]] : null; + const showCheckbox = field.checkbox || false; + let label = field.label; + if (showCheckbox) + label = { + field.checkboxValue = v === "1"; + onSelectedChangeHandle && onSelectedChangeHandle(field, v); + }}/>; + let coms; + if (customerRender == null) { + coms = ; + } else { + coms = customerRender(field, textAreaProps, form, formParams); + } + Object.assign(itemProps, { label, error: form.getError(field) }); + let col = 1; + if (multiColumn != null) {//检查有哪些字段需要一行显示多个 + const idx = _.findIndex(multiColumn, item => item.key === field.domkey[0]); + if (idx > -1) { + col = field.colSpan || 1; + if (multiColumn[idx].labelCol != null)//检查字段是否有配置标题宽度 + Object.assign(itemProps, { + labelCol: { span: multiColumn[idx].labelCol }, + wrapperCol: { span: 24 - multiColumn[idx].labelCol } + }); + } else { + Object.assign(itemProps, { + labelCol: { span: labelCol }, + wrapperCol: { span: 24 - labelCol } + }); + } + } + + coms != null && formItems.push({ + com: ({coms}), + col + }); + + if (childrenComponents && childrenComponents[field.domkey[0]]) { + childrenComponents[field.domkey[0]]().map(child => formItems.push(child)); + } + }); + + groupArr.push(); + }); + return groupArr; + }; + + render() { + const { formFields, className } = this.props; + if (formFields == null) return (
); + return ( +
+ {this.renderForm()} +
+ ); + } +} diff --git a/pc4mobx/hrmSalary/pages/adjustSalaryManage/index.js b/pc4mobx/hrmSalary/pages/adjustSalaryManage/index.js index d1fd2bb9..a58245c7 100644 --- a/pc4mobx/hrmSalary/pages/adjustSalaryManage/index.js +++ b/pc4mobx/hrmSalary/pages/adjustSalaryManage/index.js @@ -46,8 +46,8 @@ class Index extends Component { const payload = { ...pageInfo, ...extra, departmentIds: departmentIds ? departmentIds.split(",") : [], - positionIds: departmentIds ? departmentIds.split(",") : [], - operatorIds: departmentIds ? departmentIds.split(",") : [], + positionIds: positionIds ? positionIds.split(",") : [], + operatorIds: operatorIds ? operatorIds.split(",") : [], effectiveTime: effectiveTime1 ? [effectiveTime1, effectiveTime2] : [], operateTime: operateTime1 ? [operateTime1, operateTime2] : [] }; From 8b8f4cd6106fa1f0a66956c096582010111c71ed Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Wed, 25 Dec 2024 17:20:55 +0800 Subject: [PATCH 03/21] release/2.18.2.2412.02 --- .../pages/ledgerPage/components/ledgerSalaryItemNormal.js | 2 +- .../components/welfarePlanEditSlide/planSetTable.js | 2 +- .../pages/socialSecurityBenefits/welfarePlan/index.less | 8 ++++++++ pc4mobx/hrmSalary/style/index.less | 7 +++++++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js index 82cbdfbf..4b9b42ec 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js @@ -182,7 +182,7 @@ class LedgerSalaryItemNormal extends Component { > childItem.id === id || childItem.uuid === uuid).items} + dataSource={_.find(newDateSource, childItem => childItem.uuid === uuid).items} salarySobId={editId || saveSalarySobId} selectedRowKeys={field.selectedRowKeys || []} onDropCategoryItem={(data) => onDropCategoryItem(field, data)} diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/planSetTable.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/planSetTable.js index 10751d50..aa3942b0 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/planSetTable.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/planSetTable.js @@ -84,7 +84,7 @@ class PlanSetTable extends Component { com: [{ type: "custom", key: "custom", - render: text => ({text}) + render: text => ({text}) }] }, { diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.less b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.less index 5566cc8e..0c19ca25 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.less +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.less @@ -232,6 +232,14 @@ text-overflow: ellipsis; overflow: hidden; } + + .text-td-elli { + display: inline-block; + width: 120px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } } } } diff --git a/pc4mobx/hrmSalary/style/index.less b/pc4mobx/hrmSalary/style/index.less index 02955b0b..6bc0127b 100644 --- a/pc4mobx/hrmSalary/style/index.less +++ b/pc4mobx/hrmSalary/style/index.less @@ -128,3 +128,10 @@ } } +//公共表格操作按钮间距 +.space_div { + a:not(:last-child) { + margin-right: 8px; + } +} + From 8aa696fee514fa5c2a13fa442574468989809cb3 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Fri, 27 Dec 2024 09:12:09 +0800 Subject: [PATCH 04/21] release/2.18.2.2412.02 --- pc4mobx/hrmSalary/components/PersonalScopeTable/index.js | 4 ++-- .../pages/ledgerPage/components/ledgerAssociatedPersonnel.js | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pc4mobx/hrmSalary/components/PersonalScopeTable/index.js b/pc4mobx/hrmSalary/components/PersonalScopeTable/index.js index 5faaf8a9..d8824c8b 100644 --- a/pc4mobx/hrmSalary/components/PersonalScopeTable/index.js +++ b/pc4mobx/hrmSalary/components/PersonalScopeTable/index.js @@ -41,7 +41,7 @@ class PersonalScopeTable extends Component { } getPersonalScopeList = (tabActive = this.props.tabActive) => { - const { searchValue, searchKeyVal, APIFox } = this.props; + const { searchValue, searchKeyVal, APIFox, showOperateBtn } = this.props; const { pageInfo, loading } = this.state; const payload = { [searchKeyVal["key"]]: searchKeyVal["value"], @@ -60,7 +60,7 @@ class PersonalScopeTable extends Component { return { ...item, render: (text, record) => { - if (item.dataIndex === "targetName") { + if (item.dataIndex === "targetName" && showOperateBtn) { return this.props.onEditScope(record)}>{text}; } return {text}; diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAssociatedPersonnel.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAssociatedPersonnel.js index 0b71af53..905c2f3b 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAssociatedPersonnel.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAssociatedPersonnel.js @@ -289,6 +289,7 @@ class LedgerAssociatedPersonnel extends Component { APIFox={APIFox} tabActive={selectedKey} searchValue={searchValue} + showOperateBtn={showOperateBtn} onChangeSelectKey={rowKeys => this.setState({ rowKeys })} onEditScope={this.handleAddPersonal} /> From 576a108fa9abeebbc0737e14f6e886a09253b2b1 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Mon, 30 Dec 2024 16:55:47 +0800 Subject: [PATCH 05/21] release/2.18.2.2412.02 --- .../hrmSalary/components/FormInfo/index.js | 36 ++++++++++--------- .../excelEditor/extendCodeMirror.js | 9 +++-- 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/pc4mobx/hrmSalary/components/FormInfo/index.js b/pc4mobx/hrmSalary/components/FormInfo/index.js index 5c14f828..d6940489 100644 --- a/pc4mobx/hrmSalary/components/FormInfo/index.js +++ b/pc4mobx/hrmSalary/components/FormInfo/index.js @@ -1,27 +1,28 @@ import React, { Component } from "react"; -import { WeaCheckbox, WeaFormItem, WeaSearchGroup } from "ecCom"; +import { WeaCheckbox, WeaFormItem, WeaLocaleProvider, WeaSearchGroup } from "ecCom"; import { observer } from "mobx-react"; import { WeaSwitch } from "comsMobx"; +const getLabel = WeaLocaleProvider.getLabel; @observer export default class FormInfo extends Component { renderForm = () => { const { - formFields, form, colCount, itemRender, onSelectedChangeHandle, - showLabel, multiColumn, custLabelCol, childrenComponents + formFields, form, colCount, itemRender, onSelectedChangeHandle, showLabel, multiColumn, custLabelCol, + childrenComponents } = this.props; let groupArr = []; const formParams = form.getFormParams(); const labelVisible = showLabel == null || showLabel == true; const col = colCount ? colCount : 1; - const labelCol = labelVisible ? (custLabelCol || `${window.HrmEngineLabelCol}`) : 0; + const labelCol = labelVisible ? (custLabelCol || 6) : 0; const itemProps = { - ratio1to2: labelVisible && custLabelCol == null, + // ratio1to2: labelVisible && custLabelCol == null, style: { marginLeft: 0 }, tipPosition: "bottom", labelCol: { span: labelCol }, - wrapperCol: { span: 24 - labelCol } + wrapperCol: { span: 22 - labelCol } }; const textAreaProps = { minRows: 4, maxRows: 4 }; @@ -30,7 +31,7 @@ export default class FormInfo extends Component { fields.items.map((field, j) => { const customerRender = itemRender != null ? itemRender[field.domkey[0]] : null; const showCheckbox = field.checkbox || false; - let label = field.label; + let label = getLabel(field.lanId, field.label); if (showCheckbox) label = { field.checkboxValue = v === "1"; @@ -38,13 +39,17 @@ export default class FormInfo extends Component { }}/>; let coms; if (customerRender == null) { - coms = ; + coms = ; } else { - coms = customerRender(field, textAreaProps, form, formParams); + coms = customerRender({ + ...field, helpfulTip: getLabel(field.helpfulTipLanId || "", field.helpfulTip || "") + }, textAreaProps, form, formParams); } Object.assign(itemProps, { label, error: form.getError(field) }); - let col = 1; + let col = colCount ? colCount : 1; if (multiColumn != null) {//检查有哪些字段需要一行显示多个 const idx = _.findIndex(multiColumn, item => item.key === field.domkey[0]); if (idx > -1) { @@ -61,7 +66,6 @@ export default class FormInfo extends Component { }); } } - coms != null && formItems.push({ com: ({coms}), col @@ -85,12 +89,10 @@ export default class FormInfo extends Component { }; render() { - const { formFields, className } = this.props; - if (formFields == null) return (
); + const { formFields, className, form } = this.props; + if (formFields == null || !form.isFormInit) return (
); return ( -
- {this.renderForm()} -
+
{this.renderForm()}
); } } diff --git a/pc4mobx/hrmSalary/components/excelEditor/extendCodeMirror.js b/pc4mobx/hrmSalary/components/excelEditor/extendCodeMirror.js index e70c6967..32a5e5b0 100644 --- a/pc4mobx/hrmSalary/components/excelEditor/extendCodeMirror.js +++ b/pc4mobx/hrmSalary/components/excelEditor/extendCodeMirror.js @@ -18,8 +18,10 @@ CodeMirror.extendMode("javascript", { if (this.jsonMode) { return /^[\[,{]$/.test(content) || /^}/.test(textAfter) || /^]/.test(textAfter); } else { - if (content == ";" && state.lexical && state.lexical.type == ")") return false; - return /^[;{}]$/.test(content) && !/^;/.test(textAfter); + if (content == ";" && state.lexical && state.lexical.type == "}") return false; + // if (content == ";" && state.lexical && state.lexical.type == ")") return false; + return /[=,]/.test(content) || /.*\)/.test(textAfter); + // return /^[;{}]$/.test(content) && !/^;/.test(textAfter); } } }); @@ -94,7 +96,8 @@ CodeMirror.defineExtension("autoFormatRange", function (from, to) { atSol = false; } if (!atSol && inner.mode.newlineAfterToken && - inner.mode.newlineAfterToken(style, cur, stream.string.slice(stream.pos) || text[i + 1] || "", inner.state)) + // inner.mode.newlineAfterToken(style, cur, stream.string.slice(stream.pos) || text[i + 1] || "", inner.state)) + inner.mode.newlineAfterToken(style, cur, stream.string.slice(stream.pos, stream.pos + 2) || text[i + 1] || "", inner.state)) newline(); } if (!stream.pos && outer.blankLine) outer.blankLine(state); From a3f0e27f49d4b75b3563f2ba3954be56ad146ee0 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Tue, 31 Dec 2024 09:21:25 +0800 Subject: [PATCH 06/21] release/2.18.2.2412.02 --- .../pages/salaryItem/syncToSalaryAccountSetDialog.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/salaryItem/syncToSalaryAccountSetDialog.js b/pc4mobx/hrmSalary/pages/salaryItem/syncToSalaryAccountSetDialog.js index f97ef453..d7d11617 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/syncToSalaryAccountSetDialog.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/syncToSalaryAccountSetDialog.js @@ -78,14 +78,12 @@ class SyncToSalaryAccountSetDialog extends Component { const { conditions } = this.state; return ( (pre += cur.items.length), 0) * 47 + 33 }} buttons={[]} > -
- {getSearchs(salarySetform, conditions, 1)} -
+
{getSearchs(salarySetform, conditions, 1, false)}
); } From 2d659768aca816ac833302c3b98bbcc66b36cc74 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Tue, 31 Dec 2024 13:42:33 +0800 Subject: [PATCH 07/21] release/2.18.2.2412.02 --- .../hrmSalary/pages/ledgerPage/components/ledgerSalaryItem.js | 2 +- .../pages/ledgerPage/components/ledgerSalaryItemTable.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItem.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItem.js index 934b777e..65912404 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItem.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItem.js @@ -318,7 +318,7 @@ class LedgerSalaryItem extends Component { items: [...it.items, { ...extraItems, salaryItemGroupId: moveToItemId, - key: moveId, + key: moveId ? moveId : items.key, sortedIndex: !_.isEmpty(it.items) ? it.items[it.items.length - 1].sortedIndex + 1 : 0 }] }; diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js index 73540fea..45bb59c7 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js @@ -288,7 +288,9 @@ class LedgerSalaryItemTable extends Component { width: 80, render: (text, record) => this.handleChangeItem(value, record.id || record.key)} + onChange={value => { + this.handleChangeItem(value, record.id || record.key) + }} /> }, { From cdc75b766815547ec112bf8378bad29e060fc7a5 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Tue, 31 Dec 2024 15:04:09 +0800 Subject: [PATCH 08/21] release/2.18.2.2412.02 --- .../pages/ledgerPage/components/ledgerSalaryItemTable.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js index 45bb59c7..5b623e79 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js @@ -128,8 +128,10 @@ class LedgerSalaryItemTable extends Component { formulaContent, formulaId, name, hideDefault: _.isNil(hideDefault) ? "0" : hideDefault, valueType, roundingMode, pattern, - originFormulaContent, originSqlContent, - useInEmployeeSalary: !_.isNil(useInEmployeeSalary) ? useInEmployeeSalary : "0" + useInEmployeeSalary: !_.isNil(useInEmployeeSalary) ? useInEmployeeSalary : "0", + //不能改成其他空值 + originFormulaContent: (valueType.toString() === "2" && _.isNil(originFormulaContent)) ? formulaContent : "", + originSqlContent: (valueType.toString() === "3" && _.isNil(originSqlContent)) ? formulaContent : "" }, record, userStatusList: _.map(userStatusList, it => ({ key: it.value.toString(), showname: it.defaultLabel })) @@ -289,7 +291,7 @@ class LedgerSalaryItemTable extends Component { render: (text, record) => { - this.handleChangeItem(value, record.id || record.key) + this.handleChangeItem(value, record.id || record.key); }} /> }, From a8e2a530376b1c3f091554087ef1f8e79641fdf6 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Tue, 31 Dec 2024 15:26:54 +0800 Subject: [PATCH 09/21] release/2.18.2.2412.02 --- .../pages/ledgerPage/components/ledgerSalaryItemTable.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js index 5b623e79..4f126ef9 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js @@ -130,8 +130,8 @@ class LedgerSalaryItemTable extends Component { valueType, roundingMode, pattern, useInEmployeeSalary: !_.isNil(useInEmployeeSalary) ? useInEmployeeSalary : "0", //不能改成其他空值 - originFormulaContent: (valueType.toString() === "2" && _.isNil(originFormulaContent)) ? formulaContent : "", - originSqlContent: (valueType.toString() === "3" && _.isNil(originSqlContent)) ? formulaContent : "" + originFormulaContent: _.isNil(originFormulaContent) ? formulaContent : originFormulaContent, + originSqlContent: _.isNil(originSqlContent) ? formulaContent : originSqlContent }, record, userStatusList: _.map(userStatusList, it => ({ key: it.value.toString(), showname: it.defaultLabel })) From db99c081fb08afc5be6b77d1c8756c93c5db27cb Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Tue, 31 Dec 2024 15:38:09 +0800 Subject: [PATCH 10/21] release/2.18.2.2412.02 --- pc4mobx/hrmSalary/components/PersonalScopeModal/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/components/PersonalScopeModal/index.js b/pc4mobx/hrmSalary/components/PersonalScopeModal/index.js index 935e1e00..f4c62718 100644 --- a/pc4mobx/hrmSalary/components/PersonalScopeModal/index.js +++ b/pc4mobx/hrmSalary/components/PersonalScopeModal/index.js @@ -53,7 +53,7 @@ class PersonalScopeModal extends Component { if (!_.isEmpty(nextProps.record)) { this.setState({ targetType: nextProps.record.targetType, - targetTypeIds: String(nextProps.record.targetId), + targetTypeIds: nextProps.record.targetType !== "SQL" ? String(nextProps.record.targetId) : nextProps.record.target, targetTypeIdsNames: nextProps.record.targetName, status: nextProps.record.status, statusAll: "" From 9d8cd5c6fa5307d504bd963821e8cda1d6e54162 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Tue, 31 Dec 2024 16:07:35 +0800 Subject: [PATCH 11/21] release/2.18.2.2412.02 --- .../components/payrollTempNormalSet/formRender.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempNormalSet/formRender.js b/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempNormalSet/formRender.js index b004e177..5e7f1398 100644 --- a/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempNormalSet/formRender.js +++ b/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempNormalSet/formRender.js @@ -41,7 +41,7 @@ export const payrollTempNormalSetForm = (form, condition, background, onChange = /> } { - getKey(fields) === "theme" && c.viewAttr === 3 && + getKey(fields) === "theme" && fields.viewAttr === 3 &&
{getLabel(500143, "插入变量")}： Date: Thu, 2 Jan 2025 14:32:25 +0800 Subject: [PATCH 12/21] release/2.18.2.2412.02 --- .../standingBookDetail/components/index.less | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less index 235eba25..c7117046 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less @@ -4,12 +4,16 @@ height: 100%; background: #f6f6f6; + .wea-tab { + border-bottom: none !important; + } + .wea-new-top-req-wapper .wea-new-top-req { z-index: 0 !important; } .wea-search-tab, .wea-input-focus { - background: #f6f6f6; + background: #f1f1f1; } .normalWapper { From 4212bf9ff5759b4d4ada2c0e2c569e68f082ccae Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Thu, 2 Jan 2025 15:31:55 +0800 Subject: [PATCH 13/21] release/2.18.2.2412.02 --- pc4mobx/hrmSalary/components/pcTemplate/index.less | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pc4mobx/hrmSalary/components/pcTemplate/index.less b/pc4mobx/hrmSalary/components/pcTemplate/index.less index e57fe5e5..4f834426 100644 --- a/pc4mobx/hrmSalary/components/pcTemplate/index.less +++ b/pc4mobx/hrmSalary/components/pcTemplate/index.less @@ -82,6 +82,8 @@ } .data-detail { + padding-bottom: 16px; + .salary-group { background: #FFF; From 9c04b2adaf7972f9fad3c668567579e13d4df2bf Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Fri, 3 Jan 2025 11:40:39 +0800 Subject: [PATCH 14/21] release/2.18.2.2412.02 --- .../hrmSalary/pages/ledgerPage/components/ledgerMovoTo.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerMovoTo.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerMovoTo.js index af75ac82..8a333ea5 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerMovoTo.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerMovoTo.js @@ -18,10 +18,8 @@ class LedgerMovoTo extends Component { ]; return ( + {...extraProps} buttons={buttons} hasScroll initLoadCss className="moveModalWrapper" + style={{ width: 440, height: Math.ceil((dataList.length - 1) / 3) * 25 + 41 }}> item.showname === "未分类")} From 2c039088859e2416d46241f37a59e54597ae820e Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Fri, 3 Jan 2025 15:49:53 +0800 Subject: [PATCH 15/21] release/2.18.2.2412.02 --- .../declare/generateDeclarationDetail.js | 87 ++++++------------- pc4mobx/hrmSalary/pages/declare/index.less | 13 ++- .../pages/payroll/payrollGrant/index.js | 3 +- 3 files changed, 35 insertions(+), 68 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js b/pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js index cdfe5a73..cd1b1996 100644 --- a/pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js +++ b/pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js @@ -1,23 +1,20 @@ import React from "react"; -import CustomTab from "../../components/customTab"; import { inject, observer } from "mobx-react"; +import { WeaLocaleProvider, WeaTable, WeaTop } from "ecCom"; import { getQueryString } from "../../util/url"; import * as API from "../../apis/declare"; import { Button } from "antd"; -import UnifiedTable from "../../components/UnifiedTable"; import "./index.less"; +const { getLabel } = WeaLocaleProvider; @inject("taxAgentStore") @observer export default class GenerateDeclarationDetail extends React.Component { constructor(props) { super(props); this.state = { - loading: false, - dataSource: [], - columns: [], - pageInfo: { current: 1, pageSize: 10, total: 0 }, - declareInfo: {} + loading: false, dataSource: [], columns: [], declareInfo: {}, + pageInfo: { current: 1, pageSize: 10, total: 0 } }; } @@ -37,31 +34,19 @@ export default class GenerateDeclarationDetail extends React.Component { if (status) { const { columns, list: dataSource, pageNum: current, pageSize, total } = data; this.setState({ - dataSource, - pageInfo: { - ...pageInfo, - current, pageSize, total - }, + dataSource, pageInfo: { ...pageInfo, current, pageSize, total }, columns: _.map(_.filter(columns, it => it.dataIndex !== "jobNum"), item => { if (item.dataIndex === "username") { return { - ...item, - render: (text, record) => { - return window.pointerXY(e)} - title={text} - > - {text} - ; - } + ...item, width: 180, + render: (text, record) => ( window.pointerXY(e)} + title={text}>{text}) }; } return { - ...item, - render: (text) => { - return {text}; - } + ...item, width: (item.dataIndex === "cardType" || item.dataIndex === "cardNum") ? 180 : 100, + render: (text) => ({text}) }; }) }); @@ -78,26 +63,19 @@ export default class GenerateDeclarationDetail extends React.Component { const url = `${window.location.origin}/api/bs/hrmsalary/taxdeclaration/export?taxDeclarationId=${getQueryString("id")}`; window.open(url, "_self"); }; + renderTitle = () => { + const { declareInfo } = this.state; + return ( + {getLabel(111, "薪资所属月")}：{declareInfo.salaryMonth} + {getLabel(111, "个税扣缴义务人")}：{declareInfo.taxAgentName} + ); + }; render() { - const { declareInfo, loading, pageInfo, columns, dataSource } = this.state; + const { loading, pageInfo, columns, dataSource } = this.state; const { taxAgentStore: { showOperateBtn } } = this.props; - - const renderRightOperation = () => { - return ( -
- -
- ); - }; - const renderLeftOperation = () => { - return ( -
- 薪资所属月：{declareInfo.salaryMonth} - 个税扣缴义务人：{declareInfo.taxAgentName} -
- ); - }; + const buttons = showOperateBtn ? [] : []; const pagination = { ...pageInfo, showTotal: (total) => `共 ${total} 条`, @@ -115,23 +93,12 @@ export default class GenerateDeclarationDetail extends React.Component { }, () => this.getDetailList()); } }; - return ( -
- -
- -
+ return (} iconBgcolor="#F14A2D" + buttons={buttons}> +
+
- ); + ); } } diff --git a/pc4mobx/hrmSalary/pages/declare/index.less b/pc4mobx/hrmSalary/pages/declare/index.less index 9e4ced1a..01b8fd58 100644 --- a/pc4mobx/hrmSalary/pages/declare/index.less +++ b/pc4mobx/hrmSalary/pages/declare/index.less @@ -1,11 +1,10 @@ -.generateDeclarationDetail { - .tabWrapper { - padding-left: 10px - } +.declare-detail-table-container { + height: 100%; + background: #f6f6f6; + padding: 8px 16px; - .tableWrapper { - height: calc(100vh - 48px); - overflow: auto; + .wea-new-table { + background: #FFF; } } diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js index 8cde7da5..f140ab79 100644 --- a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js +++ b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js @@ -599,6 +599,7 @@ export default class PayrollGrant extends React.Component { this.setState({ selectedKey: v }, () => { + this.pageInfo = { current: 1, pageSize: 10 }; getInfoList({ salarySendId: currentId, isGranted: v !== "0" }); })} searchsBasePlaceHolder="请输入姓名" showSearchAd={grantListShowSearchAd} buttonsAd={adBtn} @@ -652,7 +653,7 @@ export default class PayrollGrant extends React.Component { this.pageInfo = { current, pageSize }; this.handleShowSizeChange(this.pageInfo); }} - scroll={{ y: `calc(100vh - 236px)` }} + scroll={{ y: `calc(100vh - 255px)` }} /> : renderLoading() }
From 9740a9ef77a3484386771fdfdbbf50848fe5a8d3 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Fri, 3 Jan 2025 15:50:59 +0800 Subject: [PATCH 16/21] release/2.19.1.2501.01 --- pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js b/pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js index cd1b1996..3bd8af4a 100644 --- a/pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js +++ b/pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js @@ -97,7 +97,7 @@ export default class GenerateDeclarationDetail extends React.Component { buttons={buttons}>
+ scroll={{ x: 1200, y: `calc(100vh - 186px)` }}/>
); } From 13dc35f12268ffab992f4465d37b9d9077ff2dc4 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Fri, 3 Jan 2025 17:14:33 +0800 Subject: [PATCH 17/21] release/2.19.1.2501.01 --- pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js b/pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js index 3bd8af4a..91a1a88f 100644 --- a/pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js +++ b/pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js @@ -18,7 +18,7 @@ export default class GenerateDeclarationDetail extends React.Component { }; } - componentWillMount() { + componentDidMount() { this.getDetailList(); this.getDeclareInfo(); } From 21a2e21c3f88db199332967c8227bea9f1e871b8 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Mon, 6 Jan 2025 10:48:52 +0800 Subject: [PATCH 18/21] release/2.19.1.2501.01 --- pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js b/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js index cdac76ff..474eb08c 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js @@ -64,7 +64,7 @@ export default class CustomSalaryItemSlide extends React.Component { case "taxAgentIds": fields = { ...fields, options: _.map(taxAgentList, o => ({ key: o.id, showname: o.content })), - hide: String(salaryItemForm["sharedType"]) === "0" || !_.isNil(salaryItemForm["sharedType"]) + hide: String(salaryItemForm["sharedType"]) === "0" || _.isNil(salaryItemForm["sharedType"]) }; break; case "dataType": From 07ef0535c40eaf5c18683d3f4c20e58f5c88b4cd Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Tue, 7 Jan 2025 15:55:25 +0800 Subject: [PATCH 19/21] release/2.19.1.2501.01 --- pc4mobx/hrmSalary/style/index.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pc4mobx/hrmSalary/style/index.less b/pc4mobx/hrmSalary/style/index.less index 6bc0127b..c10d1873 100644 --- a/pc4mobx/hrmSalary/style/index.less +++ b/pc4mobx/hrmSalary/style/index.less @@ -39,6 +39,10 @@ .form-dialog-layout { background: #f6f6f6; + .wea-form-item-wrapper { + display: block; + } + .wea-form-item .wea-form-item-wrapper .wea-field-readonly { line-height: 28px; } From 30bbcfb7122493c67ca97303e337963a593a2626 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Tue, 7 Jan 2025 15:59:44 +0800 Subject: [PATCH 20/21] release/2.19.1.2501.01 --- pc4mobx/hrmSalary/style/index.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/style/index.less b/pc4mobx/hrmSalary/style/index.less index c10d1873..eedbf38d 100644 --- a/pc4mobx/hrmSalary/style/index.less +++ b/pc4mobx/hrmSalary/style/index.less @@ -40,7 +40,7 @@ background: #f6f6f6; .wea-form-item-wrapper { - display: block; + display: block !important; } .wea-form-item .wea-form-item-wrapper .wea-field-readonly { From 811083310b71a33f4d11c395eb6cf72b5636d100 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Tue, 14 Jan 2025 14:02:24 +0800 Subject: [PATCH 21/21] release/2.19.1.2501.01 --- pc4mobx/hrmSalary/pages/ruleConfig/conditions.js | 9 +++++++++ pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/pages/ruleConfig/conditions.js b/pc4mobx/hrmSalary/pages/ruleConfig/conditions.js index c5701013..5813e659 100644 --- a/pc4mobx/hrmSalary/pages/ruleConfig/conditions.js +++ b/pc4mobx/hrmSalary/pages/ruleConfig/conditions.js @@ -188,6 +188,15 @@ export const conditions = [ lanId: 111, labelcol: 8, viewAttr: 2 + }, + { + conditionType: "SWITCH", + domkey: ["SHOT_EMP_BTN"], + fieldcol: 10, + label: "启用组织快照", + lanId: 111, + labelcol: 8, + viewAttr: 2 } ], title: "薪资核算", diff --git a/pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js b/pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js index 573bc864..ab502d5c 100644 --- a/pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js +++ b/pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js @@ -154,6 +154,7 @@ class RuleConfig extends Component { case "APPROVAL_CAN_RE_CALC_STATUS": case "APPROVAL_CAN_EDIT_RESULT_STATUS": case "ATTENDANCE_SERIAL_COLLECTION_BTN": + case "SHOT_EMP_BTN": if (!this.handleDebounce) { this.handleDebounce = _.debounce(() => { const confTitle = { @@ -171,7 +172,8 @@ class RuleConfig extends Component { APPROVAL_CAN_MANUAL_FILE_STATUS: getLabel(111, "开启审批的核算记录允许手动归档"), APPROVAL_CAN_RE_CALC_STATUS: getLabel(111, "开启审批的核算记录允许重新核算"), APPROVAL_CAN_EDIT_RESULT_STATUS: getLabel(111, "审批流程发起后允许修改核算数据"), - ATTENDANCE_SERIAL_COLLECTION_BTN: getLabel(111, "考勤引用是否采集班次数据") + ATTENDANCE_SERIAL_COLLECTION_BTN: getLabel(111, "考勤引用是否采集班次数据"), + SHOT_EMP_BTN: getLabel(111, "启用组织快照") }; this.unifiedSettings(key, confTitle[key]); this.handleDebounce = null;