diff --git a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js index c510a622..47d48a73 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js @@ -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, diff --git a/pc4mobx/hrmSalary/stores/salaryItem.js b/pc4mobx/hrmSalary/stores/salaryItem.js index 54a84562..cc3a0214 100644 --- a/pc4mobx/hrmSalary/stores/salaryItem.js +++ b/pc4mobx/hrmSalary/stores/salaryItem.js @@ -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