Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
R
rbc-demo
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王衍超
rbc-demo
Commits
2359edbd
Commit
2359edbd
authored
Jun 09, 2022
by
Joey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(@gms/gms-plugin-billexpand): 基础数据,分组列表结果错误
parent
b4e6e01b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
16 deletions
+9
-16
baseDataMixin.js
...in-billexpand/src/control/baseDataSelect/baseDataMixin.js
+1
-1
index.vue
...ms-plugin-billexpand/src/control/baseDataSelect/index.vue
+3
-2
select-table.vue
...in-billexpand/src/control/baseDataSelect/select-table.vue
+4
-2
tree.vue
...gms-plugin-billexpand/src/control/baseDataSelect/tree.vue
+1
-11
No files found.
develop/@gms/gms-plugin-billexpand/src/control/baseDataSelect/baseDataMixin.js
View file @
2359edbd
...
...
@@ -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
View file @
2359edbd
...
...
@@ -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
View file @
2359edbd
...
...
@@ -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
View file @
2359edbd
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment