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
4b95f4ac
Commit
4b95f4ac
authored
Sep 27, 2019
by
黄奎
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/luochao/superman
parents
84e8bee3
a32db7b4
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
72 additions
and
19 deletions
+72
-19
BasicDocuments.vue
src/components/FinancialModule/BasicDocuments.vue
+15
-1
FinancialDocumentsDetail.vue
src/components/FinancialModule/FinancialDocumentsDetail.vue
+14
-1
enrollTotal.vue
src/components/SalesModule/enrollTotal.vue
+6
-3
groupTourOrder.vue
src/components/SalesModule/groupTourOrder.vue
+9
-4
groupTourOrderByTuan.vue
src/components/SalesModule/groupTourOrderByTuan.vue
+9
-3
RegistrationList.vue
src/components/TravelManager/TravelList/RegistrationList.vue
+13
-4
todayOrderTotal.vue
src/components/TravelManager/TravelList/todayOrderTotal.vue
+6
-3
No files found.
src/components/FinancialModule/BasicDocuments.vue
View file @
4b95f4ac
...
@@ -322,7 +322,11 @@
...
@@ -322,7 +322,11 @@
</
template
>
</
template
>
<div
class=
"_explain"
>
<div
class=
"_explain"
>
<p>
附加说明:
<span
class=
"fr"
v-if=
"GetDetail.ComplainID > 0"
@
click=
"goUrl('ComplaintsDetail', GetDetail.ComplainID,GetDetail.OrderID)"
>
<span
style=
"color:#000"
>
投诉单号:
</span>
<span
class=
"cursorpointer text-decoration"
>
{{GetDetail.ComplainID}}
</span></span></p>
<p>
附加说明:
<span
class=
"fr"
v-if=
"GetDetail.ComplainID > 0"
@
click=
"goUrl('ComplaintsDetail', GetDetail.ComplainID,GetDetail.OrderID)"
>
<span
style=
"color:#000"
>
投诉单号:
</span>
<span
class=
"cursorpointer text-decoration"
>
{{GetDetail.ComplainID}}
</span></span>
<span
v-if=
"GetDetail.TemplateId==28 || GetDetail.TemplateId==30"
@
click=
"Gourl"
style=
"cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;"
>
提成详情
</span>
</p>
<table
border=
"1"
bordercolor=
"#D2D2D2"
style=
"border-collapse:collapse;margin-top:15px;"
width=
"100%"
v-if=
"GetDetail.TCIDAndTCNUMList.length>0"
>
<table
border=
"1"
bordercolor=
"#D2D2D2"
style=
"border-collapse:collapse;margin-top:15px;"
width=
"100%"
v-if=
"GetDetail.TCIDAndTCNUMList.length>0"
>
<tr
v-for=
"(o,ox) in GetDetail.TCIDAndTCNUMList"
class=
"_fujiashuoming_tr"
>
<tr
v-for=
"(o,ox) in GetDetail.TCIDAndTCNUMList"
class=
"_fujiashuoming_tr"
>
<td
:colspan=
"3"
>
<td
:colspan=
"3"
>
...
@@ -1485,6 +1489,16 @@ export default {
...
@@ -1485,6 +1489,16 @@ export default {
'myJiPiaoBill'
:
myJiPiaoBill
'myJiPiaoBill'
:
myJiPiaoBill
},
},
methods
:{
methods
:{
Gourl
(){
this
.
$router
.
push
({
name
:
'CommissionManagement'
,
query
:
{
blank
:
"y"
,
tab
:
"提成管理"
}
});
},
// 单选计算
// 单选计算
checkdIteam
(
item
){
checkdIteam
(
item
){
if
(
item
.
checked
)
{
if
(
item
.
checked
)
{
...
...
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @
4b95f4ac
...
@@ -386,7 +386,10 @@
...
@@ -386,7 +386,10 @@
<my-RVB-Bill
v-else-if=
"GetDetail.Type===1"
:ID=
"GetDetail.FrID"
:isPrintPage=
"false"
:width=
"widthSon"
:color=
"colorSon"
></my-RVB-Bill>
<my-RVB-Bill
v-else-if=
"GetDetail.Type===1"
:ID=
"GetDetail.FrID"
:isPrintPage=
"false"
:width=
"widthSon"
:color=
"colorSon"
></my-RVB-Bill>
<my-GZ-Bill
v-else-if=
"GetDetail.Type===7"
:ID=
"GetDetail.FrID"
:width=
"widthSon"
:color=
"colorSon"
></my-GZ-Bill>
<my-GZ-Bill
v-else-if=
"GetDetail.Type===7"
:ID=
"GetDetail.FrID"
:width=
"widthSon"
:color=
"colorSon"
></my-GZ-Bill>
<div
class=
"_explain"
>
<div
class=
"_explain"
>
<p>
附加说明:
<span
class=
"fr"
v-if=
"GetDetail.ComplainID > 0"
@
click=
"goComplain('ComplaintsDetail', GetDetail.ComplainID,GetDetail.OrderID)"
>
<span
style=
"color:#000"
>
投诉单号:
</span>
<span
class=
"cursorpointer text-decoration"
>
{{
GetDetail
.
ComplainID
}}
</span></span>
</p>
<p>
附加说明:
<span
class=
"fr"
v-if=
"GetDetail.ComplainID > 0"
@
click=
"goComplain('ComplaintsDetail', GetDetail.ComplainID,GetDetail.OrderID)"
>
<span
style=
"color:#000"
>
投诉单号:
</span>
<span
class=
"cursorpointer text-decoration"
>
{{
GetDetail
.
ComplainID
}}
</span></span>
<span
v-if=
"GetDetail.TemplateId==28 || GetDetail.TemplateId==30"
@
click=
"Gourl"
style=
"cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;"
>
提成详情
</span>
</p>
<table
border=
"1"
bordercolor=
"#D2D2D2"
style=
"border-collapse:collapse;margin-top:15px;"
width=
"100%"
v-if=
"GetDetail.TCIDAndTCNUMList.length>0"
>
<table
border=
"1"
bordercolor=
"#D2D2D2"
style=
"border-collapse:collapse;margin-top:15px;"
width=
"100%"
v-if=
"GetDetail.TCIDAndTCNUMList.length>0"
>
<tr
v-for=
"(o,ox) in GetDetail.TCIDAndTCNUMList"
class=
"_fujiashuoming_tr"
>
<tr
v-for=
"(o,ox) in GetDetail.TCIDAndTCNUMList"
class=
"_fujiashuoming_tr"
>
<td
:colspan=
"4"
v-if=
"GetDetail.Is_Merge===1"
>
单据号:
{{
o
.
FinanceId
}}
</td>
<td
:colspan=
"4"
v-if=
"GetDetail.Is_Merge===1"
>
单据号:
{{
o
.
FinanceId
}}
</td>
...
@@ -928,6 +931,16 @@ export default {
...
@@ -928,6 +931,16 @@ export default {
let
userinfo
=
this
.
getLocalStorage
();
let
userinfo
=
this
.
getLocalStorage
();
this
.
bossID
=
userinfo
.
EmployeeId
;
this
.
bossID
=
userinfo
.
EmployeeId
;
},
methods
:{
},
methods
:{
Gourl
(){
this
.
$router
.
push
({
name
:
'CommissionManagement'
,
query
:
{
blank
:
"y"
,
tab
:
"提成管理"
}
});
},
// 获取冲抵列表
// 获取冲抵列表
getChongDiList
(
data
){
getChongDiList
(
data
){
this
.
danjuType
=
data
.
Type
this
.
danjuType
=
data
.
Type
...
...
src/components/SalesModule/enrollTotal.vue
View file @
4b95f4ac
...
@@ -200,6 +200,9 @@
...
@@ -200,6 +200,9 @@
<span
style=
"font-weight: 100;"
v-if=
"item.scoreNum >= 0"
@
click=
'goInvetig("investigationList", item.tcid, item.orderId)'
>
(评分
{{
item
.
scoreNum
}}
)
</span>
<span
style=
"font-weight: 100;"
v-if=
"item.scoreNum >= 0"
@
click=
'goInvetig("investigationList", item.tcid, item.orderId)'
>
(评分
{{
item
.
scoreNum
}}
)
</span>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"通过小程序确认单报名"
placement=
"top"
v-show=
"item.orderForm==4"
>
<i
class=
"iconfont icon-xiaochengxu"
style=
"font-size:22px;color:red;"
></i></el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"通过小程序确认单报名"
placement=
"top"
v-show=
"item.orderForm==4"
>
<i
class=
"iconfont icon-xiaochengxu"
style=
"font-size:22px;color:red;"
></i></el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"通过B2B确认单报名"
placement=
"top"
v-show=
"item.isFormB2B ==1"
>
<i
class=
"iconfont icon-tiaozheng"
style=
"font-size:22px;color:#297BEF;"
></i></el-tooltip>
</p>
</p>
<p
class=
"fz12 over_ellipsis"
style=
"width: 100%;text-decoration:underline;cursor:pointer;"
:title=
"item.alName"
<p
class=
"fz12 over_ellipsis"
style=
"width: 100%;text-decoration:underline;cursor:pointer;"
:title=
"item.alName"
@
click=
"goUrlX('产品查询', item.isOneDay === 1 ? 'productQueryOne' : 'productQuery',item.tcid,item.tcnum)"
>
{{
item
.
tcnum
}}
</p>
@
click=
"goUrlX('产品查询', item.isOneDay === 1 ? 'productQueryOne' : 'productQuery',item.tcid,item.tcnum)"
>
{{
item
.
tcnum
}}
</p>
...
@@ -287,7 +290,7 @@
...
@@ -287,7 +290,7 @@
</tr>
</tr>
</table>
</table>
</div>
</div>
<span
style=
"cursor: pointer;color: #e95252;"
slot=
"reference"
>
{{
moneyFormat
(
item
.
discountMoney
)
}}
</span>
<span
style=
"cursor: pointer;color: #e95252;
text-decoration: underline;
"
slot=
"reference"
>
{{
moneyFormat
(
item
.
discountMoney
)
}}
</span>
</el-popover>
</el-popover>
</td>
</td>
<td>
<td>
...
@@ -317,9 +320,9 @@
...
@@ -317,9 +320,9 @@
</tr>
</tr>
</table>
</table>
</div>
</div>
<span
@
click=
"getRedBag(item)"
style=
"cursor: pointer;color: #e95252;"
slot=
"reference"
>
{{
item
.
redEnvelopeMoney
}}
</span>
<span
@
click=
"getRedBag(item)"
style=
"cursor: pointer;color: #e95252;
text-decoration: underline;
"
slot=
"reference"
>
{{
item
.
redEnvelopeMoney
}}
</span>
</el-popover>
</el-popover>
<span
v-else
style=
"color: #e95252;"
>
{{
item
.
redEnvelopeMoney
}}
</span>
<span
v-else
style=
"color: #e95252;
text-decoration: underline;
"
>
{{
item
.
redEnvelopeMoney
}}
</span>
</td>
</td>
<td
v-if=
"item.tipMoney"
>
{{
item
.
tipMoney
}}
</td>
<td
v-if=
"item.tipMoney"
>
{{
item
.
tipMoney
}}
</td>
<td
v-else
>
0.00
</td>
<td
v-else
>
0.00
</td>
...
...
src/components/SalesModule/groupTourOrder.vue
View file @
4b95f4ac
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
font-size
:
12px
;
font-size
:
12px
;
color
:
#666
;
color
:
#666
;
margin
:
20px
0
0px
0
;
margin
:
20px
0
0px
0
;
}
}
.groupTourOrderSearch
li
>
span
{
.groupTourOrderSearch
li
>
span
{
...
@@ -1547,7 +1548,11 @@
...
@@ -1547,7 +1548,11 @@
<span
:title=
"item.orderId"
@
click=
"goUrlX('团报名清单','groupTourOrderByTuan',item.tcid,item.tcnum)"
>
{{
item
.
orderId
}}
</span>
<span
:title=
"item.orderId"
@
click=
"goUrlX('团报名清单','groupTourOrderByTuan',item.tcid,item.tcnum)"
>
{{
item
.
orderId
}}
</span>
<span
style=
"font-weight: 100;text-decoration:underline;cursor:pointer;color: #e95252;"
v-if=
"item.scoreNum >= 0"
@
click=
'goInvetig("investigationList", item.tcid, item.orderId)'
>
(评分
{{
item
.
scoreNum
}}
)
</span>
<span
style=
"font-weight: 100;text-decoration:underline;cursor:pointer;color: #e95252;"
v-if=
"item.scoreNum >= 0"
@
click=
'goInvetig("investigationList", item.tcid, item.orderId)'
>
(评分
{{
item
.
scoreNum
}}
)
</span>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"通过小程序确认单报名"
placement=
"top"
v-show=
"item.orderForm==4"
>
<i
class=
"iconfont icon-xiaochengxu"
style=
"font-size:22px;color:red;"
></i></el-tooltip></p>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"通过小程序确认单报名"
placement=
"top"
v-show=
"item.orderForm==4"
>
<i
class=
"iconfont icon-xiaochengxu"
style=
"font-size:22px;color:red;"
></i></el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"通过B2B确认单报名"
placement=
"top"
v-show=
"item.isFormB2B ==1"
>
<i
class=
"iconfont icon-tiaozheng"
style=
"font-size:22px;color:#297BEF;"
></i></el-tooltip>
</p>
<p
class=
"fz12 over_ellipsis"
style=
"width: 100%;text-decoration:underline;cursor:pointer;"
<p
class=
"fz12 over_ellipsis"
style=
"width: 100%;text-decoration:underline;cursor:pointer;"
:title=
"item.alName"
@
click=
"goUrlX('产品查询','productQuery',item.tcid,item.tcnum)"
>
{{
item
.
tcnum
}}
</p>
:title=
"item.alName"
@
click=
"goUrlX('产品查询','productQuery',item.tcid,item.tcnum)"
>
{{
item
.
tcnum
}}
</p>
<p
class=
"fz12 over_ellipsis"
style=
"width: 100%;"
>
{{
item
.
commissionSPeopleName
}}
</p>
<p
class=
"fz12 over_ellipsis"
style=
"width: 100%;"
>
{{
item
.
commissionSPeopleName
}}
</p>
...
@@ -1691,7 +1696,7 @@
...
@@ -1691,7 +1696,7 @@
</tr>
</tr>
</table>
</table>
</div>
</div>
<span
style=
"cursor: pointer;color: #e95252;"
slot=
"reference"
>
{{
item
.
discountMoney
}}
</span>
<span
style=
"cursor: pointer;color: #e95252;
text-decoration: underline;
"
slot=
"reference"
>
{{
item
.
discountMoney
}}
</span>
</el-popover>
</el-popover>
</td>
</td>
<td>
<td>
...
@@ -1718,9 +1723,9 @@
...
@@ -1718,9 +1723,9 @@
</tr>
</tr>
</table>
</table>
</div>
</div>
<span
@
click=
"getRedBag(item)"
style=
"cursor: pointer;color: #e95252;"
slot=
"reference"
>
{{
item
.
redEnvelopeMoney
}}
</span>
<span
@
click=
"getRedBag(item)"
style=
"cursor: pointer;color: #e95252;
text-decoration: underline;
"
slot=
"reference"
>
{{
item
.
redEnvelopeMoney
}}
</span>
</el-popover>
</el-popover>
<span
v-else
style=
"color: #e95252;"
>
{{
item
.
redEnvelopeMoney
}}
</span>
<span
v-else
style=
"color: #e95252;
text-decoration: underline;
"
>
{{
item
.
redEnvelopeMoney
}}
</span>
</td>
</td>
<td>
{{
item
.
refund
}}
</td>
<td>
{{
item
.
refund
}}
</td>
...
...
src/components/SalesModule/groupTourOrderByTuan.vue
View file @
4b95f4ac
...
@@ -1790,6 +1790,9 @@
...
@@ -1790,6 +1790,9 @@
<el-tooltip
class=
"item"
effect=
"dark"
content=
"通过小程序确认单报名"
placement=
"top"
<el-tooltip
class=
"item"
effect=
"dark"
content=
"通过小程序确认单报名"
placement=
"top"
v-show=
"item.orderForm==4"
>
<i
class=
"iconfont icon-xiaochengxu"
v-show=
"item.orderForm==4"
>
<i
class=
"iconfont icon-xiaochengxu"
style=
"font-size:22px;color:red;"
></i></el-tooltip>
style=
"font-size:22px;color:red;"
></i></el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"通过B2B确认单报名"
placement=
"top"
v-show=
"item.isFormB2B ==1"
>
<i
class=
"iconfont icon-tiaozheng"
style=
"font-size:22px;color:#297BEF;"
></i></el-tooltip>
</p>
</p>
<div>
<div>
{{
item
.
createBy
}}
<br
/><span
v-if=
"item.leaveStr!=''"
style=
"color:red"
>
(
{{
item
.
leaveStr
}}
)
</span>
{{
item
.
createBy
}}
<br
/><span
v-if=
"item.leaveStr!=''"
style=
"color:red"
>
(
{{
item
.
leaveStr
}}
)
</span>
...
@@ -1945,7 +1948,7 @@
...
@@ -1945,7 +1948,7 @@
</div>
</div>
<!-- <span v-if='item.isEnd==0' style="cursor: pointer;" @click="getOrderDetail(item)"
<!-- <span v-if='item.isEnd==0' style="cursor: pointer;" @click="getOrderDetail(item)"
slot="reference">{{item.income}}</span> -->
slot="reference">{{item.income}}</span> -->
<span
style=
"cursor: pointer;color: #e95252;"
@
click=
"getOrderDetail(item)"
<span
style=
"cursor: pointer;color: #e95252;
text-decoration: underline;
"
@
click=
"getOrderDetail(item)"
slot=
"reference"
>
{{item.discountMoney}}
</span>
slot=
"reference"
>
{{item.discountMoney}}
</span>
</el-popover>
</el-popover>
</td>
</td>
...
@@ -1978,10 +1981,10 @@
...
@@ -1978,10 +1981,10 @@
</tr>
</tr>
</table>
</table>
</div>
</div>
<span
@
click=
"getRedBag(item)"
style=
"cursor: pointer;color: #e95252;"
slot=
"reference"
>
{{item.redEnvelopeMoney}}
</span>
<span
@
click=
"getRedBag(item)"
style=
"cursor: pointer;color: #e95252;
text-decoration: underline;
"
slot=
"reference"
>
{{item.redEnvelopeMoney}}
</span>
</el-popover>
</el-popover>
<span
v-else
style=
"cursor: pointer;color: #e95252;"
>
{{item.redEnvelopeMoney}}
</span>
<span
v-else
style=
"cursor: pointer;color: #e95252;
text-decoration: underline;
"
>
{{item.redEnvelopeMoney}}
</span>
</span>
</span>
<span
v-else
>
******
</span>
<span
v-else
>
******
</span>
</td>
</td>
...
@@ -2349,6 +2352,9 @@
...
@@ -2349,6 +2352,9 @@
@
click=
'goInvetig("investigationList", item.tcid, item.orderId)'
>
(评分{{item.scoreNum}})
</span>
@
click=
'goInvetig("investigationList", item.tcid, item.orderId)'
>
(评分{{item.scoreNum}})
</span>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"通过小程序确认单报名"
placement=
"top"
v-show=
"item.orderForm==4"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"通过小程序确认单报名"
placement=
"top"
v-show=
"item.orderForm==4"
>
<i
class=
"iconfont icon-xiaochengxu"
style=
"font-size:22px;color:red;"
></i></el-tooltip>
<i
class=
"iconfont icon-xiaochengxu"
style=
"font-size:22px;color:red;"
></i></el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"通过B2B确认单报名"
placement=
"top"
v-show=
"childItem.isFormB2B ==1"
>
<i
class=
"iconfont icon-tiaozheng"
style=
"font-size:22px;color:#297BEF;"
></i></el-tooltip>
</p>
</p>
<div>
<div>
{{item.createBy}}
<br
/><span
v-if=
"item.leaveStr!=''"
style=
"color:red"
>
({{item.leaveStr}})
</span>
{{item.createBy}}
<br
/><span
v-if=
"item.leaveStr!=''"
style=
"color:red"
>
({{item.leaveStr}})
</span>
...
...
src/components/TravelManager/TravelList/RegistrationList.vue
View file @
4b95f4ac
...
@@ -1705,6 +1705,9 @@
...
@@ -1705,6 +1705,9 @@
{{item.OrderId}}
{{item.OrderId}}
<el-tooltip
class=
"item"
effect=
"dark"
content=
"通过小程序确认单报名"
placement=
"top"
v-show=
"item.OrderForm==4"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"通过小程序确认单报名"
placement=
"top"
v-show=
"item.OrderForm==4"
>
<i
class=
"iconfont icon-xiaochengxu"
style=
"font-size:22px;color:red;"
></i></el-tooltip>
<i
class=
"iconfont icon-xiaochengxu"
style=
"font-size:22px;color:red;"
></i></el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"通过B2B确认单报名"
placement=
"top"
v-show=
"item.IsFormB2B ==1"
>
<i
class=
"iconfont icon-tiaozheng"
style=
"font-size:22px;color:#297BEF;"
></i></el-tooltip>
</div>
</div>
<div
class=
"RL_CreatInfo"
>
{{item.CreateBy}}
<span
v-if=
"item.LeaveStr!=''"
<div
class=
"RL_CreatInfo"
>
{{item.CreateBy}}
<span
v-if=
"item.LeaveStr!=''"
style=
"color:red"
>
({{item.LeaveStr}})
</span></div>
style=
"color:red"
>
({{item.LeaveStr}})
</span></div>
...
@@ -1795,7 +1798,7 @@
...
@@ -1795,7 +1798,7 @@
</tr>
</tr>
</table>
</table>
</div>
</div>
<span
style=
"cursor: pointer;color: #e95252;"
<span
style=
"cursor: pointer;color: #e95252;
text-decoration: underline;
"
slot=
"reference"
>
{{moneyFormat(item.DiscountMoney)}}
</span>
slot=
"reference"
>
{{moneyFormat(item.DiscountMoney)}}
</span>
</el-popover>
</el-popover>
</td>
</td>
...
@@ -1826,11 +1829,11 @@
...
@@ -1826,11 +1829,11 @@
</tr>
</tr>
</table>
</table>
</div>
</div>
<span
@
click=
"getRedBag(item)"
style=
"cursor: pointer;color: #e95252;padding:0 15px"
<span
@
click=
"getRedBag(item)"
style=
"cursor: pointer;color: #e95252;padding:0 15px
;text-decoration: underline;
"
slot=
"reference"
>
{{item.RedEnvelopeMoney}}
</span>
slot=
"reference"
>
{{item.RedEnvelopeMoney}}
</span>
</el-popover>
</el-popover>
<span
v-else
style=
"cursor: pointer;color: #e95252;"
>
{{item.RedEnvelopeMoney}}
</span>
<span
v-else
style=
"cursor: pointer;color: #e95252;
text-decoration: underline;
"
>
{{item.RedEnvelopeMoney}}
</span>
</td>
</td>
<td>
{{item.Refund}}
</td>
<td>
{{item.Refund}}
</td>
<td>
{{item.PlatformTax}}
</td>
<td>
{{item.PlatformTax}}
</td>
...
@@ -1966,7 +1969,7 @@
...
@@ -1966,7 +1969,7 @@
订单类型:
<span
class=
"RL-redType"
>
{{
subItem
.
GroupTypeName
}}
</span>
订单类型:
<span
class=
"RL-redType"
>
{{
subItem
.
GroupTypeName
}}
</span>
</td>
</td>
</tr>
</tr>
<tbody
v-for=
"(childItem,childIndex) in subItem.List"
>
<tbody
v-for=
"(childItem,childIndex) in subItem.List"
:key=
"childIndex+2000"
>
<tr>
<tr>
<td
rowspan=
"3"
style=
"position:relative;"
>
<td
rowspan=
"3"
style=
"position:relative;"
>
<div
class=
"order_union"
>
<div
class=
"order_union"
>
...
@@ -1980,6 +1983,9 @@
...
@@ -1980,6 +1983,9 @@
<el-tooltip
class=
"item"
effect=
"dark"
content=
"通过小程序确认单报名"
placement=
"top"
<el-tooltip
class=
"item"
effect=
"dark"
content=
"通过小程序确认单报名"
placement=
"top"
v-show=
"childItem.OrderForm==4"
>
<i
class=
"iconfont icon-xiaochengxu"
v-show=
"childItem.OrderForm==4"
>
<i
class=
"iconfont icon-xiaochengxu"
style=
"font-size:22px;color:red;"
></i></el-tooltip>
style=
"font-size:22px;color:red;"
></i></el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"通过B2B确认单报名"
placement=
"top"
v-show=
"childItem.IsFormB2B ==1"
>
<i
class=
"iconfont icon-tiaozheng"
style=
"font-size:22px;color:#297BEF;"
></i></el-tooltip>
</div>
</div>
<div
class=
"RL_CreatInfo"
>
{{
childItem
.
CreateBy
}}
<span
v-if=
"childItem.LeaveStr!=''"
<div
class=
"RL_CreatInfo"
>
{{
childItem
.
CreateBy
}}
<span
v-if=
"childItem.LeaveStr!=''"
style=
"color:red"
>
(
{{
childItem
.
LeaveStr
}}
)
</span></div>
style=
"color:red"
>
(
{{
childItem
.
LeaveStr
}}
)
</span></div>
...
@@ -2389,6 +2395,9 @@
...
@@ -2389,6 +2395,9 @@
<el-tooltip
class=
"item"
effect=
"dark"
content=
"通过小程序确认单报名"
placement=
"top"
<el-tooltip
class=
"item"
effect=
"dark"
content=
"通过小程序确认单报名"
placement=
"top"
v-show=
"item.OrderForm==4"
>
<i
class=
"iconfont icon-xiaochengxu"
v-show=
"item.OrderForm==4"
>
<i
class=
"iconfont icon-xiaochengxu"
style=
"font-size:22px;color:red;"
></i></el-tooltip>
style=
"font-size:22px;color:red;"
></i></el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"通过B2B确认单报名"
placement=
"top"
v-show=
"item.IsFormB2B ==1"
>
<i
class=
"iconfont icon-tiaozheng"
style=
"font-size:22px;color:#297BEF;"
></i></el-tooltip>
</p>
</p>
<p
v-if=
"item.IsLeaderOrder==1"
>
(领队)
</p>
<p
v-if=
"item.IsLeaderOrder==1"
>
(领队)
</p>
<p
v-else-if=
"item.IsLeaderOrder!=1&&item.GroupType==1"
>
(散拼跟团)
</p>
<p
v-else-if=
"item.IsLeaderOrder!=1&&item.GroupType==1"
>
(散拼跟团)
</p>
...
...
src/components/TravelManager/TravelList/todayOrderTotal.vue
View file @
4b95f4ac
...
@@ -215,6 +215,9 @@
...
@@ -215,6 +215,9 @@
<p
class=
"fbold over_ellipsis"
style=
"width: 100%;cursor:pointer;text-decoration:underline;"
:title=
"item.orderId"
<p
class=
"fbold over_ellipsis"
style=
"width: 100%;cursor:pointer;text-decoration:underline;"
:title=
"item.orderId"
@
click=
"goUrlX('团报名清单', 'RegistrationList',item.tcid,item.tcnum)"
title=
"点击跳转到报名清单"
>
{{
item
.
orderId
}}
@
click=
"goUrlX('团报名清单', 'RegistrationList',item.tcid,item.tcnum)"
title=
"点击跳转到报名清单"
>
{{
item
.
orderId
}}
<el-tooltip
class=
"item"
effect=
"dark"
content=
"通过小程序确认单报名"
placement=
"top"
v-show=
"item.orderForm==4"
>
<i
class=
"iconfont icon-xiaochengxu"
style=
"font-size:22px;color:red;text-decoration: none;display: inline-block;"
></i></el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"通过小程序确认单报名"
placement=
"top"
v-show=
"item.orderForm==4"
>
<i
class=
"iconfont icon-xiaochengxu"
style=
"font-size:22px;color:red;text-decoration: none;display: inline-block;"
></i></el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"通过B2B确认单报名"
placement=
"top"
v-show=
"item.isFormB2B ==1"
>
<i
class=
"iconfont icon-tiaozheng"
style=
"font-size:22px;color:#297BEF;"
></i></el-tooltip>
</p>
</p>
<p
class=
"fz12 over_ellipsis"
style=
"width: 100%;text-decoration:underline;cursor:pointer;"
title=
"点击跳转到团控列表"
@
click=
"goUrlX('团控列表', 'TravelControlList',item.tcid,item.tcnum)"
>
{{
item
.
tcnum
}}
</p>
<p
class=
"fz12 over_ellipsis"
style=
"width: 100%;text-decoration:underline;cursor:pointer;"
title=
"点击跳转到团控列表"
@
click=
"goUrlX('团控列表', 'TravelControlList',item.tcid,item.tcnum)"
>
{{
item
.
tcnum
}}
</p>
...
@@ -295,7 +298,7 @@
...
@@ -295,7 +298,7 @@
</tr>
</tr>
</table>
</table>
</div>
</div>
<span
style=
"cursor: pointer;color: #e95252;"
slot=
"reference"
>
{{
item
.
discountMoney
}}
</span>
<span
style=
"cursor: pointer;color: #e95252;
text-decoration: underline;
"
slot=
"reference"
>
{{
item
.
discountMoney
}}
</span>
</el-popover>
</el-popover>
</td>
</td>
<td>
<td>
...
@@ -326,10 +329,10 @@
...
@@ -326,10 +329,10 @@
</tr>
</tr>
</table>
</table>
</div>
</div>
<span
@
click=
"getRedBag(item)"
style=
"cursor: pointer;color: #e95252;padding:0 15px"
slot=
"reference"
>
{{
item
.
redEnvelopeMoney
}}
</span>
<span
@
click=
"getRedBag(item)"
style=
"cursor: pointer;color: #e95252;padding:0 15px
;text-decoration: underline;
"
slot=
"reference"
>
{{
item
.
redEnvelopeMoney
}}
</span>
</el-popover>
</el-popover>
<span
v-else
style=
"cursor: pointer;color: #e95252;"
>
{{
item
.
redEnvelopeMoney
}}
</span>
<span
v-else
style=
"cursor: pointer;color: #e95252;
text-decoration: underline;
"
>
{{
item
.
redEnvelopeMoney
}}
</span>
</td>
</td>
<td
v-if=
"item.tipMoney"
>
{{
item
.
tipMoney
}}
</td>
<td
v-if=
"item.tipMoney"
>
{{
item
.
tipMoney
}}
</td>
<td
v-else
>
0.00
</td>
<td
v-else
>
0.00
</td>
...
...
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