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
bf9c5b89
Commit
bf9c5b89
authored
Jul 28, 2023
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
申请发票
parent
a4558029
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
139 additions
and
22 deletions
+139
-22
invoicesManagerAdd.vue
src/components/FinancialModule/invoicesManagerAdd.vue
+21
-10
OrderList.vue
src/components/Hotel/reservation/OrderList.vue
+21
-2
orderList.vue
...omponents/busManagement/BookAcar/components/orderList.vue
+24
-5
tripBusOrderList.vue
...ts/busManagement/BookAcar/components/tripBusOrderList.vue
+1
-1
ApplyFoInvoice.vue
src/components/public/ApplyFoInvoice.vue
+48
-0
OrderList.vue
src/components/scenicSpot/reservation/OrderList.vue
+24
-4
No files found.
src/components/FinancialModule/invoicesManagerAdd.vue
View file @
bf9c5b89
...
@@ -146,10 +146,10 @@
...
@@ -146,10 +146,10 @@
</tr>
</tr>
<tr>
<tr>
<td
v-if=
"msg.TCID"
>
团号
</td>
<td
v-if=
"msg.TCID
>0
"
>
团号
</td>
<td
v-if=
"msg.TCID"
>
{{
msg
.
TCID
}}
</td>
<td
v-if=
"msg.TCID
>0
"
>
{{
msg
.
TCID
}}
</td>
<td>
订单号
</td>
<td>
订单号
</td>
<td
:colspan=
"msg.TCID?0:3"
>
{{
msg
.
OrderId
}}
</td>
<td
:colspan=
"msg.TCID
>0
?0:3"
>
{{
msg
.
OrderId
}}
</td>
</tr>
</tr>
<tr>
<tr>
<td
rowspan=
"6"
>
开具内容
</td>
<td
rowspan=
"6"
>
开具内容
</td>
...
@@ -421,7 +421,12 @@
...
@@ -421,7 +421,12 @@
res
=>
{
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
$message
.
success
(
res
.
data
.
message
);
this
.
$message
.
success
(
res
.
data
.
message
);
let
path
=
this
.
msg
.
InvoiceApplyType
==
1
?
'groupTourOrder'
:
'VisaProductEditOrder'
let
path
=
''
if
(
this
.
msg
.
InvoiceApplyType
==
1
){
path
=
'groupTourOrder'
}
else
if
(
this
.
msg
.
InvoiceApplyType
==
4
){
path
=
'VisaProductEditOrder'
}
setTimeout
(()
=>
{
setTimeout
(()
=>
{
if
(
!
this
.
crmOrderObj
){
if
(
!
this
.
crmOrderObj
){
this
.
$router
.
push
({
this
.
$router
.
push
({
...
@@ -469,9 +474,17 @@
...
@@ -469,9 +474,17 @@
},
},
getOrderDetail
:
function
()
{
getOrderDetail
:
function
()
{
// 获取订单详情
// 获取订单详情
let
OrderResource
=
8
;
//团队订单
let
OrderResource
=
this
.
msg
.
InvoiceApplyType
;
if
(
this
.
msg
.
InvoiceApplyType
!=
1
)
{
if
(
this
.
msg
.
InvoiceApplyType
==
1
)
{
OrderResource
=
8
;
//团队订单
}
else
if
(
this
.
msg
.
InvoiceApplyType
==
4
){
OrderResource
=
10
;
//签证订单
OrderResource
=
10
;
//签证订单
}
else
if
(
this
.
msg
.
InvoiceApplyType
==
5
){
OrderResource
=
4
;
//车
}
else
if
(
this
.
msg
.
InvoiceApplyType
==
6
){
OrderResource
=
1
;
//酒店
}
else
if
(
this
.
msg
.
InvoiceApplyType
==
7
){
OrderResource
=
3
;
//景点
}
}
this
.
apipost
(
this
.
apipost
(
"InvoiceApply_get_GetOrderFinanceList"
,
{
"InvoiceApply_get_GetOrderFinanceList"
,
{
...
@@ -536,11 +549,9 @@
...
@@ -536,11 +549,9 @@
this
.
DepartName
=
userInfo
.
DepartName
;
this
.
DepartName
=
userInfo
.
DepartName
;
this
.
emName
=
userInfo
.
emName
;
this
.
emName
=
userInfo
.
emName
;
this
.
msg
.
OrderId
=
this
.
$route
.
query
.
OrderId
;
this
.
msg
.
OrderId
=
this
.
$route
.
query
.
OrderId
;
this
.
msg
.
TCID
=
this
.
$route
.
query
.
TCID
;
this
.
msg
.
TCID
=
this
.
$route
.
query
.
TCID
?
this
.
$route
.
query
.
TCID
:
0
;
this
.
msg
.
CustomerId
=
this
.
$route
.
query
.
customerId
;
this
.
msg
.
CustomerId
=
this
.
$route
.
query
.
customerId
;
if
(
this
.
$route
.
query
.
InvoiceApplyType
)
{
this
.
msg
.
InvoiceApplyType
=
this
.
$route
.
query
.
InvoiceApplyType
?
this
.
$route
.
query
.
InvoiceApplyType
:
1
;
this
.
msg
.
InvoiceApplyType
=
this
.
$route
.
query
.
InvoiceApplyType
;
}
if
(
this
.
$route
.
query
.
crmOrderObj
){
if
(
this
.
$route
.
query
.
crmOrderObj
){
let
crmOrderObj
=
JSON
.
parse
(
this
.
$route
.
query
.
crmOrderObj
)
let
crmOrderObj
=
JSON
.
parse
(
this
.
$route
.
query
.
crmOrderObj
)
this
.
crmOrderObj
=
crmOrderObj
this
.
crmOrderObj
=
crmOrderObj
...
...
src/components/Hotel/reservation/OrderList.vue
View file @
bf9c5b89
...
@@ -678,6 +678,22 @@
...
@@ -678,6 +678,22 @@
</el-tooltip>
</el-tooltip>
</div>
</div>
</div>
</div>
<div
class=
"column px15 bgf5 radius5 ml flex-g pa relative"
style=
"min-width: 150px;max-width:400px"
>
<div
class=
"fz12"
>
发票单据
</div>
<div
class=
"row wrap orderNo fz12 py"
>
<span
class=
"cursor-pointer radius5 mr px5"
:class=
"{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
v-for=
"(x, i) in item.InvoiceApplyList"
@
click=
"openDetails(x)"
>
{{ x.FrID }}
</span
>
<span
v-if=
"item.InvoiceApplyList.length == 0"
class=
"c9e fz12"
>
暂无发票单据
</span>
</div>
</div>
<!--<div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px">
<!--<div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px">
<div class="fz12">手配费单据</div>
<div class="fz12">手配费单据</div>
<div class="row wrap orderNo fz12 py">
<div class="row wrap orderNo fz12 py">
...
@@ -738,8 +754,8 @@
...
@@ -738,8 +754,8 @@
</div>
</div>
</div>
</div>
</div>
</div>
<!-- v-if="item.OrderStatus > 3 || item.OrderStatus < 3" -->
<div
<div
v-if=
"item.OrderStatus > 3 || item.OrderStatus < 3"
class=
"row-c wrap justify-c px15 bgE8F5E9 radius5 ml fz12 orderop pa20 flex-s"
class=
"row-c wrap justify-c px15 bgE8F5E9 radius5 ml fz12 orderop pa20 flex-s"
>
>
<div
<div
...
@@ -802,6 +818,8 @@
...
@@ -802,6 +818,8 @@
>
>
<span
class=
"c059FF6"
>
编辑总金额
</span>
<span
class=
"c059FF6"
>
编辑总金额
</span>
</div>
</div>
<!-- 申请发票 -->
<ApplyFoInvoice
v-if=
"userInfo.EmployeeId==item.EnterID"
:obj=
"item"
:type=
"6"
></ApplyFoInvoice>
</div>
</div>
<!-- <div v-if="item.OrderStatus==2" class="column-jac px15 bgE8F5E9 radius5 ml fz12 pa20 flex-s c20C997">
<!-- <div v-if="item.OrderStatus==2" class="column-jac px15 bgE8F5E9 radius5 ml fz12 pa20 flex-s c20C997">
<div class="mb5">已支付</div>
<div class="mb5">已支付</div>
...
@@ -928,8 +946,9 @@
...
@@ -928,8 +946,9 @@
import
more
from
'../../public/more.vue'
;
import
more
from
'../../public/more.vue'
;
import
correlationOP
from
'./correlationOP.vue'
;
import
correlationOP
from
'./correlationOP.vue'
;
import
commissionDialog
from
"../../FinancialModule/TradeCommission/commissionDialog"
import
commissionDialog
from
"../../FinancialModule/TradeCommission/commissionDialog"
import
ApplyFoInvoice
from
'../../public/ApplyFoInvoice'
;
export
default
{
export
default
{
components
:
{
offset
,
more
,
correlationOP
,
commissionDialog
},
components
:
{
offset
,
more
,
correlationOP
,
commissionDialog
,
ApplyFoInvoice
},
props
:
[
"OrderList"
,
"pagesTitle"
],
props
:
[
"OrderList"
,
"pagesTitle"
],
data
()
{
data
()
{
return
{
return
{
...
...
src/components/busManagement/BookAcar/components/orderList.vue
View file @
bf9c5b89
...
@@ -785,6 +785,22 @@
...
@@ -785,6 +785,22 @@
</el-tooltip>
</el-tooltip>
</div>
</div>
</div>
</div>
<div
class=
"column px15 bgf5 radius5 ml flex-g pa relative"
style=
"min-width: 150px;max-width:400px"
>
<div
class=
"fz12"
>
发票单据
</div>
<div
class=
"row wrap orderNo fz12 py"
>
<span
class=
"cursor-pointer radius5 mr px5"
:class=
"{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
v-for=
"(x, i) in item.InvoiceApplyList"
@
click=
"openDetails(x)"
>
{{ x.FrID }}
</span
>
<span
v-if=
"item.InvoiceApplyList.length == 0"
class=
"c9e fz12"
>
暂无发票单据
</span>
</div>
</div>
<div
<div
class=
"column justify-c px15 bgf5 radius5 ml flex-g pa20"
class=
"column justify-c px15 bgf5 radius5 ml flex-g pa20"
style=
"min-width: 230px"
style=
"min-width: 230px"
...
@@ -809,13 +825,13 @@
...
@@ -809,13 +825,13 @@
</div>
</div>
</div>
</div>
</div>
</div>
<div
<!-- v-if="
v-if=
"
item.OrderStatus > 0 &&
item.OrderStatus > 0 &&
item.OrderStatus < 4 &&
item.OrderStatus < 4 &&
item.OrderStatus != 3
item.OrderStatus != 3
"
" -->
class=
"column justify-c px15 bgE8F5E9 radius5 ml fz12 orderop pa20 flex-s"
<div
class=
"row-c wrap justify-c px15 bgE8F5E9 radius5 ml fz12 orderop pa20 flex-s"
>
>
<div
<div
v-if=
"
v-if=
"
...
@@ -877,6 +893,8 @@
...
@@ -877,6 +893,8 @@
>
>
<span
class=
"c059FF6"
>
编辑总金额
</span>
<span
class=
"c059FF6"
>
编辑总金额
</span>
</div>
</div>
<!-- 申请发票 -->
<ApplyFoInvoice
v-if=
"userInfo.EmployeeId==item.EnterID"
:obj=
"item"
:type=
"5"
></ApplyFoInvoice>
</div>
</div>
</div>
</div>
<div
class=
"mt mb20 bgf5 pa15 row-c"
v-if=
"item.CancelRemark"
>
<div
class=
"mt mb20 bgf5 pa15 row-c"
v-if=
"item.CancelRemark"
>
...
@@ -1015,8 +1033,9 @@
...
@@ -1015,8 +1033,9 @@
import
offset
from
"../../../public/offset.vue"
;
import
offset
from
"../../../public/offset.vue"
;
import
correlationOP
from
"../../../Hotel/reservation/correlationOP.vue"
;
import
correlationOP
from
"../../../Hotel/reservation/correlationOP.vue"
;
import
commissionDialog
from
"../../../FinancialModule/TradeCommission/commissionDialog"
;
import
commissionDialog
from
"../../../FinancialModule/TradeCommission/commissionDialog"
;
import
ApplyFoInvoice
from
'../../../public/ApplyFoInvoice'
;
export
default
{
export
default
{
components
:
{
offset
,
correlationOP
,
commissionDialog
},
components
:
{
offset
,
correlationOP
,
commissionDialog
,
ApplyFoInvoice
},
props
:
[
"OrderList"
,
"pagesTitle"
],
props
:
[
"OrderList"
,
"pagesTitle"
],
data
()
{
data
()
{
return
{
return
{
...
...
src/components/busManagement/BookAcar/components/tripBusOrderList.vue
View file @
bf9c5b89
...
@@ -650,7 +650,7 @@
...
@@ -650,7 +650,7 @@
</div>
</div>
<div
<div
v-if=
"item.OfferState!=3"
v-if=
"item.OfferState!=3"
class=
"
column
justify-c px15 bgE8F5E9 radius5 ml fz12 orderop pa20 flex-s"
class=
"
row-c wrap
justify-c px15 bgE8F5E9 radius5 ml fz12 orderop pa20 flex-s"
>
>
<div
<div
v-if=
"
v-if=
"
...
...
src/components/public/ApplyFoInvoice.vue
0 → 100644
View file @
bf9c5b89
<
template
>
<div
class=
"row-c cursor-pointer radius5 change py5"
@
click=
"goUrlAdd"
>
<span
class=
"c059FF6"
>
申请发票
</span>
</div>
</
template
>
<
script
>
export
default
{
props
:
[
"obj"
,
"type"
],
components
:
{},
data
()
{
return
{
}
},
watch
:
{
obj
:
{
handler
(
newValue
,
onldValue
)
{
},
deep
:
true
,
immediate
:
true
},
},
mounted
()
{
},
methods
:
{
// 申请发票 tyep 4机票 5车 6酒店 7景点
goUrlAdd
()
{
this
.
$router
.
push
({
name
:
'invoicesManagerAdd'
,
query
:
{
OrderId
:
this
.
obj
.
OrderId
,
TCID
:
0
,
customerId
:
this
.
obj
.
CustomerId
,
InvoiceApplyType
:
this
.
type
,
blank
:
"y"
,
}
});
},
}
}
</
script
>
<
style
scoped
>
</
style
>
src/components/scenicSpot/reservation/OrderList.vue
View file @
bf9c5b89
...
@@ -757,7 +757,22 @@
...
@@ -757,7 +757,22 @@
@
click=
"isOffset(item, index, 3)"
></i>
@
click=
"isOffset(item, index, 3)"
></i>
</el-tooltip>
</el-tooltip>
</div>
</div>
</div>
<div
class=
"column px15 bgf5 radius5 ml flex-g pa relative"
style=
"min-width: 150px;max-width:400px"
>
<div
class=
"fz12"
>
发票单据
</div>
<div
class=
"row wrap orderNo fz12 py"
>
<span
class=
"cursor-pointer radius5 mr px5"
:class=
"{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
v-for=
"(x, i) in item.InvoiceApplyList"
@
click=
"openDetails(x)"
>
{{ x.FrID }}
</span
>
<span
v-if=
"item.InvoiceApplyList.length == 0"
class=
"c9e fz12"
>
暂无发票单据
</span>
</div>
</div>
</div>
<div
class=
"column justify-c px15 bgf5 radius5 ml flex-g pa20"
style=
"min-width: 230px;"
>
<div
class=
"column justify-c px15 bgf5 radius5 ml flex-g pa20"
style=
"min-width: 230px;"
>
<div
class=
"row-c justify-sb pb5"
:class=
"{'borderD':item.MailingMoney>0||item.DiscountsMoney>0}"
>
<div
class=
"row-c justify-sb pb5"
:class=
"{'borderD':item.MailingMoney>0||item.DiscountsMoney>0}"
>
...
@@ -789,7 +804,8 @@
...
@@ -789,7 +804,8 @@
</div>
</div>
</div>
</div>
</div>
</div>
<div
v-if=
"item.OrderStatus > 0 && item.OrderStatus < 4 && item.OrderStatus != 3"
<!-- v-if="item.OrderStatus > 0 && item.OrderStatus < 4 && item.OrderStatus != 3" -->
<div
class=
"row-c wrap justify-c px15 bgE8F5E9 radius5 ml fz12 orderop flex-s"
>
class=
"row-c wrap justify-c px15 bgE8F5E9 radius5 ml fz12 orderop flex-s"
>
<div
v-if=
"
<div
v-if=
"
item.OrderStatus == 1 &&
item.OrderStatus == 1 &&
...
@@ -849,6 +865,8 @@
...
@@ -849,6 +865,8 @@
>
>
<span
class=
"c059FF6"
>
编辑总金额
</span>
<span
class=
"c059FF6"
>
编辑总金额
</span>
</div>
</div>
<!-- 申请发票 -->
<ApplyFoInvoice
v-if=
"userInfo.EmployeeId==item.EnterID"
:obj=
"item"
:type=
"7"
></ApplyFoInvoice>
<!-- <template v-if="item.OrderStatus==2">
<!-- <template v-if="item.OrderStatus==2">
<div class="column-jac fz12 flex-s c20C997">
<div class="column-jac fz12 flex-s c20C997">
<div class="mb5">已支付</div>
<div class="mb5">已支付</div>
...
@@ -1015,9 +1033,11 @@
...
@@ -1015,9 +1033,11 @@
import
offset
from
'../../public/offset.vue'
;
import
offset
from
'../../public/offset.vue'
;
import
correlationOP
from
'../../Hotel/reservation/correlationOP.vue'
;
import
correlationOP
from
'../../Hotel/reservation/correlationOP.vue'
;
import
commissionDialog
from
"../../FinancialModule/TradeCommission/commissionDialog"
import
commissionDialog
from
"../../FinancialModule/TradeCommission/commissionDialog"
export
default
{
import
ApplyFoInvoice
from
'../../public/ApplyFoInvoice'
;
export
default
{
components
:
{
components
:
{
offset
,
correlationOP
,
commissionDialog
offset
,
correlationOP
,
commissionDialog
,
ApplyFoInvoice
},
},
props
:
[
"OrderList"
,
"pagesTitle"
],
props
:
[
"OrderList"
,
"pagesTitle"
],
data
()
{
data
()
{
...
...
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