Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
P
pc
Project
Project
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
wbx-PCAndMobi
pc
Commits
6cf000a5
Commit
6cf000a5
authored
Dec 04, 2020
by
yulunyao
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'xuhui' into dev
parents
1e46c158
f7959098
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
72 additions
and
71 deletions
+72
-71
basicInfo.vue
src/views/houseData/basicInfo.vue
+1
-1
basicView.vue
src/views/houseData/basicView.vue
+71
-70
No files found.
src/views/houseData/basicInfo.vue
View file @
6cf000a5
...
@@ -348,7 +348,7 @@ export default {
...
@@ -348,7 +348,7 @@ export default {
'c.hoId'
:
!
this
.
form
.
getFieldValue
(
'c.hoId'
)?
''
:
this
.
form
.
getFieldValue
(
'c.hoId'
).
split
(
'#'
)[
1
],
'c.hoId'
:
!
this
.
form
.
getFieldValue
(
'c.hoId'
)?
''
:
this
.
form
.
getFieldValue
(
'c.hoId'
).
split
(
'#'
)[
1
],
'c.streetId'
:
!
this
.
form
.
getFieldValue
(
'c.streetId'
)?
''
:
this
.
form
.
getFieldValue
(
'c.streetId'
).
split
(
'#'
)[
1
],
'c.streetId'
:
!
this
.
form
.
getFieldValue
(
'c.streetId'
)?
''
:
this
.
form
.
getFieldValue
(
'c.streetId'
).
split
(
'#'
)[
1
],
'stKind_in'
:
!
this
.
form
.
getFieldValue
(
'stKind_in'
)?
''
:
this
.
form
.
getFieldValue
(
'stKind_in'
).
join
(
','
),
'stKind_in'
:
!
this
.
form
.
getFieldValue
(
'stKind_in'
)?
''
:
this
.
form
.
getFieldValue
(
'stKind_in'
).
join
(
','
),
'unitAddr'
:
!
this
.
form
.
getFieldValue
(
'unitAddr'
)?
''
:
this
.
form
.
getFieldValue
(
'unitAddr'
),
'unitAddr'
:
!
this
.
form
.
getFieldValue
(
'unitAddr'
)?
''
:
this
.
form
.
getFieldValue
(
'unitAddr'
),
'sectType_in'
:
'1'
,
'sectType_in'
:
'1'
,
'c.createTime_desc'
:
'desc'
'c.createTime_desc'
:
'desc'
},
obj
,
isHocId
)
// 融合obj 和isHocId 到入参
},
obj
,
isHocId
)
// 融合obj 和isHocId 到入参
...
...
src/views/houseData/basicView.vue
View file @
6cf000a5
This diff is collapsed.
Click to expand it.
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