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

develop/@gms/gms-plugin-billexpand/package.json

 {
   "name": "@gms/gms-plugin-billexpand",
-  "version": "0.0.5-SNAPSHOT",
+  "version": "0.0.6",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",

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

 
 .rbc-basedata-popover {
-  padding: 0px;
+  padding: 0px !important;
 }
\ No newline at end of file

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

@@ -731,7 +731,13 @@ export default {
 						"type": "field",
 						"title": "单据id",
 						"key": "billId"
-					}
+					},
+					{
+						"isRequired": true,
+						"type": "string",
+						"title": "页签名称",
+						"key": "displayName"
+					},
 				]
 			},
 			"description": "指定跳转页面，配置单据id，通过在当前页签打开形式进行跳转",
@@ -764,6 +770,12 @@ export default {
 						"title": "隐藏工具栏",
 						"key": "hideButton"
 					},
+					{
+						"isRequired": true,
+						"type": "string",
+						"title": "页签名称",
+						"key": "displayName"
+					},
 				]
 			},
 			"description": "指定跳转页面，配置单据id和单据类型，通过在当前页签打开形式进行跳转",
@@ -896,7 +908,13 @@ export default {
 						"type": "metaData",
 						"title": "跳转页面",
 						"key": "viewName"
-					}
+					},
+					{
+						"isRequired": true,
+						"type": "string",
+						"title": "页签名称",
+						"key": "displayName"
+					},
 				],
 				"paramHandler": "function (val){if(val && Object.prototype.toString.call(val) === '[object Array]'){return{'viewName':val[0]}}}"
 			},
@@ -942,7 +960,13 @@ export default {
 						"type": "field",
 						"title": "单据id",
 						"key": "billId"
-					}
+					},
+					{
+						"isRequired": true,
+						"type": "string",
+						"title": "页签名称",
+						"key": "displayName"
+					},
 				]
 			},
 			"description": "指定跳转页面，配置单据id，通过打开新页签形式进行跳转",
@@ -980,7 +1004,13 @@ export default {
 						"type": "Boolean",
 						"title": "可编辑",
 						"key": "canEdit"
-					}
+					},
+					{
+						"isRequired": true,
+						"type": "string",
+						"title": "页签名称",
+						"key": "displayName"
+					},
 				]
 			},
 			"description": "配置单据id和需审批的taskId，通过打开新页签形式进行跳转，该审批页面是列表唯一指定",

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

@@ -14,8 +14,8 @@ export default {
             let tmpField = subField.FieldCode;
             let subTableObject = context.getTableType(subField.FieldTableCode)
             let oldIndex = context.getSubFocus()
-            let focusData = context.getAllSubData()[subTableObject.title][oldIndex].getData()
-            if (!_.isEqual(focusData[tmpField]._field_old_value_, focusData[tmpField].value) || !_.isEmpty(focusData[tmpField].value)) {
+            let focusData = oldIndex && context.getAllSubData()[subTableObject.title][oldIndex].getData()
+            if (focusData && (!_.isEqual(focusData[tmpField]._field_old_value_, focusData[tmpField].value) || !_.isEmpty(focusData[tmpField].value))) {
                 focusData[tmpField]._field_old_value_ = focusData[tmpField].value = null
                 context.refreshSubDataRow(subTableObject.title);
             }

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

@@ -25,8 +25,9 @@ export default {
             }
             if (targetObject.type === "sub") {
                 let subTableFocusOldIndex = context.getSubFocus()
-                let subTableFocusData = context.getAllSubData()[targetObject.title][subTableFocusOldIndex].getData()
+                let subTableFocusData = subTableFocusOldIndex && context.getAllSubData()[targetObject.title][subTableFocusOldIndex].getData()
                 let oldIndex = context.getSubFocus()
+                if(subTableFocusData){
                     switch (valueType) {
                         case  FormulaConstants.billFiled.BMJJFL: {
                             let comp1 = arguments[0][2].getResult().Value;
@@ -85,6 +86,7 @@ export default {
                             console.log("")
                         }
                     }
+                }
             } else {
                 console.error("SetSubFieldValue公式配置错误,暂不支持主表字段赋值")
                 return null

develop/@gms/gms-plugin-billexpand/src/query-actions/createBill.js

@@ -29,7 +29,7 @@ export default {
         },
         {
           openWay: "FUNCTAB",
-          title: "创建单据",
+          title: param.displayName || "创建单据",
         }
       );
     }else{

develop/@gms/gms-plugin-billexpand/src/query-actions/editBill.js

@@ -27,7 +27,7 @@ export default {
         },
         {
           openWay: "FUNCTAB",
-          title: "编辑单据",
+          title: param.displayName || "编辑单据",
         }
       );
     } else {

develop/@gms/gms-plugin-billexpand/src/query-actions/examineAction.js

@@ -31,7 +31,7 @@ export default {
         },
         {
           openWay: "FUNCTAB",
-          title: "单据审批",
+          title: param.displayName || "单据审批",
         }
       );
     } else {

develop/@gms/gms-plugin-billexpand/src/query-actions/goToDetail.js

@@ -29,7 +29,7 @@ export default {
                 },
                 {
                     openWay: "FUNCTAB",
-                    title: "单据详情",
+                    title: param.displayName || "单据详情",
                 }
             );
         } else {

develop/@gms/gms-plugin-billexpand/src/query-actions/seeDetailAction.js

@@ -29,7 +29,7 @@ export default {
             },
             {
               openWay: "FUNCTAB",
-              title: "单据详情",
+              title: param.displayName || "单据详情",
             }
           );
     } else {

solution.json

@@ -101,7 +101,7 @@
 			},
 			{
 				"name": "gms-plugin-billexpand",
-				"version": "0.0.5-SNAPSHOT"
+				"version": "0.0.6"
 			},
 			{
 				"name": "gms-plugin-mainpage-reimburseBill",