@bchr/bchr-front-lib 0.3.134 → 0.3.137

package/lib/base/AppFormulaFunctions.js

@@ -61,6 +61,46 @@ window.AppFormulaFunctions = {
 
     return null;
   },
+  getDateValueByDate: function getDateValueByDate(dateStr) {
+    if (dateStr) {
+      return dateStr;
+    }
+
+    return null;
+  },
+
+  /**
+   * 根据基本工资计算其他工资项
+   * @param baseWa     级别薪资
+   * @param percent    百分比
+   * @param digitsNum  保留小数点后几位 (默认0)
+   * @param calcType   计算方式（默认向上取整）
+   * @returns {null|number}
+   */
+  calcOtherWaByBaseWa: function calcOtherWaByBaseWa(baseWa, percent, digitsNum, calcType) {
+    if (!baseWa || !percent) {
+      console.log("calcOtherWaByBaseWa param baseWa: " + baseWa + ",percent" + percent);
+      return null;
+    }
+
+    if (!digitsNum) {
+      digitsNum = 0;
+    }
+
+    var wa = Math.floor(parseFloat(baseWa * Math.pow(10, digitsNum) * percent));
+
+    if (!calcType) {
+      calcType = 3;
+    }
+
+    if (calcType == 1) {
+      return Math.round(wa) / Math.pow(10, digitsNum); //四舍五入
+    } else if (calcType == 2) {
+      return Math.floor(wa) / Math.pow(10, digitsNum); //向下取整
+    } else {
+      return Math.ceil(wa) / Math.pow(10, digitsNum); //向上取整
+    }
+  },
   //生活补贴标准级别
   lifeBTLevel: function lifeBTLevel(execute_wa_grade_pk, work_place_pk) {
     if (!execute_wa_grade_pk || !work_place_pk) {

package/lib/base/layout/ui_tpl/form/FormForModify.js

@@ -1149,13 +1149,13 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
         this.props.data[display_code] = display_value;
       }
 
-      if (value) {
-        this.formItemOnChangeForFormula(config, value);
-      }
-
       if (callback && typeof callback === "function") {
         callback(value, option);
       }
+
+      if (value) {
+        this.formItemOnChangeForFormula(config, value);
+      }
     }
   }, {
     key: "buildTreeData",
@@ -1238,6 +1238,10 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
       if (callback && typeof callback === "function") {
         callback(value, label, extra, ref);
       }
+
+      if (value) {
+        this.formItemOnChangeForFormula(config, value);
+      }
     }
   }, {
     key: "showModal",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bchr/bchr-front-lib",
-  "version": "0.3.134",
+  "version": "0.3.137",
   "description": "bchr front lib",
   "main": "lib/index.js",
   "scripts": {

package/src/base/AppFormulaFunctions.js

@@ -65,6 +65,47 @@ window.AppFormulaFunctions = {
         return null;
     },
 
+    getDateValueByDate(dateStr) {
+        if (dateStr) {
+            return dateStr;
+        }
+
+        return null;
+    },
+
+    /**
+     * 根据基本工资计算其他工资项
+     * @param baseWa     级别薪资
+     * @param percent    百分比
+     * @param digitsNum  保留小数点后几位 (默认0)
+     * @param calcType   计算方式（默认向上取整）
+     * @returns {null|number}
+     */
+    calcOtherWaByBaseWa(baseWa, percent, digitsNum, calcType) {
+        if (!baseWa || !percent) {
+            console.log("calcOtherWaByBaseWa param baseWa: " + baseWa + ",percent" + percent);
+            return null;
+        }
+
+        if (!digitsNum) {
+            digitsNum = 0;
+        }
+
+        let wa = Math.floor(parseFloat(baseWa * Math.pow(10, digitsNum) * percent));
+
+        if (!calcType) {
+            calcType = 3;
+        }
+
+        if (calcType == 1) {
+            return  Math.round(wa)/Math.pow(10, digitsNum);    //四舍五入
+        } else if (calcType == 2) {
+            return Math.floor(wa)/Math.pow(10, digitsNum);     //向下取整
+        } else {
+            return Math.ceil(wa)/Math.pow(10, digitsNum);      //向上取整
+        }
+    },
+
     //生活补贴标准级别
     lifeBTLevel : function (execute_wa_grade_pk, work_place_pk) {
         if (!execute_wa_grade_pk || !work_place_pk) {

package/src/base/layout/ui_tpl/form/FormForModify.js

@@ -976,13 +976,13 @@ class FormForModify extends React.Component{
             this.props.data[display_code] = display_value;
         }
 
-        if (value) {
-            this.formItemOnChangeForFormula(config, value)
-        }
-
         if (callback && typeof callback === "function") {
             callback(value, option);
         }
+
+        if (value) {
+            this.formItemOnChangeForFormula(config, value)
+        }
     }
 
     buildTreeData(selectedNodes) {
@@ -1058,6 +1058,10 @@ class FormForModify extends React.Component{
         if (callback && typeof callback === "function") {
             callback(value, label, extra, ref);
         }
+
+        if (value) {
+            this.formItemOnChangeForFormula(config, value)
+        }
     }
 
     showModal(config) {