Merge branch 'develop-fengjiansheng' into 'develop'

feat(@gms/gms-plugin-billexpand): 扣减预算服务校验公式

See merge request GFP/RBC/rbc-frontend!124

develop/@gms/gms-plugin-billexpand/src/emcon.js

@@ -3830,6 +3830,22 @@ export default {
 			"extends": {
 				"info": {
 					"param": [],
+					"name": "CheckReduceBudgetAmount",
+					"description": "校验公式:扣减预算服务校验公式",
+					"title": "校验公式:扣减预算服务校验公式",
+					"return": 0
+				}
+			},
+			"description": "校验公式:扣减预算服务校验公式",
+			"title": "校验公式:扣减预算服务校验公式",
+			"value": "CheckReduceBudgetAmount"
+		},
+		{
+			"discard": false,
+			"path": "通用",
+			"extends": {
+				"info": {
+					"param": [],
 					"name": "HasContainExpandFields",
 					"description": "前端公式:判断基础数据中是否加载拓展字段，以支撑校验公式正确应对多种情况下的校验",
 					"title": "前端公式:判断基础数据中是否加载拓展字段",

develop/@gms/gms-plugin-billexpand/src/formula/CheckReduceBudgetAmount.js

+/**
+ * 扣减预算服务校验公式
+ * @author fengjiansheng
+ * @date 2022-03-24
+ */
+export default {
+    formulaName: "CheckReduceBudgetAmount",
+    execute: function () {
+    },
+    getResultType: function () {
+        return FMR.ConstDataTypes.General;
+    }
+}

develop/@gms/gms-plugin-billexpand/src/mcon.js

@@ -185,6 +185,7 @@ import GetUserStaffInfo from "./formula/GetUserStaffInfo";
 import MdFilterInfiniteValue from "./formula/MdFilterInfiniteValue";
 import SetSubFieldsByBaseData from "./formula/SetSubFieldsByBaseData";
 import UpdateBillMoneyFunction from "./formula/UpdateBillMoneyFunction";
+import CheckReduceBudgetAmount from "./formula/CheckReduceBudgetAmount";
 export default {
     actions: {
         updateFieldAction,
@@ -352,6 +353,7 @@ export default {
         HasContainExpandFields,
         SetMasterJdhdAmount,
         CheckJdhdAmount,
+        CheckReduceBudgetAmount,
         SetSubFieldValue,
         CheckRoleAuthentication,
         HasContainSubString,