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
151be522
Commit
151be522
authored
May 12, 2022
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
c068dea2
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
75 additions
and
52 deletions
+75
-52
orderDetailsDrawer.vue
src/components/customerManage/orderDetailsDrawer.vue
+8
-1
orderList.vue
src/components/customerManage/orderList.vue
+3
-21
Agreement.vue
src/components/guestManagement/Agreement.vue
+28
-22
ticketOrder.vue
src/components/guestManagement/ticketOrder.vue
+2
-2
index.vue
src/components/planeTicketOrder/index.vue
+34
-6
No files found.
src/components/customerManage/orderDetailsDrawer.vue
View file @
151be522
...
@@ -139,6 +139,10 @@ export default {
...
@@ -139,6 +139,10 @@ export default {
type
:
Number
,
type
:
Number
,
required
:
true
,
required
:
true
,
},
},
activeNameNum
:
{
type
:
String
,
required
:
true
}
},
},
data
()
{
data
()
{
return
{
return
{
...
@@ -156,7 +160,7 @@ export default {
...
@@ -156,7 +160,7 @@ export default {
this
.
orderId
=
val
this
.
orderId
=
val
},
},
deep
:
true
,
deep
:
true
,
}
,
}
},
},
mounted
()
{
mounted
()
{
let
$this
=
this
;
let
$this
=
this
;
...
@@ -165,6 +169,9 @@ export default {
...
@@ -165,6 +169,9 @@ export default {
this
.
MsgBus
.
$on
(
"RefreshInfoBox"
,
function
()
{
this
.
MsgBus
.
$on
(
"RefreshInfoBox"
,
function
()
{
$this
.
init
();
$this
.
init
();
});
});
if
(
this
.
activeNameNum
){
this
.
activeName
=
this
.
activeNameNum
}
},
},
methods
:
{
methods
:
{
init
()
{
init
()
{
...
...
src/components/customerManage/orderList.vue
View file @
151be522
...
@@ -810,12 +810,6 @@ export default {
...
@@ -810,12 +810,6 @@ export default {
font-size
:
12px
;
font-size
:
12px
;
}
}
.classorder
table
th
{
background-color
:
#ededed
;
height
:
34px
;
text-indent
:
15px
;
}
.enrollTotalSearchTable
td
{
.enrollTotalSearchTable
td
{
background-color
:
#ffffff
;
background-color
:
#ffffff
;
padding
:
9px
15px
;
padding
:
9px
15px
;
...
@@ -832,12 +826,6 @@ export default {
...
@@ -832,12 +826,6 @@ export default {
padding
:
9px
15px
;
padding
:
9px
15px
;
}
}
.classorder
table
th
{
background-color
:
#ededed
;
height
:
34px
;
text-indent
:
15px
;
}
.classorder
table
td
{
.classorder
table
td
{
background-color
:
#ffffff
;
background-color
:
#ffffff
;
padding
:
9px
15px
;
padding
:
9px
15px
;
...
@@ -1227,13 +1215,6 @@ li {
...
@@ -1227,13 +1215,6 @@ li {
border
:
1px
solid
#d2d2d2
;
border
:
1px
solid
#d2d2d2
;
font-size
:
12px
;
font-size
:
12px
;
}
}
.classorder
table
th
{
background-color
:
#ededed
;
height
:
34px
;
text-indent
:
15px
;
}
.enrollTotalSearchTable
td
{
.enrollTotalSearchTable
td
{
background-color
:
#ffffff
;
background-color
:
#ffffff
;
padding
:
9px
15px
;
padding
:
9px
15px
;
...
@@ -1253,7 +1234,8 @@ li {
...
@@ -1253,7 +1234,8 @@ li {
.classorder
table
th
{
.classorder
table
th
{
background-color
:
#ededed
;
background-color
:
#ededed
;
height
:
34px
;
height
:
34px
;
text-indent
:
15px
;
text-indent
:
0
;
padding
:
0
5px
;
}
}
.classorder
table
td
{
.classorder
table
td
{
...
@@ -1304,7 +1286,7 @@ li {
...
@@ -1304,7 +1286,7 @@ li {
.classorder
.enrollTotalSearchTable
tr
td
{
.classorder
.enrollTotalSearchTable
tr
td
{
height
:
46px
;
height
:
46px
;
padding
:
10px
;
padding
:
10px
5px
;
}
}
.classorder
.enrollTotalSearchTable
tr
td
>
img
{
.classorder
.enrollTotalSearchTable
tr
td
>
img
{
...
...
src/components/guestManagement/Agreement.vue
View file @
151be522
<
style
>
<
style
scoped
>
.add-Enclosure
{
.add-Enclosure
{
display
:
flex
;
display
:
flex
;
justify-content
:
space-between
;
justify-content
:
space-between
;
...
@@ -87,8 +87,8 @@
...
@@ -87,8 +87,8 @@
padding
:
10px
19px
10px
19px
;
padding
:
10px
19px
10px
19px
;
Box-shadow
:
5px
5px
10px
5px
#ccc
;
Box-shadow
:
5px
5px
10px
5px
#ccc
;
}
}
/
deep
/
.el-table
.cell
{
/
deep
/
.
Agreement-Business
.
el-table
.cell
{
overflow
:
initial
;
overflow
:
initial
!important
;
}
}
.agreement-Cancel
{
.agreement-Cancel
{
text-align
:
right
;
text-align
:
right
;
...
@@ -116,6 +116,12 @@
...
@@ -116,6 +116,12 @@
/
deep
/
.el-table
.cell.el-tooltip
{
/
deep
/
.el-table
.cell.el-tooltip
{
overflow
:
hidden
!important
;
overflow
:
hidden
!important
;
}
}
/
deep
/
.classorder
.Agreement-Business
table
th
{
text-indent
:
0
!important
;
}
/
deep
/
.el-table
th
>
.cell
{
text-align
:
left
!important
;
}
.OrderType-text-box
{
.OrderType-text-box
{
word-break
:
break-word
;
word-break
:
break-word
;
word-wrap
:
break-word
;
word-wrap
:
break-word
;
...
@@ -127,8 +133,8 @@
...
@@ -127,8 +133,8 @@
white-space
:
pre-wrap
;
white-space
:
pre-wrap
;
white-space
:
pre-line
;
white-space
:
pre-line
;
}
}
.
OrderType-text-box
.
text-underline
{
.text-underline
{
font-size
:
1
9
px
;
font-size
:
1
6
px
;
color
:
rgb
(
41
,
97
,
254
);
color
:
rgb
(
41
,
97
,
254
);
margin-right
:
10px
;
margin-right
:
10px
;
font-weight
:
bold
;
font-weight
:
bold
;
...
@@ -172,7 +178,7 @@
...
@@ -172,7 +178,7 @@
}
}
</
style
>
</
style
>
<
template
>
<
template
>
<div
class=
"Business"
>
<div
class=
"
Agreement-
Business"
>
<div
class=
"add-Enclosure"
>
<div
class=
"add-Enclosure"
>
<el-row
:gutter=
"16"
>
<el-row
:gutter=
"16"
>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
...
@@ -213,7 +219,7 @@
...
@@ -213,7 +219,7 @@
row-class-name=
"font-size-12"
>
row-class-name=
"font-size-12"
>
<el-table-column
<el-table-column
fixed
fixed
label=
"订单号"
width=
"110"
>
label=
"订单号"
:
width=
"110"
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
<div
class=
"OrderType-text-box"
@
click=
"clickSingleNumber(scope.row)"
>
<div
class=
"OrderType-text-box"
@
click=
"clickSingleNumber(scope.row)"
>
<span
class=
"text-underline"
>
{{
scope
.
row
.
OrderId
}}
</span>
<span
class=
"text-underline"
>
{{
scope
.
row
.
OrderId
}}
</span>
...
@@ -242,7 +248,7 @@
...
@@ -242,7 +248,7 @@
:class=
"scope.row.TicketStatus==1&&scope.row.OrderStatus==1?'font-color-link':''"
>
{{
scope
.
row
.
Money
}}
</p>
:class=
"scope.row.TicketStatus==1&&scope.row.OrderStatus==1?'font-color-link':''"
>
{{
scope
.
row
.
Money
}}
</p>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"实收"
width=
"120"
>
<el-table-column
label=
"实收"
:
width=
"120"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<div
class=
"agreement-IncomeMoney-box"
>
<div
class=
"agreement-IncomeMoney-box"
>
{{
scope
.
row
.
IncomeMoney
}}
{{
scope
.
row
.
IncomeMoney
}}
...
@@ -269,13 +275,13 @@
...
@@ -269,13 +275,13 @@
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"退款"
width=
"120"
>
<el-table-column
label=
"退款"
:
width=
"120"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
{{
scope
.
row
.
BackMoney
}}
<i
v-if=
"scope.row.OrderStatus==1"
{{
scope
.
row
.
BackMoney
}}
<i
v-if=
"scope.row.OrderStatus==1"
@
click=
"makeAdocument(scope.row,scope.$index,2)"
class=
"iconfont iconjia- numIcon"
></i>
@
click=
"makeAdocument(scope.row,scope.$index,2)"
class=
"iconfont iconjia- numIcon"
></i>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"成本"
width=
"120"
>
<el-table-column
label=
"成本"
:
width=
"120"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<div
class=
"agreement-IncomeMoney-box"
>
<div
class=
"agreement-IncomeMoney-box"
>
{{
scope
.
row
.
PayMoney
}}
<i
v-if=
"scope.row.OrderStatus==1"
{{
scope
.
row
.
PayMoney
}}
<i
v-if=
"scope.row.OrderStatus==1"
...
@@ -308,7 +314,7 @@
...
@@ -308,7 +314,7 @@
</p>
</p>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"出票状态"
width=
"90"
>
<el-table-column
label=
"出票状态"
:
width=
"90"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<span
@
click=
"modifyStatus(scope.row)"
<span
@
click=
"modifyStatus(scope.row)"
class=
"cp tatusText"
class=
"cp tatusText"
...
@@ -361,7 +367,7 @@
...
@@ -361,7 +367,7 @@
</el-table-column>
</el-table-column>
<el-table-column
prop=
"CreateByName"
label=
"创建人"
show-overflow-tooltip
>
<el-table-column
prop=
"CreateByName"
label=
"创建人"
show-overflow-tooltip
>
</el-table-column>
</el-table-column>
<el-table-column
fixed=
"right"
label=
"操作"
width=
"120"
>
<el-table-column
fixed=
"right"
label=
"操作"
:
width=
"120"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<div
class=
"item-but-box"
>
<div
class=
"item-but-box"
>
<div
class=
"enedit-box"
>
<div
class=
"enedit-box"
>
...
...
src/components/guestManagement/ticketOrder.vue
View file @
151be522
...
@@ -278,7 +278,7 @@
...
@@ -278,7 +278,7 @@
.MultipleChoice-left
.el-checkbox-group
.el-checkbox
{
.MultipleChoice-left
.el-checkbox-group
.el-checkbox
{
flex
:
1
;
flex
:
1
;
padding
:
3
0px
19px
;
padding
:
1
0px
19px
;
}
}
.MultipleChoice-right
{
.MultipleChoice-right
{
...
@@ -292,7 +292,7 @@
...
@@ -292,7 +292,7 @@
background
:
#fff
;
background
:
#fff
;
flex
:
1
;
flex
:
1
;
padding
:
9px
19px
;
padding
:
9px
19px
;
margin-bottom
:
2
0px
;
margin-bottom
:
1
0px
;
}
}
.MultipleChoice-right-box.active
{
.MultipleChoice-right-box.active
{
...
...
src/components/planeTicketOrder/index.vue
View file @
151be522
...
@@ -171,7 +171,7 @@
...
@@ -171,7 +171,7 @@
<div
v-if=
"scope.row.OrderId === 0"
>
<div
v-if=
"scope.row.OrderId === 0"
>
-
-
</div>
</div>
<div
v-else
@
click=
"toOrder(scope.row
.OrderId
)"
class=
"hover"
>
<div
v-else
@
click=
"toOrder(scope.row)"
class=
"hover"
>
{{
scope
.
row
.
OrderId
}}
{{
scope
.
row
.
OrderId
}}
</div>
</div>
</
template
>
</
template
>
...
@@ -325,11 +325,19 @@
...
@@ -325,11 +325,19 @@
</div>
</div>
</div>
</div>
<!-- 单号抽屉 -->
<el-drawer
@
closed=
"closeOrderDrawerHandler"
:with-header=
"false"
size=
'70%'
:append-to-body=
"true"
:visible
.
sync=
"orderDrawer"
direction=
"rtl"
:before-close=
"handleClose"
>
<orderDetailsDrawer
v-if=
"currentOrder"
:orderId=
"currentOrder.OrderId"
:activeNameNum=
"activeNameNum"
/>
</el-drawer>
</div>
</div>
</template>
</template>
<
script
>
<
script
>
import
orderDetailsDrawer
from
"../customerManage/orderDetailsDrawer"
;
export
default
{
export
default
{
components
:
{
orderDetailsDrawer
},
created
()
{
created
()
{
// erp自动登陆传过来的参数
// erp自动登陆传过来的参数
if
(
this
.
$route
.
query
.
erpOrderObj
)
{
if
(
this
.
$route
.
query
.
erpOrderObj
)
{
...
@@ -375,10 +383,25 @@ export default {
...
@@ -375,10 +383,25 @@ export default {
],
],
EmployeeList
:
[],
EmployeeList
:
[],
tableData
:
[],
tableData
:
[],
StatModel
:[]
StatModel
:[],
currentOrder
:
null
,
orderDrawer
:
false
,
activeNameNum
:
"2"
};
};
},
},
methods
:
{
methods
:
{
// 点击单号
clickSingleNumber
(
item
)
{
this
.
currentOrder
=
item
;
this
.
orderDrawer
=
true
;
},
closeOrderDrawerHandler
()
{
this
.
currentOrder
=
null
;
this
.
orderDrawer
=
false
;
},
handleClose
(
done
)
{
done
();
},
// 获取业务员
// 获取业务员
Employee
()
{
Employee
()
{
let
userInfo
=
this
.
getLocalStorage
();
let
userInfo
=
this
.
getLocalStorage
();
...
@@ -429,7 +452,6 @@ export default {
...
@@ -429,7 +452,6 @@ export default {
this
.
tableData
=
data
;
this
.
tableData
=
data
;
this
.
msg
.
pageSize
=
res
.
data
.
data
.
pageSize
this
.
msg
.
pageSize
=
res
.
data
.
data
.
pageSize
this
.
total
=
res
.
data
.
data
.
count
;
this
.
total
=
res
.
data
.
data
.
count
;
console
.
log
(
this
.
total
)
}
else
{
}
else
{
this
.
$message
.
error
(
res
.
data
.
message
);
this
.
$message
.
error
(
res
.
data
.
message
);
}
}
...
@@ -466,7 +488,10 @@ export default {
...
@@ -466,7 +488,10 @@ export default {
);
);
},
},
//订单跳转
//订单跳转
toOrder
(
val
){
toOrder
(
item
){
this
.
currentOrder
=
item
;
this
.
orderDrawer
=
true
;
return
this
.
$router
.
push
({
path
:
'/customerOrder'
,
query
:{
OrderId
:
val
}})
this
.
$router
.
push
({
path
:
'/customerOrder'
,
query
:{
OrderId
:
val
}})
},
},
//改变状态背景颜色
//改变状态背景颜色
...
@@ -504,9 +529,12 @@ export default {
...
@@ -504,9 +529,12 @@ export default {
}
}
}
}
}
}
.hover:hover{
.hover{
color:#2961fe;
cursor: pointer;
cursor: pointer;
color: skyblue;
}
.hover:hover{
text-decoration: underline;
}
}
}
}
</
style
>
</
style
>
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