Merge remote-tracking branch 'origin/develop' into develop-fengjiansheng

# Conflicts:
#	develop/@gms/gms-plugin-billexpand/src/mcon.js

develop/@gms/gms-plugin-billexpand/src/control/baseDataSelect/index.vue

@@ -180,22 +180,22 @@ export default {
       this.getBaseDataList()
     },
     handleBlur() {
-      if (!this.onResultList) {
-        this.hasFocus = false
-        this.dataListShow = false
-      }
+      // if (!this.onResultList) {
+      //   this.hasFocus = false
+      //   this.dataListShow = false
+      // }
 
-      this.selectValue = String(this.selectValue)
-      if (this.value === null) {
-        this.selectValue = ''
-        this.selectIndex = -1
-        this.selectedItem = {}
-      } else {
-        this.selectValue = this.value.name
-        this.selectedItem = this.value
-        this.findIndex()
-      }
-      this.$emit('data-change', this.value)
+      // this.selectValue = String(this.selectValue)
+      // if (this.value === null) {
+      //   this.selectValue = ''
+      //   this.selectIndex = -1
+      //   this.selectedItem = {}
+      // } else {
+      //   this.selectValue = this.value.name
+      //   this.selectedItem = this.value
+      //   this.findIndex()
+      // }
+      // this.$emit('data-change', this.value)
     },
     // 输入查询时
     handleChange() {

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

@@ -4355,11 +4355,66 @@ export default {
 			"discard": false,
 			"path": "通用",
 			"extends": {
+				"info": {
+					"param": [],
+					"name": "SubTableSetBaseData",
+					"description": "例如MdFilterInfiniteValue(1.在该基础数据中他的扩展字段名:bm,2.上一个参数取到字段名后具体的值是多少如果你要从单据上取那就是xxx.code等等,以此类推两个参数为一组无限制的or方式过滤)",
+					"title": "根据多个条件去过滤基础数据",
+					"return": 0
+				}
 			},
 			"description": "例如MdFilterInfiniteValue(1.在该基础数据中他的扩展字段名:bm,2.上一个参数取到字段名后具体的值是多少如果你要从单据上取那就是xxx.code等等,以此类推两个参数为一组无限制的or方式过滤)",
 			"title": "根据多个条件去过滤基础数据",
 			"value": "MdFilterInfiniteValue"
 		},
+		{
+			"discard": false,
+			"path": "通用",
+			"extends": {
+				"info": {
+					"param": [
+						{
+							"isOmitable": true,
+							"dataType": 0,
+							"name": "_value",
+							"title": "目标值"
+						},
+						{
+							"isOmitable": true,
+							"dataType": 6,
+							"name": "_relationBillIdField",
+							"title": "关联单据唯一标识"
+						},
+						{
+							"isOmitable": true,
+							"dataType": 6,
+							"name": "_relationBillDefine",
+							"title": "关联单据定义"
+						},
+						{
+							"isOmitable": true,
+							"dataType": 6,
+							"name": "_relationBillField",
+							"title": "赋值字段"
+						},
+						{
+							"isOmitable": true,
+							"dataType": 6,
+							"name": "operator",
+							"title": "运算符号"
+						}
+
+					],
+					"name": "UpdateBillMoneyFunction",
+					"description": "修改引用的回写金额公式,例如还款单引用借款单后需要修改借款单的剩余金额",
+					"title": "修改引用的回写金额公式,例如还款单引用借款单后需要修改借款单的剩余金额",
+					"return": 0
+				}
+			},
+			"description": "修改引用的回写金额公式,例如还款单引用借款单后需要修改借款单的剩余金额",
+			"title": "修改引用的回写金额公式,例如还款单引用借款单后需要修改借款单的剩余金额",
+			"value": "UpdateBillMoneyFunction"
+		},
 	],
 	dropdownOptionList: [
 		{

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

@@ -57,6 +57,7 @@ export default {
           for (let i = 1; i < value.length; ++i) {
             ans = ans[value[i]]
           }
+          if (!ans) ans = ''
           templateString = templateString.replace(str, ans)
         })
         return templateString

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

+/**
+ * 修改引用的回写金额公式,例如还款单引用借款单后需要修改借款单的剩余金额
+ */
+export default {
+    execute: function () {
+    },
+    getResultType:function(){
+        return FMR.ConstDataTypes.General;
+    }
+}

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

@@ -184,6 +184,7 @@ import SubTableHasContainField from "./formula/SubTableHasContainField";
 import GetUserStaffInfo from "./formula/GetUserStaffInfo";
 import MdFilterInfiniteValue from "./formula/MdFilterInfiniteValue";
 import SetSubFieldsByBaseData from "./formula/SetSubFieldsByBaseData";
+import UpdateBillMoneyFunction from "./formula/UpdateBillMoneyFunction";
 export default {
     actions: {
         updateFieldAction,
@@ -372,6 +373,7 @@ export default {
         SubTableHasContainField,
         GetUserStaffInfo,
         ApplyTemplateString,
+        UpdateBillMoneyFunction
     },
     routes : {
         showPrint: {

solution.json

@@ -65,14 +65,9 @@
 			{
 				"name":  "system-options-app",
 				"version": "1.2.10"
-			},
-			{
+			},{
 				"name":  "oss-system-option",
 				"version": "1.0.9"
-			},
-			{
-				"name":"nvwa-job-manager-app",
-				"version": "dev-1.3.0"
 			}
 		],
 		"@gms":[