Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CRM
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
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
华国豪
CRM
Commits
21f40a0d
Commit
21f40a0d
authored
Apr 06, 2023
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
c5e0b132
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
17 deletions
+23
-17
finance.vue
src/components/guestManagement/finance.vue
+12
-15
orderList.vue
src/components/myOrdersAllType/components/orderList.vue
+11
-2
No files found.
src/components/guestManagement/finance.vue
View file @
21f40a0d
...
...
@@ -48,7 +48,7 @@
</
style
>
<
template
>
<div
class=
"Business"
>
<div
class=
"add-Enclosure"
>
<
!--
<
div
class=
"add-Enclosure"
>
<el-row
:gutter=
"16"
>
<el-col
:span=
"8"
>
<el-input
size=
"mini"
placeholder=
"输入单号"
v-model=
"msg.FrID"
label=
"单号"
...
...
@@ -77,7 +77,7 @@
</div>
</el-col>
</el-row>
</div>
</div>
!-->
<div
class=
"page-content"
>
<el-table
v-loading=
"loading"
...
...
@@ -202,13 +202,13 @@ export default {
msg
:
{
pageIndex
:
1
,
pageSize
:
10
,
FrID
:
"0"
,
Type
:
"-1"
,
Status
:
"-1"
,
//
FrID:"0",
//
Type:"-1",
//
Status: "-1",
GuestId
:
""
,
ReFinanceId
:
""
,
// 订单ID
ReFinanceId2
:
""
,
//1收入 2退款 3成本
RelevanceFrId
:
""
,
//收据类型
//
ReFinanceId:"",// 订单ID
//
ReFinanceId2:"",//1收入 2退款 3成本
//
RelevanceFrId:"",//收据类型
},
total
:
0
};
...
...
@@ -246,7 +246,7 @@ export default {
if
(
this
.
isOnline
()){
url
=
'http://yx.oytour.com/#/'
}
else
{
url
=
'http://
www.test.com:8080
/#/'
url
=
'http://
localhost:8081
/#/'
}
let
data
=
[
{
...
...
@@ -259,18 +259,15 @@ export default {
},
// 获取订单列表
getList
()
{
if
(
this
.
msg
.
FrID
==
''
){
this
.
msg
.
FrID
=
0
}
this
.
loading
=
true
;
this
.
apipost2
(
"
Financial_post_GetCRMGuestFinancePag
eList"
,
"
CarSingle_post_GetGuestOrderFinanc
eList"
,
this
.
msg
,
(
res
)
=>
{
this
.
msg
.
FrID
=
""
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
dataList
=
res
.
data
.
data
.
pageData
;
this
.
total
=
res
.
data
.
data
.
count
;
this
.
dataList
=
res
.
data
.
data
;
//
this.total = res.data.data.count;
this
.
loading
=
false
}
else
{
this
.
$message
.
error
(
res
.
data
.
message
);
...
...
src/components/myOrdersAllType/components/orderList.vue
View file @
21f40a0d
...
...
@@ -133,13 +133,22 @@
<el-drawer
:with-header=
"false"
size=
'70%'
:visible
.
sync=
"drawer"
direction=
"rtl"
:before-close=
"handleClose"
>
<customerInfoBox
:CustomerId=
"CustomerId"
:activeNameNum=
"activeNameNum"
:receiptType=
"receiptType"
/>
</el-drawer>
<!-- 单号抽屉 -->
<el-drawer
@
closed=
"closeOrderDrawerHandler"
:with-header=
"false"
size=
'70%'
:visible
.
sync=
"orderDrawer"
direction=
"rtl"
:before-close=
"handleClose"
>
<orderDetailsDrawer
v-if=
"currentOrder"
:orderId=
"currentOrder.OrderId"
:activeNameNum=
"activeNameNum"
/>
</el-drawer>
<!-- 提成详情 -->
<commissionPopUp
v-if=
"commissionPopUpVisible"
:parameters=
"parameters"
></commissionPopUp>
</div>
</template>
<
script
>
export
default
{
components
:
{
customerInfoBox
:()
=>
import
(
'../../guestManagement/customerInfoBox'
)
customerInfoBox
:()
=>
import
(
'../../guestManagement/customerInfoBox'
),
orderDetailsDrawer
:()
=>
import
(
'../../customerManage/orderDetailsDrawer'
),
commissionPopUp
:()
=>
import
(
'../../dialogModel/commissionPopUp'
)
},
props
:
{
pagesTitle
:
{
...
...
@@ -229,7 +238,7 @@ export default {
data
[
0
].
path
=
'VisaProductEditOrderOP'
}
href
=
url
+
"automaticLogin?token="
+
this
.
getLocalStorage
().
token
+
"&data="
+
JSON
.
stringify
(
data
);
}
else
if
(
row
.
OrderType
==
2
)
{
//
3跟团 4
一日游
}
else
if
(
row
.
OrderType
==
2
)
{
//
跟团
一日游
if
(
this
.
pagesTitle
==
'销售'
||
this
.
pagesTitle
==
'详情'
){
if
(
row
.
TravelType
==
1
){
data
[
0
].
path
=
'groupTourOrder'
...
...
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