Merge branch 'develop-qiaozhi' into 'develop'

加前端公式

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

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

@@ -4594,6 +4594,35 @@ export default {
 			"title": "修改引用的回写金额公式,例如还款单引用借款单后需要修改借款单的剩余金额",
 			"value": "UpdateBillMoneyFunction"
 		},
+		{
+			"discard": false,
+			"path": "通用",
+			"extends": {
+				"info": {
+					"param": [
+						{
+							"isOmitable": true,
+							"dataType": 0,
+							"name": "subField",
+							"title": "子表字段"
+						},
+						{
+							"isOmitable": true,
+							"dataType": 0,
+							"name": "value",
+							"title": "子表字段值"
+						}
+					],
+					"name": "SubTableSetData",
+					"description": "子表字段赋值",
+					"title": "子表字段赋值",
+					"return": 0
+				}
+			},
+			"description": "子表字段赋值",
+			"title": "子表字段赋值",
+			"value": "SubTableSetData"
+		},
 	],
 	dropdownOptionList: [
 		{

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

+// 子表中字段赋值
+export default {
+    execute: async function () {
+        console.log("子表中字段赋值");
+        let result = ''
+        //根据SetDefaultValue和SubTableSetBaseData写的，能实现目前遇到的问题
+        if (arguments && arguments[0] && arguments[0].length > 1 && arguments[1]) {
+            let context = arguments[1]
+            let targetSubField = arguments[0][0]
+            let sourceValueField = arguments[0][1]
+            if (sourceValueField instanceof FunctionNode) {
+                let funcResult = sourceValueField.getResult()
+                if(funcResult instanceof AbstractData) {
+                    await funcResult.Value.then(res => {
+                        result = res
+                    })
+                }
+            } else if (sourceValueField instanceof BillDataNode) {
+                let tableObj = bill.getTableType(sourceValueField.FieldTableCode);
+                if (tableObj.type == "sub") {
+                } else {
+                    result = sourceValueField.dynamicNodeFactory.methodJson.GetFieldData('', sourceValueField.FieldTableCode + "." + sourceValueField.FieldCode, '')
+                }
+            } else if (sourceValueField instanceof StaticDataNode) {
+                result = sourceValueField.StaticValue
+            }
+            let subTableObject = context.getTableType(targetSubField.FieldTableCode)
+            let oldIndex = context.getSubFocus()
+            let focusData = context.getAllSubData()[subTableObject.title][oldIndex].getData()
+            focusData[targetSubField.FieldCode]._field_old_value_ = focusData[targetSubField.FieldCode].value = result
+            context.refreshSubDataRow(subTableObject.title);
+        }
+        return result
+    },
+    getResultType: function () {
+        return FMR.ConstDataTypes.General;
+    }
+}
\ No newline at end of file

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

@@ -158,6 +158,7 @@ import ApplyTemplateString from "@/formula/ApplyTemplateString"
 import AmountComp from "./formula/AmountComp";
 import SubTableHasContainField from "./formula/SubTableHasContainField";
 import SetSubFieldsByBaseData from "./formula/SetSubFieldsByBaseData";
+import SubTableSetData from "./formula/SubTableSetData";
 export default {
     actions: {
         updateFieldAction,
@@ -317,6 +318,7 @@ export default {
         AmountComp,
         SubTableHasContainField,
         ApplyTemplateString,
+        SubTableSetData,
         ...GeneralImportFile
     },
     routes : {