qt
/
salary-management-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release/2.16.1.2410.01' into feature/2.15.2.2409.01合并业务线测试

This commit is contained in:
lys 2024-10-30 10:27:18 +08:00
parent 000f36ec0e 8488f54aac
commit 09ea3da3e3
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
View File

@ -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 : ""
}
});
};

3
pc4mobx/hrmSalary/pages/payroll/templatePreview/tmpPreview.js
View File

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

2
pc4mobx/hrmSalary/pages/payrollRelease/components/conditions.js
View File

@ -253,7 +253,7 @@ export const tempNormalSetConditions = [
colSpan: 1,
conditionType: "INPUT",
domkey: ["theme"],
fieldcol: 10,
fieldcol: 8,
label: "工资单标题",
lanId: 543588,
labelcol: 6,

2
pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempNormalSet/formRender.js
View File

@ -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>

2
pc4mobx/hrmSalary/pages/payrollRelease/index.less
View File

@ -158,7 +158,7 @@
margin-left: 10px;
position: absolute;
top: 25%;
right: -208px;
right: -262px;
margin-top: -2px;
.sftv-item {