Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
frontend
/
qqxb-self-service
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
f5c88fe2
authored
4 years ago
by
展昭
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
解决代码冲突
parent
8d134369
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
7 deletions
src/views/SelectIdentity.vue
src/views/SelectIdentity.vue
View file @
f5c88fe2
...
...
@@ -205,17 +205,11 @@ export default class SelectIdentity extends Vue {
this
.
disableBack
();
await
this
.
getUserInfo
();
<<<<<<<
HEAD
// if (this.id_no) {
// await this.getDispatchList();
// await this.getDispatchList();
//这里是开启劳务派遣的开关,这里开启后需要html解注
// }
=======
if
(
this
.
id_no
)
{
await
this
.
getDispatchList
();
//这里是开启劳务派遣的开关,这里开启后需要html解注
}
this
.
loading
.
clear
();
>>>>>>>
22148
dfb71906f3bc049514c232d0815c1f37348
}
}
</
script
>
...
...
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