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

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: "薪资核算",

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;

pc4mobx/hrmSalary/style/index.less

@@ -39,6 +39,10 @@
 .form-dialog-layout {
   background: #f6f6f6;
 
+  .wea-form-item-wrapper {
+    display: block !important;
+  }
+
   .wea-form-item .wea-form-item-wrapper .wea-field-readonly {
     line-height: 28px;
   }