diff --git a/pc4mobx/hrmSalary/pages/calculate/calculate.js b/pc4mobx/hrmSalary/pages/calculate/calculate.js index 72f348fe..7f9f791d 100644 --- a/pc4mobx/hrmSalary/pages/calculate/calculate.js +++ b/pc4mobx/hrmSalary/pages/calculate/calculate.js @@ -28,7 +28,7 @@ class Calculate extends Component { name: "", dateRange: [ moment(new Date()).startOf("year").format("YYYY-MM"), - moment(new Date()).startOf("month").format("YYYY-MM") + moment(new Date()).endOf("year").format("YYYY-MM") ] }, isRefresh: false, progressModule: { visible: false, progress: 0, title: getLabel(111, "正在归档中请稍后") }, diff --git a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js index ab02fe74..8a6533ee 100644 --- a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js +++ b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js @@ -43,6 +43,7 @@ class FieldSlide extends Component { roundingMode: "1", pattern: "2", sortedIndex: "", + width: "", description: "" }; } @@ -72,6 +73,7 @@ class FieldSlide extends Component { dataType, description, sortedIndex, + width, sharedType, roundingMode, taxAgentIds, @@ -86,6 +88,7 @@ class FieldSlide extends Component { dataType, description, sortedIndex, + width, sharedType: sharedType ? sharedType.toString() : "0", roundingMode: roundingMode ? roundingMode.toString() : "0", taxAgentIds, @@ -140,6 +143,7 @@ class FieldSlide extends Component { dataType, description, sortedIndex, + width, sharedType, roundingMode, taxAgentIds, @@ -153,6 +157,7 @@ class FieldSlide extends Component { dataType, description, sortedIndex, + width, sharedType, roundingMode: Number(roundingMode), taxAgentIds, @@ -192,6 +197,7 @@ class FieldSlide extends Component { roundingMode: "1", pattern: "2", sortedIndex: "", + width: "", description: "" }); }; @@ -217,6 +223,7 @@ class FieldSlide extends Component { roundingMode, pattern, sortedIndex, + width, description } = this.state; return ( @@ -329,6 +336,11 @@ class FieldSlide extends Component { this.handleChangeFields("sortedIndex", value)}/> + + this.handleChangeFields("width", value)}/> + px + : (type === "INPUTNUMBER" && display) ? - this.handleChangeSalaryFiledItems(key, v)}/> + + this.handleChangeSalaryFiledItems(key, v)}/> + {key === "width" && + px} + : null } ;