From d9844eed9bea223e330b89d7703992a1b03a88d7 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Wed, 11 Dec 2024 15:28:14 +0800
Subject: [PATCH 1/2] release/2.18.1.2412.01

---
 .../pages/mySalaryMobile/components/payrollList/index.js        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pc4mobx/hrmSalary/pages/mySalaryMobile/components/payrollList/index.js b/pc4mobx/hrmSalary/pages/mySalaryMobile/components/payrollList/index.js
index 69bac121..78a2c045 100644
--- a/pc4mobx/hrmSalary/pages/mySalaryMobile/components/payrollList/index.js
+++ b/pc4mobx/hrmSalary/pages/mySalaryMobile/components/payrollList/index.js
@@ -28,7 +28,7 @@ class Index extends Component {
                 <span>{moment(it.sendTime).format("YYYY-MM")}</span>
               </div>
               <a
-                href={`/spa/hrmSalary/static/index.html#/main/hrmSalary/mobilepayroll?id=${it.id}&recipient=${it.employeeId}&type=phone`}
+                href={`/spa/hrmSalary/static/index.html#/main/hrmSalary/mobilepayroll?id=${it.id}&salaryCode=${it.salaryCode}&type=phone`}
                 target="_blank">
                 {`${getLabel(33564, "查看")}>`}
               </a>

From ef1c529941d23c3c9a9db99e44f7b8a6acc5a1c9 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Tue, 17 Dec 2024 16:03:52 +0800
Subject: [PATCH 2/2] release/2.18.1.2412.01

---
 pc4mobx/hrmSalary/pages/ruleConfig/conditions.js | 16 ++++++++++++++++
 pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js |  4 +++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/pc4mobx/hrmSalary/pages/ruleConfig/conditions.js b/pc4mobx/hrmSalary/pages/ruleConfig/conditions.js
index 51759130..c5701013 100644
--- a/pc4mobx/hrmSalary/pages/ruleConfig/conditions.js
+++ b/pc4mobx/hrmSalary/pages/ruleConfig/conditions.js
@@ -152,6 +152,22 @@ export const conditions = [
     lanId: 538004,
     defaultshow: true
   },
+  {
+    items: [
+      {
+        conditionType: "SWITCH",
+        domkey: ["ATTENDANCE_SERIAL_COLLECTION_BTN"],
+        fieldcol: 10,
+        label: "考勤引用是否采集班次数据",
+        lanId: 111,
+        labelcol: 8,
+        viewAttr: 2
+      }
+    ],
+    title: "数据采集",
+    lanId: 111,
+    defaultshow: true
+  },
   {
     items: [
       {
diff --git a/pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js b/pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js
index f84987cb..573bc864 100644
--- a/pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js
+++ b/pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js
@@ -153,6 +153,7 @@ class RuleConfig extends Component {
           case "APPROVAL_CAN_MANUAL_FILE_STATUS":
           case "APPROVAL_CAN_RE_CALC_STATUS":
           case "APPROVAL_CAN_EDIT_RESULT_STATUS":
+          case "ATTENDANCE_SERIAL_COLLECTION_BTN":
             if (!this.handleDebounce) {
               this.handleDebounce = _.debounce(() => {
                 const confTitle = {
@@ -169,7 +170,8 @@ class RuleConfig extends Component {
                   SALARY_APPROVAL_STATUS: getLabel(111, "是否开启薪资审批"),
                   APPROVAL_CAN_MANUAL_FILE_STATUS: getLabel(111, "开启审批的核算记录允许手动归档"),
                   APPROVAL_CAN_RE_CALC_STATUS: getLabel(111, "开启审批的核算记录允许重新核算"),
-                  APPROVAL_CAN_EDIT_RESULT_STATUS: getLabel(111, "审批流程发起后允许修改核算数据")
+                  APPROVAL_CAN_EDIT_RESULT_STATUS: getLabel(111, "审批流程发起后允许修改核算数据"),
+                  ATTENDANCE_SERIAL_COLLECTION_BTN: getLabel(111, "考勤引用是否采集班次数据")
                 };
                 this.unifiedSettings(key, confTitle[key]);
                 this.handleDebounce = null;