From 002cb5522b0382a06bd71dd42752e4b5b1c42ead Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Thu, 13 Feb 2025 13:28:28 +0800 Subject: [PATCH 1/4] release/2.19.1.2501.01 --- .../pages/dataAcquisition/components/tableRecord.js | 8 +++++--- .../hrmSalary/pages/dataAcquisition/cumDeduct/index.js | 6 ++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/components/tableRecord.js b/pc4mobx/hrmSalary/pages/dataAcquisition/components/tableRecord.js index 4bba03cd..9c36b02a 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/components/tableRecord.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/components/tableRecord.js @@ -5,11 +5,13 @@ * Date: 2023/2/20 */ import React, { Component } from "react"; -import { WeaSearchGroup, WeaTable } from "ecCom"; +import { WeaLocaleProvider, WeaSearchGroup, WeaTable } from "ecCom"; import { getTableRecordDate } from "../../../apis/cumDeduct"; import { DataCollectionDateRangePick, DataCollectionSelect, Input } from "../cumDeduct"; import "./index.less"; +const getLabel = WeaLocaleProvider.getLabel; + class TableRecord extends Component { constructor(props) { super(props); @@ -167,11 +169,11 @@ class TableRecord extends Component { }; const items = screenParams.length === 1 ? [ { - com: Input({ value: record.username }) + com: Input({ label: getLabel(111, "姓名"), value: record.username }) } ] : [ { - com: Input({ value: record.username }) + com: Input({ label: getLabel(111, "姓名"), value: record.username }) }, { com: DataCollectionSelect({ diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js index 867c8423..d7d92744 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js @@ -557,8 +557,10 @@ export const DataCollectionSelect = (props) => { }; export const Input = (props) => { - const { value } = props; - return (); + const { value, label } = props; + return ( + + ); }; export const DataCollectionDateRangePick = (props) => { const { range, label, onChange, format = "YYYY-MM", key } = props; From 46f7b0836054c2538ba6be7fd0e1d5415d319c0a Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Fri, 14 Feb 2025 10:43:36 +0800 Subject: [PATCH 2/4] release/2.19.1.2501.01 --- pc4mobx/hrmSalary/pages/ruleConfig/conditions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/pages/ruleConfig/conditions.js b/pc4mobx/hrmSalary/pages/ruleConfig/conditions.js index e13f2d02..a141d796 100644 --- a/pc4mobx/hrmSalary/pages/ruleConfig/conditions.js +++ b/pc4mobx/hrmSalary/pages/ruleConfig/conditions.js @@ -193,7 +193,7 @@ export const conditions = [ conditionType: "SWITCH", domkey: ["SHOT_EMP_BTN"], fieldcol: 10, - label: "启用组织快照", + label: "启用人事信息快照", lanId: 111, labelcol: 8, viewAttr: 2 From e344eed2d0216fd2ecb5535f8c0a8b89c036742e Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Mon, 17 Feb 2025 18:40:39 +0800 Subject: [PATCH 3/4] release/2.19.1.2501.01 --- pc4mobx/hrmSalary/pages/payrollRelease/index.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/index.less b/pc4mobx/hrmSalary/pages/payrollRelease/index.less index 634a44e4..b9966438 100644 --- a/pc4mobx/hrmSalary/pages/payrollRelease/index.less +++ b/pc4mobx/hrmSalary/pages/payrollRelease/index.less @@ -20,6 +20,10 @@ } } + .wea-new-top-req { + z-index: 0 !important; + } + .wea-new-top-req-wapper .wea-new-top-req-title > div:last-child { right: 16px; } From ea084c93a2fe01ae462306c6aed37124dc2a83c8 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Tue, 18 Feb 2025 09:08:07 +0800 Subject: [PATCH 4/4] =?UTF-8?q?release/2.19.1.2501.01=20=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E9=A1=B5=E9=9D=A2=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/layout.js | 2 ++ pc4mobx/hrmSalary/stores/baseForm.js | 9 +++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pc4mobx/hrmSalary/layout.js b/pc4mobx/hrmSalary/layout.js index 39c9d174..a4919d5d 100644 --- a/pc4mobx/hrmSalary/layout.js +++ b/pc4mobx/hrmSalary/layout.js @@ -22,6 +22,8 @@ class Layout extends Component { componentWillReceiveProps(nextProps, nextContext) { if (window.e9LibsConfigCustomF && _.some(window.e9LibsConfigCustomF, o => (_.some(o, k => k === "h_hrmSalary")))) { + stores.baseFormStore.initForm(); + stores.baseFormStore.initFormExtra(); if (window.location.hash.indexOf("payroll") !== -1) { window.localStorage.removeItem("template-basedata"); window.localStorage.removeItem("salary-showset"); diff --git a/pc4mobx/hrmSalary/stores/baseForm.js b/pc4mobx/hrmSalary/stores/baseForm.js index 3eb3a57e..29cdc064 100644 --- a/pc4mobx/hrmSalary/stores/baseForm.js +++ b/pc4mobx/hrmSalary/stores/baseForm.js @@ -10,12 +10,9 @@ const getLabel = WeaLocaleProvider.getLabel; export class BaseFormStore { @observable form = new WeaForm(); // 规则渲染form - - @observable logStore = new LogStore(); - @observable condition = []; // 存储后台得到的form数据 - @observable saveLoading = false; // 保存状态处理：保证保存的时候接口只走一次 - @observable loading = true; // 页面初始化的loading状态：数据加载成功前后前使用 - @observable hasRight = true; // 判断用户是有权限查看当前页面： 没有权限渲染无权限页面，有权限渲染数据 + @action("初始化form表单") initForm = () => this.form = new WeaForm(); + @observable formExtra = new WeaForm(); // 规则渲染form + @action("初始化form表单") initFormExtra = () => this.formExtra = new WeaForm(); @observable logVisible = false; // 控制日志弹框的显影 @action // 初始化操作： 一般用来初始化获取后台数据