Merge branch 'develop' of ssh://nvwa.jiuqi.com.cn:2222/GFP/RBC/rbc-frontend into develop-yuancheng

develop/@gms/gms-plugin-billexpand/src/actions/util/errorMessageUtil.js

@@ -12,7 +12,11 @@ export default {
         customMessageList: [
             {
                 preMessage: "More than one row with the given identifier was found",
-                convertMessage: "保存失败，基础数据存在多条相同记录，基础数据标识："
+                convertMessage: "multiBaseDataError"
+            },
+            {
+                preMessage: "formulaError:",
+                convertMessage: "backFormulaError",
             }
         ],
         getErrorBaseDataName(a) {
@@ -34,10 +38,24 @@ export default {
                     break;
                 }
             }
-            return errorPreMessage === "" ? this.commonMessage : errorPreMessage + this.getErrorBaseDataName(a);
+            return this.doDealWithErrorMessage(errorPreMessage, a);
         },
         getCommonMessage(){
             return this.commonMessage;
+        },
+        doDealWithErrorMessage(type,sourceMessage){
+            if (!type || !_.isString(type)) {
+                return this.commonMessage;
+            }
+            if (type === ""){
+                return this.commonMessage;
+            }
+            if (type === "backFormulaError") {
+                return sourceMessage.substring("formulaError:".length)
+            }
+            if (type === "multiBaseDataError") {
+                return "保存失败，基础数据存在多条相同记录，基础数据标识：" + this.getErrorBaseDataName(sourceMessage);
+            }
         }
     },
     tempSaveAction: {

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

@@ -10,39 +10,6 @@ import util from './FormulaConstants'
 export default {
     formulaName: "EqualsMasterAndSubField",
     execute: function () {
-        if (arguments && arguments[0] && arguments[0].length === 3) {
-            let context = arguments[1]
-            let compType = util.getFormulaParamValue(arguments[0][0])
-            let masterField = arguments[0][1]
-            if (compType !== 1) {
-                return true
-            }
-            masterField = util.getFormulaParamValue(masterField).id
-            let tempSubTableObject = context.getTableType(arguments[0][2].FieldTableCode);
-            if (!_.isEqual(tempSubTableObject.type, "sub")) {
-                return false
-            }
-            let allSubData = context.getAllSubData();
-            if (!allSubData || _.isEmpty(allSubData)) {
-                return true
-            }
-            let tempAllSubData = context.getAllSubData()[tempSubTableObject.title];
-            if (!tempAllSubData || _.isEmpty(tempAllSubData)) {
-                return true
-            }
-            if (tempAllSubData instanceof Array) {
-                for (const tempSubData of tempAllSubData) {
-                    let tempData = tempSubData.getValue(arguments[0][2].FieldCode).id
-                    if (masterField !== tempData) {
-                        return false
-                    }
-                }
-            }
-            return true
-        } else {
-            console.error(this.formulaName + _.ERROR_MSG.PARAM_NUM)
-            return false
-        }
     },
     getResultType: function () {
         return util.resultType.boolean