Merge branch 'release/2.19.1.2501.01' into release/2.19.1.2501.01-个税

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");

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({

pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js

@@ -609,8 +609,10 @@ export const DataCollectionSelect = (props) => {
 };
 
 export const Input = (props) => {
-  const { value } = props;
+  const { value, label } = props;
-  return (<WeaInput value={value} viewAttr={1}/>);
+  return (<WeaFormItem label={label} labelCol={{ span: 8 }} wrapperCol={{ span: 16 }}>
+    <WeaInput value={value} viewAttr={1}/>
+  </WeaFormItem>);
 };
 export const DataCollectionDateRangePick = (props) => {
   const { range, label, onChange, format = "YYYY-MM", key } = props;

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;
   }

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

pc4mobx/hrmSalary/stores/baseForm.js

@@ -10,12 +10,9 @@ const getLabel = WeaLocaleProvider.getLabel;
 
 export class BaseFormStore {
   @observable form = new WeaForm(); // 规则渲染form
-
+  @action("初始化form表单") initForm = () => this.form = new WeaForm();
-  @observable logStore = new LogStore();
+  @observable formExtra = new WeaForm(); // 规则渲染form
-  @observable condition = []; // 存储后台得到的form数据
+  @action("初始化form表单") initFormExtra = () => this.formExtra = new WeaForm();
-  @observable saveLoading = false; // 保存状态处理：保证保存的时候接口只走一次
-  @observable loading = true; // 页面初始化的loading状态：数据加载成功前后前使用
-  @observable hasRight = true; // 判断用户是有权限查看当前页面： 没有权限渲染无权限页面，有权限渲染数据
   @observable logVisible = false; // 控制日志弹框的显影
 
   @action // 初始化操作： 一般用来初始化获取后台数据