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

hotfix/2.14.2.2405.02

This commit is contained in:
黎永顺 2024-05-21 17:33:47 +08:00
parent 4eabe19035
commit fb64d5e344
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
View File

@ -87,6 +87,7 @@ class SalaryItemForm extends Component {
case "defaultValue":
return {
...item,
type: dataType === "number" ? "INPUTNUMBER" : "INPUT",
display: valueType && valueType.toString() === "1",
viewAttr: (isLedger && record.canEdit) || (editable && record.canEdit) || isAdd ? 2 : 1
};
@ -117,6 +118,10 @@ class SalaryItemForm extends Component {
return { ...item, display: v === "1", viewAttr: 3 };
} else if (key === "dataType" && (item.key === "roundingMode" || item.key === "pattern")) {
return { ...item, display: v === "number" };
} else if (key === "dataType" && (item.key === "defaultValue")) {
return { ...item, type: v === "number" ? "INPUTNUMBER" : "INPUT" };
} else if (key === "valueType" && item.key === "defaultValue") {
return { ...item, display: v === "1" };
} else if (key === "valueType" && (item.key === "originSqlContent" || item.key === "originFormulaContent")) {
return {
...item,

6
pc4mobx/hrmSalary/stores/salaryItem.js
View File

@ -34,7 +34,8 @@ export class SalaryItemStore {
dataType: "number",
description: "",
sharedType: "0",
taxAgentIds: ""
taxAgentIds: "",
defaultValue: ""
};
@observable tableDataSource = []; // 主列表
@ -75,7 +76,8 @@ export class SalaryItemStore {
dataType: "number",
description: "",
sharedType: "0",
taxAgentIds: ""
taxAgentIds: "",
defaultValue: ""
};
@action