From 444c9b19abefa048470bd922c6ef96238f3385a0 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Fri, 25 Oct 2024 17:04:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?release/2.16.1.2410.01=20=E5=B7=A5=E8=B5=84?=
 =?UTF-8?q?=E5=8D=95=E6=A8=A1=E6=9D=BF=E8=AE=BE=E7=BD=AE=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=89=80=E5=B1=9E=E5=B9=B4=E7=9A=84=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/pages/payroll/templatePreview/tmpPreview.js  | 3 ++-
 .../hrmSalary/pages/payrollRelease/components/conditions.js    | 2 +-
 .../components/payrollTempNormalSet/formRender.js              | 2 ++
 pc4mobx/hrmSalary/pages/payrollRelease/index.less              | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/payroll/templatePreview/tmpPreview.js b/pc4mobx/hrmSalary/pages/payroll/templatePreview/tmpPreview.js
index d6d410d1..90db1ebb 100644
--- a/pc4mobx/hrmSalary/pages/payroll/templatePreview/tmpPreview.js
+++ b/pc4mobx/hrmSalary/pages/payroll/templatePreview/tmpPreview.js
@@ -37,7 +37,8 @@ class TmpPreview extends Component {
     }
     const data = JSON.parse(dataStr);
     let theme = data.theme || "";
-    theme = theme.replaceAll("${salaryMonth}", moment().format("YYYY-MM"));
+    theme = theme.replaceAll("${salaryMonth}", moment().format("YYYY年MM月"));
+    theme = theme.replaceAll("${salaryYear}", moment().format("YYYY年"));
     this.setState({
       theme, tip: data.textContent || "",
       background: data.background || "",
diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/components/conditions.js b/pc4mobx/hrmSalary/pages/payrollRelease/components/conditions.js
index 1bbae152..30c63a43 100644
--- a/pc4mobx/hrmSalary/pages/payrollRelease/components/conditions.js
+++ b/pc4mobx/hrmSalary/pages/payrollRelease/components/conditions.js
@@ -253,7 +253,7 @@ export const tempNormalSetConditions = [
         colSpan: 1,
         conditionType: "INPUT",
         domkey: ["theme"],
-        fieldcol: 10,
+        fieldcol: 8,
         label: "工资单标题",
         lanId: 543588,
         labelcol: 6,
diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempNormalSet/formRender.js b/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempNormalSet/formRender.js
index 50df1c24..2556e25a 100644
--- a/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempNormalSet/formRender.js
+++ b/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempNormalSet/formRender.js
@@ -46,6 +46,8 @@ export const payrollTempNormalSetForm = (form, condition, background, onChange =
                 <span className="sftv-tip">{getLabel(500143, "插入变量")}：</span>
                 <a className="sftv-item"
                    onClick={() => insertVar("theme", "${companyName}")}>{getLabel(1976, "公司名称")}</a>
+                <a className="sftv-item"
+                   onClick={() => insertVar("theme", "${salaryYear}")}>{getLabel(111, "薪资所属年")}</a>
                 <a className="sftv-item"
                    onClick={() => insertVar("theme", "${salaryMonth}")}>{getLabel(542604, "薪资所属月")}</a>
               </div>
diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/index.less b/pc4mobx/hrmSalary/pages/payrollRelease/index.less
index 0caebb48..634a44e4 100644
--- a/pc4mobx/hrmSalary/pages/payrollRelease/index.less
+++ b/pc4mobx/hrmSalary/pages/payrollRelease/index.less
@@ -158,7 +158,7 @@
         margin-left: 10px;
         position: absolute;
         top: 25%;
-        right: -208px;
+        right: -262px;
         margin-top: -2px;
 
         .sftv-item {

From 8488f54aac84b820f1fad6451f3c05be856b0fa9 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Tue, 29 Oct 2024 09:21:38 +0800
Subject: [PATCH 2/2] release/2.16.1.2410.01

---
 .../pages/ledgerPage/components/ledgerSalaryItemTable.js        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
index 838f44a0..7c160168 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
@@ -173,7 +173,7 @@ class LedgerSalaryItemTable extends Component {
     this.setState({
       editFormulModal: {
         ...editFormulModal, visible: true, valueType, dataType, name: salaryItemName,
-        formulaId: ((valueType.toString() === "2" && (originFormulaContent || originFormulaContent !== " ")) || valueType.toString() === "3" && (originSqlContent || originSqlContent === " ")) ? formulaId : ""
+        formulaId: ((valueType.toString() === "2" && (originFormulaContent || originFormulaContent !== " ")) || valueType.toString() === "3" && (originSqlContent || originSqlContent !== " ")) ? formulaId : ""
       }
     });
   };