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
2ada4d98
Commit
2ada4d98
authored
1 year ago
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
90200eae
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
1119 additions
and
670 deletions
+1119
-670
OrderList.vue
src/components/myOrdersAllType/components/OrderList.vue
+1049
-633
allList.vue
src/components/myOrdersAllType/components/allList.vue
+58
-27
erpChangePricehOrder.vue
src/components/myOrdersAllType/erpChangePricehOrder.vue
+6
-5
erpExaminePricehOrder.vue
src/components/myOrdersAllType/erpExaminePricehOrder.vue
+6
-5
No files found.
src/components/myOrdersAllType/components/OrderList.vue
View file @
2ada4d98
This diff is collapsed.
Click to expand it.
src/components/myOrdersAllType/components/allList.vue
View file @
2ada4d98
...
@@ -87,32 +87,35 @@
...
@@ -87,32 +87,35 @@
<div
class=
"HotelWorkList"
>
<div
class=
"HotelWorkList"
>
<div
class=
"query-box HotelWorkInput"
style=
"border-bottom: none;"
>
<div
class=
"query-box HotelWorkInput"
style=
"border-bottom: none;"
>
<ul>
<ul>
<!--
<li>
<li
v-if=
"Title=='审核'"
>
<span><em>
客人姓名
</em>
<span>
<el-input
clearable
v-model=
"msg.CustomerName"
placeholder=
"客人姓名"
class=
"w200"
/>
<em>
审核状态
</em>
</span>
<el-select
v-model=
'msg.OrderState'
class=
"w200"
>
</li>
-->
<!--
<el-option
:value=
"0"
label=
"不限"
></el-option>
-->
<li>
<el-option
v-for=
'item in OrderStatusList'
:label=
'item.Name'
:value=
'item.Id'
:key=
'item.Id'
>
</el-option>
</el-select>
</span>
</li>
<li
v-if=
"Title!='申请'&&Title!='审核'"
>
<span><em>
商品名称
</em>
<span><em>
商品名称
</em>
<el-input
clearable
type=
""
v-model=
"msg.ProductName"
placeholder=
"请输入商品名称"
class=
"w200"
/>
<el-input
clearable
type=
""
v-model=
"msg.ProductName"
placeholder=
"请输入商品名称"
class=
"w200"
/>
</span>
</span>
</li>
</li>
<li>
<li
v-if=
"Title!='申请'&&Title!='审核'"
>
<span><em>
订单Id
</em>
<span><em>
订单Id
</em>
<el-input
clearable
type=
"Number"
v-model=
"msg.OrderId"
placeholder=
"请输入订单Id"
class=
"w200"
/>
<el-input
clearable
type=
"Number"
v-model=
"msg.OrderId"
placeholder=
"请输入订单Id"
class=
"w200"
/>
</span>
</span>
</li>
</li>
<li>
<li
v-if=
"Title!='申请'&&Title!='审核'"
>
<span><em>
团号
</em>
<span><em>
团号
</em>
<el-input
clearable
type=
""
v-model=
"msg.TCNUM"
placeholder=
"请输入团号"
class=
"w200"
/>
<el-input
clearable
type=
""
v-model=
"msg.TCNUM"
placeholder=
"请输入团号"
class=
"w200"
/>
</span>
</span>
</li>
</li>
<!--
<li>
<li
v-if=
"Title!='销售'&&Title!='申请'&&Title!='审核'"
>
<span><em>
电话
</em>
<el-input
clearable
v-model=
"msg.Mobile"
placeholder=
"电话"
class=
"w200"
/>
</span>
</li>
-->
<li
v-if=
"Title!='销售'"
>
<span>
<span>
<em>
业务员
</em>
<em>
业务员
</em>
<el-select
filterable
v-model=
'msg.EnterId'
class=
"w200"
clearable
>
<el-select
filterable
v-model=
'msg.EnterId'
class=
"w200"
clearable
>
...
@@ -125,7 +128,7 @@
...
@@ -125,7 +128,7 @@
</el-select>
</el-select>
</span>
</span>
</li>
</li>
<li
v-if=
"Title!='销售'"
>
<li
v-if=
"Title!='销售'
&&Title!='申请'&&Title!='审核'
"
>
<span>
<span>
<em>
引流人
</em>
<em>
引流人
</em>
<el-select
filterable
v-model=
'msg.LureEmpId'
class=
"w200"
clearable
>
<el-select
filterable
v-model=
'msg.LureEmpId'
class=
"w200"
clearable
>
...
@@ -138,7 +141,7 @@
...
@@ -138,7 +141,7 @@
</el-select>
</el-select>
</span>
</span>
</li>
</li>
<li>
<li
v-if=
"Title!='审核'"
>
<span>
<span>
<em>
订单类型
</em>
<em>
订单类型
</em>
<el-select
v-model=
"msg.OrderType"
class=
"w200 HworkInput"
>
<el-select
v-model=
"msg.OrderType"
class=
"w200 HworkInput"
>
...
@@ -148,7 +151,7 @@
...
@@ -148,7 +151,7 @@
</li>
</li>
<li>
<li
v-if=
"Title!='申请'&&Title!='审核'"
>
<span>
<span>
<em>
订单状态
</em>
<em>
订单状态
</em>
<el-select
v-model=
'msg.OrderState'
class=
"w200"
>
<el-select
v-model=
'msg.OrderState'
class=
"w200"
>
...
@@ -161,7 +164,7 @@
...
@@ -161,7 +164,7 @@
</el-select>
</el-select>
</span>
</span>
</li>
</li>
<li>
<li
v-if=
"Title!='申请'&&Title!='审核'"
>
<span>
<span>
<em>
收款状态
</em>
<em>
收款状态
</em>
<el-select
v-model=
'msg.Q_IsCollect'
class=
"w200"
>
<el-select
v-model=
'msg.Q_IsCollect'
class=
"w200"
>
...
@@ -175,7 +178,7 @@
...
@@ -175,7 +178,7 @@
</li>
</li>
<li>
<li
v-if=
"Title!='审核'"
>
<span>
<span>
<em>
报名时间
</em>
<em>
报名时间
</em>
<el-date-picker
<el-date-picker
...
@@ -189,7 +192,7 @@
...
@@ -189,7 +192,7 @@
</el-date-picker>
</el-date-picker>
</span>
</span>
</li>
</li>
<li
style=
"line-height: 30px; padding-left: 30px;"
>
<li
style=
"line-height: 30px; padding-left: 30px;"
v-if=
"Title!='申请'&&Title!='审核'"
>
<el-popover
width=
"350"
trigger=
"click"
>
<el-popover
width=
"350"
trigger=
"click"
>
<div
class=
"groupSuperSearchLayer"
>
<div
class=
"groupSuperSearchLayer"
>
<p
style=
"padding-bottom: 10px;"
>
订单高级查询
</p>
<p
style=
"padding-bottom: 10px;"
>
订单高级查询
</p>
...
@@ -268,7 +271,7 @@
...
@@ -268,7 +271,7 @@
</ul>
</ul>
</div>
</div>
<!-- 统计版块 -->
<!-- 统计版块 -->
<div
class=
"groupTourOrder_count"
>
<div
class=
"groupTourOrder_count"
v-if=
"pagesTitle=='销售'||pagesTitle=='OP'"
>
<!--
<el-row
:gutter=
"20"
>
<el-col
:xs=
"8"
:sm=
"8"
:md=
"8"
:lg=
"8"
:xl=
"8"
></el-col></el-row>
-->
<!--
<el-row
:gutter=
"20"
>
<el-col
:xs=
"8"
:sm=
"8"
:md=
"8"
:lg=
"8"
:xl=
"8"
></el-col></el-row>
-->
<div
class=
"groupTourOrder_count_item HT_total"
v-for=
"(item,index) in SummaryList"
>
<div
class=
"groupTourOrder_count_item HT_total"
v-for=
"(item,index) in SummaryList"
>
<div>
<div>
...
@@ -365,7 +368,7 @@
...
@@ -365,7 +368,7 @@
OrderList
:
[],
OrderList
:
[],
//默认高度
//默认高度
tableHeight
:
0
,
tableHeight
:
0
,
msg
:{
msg
:
{
pageIndex
:
1
,
pageIndex
:
1
,
pageSize
:
15
,
pageSize
:
15
,
OrderId
:
""
,
//订单id
OrderId
:
""
,
//订单id
...
@@ -432,6 +435,12 @@
...
@@ -432,6 +435,12 @@
],
],
LineList
:
[],
LineList
:
[],
SummaryList
:
[],
SummaryList
:
[],
OrderStatusList
:
[
{
Name
:
"不限"
,
Id
:
"0"
},
{
Name
:
"待审核"
,
Id
:
"1"
},
{
Name
:
"已通过"
,
Id
:
"2"
},
{
Name
:
"已取消"
,
Id
:
"3"
},
]
};
};
},
},
watch
:
{
watch
:
{
...
@@ -575,14 +584,28 @@
...
@@ -575,14 +584,28 @@
//获取酒店订单列表
//获取酒店订单列表
GetList
()
{
GetList
()
{
this
.
loading
=
true
this
.
loading
=
true
let
msgObj
let
msg
=
{
OrderId
:
''
,
OrderState
:
'0'
,
OrderType
:
'0'
,
papageIndex
:
1
,
pagesize
:
15
}
let
url
=
"CarSingle_post_GetGuestOrderStatisticsPageList"
let
url
=
"CarSingle_post_GetGuestOrderStatisticsPageList"
// 销售 OP
// 销售 OP
if
(
this
.
pagesTitle
==
'销售'
){
if
(
this
.
pagesTitle
==
'销售'
){
this
.
msg
.
IsMyOrder
=
'1'
this
.
msg
.
IsMyOrder
=
'1'
}
else
{
}
else
if
(
this
.
pagesTitle
==
'申请'
){
url
=
"CarSingle_post_GetChangePriceOrderPageList"
this
.
msg
.
IsMyOrder
=
'1'
}
else
if
(
this
.
pagesTitle
==
'审核'
){
url
=
"CarSingle_post_GetExaminePriceOrderPageList"
}
else
{
this
.
msg
.
IsMyOrder
=
'0'
this
.
msg
.
IsMyOrder
=
'0'
}
}
this
.
apipost
(
url
,
this
.
msg
,
msgObj
=
this
.
pagesTitle
==
'审核'
?
msg
:
this
.
msg
this
.
apipost
(
url
,
msgObj
,
res
=>
{
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
getSummaryData
()
this
.
getSummaryData
()
...
@@ -633,9 +656,17 @@
...
@@ -633,9 +656,17 @@
this
.
employeeMsg
.
GroupId
=
userInfo
.
RB_Group_id
;
//集团ID
this
.
employeeMsg
.
GroupId
=
userInfo
.
RB_Group_id
;
//集团ID
this
.
msg
.
EnterId
=
this
.
$route
.
query
.
EnterId
?
Number
(
this
.
$route
.
query
.
EnterId
):
0
//userInfo.EmployeeId;
this
.
msg
.
EnterId
=
this
.
$route
.
query
.
EnterId
?
Number
(
this
.
$route
.
query
.
EnterId
):
0
//userInfo.EmployeeId;
this
.
msg
.
LureEmpId
=
this
.
$route
.
query
.
LureEmpId
?
Number
(
this
.
$route
.
query
.
LureEmpId
):
0
this
.
msg
.
LureEmpId
=
this
.
$route
.
query
.
LureEmpId
?
Number
(
this
.
$route
.
query
.
LureEmpId
):
0
this
.
msg
.
StartTime
=
this
.
getBeforeDate
(
0
,
new
Date
())
if
(
this
.
pagesTitle
==
'销售'
||
this
.
pagesTitle
==
'OP'
){
this
.
msg
.
EndTime
=
this
.
getBeforeDate
(
0
,
new
Date
())
this
.
msg
.
StartTime
=
this
.
getBeforeDate
(
0
,
new
Date
())
this
.
DatelistBM
=
[
new
Date
(
this
.
msg
.
StartTime
),
new
Date
()]
this
.
msg
.
EndTime
=
this
.
getBeforeDate
(
0
,
new
Date
())
this
.
DatelistBM
=
[
new
Date
(
this
.
msg
.
StartTime
),
new
Date
()]
}
else
{
this
.
msg
.
DepartSTime
=
this
.
getBeforeDate
(
200
,
new
Date
())
this
.
msg
.
DepartETime
=
this
.
getBeforeDate
(
0
,
new
Date
())
this
.
DatelistBM
=
[
this
.
msg
.
DepartSTime
,
this
.
msg
.
DepartETime
]
this
.
msg
.
Q_IsCollect
=
'2'
}
if
(
this
.
$route
.
query
.
OrderId
){
if
(
this
.
$route
.
query
.
OrderId
){
this
.
msg
.
OrderId
=
this
.
$route
.
query
.
OrderId
this
.
msg
.
OrderId
=
this
.
$route
.
query
.
OrderId
this
.
msg
.
StartTime
=
''
this
.
msg
.
StartTime
=
''
...
...
This diff is collapsed.
Click to expand it.
src/components/myOrdersAllType/erpChangePricehOrder.vue
View file @
2ada4d98
...
@@ -7,12 +7,13 @@
...
@@ -7,12 +7,13 @@
</div>
</div>
</
template
>
</
template
>
<
script
>
<
script
>
import
allList
from
'./components/allListChangePrice.vue'
;
// import allList from './components/allListChangePrice.vue';
import
allList
from
'./components/allList.vue'
;
export
default
{
export
default
{
components
:
{
allList
},
components
:
{
allList
},
data
()
{
data
()
{
return
{
return
{
pagesTitle
:
'
销售
'
,
pagesTitle
:
'
申请
'
,
dataObj
:{
dataObj
:{
OrderId
:
''
,
OrderId
:
''
,
}
}
...
@@ -20,14 +21,14 @@
...
@@ -20,14 +21,14 @@
},
},
watch
:
{
watch
:
{
pagesTitle
(
val
,
oldval
){
pagesTitle
(
val
,
oldval
){
},
},
},
},
methods
:
{
methods
:
{
},
},
created
()
{
created
()
{
},
},
mounted
()
{
mounted
()
{
if
(
this
.
$route
.
query
.
OrderId
){
if
(
this
.
$route
.
query
.
OrderId
){
...
...
This diff is collapsed.
Click to expand it.
src/components/myOrdersAllType/erpExaminePricehOrder.vue
View file @
2ada4d98
...
@@ -7,12 +7,13 @@
...
@@ -7,12 +7,13 @@
</div>
</div>
</
template
>
</
template
>
<
script
>
<
script
>
import
allList
from
'./components/allListExaminePrice.vue'
;
// import allList from './components/allListExaminePrice.vue';
import
allList
from
'./components/allList.vue'
;
export
default
{
export
default
{
components
:
{
allList
},
components
:
{
allList
},
data
()
{
data
()
{
return
{
return
{
pagesTitle
:
'
销售
'
,
pagesTitle
:
'
审核
'
,
dataObj
:{
dataObj
:{
OrderId
:
''
,
OrderId
:
''
,
}
}
...
@@ -20,14 +21,14 @@
...
@@ -20,14 +21,14 @@
},
},
watch
:
{
watch
:
{
pagesTitle
(
val
,
oldval
){
pagesTitle
(
val
,
oldval
){
},
},
},
},
methods
:
{
methods
:
{
},
},
created
()
{
created
()
{
},
},
mounted
()
{
mounted
()
{
if
(
this
.
$route
.
query
.
OrderId
){
if
(
this
.
$route
.
query
.
OrderId
){
...
...
This diff is collapsed.
Click to expand it.
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