Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
SuperMan
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
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
罗超
SuperMan
Commits
47ca4f0b
Commit
47ca4f0b
authored
Oct 24, 2019
by
黄媛媛
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/luochao/superman
parents
be0681fc
233f7202
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1077 additions
and
1008 deletions
+1077
-1008
TravelControlList.vue
...components/TravelManager/TravelList/TravelControlList.vue
+2
-2
myDocuments.vue
src/components/administrative/myDocuments.vue
+1075
-1006
No files found.
src/components/TravelManager/TravelList/TravelControlList.vue
View file @
47ca4f0b
...
...
@@ -383,8 +383,8 @@
</div>
<div>
<div
class=
"el-col"
style=
"position:relative;width:200px"
>
<div
v-if=
"item.IsWarning===1
&&item.TeamType!=3
"
title=
"紧急团"
class=
"travel_warning"
></div>
<
div
v-else
title=
"地接团"
class=
"travel_warningDi"
></div
>
<div
v-if=
"item.IsWarning===1"
title=
"紧急团"
class=
"travel_warning"
></div>
<
!--
<div
v-else
title=
"地接团"
class=
"travel_warningDi"
></div>
--
>
<div>
<div
class=
"TC_teamType"
>
<span
v-if=
"item.IsB2B==0"
title=
"内部团"
>
{{
$t
(
'Operation.Op_nei'
)
}}
</span>
...
...
src/components/administrative/myDocuments.vue
View file @
47ca4f0b
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