release/2.16.1.2410.01

工资单模板设置添加薪资所属年的设置

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 || "",

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,

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>

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 {