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
1f8b84db
Commit
1f8b84db
authored
Dec 06, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
景点票券订单问题修改新增平台税金列,签证订单列表 发票单据显示样式问题
parent
ee1d86fe
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
39 additions
and
11 deletions
+39
-11
invoicesManagerAdd.vue
src/components/FinancialModule/invoicesManagerAdd.vue
+1
-1
VisaProductEditOrder.vue
src/components/SalesVisa/VisaProductEditOrder.vue
+1
-1
VisaProductOrder.vue
src/components/SalesVisa/VisaProductOrder.vue
+27
-1
ScenTicketOrder.vue
src/components/scenicSpot/ScenTicketOrder.vue
+10
-8
No files found.
src/components/FinancialModule/invoicesManagerAdd.vue
View file @
1f8b84db
...
...
@@ -498,7 +498,7 @@ export default {
this
.
msg
.
OrderId
=
this
.
$route
.
query
.
OrderId
;
this
.
msg
.
TCID
=
this
.
$route
.
query
.
TCID
;
this
.
msg
.
CustomerId
=
this
.
$route
.
query
.
customerId
;
this
.
msg
.
InvoiceApplyType
=
this
.
$route
.
query
.
InvoiceApplyType
?
this
.
$route
.
query
.
InvoiceApplyType
:
''
this
.
msg
.
InvoiceApplyType
=
this
.
$route
.
query
.
InvoiceApplyType
?
this
.
$route
.
query
.
InvoiceApplyType
:
1
this
.
getAccountList
();
this
.
getOrderDetail
();
this
.
getCustomerInvoiceList
();
...
...
src/components/SalesVisa/VisaProductEditOrder.vue
View file @
1f8b84db
...
...
@@ -200,7 +200,7 @@
</div>
</div>
</td>
<td
colspan=
"8"
class=
"groupTourOrder_tickets"
style=
"height: 40px;"
>
<td
colspan=
"8"
class=
"groupTourOrder_tickets
2
"
style=
"height: 40px;"
>
<div>
<div>
<span>
{{
$t
(
'hotel.hotel_Order'
)
}}
:
</span>
...
...
src/components/SalesVisa/VisaProductOrder.vue
View file @
1f8b84db
...
...
@@ -235,7 +235,7 @@
</div>
</div>
</td>
<td
colspan=
"8"
class=
"groupTourOrder_tickets"
style=
"height: 40px;"
>
<td
colspan=
"8"
class=
"groupTourOrder_tickets
2
"
style=
"height: 40px;"
>
<div>
<div>
<span>
财务单据:
</span>
...
...
@@ -247,6 +247,21 @@
</span>
<span
v-if=
"item.FinanceList.length===0"
style=
"cursor: default;"
>
暂无数据
</span>
</div>
<div>
<span>
{{
$t
(
'salesModule.Invoice'
)
}}
:
</span>
<span
v-for=
"(item2,index2) in item.invoiceApplyList"
:key=
"index2"
style=
"margin-right:10px;cursor:pointer;"
>
<span
v-if=
"item2.invoiceApplyState === 6"
class=
"groupTourOrder_tickets_blue"
@
click=
"goIisDetail(item2.id)"
>
{{
item2
.
id
}}
</span>
<span
v-else-if=
"item2.invoiceApplyState === 1 || item2.invoiceApplyState === 3 || item2.invoiceApplyState === 6"
class=
"groupTourOrder_tickets_green"
@
click=
"goIisDetail(item2.id)"
>
{{
item2
.
id
}}
</span>
<span
v-else-if=
"item2.invoiceApplyState === 5 || item2.invoiceApplyState === 4 "
class=
"groupTourOrder_tickets_red"
@
click=
"goIisDetail(item2.id)"
>
{{
item2
.
id
}}
</span>
<span
v-else-if=
"item2.invoiceApplyState === 2"
class=
"groupTourOrder_tickets_black"
@
click=
"goIisDetail(item2.id)"
>
{{
item2
.
id
}}
</span>
</span>
<span
v-if=
"item.InvoiceApplyList.length===0"
style=
"cursor: default;"
>
{{
$t
(
'system.content_noData'
)
}}
</span>
</div>
</div>
</td>
</tr>
...
...
@@ -311,6 +326,17 @@ export default {
},
}
},
methods
:{
goIisDetail
:
function
(
id
)
{
// 跳转发票详情页面
this
.
$router
.
push
({
name
:
'invoicesManagerDetail'
,
query
:
{
id
:
id
,
noDetail
:
1
,
InvoiceApplyType
:
2
,
blank
:
"y"
,
}
});
},
PerferPrice
(){
this
.
apipost
(
'dmc_get_visa_SetVisaOrderPrice'
,
this
.
EditMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
){
...
...
src/components/scenicSpot/ScenTicketOrder.vue
View file @
1f8b84db
...
...
@@ -233,6 +233,7 @@
<th>
{{
$t
(
'fnc.tkjine'
)
}}
</th>
<th>
{{
$t
(
'Operation.Op_daishou'
)
}}
</th>
<th>
{{
$t
(
'sm.youhuijine'
)
}}
</th>
<th>
{{
$t
(
'fnc.ptshuijin'
)
}}
</th>
<th>
{{
$t
(
'hotel.hotel_OrderStates'
)
}}
</th>
<th>
{{
$t
(
'fnc.cjshijian'
)
}}
</th>
<th>
{{
$t
(
'scen.sc_etTime'
)
}}
</th>
...
...
@@ -252,6 +253,7 @@
</td>
<td>
{{
item
.
duein
}}
</td>
<td>
{{
item
.
discountMoney
}}
</td>
<td>
{{
item
.
platformTax
}}
</td>
<td>
<span
v-if=
"item.status==1"
>
{{
$t
(
'system.ph_zhengchang'
)
}}
</span>
<span
class=
"color_red_order"
v-if=
"item.status==2"
>
{{
$t
(
'pub.cancelBtn'
)
}}
</span>
...
...
@@ -292,7 +294,7 @@
</td>
</tr>
<tr>
<td
colspan=
"
7
"
style=
"text-align:left;width:600px"
>
<td
colspan=
"
8
"
style=
"text-align:left;width:600px"
>
<div
class=
"clearfix"
>
<div
class=
"SH_beizhu"
style=
""
>
{{
$t
(
'pub.pubRemark'
)
}}
:
...
...
@@ -306,25 +308,25 @@
<div
class=
"SH_OrderDan"
>
<div>
{{
$t
(
'fnc.skdanju'
)
}}
:
</div>
<div>
<span
v-for=
"(subItem,index) in item.
Revenue
"
:key=
"index+5000"
>
<span
v-for=
"(subItem,index) in item.
expend
"
:key=
"index+5000"
>
<span
style=
"margin-right:6px"
@
click=
"goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)"
v-if=
"subItem.color===1"
class=
"groupTourOrder_tickets_blue"
>
{{
subItem
.
FrID
}}
</span>
<span
style=
"margin-right:6px"
@
click=
"goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)"
v-else-if=
"subItem.color===2"
class=
"groupTourOrder_tickets_
blue
"
>
{{
subItem
.
FrID
}}
</span>
<span
style=
"margin-right:6px"
@
click=
"goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)"
v-else-if=
"subItem.color===3"
class=
"groupTourOrder_tickets_
blue
"
>
{{
subItem
.
FrID
}}
</span>
<span
style=
"margin-right:6px"
@
click=
"goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)"
v-else-if=
"subItem.color===4"
class=
"groupTourOrder_tickets_bl
ue
"
>
{{
subItem
.
FrID
}}
</span>
<span
style=
"margin-right:6px"
@
click=
"goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)"
v-else-if=
"subItem.color===2"
class=
"groupTourOrder_tickets_
green
"
>
{{
subItem
.
FrID
}}
</span>
<span
style=
"margin-right:6px"
@
click=
"goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)"
v-else-if=
"subItem.color===3"
class=
"groupTourOrder_tickets_
red
"
>
{{
subItem
.
FrID
}}
</span>
<span
style=
"margin-right:6px"
@
click=
"goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)"
v-else-if=
"subItem.color===4"
class=
"groupTourOrder_tickets_bl
ack
"
>
{{
subItem
.
FrID
}}
</span>
</span>
<span
v-if=
"item.
Revenue
==0"
>
{{
$t
(
'system.content_noData'
)
}}
</span>
<span
v-if=
"item.
expend
==0"
>
{{
$t
(
'system.content_noData'
)
}}
</span>
</div>
</div>
<div
class=
"SH_OrderDan"
>
<div>
{{
$t
(
'fnc.fkdanju'
)
}}
:
</div>
<div>
<span
v-for=
"(subItem,index) in item.
expend
"
:key=
"index+1000"
>
<span
v-for=
"(subItem,index) in item.
Revenue
"
:key=
"index+1000"
>
<span
style=
"margin-right:6px"
@
click=
"goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)"
v-if=
"subItem.color===1"
class=
"groupTourOrder_tickets_blue"
>
{{
subItem
.
FrID
}}
</span>
<span
style=
"margin-right:6px"
@
click=
"goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)"
v-else-if=
"subItem.color===2"
class=
"groupTourOrder_tickets_green"
>
{{
subItem
.
FrID
}}
</span>
<span
style=
"margin-right:6px"
@
click=
"goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)"
v-else-if=
"subItem.color===3"
class=
"groupTourOrder_tickets_red"
>
{{
subItem
.
FrID
}}
</span>
<span
style=
"margin-right:6px"
@
click=
"goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)"
v-else-if=
"subItem.color===4"
class=
"groupTourOrder_tickets_black"
>
{{
subItem
.
FrID
}}
</span>
</span>
<span
v-if=
"item.
expend
==0"
>
{{
$t
(
'system.content_noData'
)
}}
</span>
<span
v-if=
"item.
Revenue
==0"
>
{{
$t
(
'system.content_noData'
)
}}
</span>
</div>
</div>
...
...
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