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
55f8ae71
Commit
55f8ae71
authored
Oct 22, 2019
by
黄媛媛
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/luochao/superman
parents
444c0b09
69aa5f80
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
66 additions
and
94 deletions
+66
-94
HotelProductManage2.vue
src/components/Hotel/HotelProductManage2.vue
+2
-0
PersonalInfoSet.vue
src/components/PersonalInfoSet.vue
+4
-52
flightPerformance.vue
src/components/Ticketing/flightPerformance.vue
+60
-42
No files found.
src/components/Hotel/HotelProductManage2.vue
View file @
55f8ae71
...
@@ -280,6 +280,7 @@
...
@@ -280,6 +280,7 @@
<el-option
:key=
"1"
label=
"税入R0"
:value=
"1"
></el-option>
<el-option
:key=
"1"
label=
"税入R0"
:value=
"1"
></el-option>
<el-option
:key=
"2"
label=
"税别R10"
:value=
"2"
></el-option>
<el-option
:key=
"2"
label=
"税别R10"
:value=
"2"
></el-option>
<el-option
:key=
"3"
label=
"税别R0"
:value=
"3"
></el-option>
<el-option
:key=
"3"
label=
"税别R0"
:value=
"3"
></el-option>
<el-option
:key=
"4"
label=
"税入R10"
:value=
"4"
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
...
@@ -527,6 +528,7 @@
...
@@ -527,6 +528,7 @@
<el-option
:key=
"1"
label=
"税入R0"
:value=
"1"
></el-option>
<el-option
:key=
"1"
label=
"税入R0"
:value=
"1"
></el-option>
<el-option
:key=
"2"
label=
"税别R10"
:value=
"2"
></el-option>
<el-option
:key=
"2"
label=
"税别R10"
:value=
"2"
></el-option>
<el-option
:key=
"3"
label=
"税别R0"
:value=
"3"
></el-option>
<el-option
:key=
"3"
label=
"税别R0"
:value=
"3"
></el-option>
<el-option
:key=
"4"
label=
"税入R10"
:value=
"4"
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
...
...
src/components/PersonalInfoSet.vue
View file @
55f8ae71
...
@@ -636,8 +636,8 @@
...
@@ -636,8 +636,8 @@
<li>
<li>
<span
class=
"Person_Pname"
>
部门
</span>
<span
class=
"Person_Pname"
>
部门
</span>
<span
class=
"Person_Company"
>
<span
class=
"Person_Company"
>
{{
company
Name
}}
{{
u
.
Branch
Name
}}
<span
class=
"Person_Jobs"
v-if=
"Gangwei"
>
{{
Gangwei
}}
</span>
<span
class=
"Person_Jobs"
>
{{
u
.
PostName
}}
</span>
</span>
</span>
</li>
</li>
<li>
<li>
...
@@ -870,6 +870,7 @@
...
@@ -870,6 +870,7 @@
return
{
return
{
//页面切换方式
//页面切换方式
openMode
:
0
,
openMode
:
0
,
u
:{},
outerVisible
:
false
,
outerVisible
:
false
,
nameA
:
'账户名称'
,
nameA
:
'账户名称'
,
nameB
:
'开户人'
,
nameB
:
'开户人'
,
...
@@ -924,27 +925,6 @@
...
@@ -924,27 +925,6 @@
CardNum
:[{
required
:
true
,
message
:
'请填写卡号'
,
trigger
:
'blur'
}],
CardNum
:[{
required
:
true
,
message
:
'请填写卡号'
,
trigger
:
'blur'
}],
AccountAlias
:[{
required
:
true
,
message
:
'请填写账户别名'
,
trigger
:
'blur'
}],
AccountAlias
:[{
required
:
true
,
message
:
'请填写账户别名'
,
trigger
:
'blur'
}],
},
},
//公司
companyName
:
''
,
//岗位
Gangwei
:
''
,
//获取公司参数
getCompanyMsg
:{
RB_Group_Id
:
'2'
,
Status
:
'0'
,
},
//获取部门参数
getDepartmentMsg
:{
RB_Group_Id
:
'0'
,
RB_Branch_Id
:
'-1'
,
Status
:
'0'
,
},
getPostMsg
:{
RB_Group_Id
:
'0'
,
RB_Branch_Id
:
'-1'
,
RB_Department_Id
:
'0'
,
},
//获取银行账户参数
//获取银行账户参数
AccountMsg
:{
AccountMsg
:{
BranchId
:
'-1'
,
BranchId
:
'-1'
,
...
@@ -1185,33 +1165,6 @@
...
@@ -1185,33 +1165,6 @@
}
}
},
err
=>
{})
},
err
=>
{})
},
},
//获取公司
getCompany
(){
this
.
apipost
(
'admin_get_BranchGetList'
,
this
.
getCompanyMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
){
let
data
=
res
.
data
.
data
;
data
.
forEach
(
x
=>
{
if
(
this
.
dataList
.
RB_Branch_id
==
x
.
Id
){
this
.
companyName
=
x
.
BName
;
}
})
}
else
{}
},
err
=>
{})
},
getPost
(){
//岗位
this
.
getPostMsg
.
RB_Branch_Id
=
this
.
dataList
.
RB_Branch_Id
;
this
.
getPostMsg
.
RB_Department_Id
=
this
.
dataList
.
RB_Department_Id
;
this
.
apipost
(
'admin_get_PostGetList'
,
this
.
getPostMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
){
let
data
=
res
.
data
.
data
;
data
.
forEach
(
x
=>
{
if
(
this
.
dataList
.
RB_Post_Id
==
x
.
PostId
){
this
.
Gangwei
=
x
.
PostName
;
}
})
}
else
{}
},
err
=>
{})
},
//过滤电话号码
//过滤电话号码
getBangding
(
val
){
getBangding
(
val
){
if
(
val
){
if
(
val
){
...
@@ -1397,9 +1350,8 @@
...
@@ -1397,9 +1350,8 @@
},
},
mounted
()
{
mounted
()
{
this
.
u
=
this
.
getLocalStorage
();
this
.
getList
();
this
.
getList
();
this
.
getCompany
();
this
.
getPost
();
this
.
openMode
=
localStorage
.
openMode
;
this
.
openMode
=
localStorage
.
openMode
;
this
.
radio
=
localStorage
.
openMode
;
this
.
radio
=
localStorage
.
openMode
;
...
...
src/components/Ticketing/flightPerformance.vue
View file @
55f8ae71
...
@@ -3,25 +3,38 @@
...
@@ -3,25 +3,38 @@
border-bottom
:
1px
solid
#d1d1d1
;
border-bottom
:
1px
solid
#d1d1d1
;
border-right
:
1px
solid
#d1d1d1
;
border-right
:
1px
solid
#d1d1d1
;
background
:
#E6E6E6
;
background
:
#E6E6E6
;
height
:
40px
;
height
:
40px
;
font-size
:
14px
;
font-size
:
14px
;
color
:
#333
;
color
:
#333
;
}
}
.flightPerformance
.fpTable
{
width
:
1000px
;
.flightPerformance
.fpTable
{
margin-bottom
:
30px
;
width
:
1000px
;
border-collapse
:
collapse
;
margin-bottom
:
30px
;
border-collapse
:
collapse
;
}
}
.flightPerformance
.creatName
{
color
:
green
;
.flightPerformance
.creatName
{
color
:
green
;
font-weight
:
bold
;
font-weight
:
bold
;
margin-right
:
10px
;
margin-right
:
10px
;
}
.flightPerformance
.fpTable
tr
{
background
:
#fff
;
text-align
:
center
;
height
:
40px
;
}
.flightPerformance
.fpTable
tr
td
{
font-size
:
12px
;
border
:
1px
solid
#E5E5E5
;
}
}
.flightPerformance
.fpTable
tr
{
background
:
#fff
;
text-align
:
center
;
height
:
40px
;}
.flightPerformance
.fpTable
tr
td
{
font-size
:
12px
;
border
:
1px
solid
#E5E5E5
;}
.flightPerformance
.fpTable
tbody
tr
:last-child
{
.flightPerformance
.fpTable
tbody
tr
:last-child
{
border-bottom
:
2px
solid
#333
;
border-bottom
:
2px
solid
#333
;
}
}
</
style
>
</
style
>
<
template
>
<
template
>
...
@@ -50,7 +63,8 @@
...
@@ -50,7 +63,8 @@
</li>
</li>
</ul>
</ul>
</div>
</div>
<table
class=
"fpTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
v-loading=
"loading"
v-for=
"(item,index) in dataList.resultList"
>
<table
class=
"fpTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
v-loading=
"loading"
v-for=
"(item,index) in dataList.resultList"
>
<tbody
v-for=
"(subItem,subIndex) in item.TicketList"
>
<tbody
v-for=
"(subItem,subIndex) in item.TicketList"
>
<tr
v-if=
"subIndex==0"
>
<tr
v-if=
"subIndex==0"
>
<td
colspan=
"6"
>
<td
colspan=
"6"
>
...
@@ -71,13 +85,14 @@
...
@@ -71,13 +85,14 @@
<td
width=
"10%"
>
<td
width=
"10%"
>
{{
childIndex
+
1
}}
{{
childIndex
+
1
}}
</td>
</td>
<td
width=
"20%"
:rowspan=
"subItem.SubList.length+1"
style=
"border-bottom:2px solid black"
v-if=
"childIndex==0"
>
<td
width=
"20%"
:rowspan=
"subItem.SubList.length+1"
style=
"border-bottom:2px solid black"
{{
subItem
.
OutBranchName
}}
v-if=
"childIndex==0"
>
{{
subItem
.
OutBranchName
}}
</td>
</td>
<td
width=
"30%"
>
<td
width=
"30%"
>
<template
v-if=
"childItem.TCID>0"
>
<template
v-if=
"childItem.TCID>0"
>
<a
style=
"color:blue;cursor:pointer"
@
click=
'goUrlT("RegistrationList",childItem.TCID,"报名清单")'
>
<a
style=
"color:blue;cursor:pointer"
@
click=
'goUrlT("RegistrationList",childItem.TCID,"报名清单")'
>
(
{{
childItem
.
TCID
}}
)
{{
childItem
.
TCNUM
}}
(
{{
childItem
.
TCID
}}
)
{{
childItem
.
TCNUM
}}
</a>
</a>
</
template
>
</
template
>
<
template
v-else
>
<
template
v-else
>
...
@@ -85,18 +100,19 @@
...
@@ -85,18 +100,19 @@
</
template
>
</
template
>
</td>
</td>
<td
width=
"10%"
>
{{childItem.TicketNum}}
</td>
<td
width=
"10%"
>
{{childItem.TicketNum}}
</td>
<td
width=
"10%"
:rowspan=
"subItem.SubList.length+1"
style=
"border-bottom:2px solid black"
v-if=
"childIndex==0"
>
{{dataList.UnitPrice}}
</td>
<td
width=
"10%"
:rowspan=
"subItem.SubList.length+1"
style=
"border-bottom:2px solid black"
v-if=
"childIndex==0"
>
{{dataList.UnitPrice}}
</td>
<td
width=
"10%"
>
{{childItem.TicketNum*dataList.UnitPrice}}
</td>
<td
width=
"10%"
>
{{childItem.TicketNum*dataList.UnitPrice}}
</td>
</tr>
</tr>
<tr
v-if=
"childIndex==subItem.SubList.length-1"
>
<tr
v-if=
"childIndex==subItem.SubList.length-1"
>
<td></td>
<td></td>
<td
style=
"font-weight:bold;"
>
合计
</td>
<td
style=
"font-weight:bold;"
>
合计
</td>
<td
style=
"color:red;"
>
<td
style=
"color:red;"
>
{{getPeopleCount(subItem.SubList)}}
{{getPeopleCount(subItem.SubList)}}
</td>
</td>
<td
style=
"color:red;"
>
<td
style=
"color:red;"
>
{{getCount(subItem.SubList)}}
{{getCount(subItem.SubList)}}
</td>
</td>
</tr>
</tr>
</template>
</template>
<tr
v-if=
"subIndex==item.TicketList.length-1"
>
<tr
v-if=
"subIndex==item.TicketList.length-1"
>
...
@@ -168,41 +184,43 @@
...
@@ -168,41 +184,43 @@
this
.
loading
=
false
;
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
dataList
=
res
.
data
.
data
;
this
.
dataList
=
res
.
data
.
data
;
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
}
});
});
},
},
//获取没个的人数
//获取没个的人数
getPeopleCount
(
subList
){
getPeopleCount
(
subList
)
{
let
count
=
0
;
let
count
=
0
;
subList
.
forEach
(
x
=>
{
subList
.
forEach
(
x
=>
{
count
+=
x
.
TicketNum
;
count
+=
x
.
TicketNum
;
});
});
return
count
;
return
count
;
},
},
//计算小计
//计算小计
getCount
(
list
){
getCount
(
list
)
{
let
count
=
0
;
let
count
=
0
;
list
.
forEach
(
x
=>
{
list
.
forEach
(
x
=>
{
count
+=
x
.
TicketNum
;
count
+=
x
.
TicketNum
;
});
});
return
count
*
this
.
dataList
.
UnitPrice
;
return
count
*
this
.
dataList
.
UnitPrice
;
},
},
//计算总计
//计算总计
getTotalCount
(
list
){
getTotalCount
(
list
)
{
let
count
=
0
;
let
count
=
0
;
list
.
forEach
(
x
=>
{
list
.
forEach
(
x
=>
{
x
.
SubList
.
forEach
(
y
=>
{
x
.
SubList
.
forEach
(
y
=>
{
count
+=
y
.
TicketNum
count
+=
y
.
TicketNum
})
})
})
})
return
count
*
this
.
dataList
.
UnitPrice
;
return
count
*
this
.
dataList
.
UnitPrice
;
},
},
//获取总计人数
//获取总计人数
getTotalNum
(
list
){
getTotalNum
(
list
)
{
let
count
=
0
;
let
count
=
0
;
list
.
forEach
(
x
=>
{
list
.
forEach
(
x
=>
{
x
.
SubList
.
forEach
(
y
=>
{
x
.
SubList
.
forEach
(
y
=>
{
count
+=
y
.
TicketNum
count
+=
y
.
TicketNum
})
})
})
})
return
count
;
return
count
;
...
...
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