hotfix/2.14.2.2406.02

pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js

@@ -37,7 +37,7 @@ class SalaryDetails extends Component {
 
   componentWillReceiveProps(nextProps, nextContext) {
     if (nextProps.isQuery !== this.props.isQuery) this.setState({
-      pageInfo: { ...this.state.pageInfo, current: 1 }
+      pageInfo: { ...this.state.pageInfo, current: 1 }, updateSum: true
     }, () => this.getSalaryList(nextProps));
   }
 
@@ -56,7 +56,7 @@ class SalaryDetails extends Component {
         const { pageNum: current, size: pageSize } = params;
         this.setState({
           pageInfo: { ...pageInfo, current, pageSize },
-          updateSum: true
+          updateSum: false
         }, () => this.getSalaryList(this.props));
       } else if (id === "CHECKBOX") {
         const { selectedRowKeys: checkBox } = params;

pc4mobx/hrmSalary/pages/salaryItem/options.js

@@ -71,6 +71,16 @@ export const patternOptions = [
     key: "8",
     showname: "8",
     selected: false
+  },
+  {
+    key: "9",
+    showname: "9",
+    selected: false
+  },
+  {
+    key: "10",
+    showname: "10",
+    selected: false
   }
 ];
 

pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/planSetTable.js

@@ -246,7 +246,9 @@ class PlanSetTable extends Component {
               { key: "5", showname: "5" },
               { key: "6", showname: "6" },
               { key: "7", showname: "7" },
-              { key: "8", showname: "8" }
+              { key: "8", showname: "8" },
+              { key: "9", showname: "9" },
+              { key: "10", showname: "10" }
             ]} viewAttr={showOperateBtn ? 2 : 1}
                        onChange={validNum => onEdit({
                          record: { ...record, validNum },