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

Merge branch 'hotfix/2.9.42310.01' into release/2.9.42310.01

This commit is contained in:
黎永顺 2023-10-11 18:23:44 +08:00
parent c8e58db7d9 d67b8bc6ab
commit 4d76443438
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pc4mobx/hrmSalary/pages/mobilePayroll/index.js
View File

@ -143,7 +143,8 @@ export default class MobilePayroll extends React.Component {
const { salaryTemplate } = mySalaryBillData;
const { feedbackUrl } = salaryTemplate;
this.getMySalaryBill(getQueryString("id"));
window.open(`${window.ecologyContentPath || ""}${feedbackUrl}`);
window.location.href=`${window.ecologyContentPath || ""}${feedbackUrl}`
// window.open(`${window.ecologyContentPath || ""}${feedbackUrl}`);
} else {
message.error(errorMsg);
}

2
pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js
View File

@ -312,7 +312,7 @@ export default class FormalFormModal extends React.Component {
// validateType: this.props.dataType || this.state.returnType,
// extendParam: JSON.stringify(this.state.extendParam),
// formula: this.state.value,
parameters: this.parameters,
parameters: _.map(this.parameters, o => ({ ...o, content: o.content || "" })),
id: this.props.formulaId
// referenceType: this.referenceType == "" ? this.props.valueType == "2" ? "formula" : this.props.valueType == "3" ? "sql" : "" : this.referenceType
};