Merge branch 'develop-zhouyi' into 'develop'

fix(@gms/gms-plugin-billexpand): 基础数据，分组列表结果错误

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

develop/@gms/gms-plugin-billexpand/src/control/baseDataSelect/baseDataMixin.js

@@ -258,7 +258,7 @@ export default {
     getBaseData(postData, urlParam, isInit = false) {
       let url = ''
       let postParam = {}
-      if (this.isFilter && !isInit) {
+      if (this.isFilter && !isInit && this.structtype != 1) {
         let newParam = {}
         if (this.bill && this.bill.getBuillData) {
           delete postData.expression

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

@@ -393,9 +393,10 @@ export default {
         }
         getGroupNames([treeData])
         postData = {...postData, ...{
+          groupObjectCode: groupname,
+          groupTableName: this.groupTableName.tableName,
+          showSubGroup: true,
           groupFieldName: this.groupTableName.groupFieldName,
-          groupname: groupname,
-          groupNames: objectCodes,
         }}
       }
 

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

@@ -211,8 +211,10 @@ export default {
           getGroupNames([treeData])
           postData = {
             groupFieldName: this.groupFieldName,
-            groupname: this.treeNode.attributes.objectcode,
-            groupNames: objectCodes,
+            groupObjectCode: this.treeNode.attributes.objectcode,
+            groupTableName: this.groupTableName.tableName,
+            // groupNames: objectCodes,
+            showSubGroup: true,
             tableName: this.tableName,
             pagination: true,
             offset: (this.pageNo - 1) * this.pageSize,

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

@@ -104,23 +104,13 @@ export default {
         }
         
         const postData = {
-          tableName: this.tableName,
+          tableName: this.structtype == 1 ? this.groupTableName.tableName : this.tableName,
           queryDataStructure: 'ALL',
           authType: this.authType,
           versionDate: this.versionDate,
           expression: this.filterFormular,
           'BI-SYNTAX': null
         }
-        if (this.structtype === 1) {
-          if (this.groupTableName.define.showFields) {
-            const relevance = this.groupTableName.define.showFields.find(item => item.columnName === this.groupTableName.groupFieldName)
-            let relevanceField = ''
-            if (relevance) {
-              relevanceField = relevance.mapping? relevance.mapping.split('.')[0]: ''
-              postData.tableName = relevanceField
-            }
-          }
-        }
         const { data } = await this.getBaseData(postData, '/baseData/data/tree')
         getTreeDataMap(data.rows)
         this.$emit('init-tree', this.treeDataMap, this.groupTableName.groupFieldName)