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 01/11] 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 02/11] 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 03/11] 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 04/11] 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 05/11] 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 06/11] 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 07/11] 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 08/11] 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 09/11] 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 10/11] 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 11/11] 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;