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 =
{getLabel(500143, "插入变量")}:
insertVar("theme", "${companyName}")}>{getLabel(1976, "公司名称")}
+ insertVar("theme", "${salaryYear}")}>{getLabel(111, "薪资所属年")}
insertVar("theme", "${salaryMonth}")}>{getLabel(542604, "薪资所属月")}
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 {