Merge branch 'develop' of http://nvwa.jiuqi.com.cn/gitlab/GFP/RBC/rbc-frontend…

Merge branch 'develop' of http://nvwa.jiuqi.com.cn/gitlab/GFP/RBC/rbc-frontend into develop-qiaoyanqi

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，通过打开新页签形式进行跳转",
@@ -974,7 +998,13 @@ export default {
 						"type": "field",
 						"title": "字段taskId",
 						"key": "taskId"
-					}
+					},
+					{
+						"isRequired": true,
+						"type": "string",
+						"title": "页签名称",
+						"key": "displayName"
+					},
 				]
 			},
 			"description": "配置单据id和需审批的taskId，通过打开新页签形式进行跳转，该审批页面是列表唯一指定",

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

@@ -30,7 +30,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 {