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
c31da60e
Commit
c31da60e
authored
Aug 14, 2025
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
4870dee0
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
31 additions
and
17 deletions
+31
-17
editOP.vue
src/components/cruiseShip/components/editOP.vue
+6
-5
cruiseShipInfo.vue
src/components/cruiseShip/list/cruiseShipInfo.vue
+1
-1
cruiseShipListConfig.js
src/components/cruiseShip/list/cruiseShipListConfig.js
+23
-7
cruiseShipOrderList.vue
src/components/cruiseShip/list/cruiseShipOrderList.vue
+1
-4
No files found.
src/components/cruiseShip/components/editOP.vue
View file @
c31da60e
...
@@ -434,7 +434,7 @@
...
@@ -434,7 +434,7 @@
<el-row
:gutter=
"16"
>
<el-row
:gutter=
"16"
>
<el-col
:span=
"19"
>
<el-col
:span=
"19"
>
<el-form-item
label=
""
prop=
"OpEmpId"
>
<el-form-item
label=
""
prop=
"OpEmpId"
>
<el-select
v-model=
"addMsg.
OpEmpId
"
<el-select
v-model=
"addMsg.
AppointOPList
"
multiple
filterable
placeholder=
"请选择OP"
>
multiple
filterable
placeholder=
"请选择OP"
>
<el-option
v-for=
'item in EmployeeList'
:label=
'item.EmName'
<el-option
v-for=
'item in EmployeeList'
:label=
'item.EmName'
:value=
'item.EmployeeId'
:key=
'item.EmployeeId'
></el-option>
:value=
'item.EmployeeId'
:key=
'item.EmployeeId'
></el-option>
...
@@ -485,13 +485,14 @@
...
@@ -485,13 +485,14 @@
activeTab
:
'basic'
,
activeTab
:
'basic'
,
addMsg
:
{
addMsg
:
{
OrderId
:
0
,
// 订单号
OrderId
:
0
,
// 订单号
OpEmpId
:
null
,
OpEmpId
:
''
,
AppointOPList
:
[],
},
},
rules
:
{
rules
:
{
OpEmpId
:
[{
AppointOPList
:
[{
required
:
true
,
required
:
true
,
message
:
'请选择OP'
,
message
:
'请选择OP'
,
trigger
:
"
blur
"
trigger
:
"
change
"
}],
}],
},
},
CruiseShipList
:
[],
//邮轮
CruiseShipList
:
[],
//邮轮
...
@@ -510,7 +511,7 @@
...
@@ -510,7 +511,7 @@
handler
(
newVal
)
{
handler
(
newVal
)
{
if
(
newVal
&&
newVal
.
OrderId
!==
this
.
addMsg
.
OrderId
)
{
if
(
newVal
&&
newVal
.
OrderId
!==
this
.
addMsg
.
OrderId
)
{
this
.
addMsg
.
OrderId
=
newVal
.
OrderId
;
this
.
addMsg
.
OrderId
=
newVal
.
OrderId
;
this
.
addMsg
.
OpEmpId
=
newVal
.
AppointOPList
.
length
>
0
?
newVal
.
AppointOPList
.
map
(
item
=>
item
.
OPId
):[]
this
.
addMsg
.
AppointOPList
=
newVal
.
AppointOPList
.
length
>
0
?
newVal
.
AppointOPList
.
map
(
item
=>
item
.
OPId
):[]
}
}
}
}
}
}
...
...
src/components/cruiseShip/list/cruiseShipInfo.vue
View file @
c31da60e
...
@@ -776,7 +776,7 @@
...
@@ -776,7 +776,7 @@
CompanyPhone
:
''
,
// 电话
CompanyPhone
:
''
,
// 电话
OpeningBank
:
''
,
// 开户行
OpeningBank
:
''
,
// 开户行
BankNo
:
''
,
// 开户账号
BankNo
:
''
,
// 开户账号
AppointOPList
:
''
,
// op 格式:([1,2,3])
AppointOPList
:
[]
,
// op 格式:([1,2,3])
GuestList
:
[],
// 旅客名单
GuestList
:
[],
// 旅客名单
FinalPriceTips
:
''
,
// 尾款提醒设置
FinalPriceTips
:
''
,
// 尾款提醒设置
},
},
...
...
src/components/cruiseShip/list/cruiseShipListConfig.js
View file @
c31da60e
...
@@ -36,12 +36,17 @@ export const spotListConfig = {
...
@@ -36,12 +36,17 @@ export const spotListConfig = {
// 列配置工厂函数
// 列配置工厂函数
createColumns
:
(
options
=
{})
=>
[
createColumns
:
(
options
=
{})
=>
[
{
{
id
:
'OrderNo'
,
id
:
'OrderId'
,
label
:
'订单编号'
,
label
:
'订单Id'
,
prop
:
'OrderNo'
,
prop
:
'OrderId'
,
minWidth
:
220
,
minWidth
:
100
,
// fixed: 'left',
fixed
:
'left'
,
slotName
:
'OrderNo'
,
slotName
:
'OrderId'
,
filter
:
{
type
:
'input'
,
key
:
'OrderId'
,
placeholder
:
'输入订单Id'
}
},
},
{
{
id
:
'scenic-name-column'
,
id
:
'scenic-name-column'
,
...
@@ -74,6 +79,11 @@ export const spotListConfig = {
...
@@ -74,6 +79,11 @@ export const spotListConfig = {
prop
:
'OrderGuestList'
,
prop
:
'OrderGuestList'
,
minWidth
:
150
,
minWidth
:
150
,
slotName
:
'OrderGuestList'
,
slotName
:
'OrderGuestList'
,
filter
:
{
type
:
'input'
,
key
:
'Name'
,
placeholder
:
'输入旅客名称'
}
},
},
{
{
label
:
'指定OP'
,
label
:
'指定OP'
,
...
@@ -174,7 +184,13 @@ export const spotListConfig = {
...
@@ -174,7 +184,13 @@ export const spotListConfig = {
prop
:
'CreateTime'
,
prop
:
'CreateTime'
,
minWidth
:
120
,
minWidth
:
120
,
slotName
:
'CreateTime'
,
slotName
:
'CreateTime'
,
emptyText
:
'-'
emptyText
:
'-'
,
filter
:
{
type
:
'rangeDate'
,
key
:
'Datelist'
,
startplaceholder
:
'开始日期'
,
endplaceholder
:
'结束日期'
,
}
},
},
{
{
label
:
'状态'
,
label
:
'状态'
,
...
...
src/components/cruiseShip/list/cruiseShipOrderList.vue
View file @
c31da60e
...
@@ -20,9 +20,6 @@
...
@@ -20,9 +20,6 @@
@
add-click=
"addSpot"
@
add-click=
"addSpot"
>
>
<!-- 插槽 -->
<!-- 插槽 -->
<template
slot=
"OrderNo"
slot-scope=
"
{ row }">
{{
row
.
OrderNo
}}
(
{{
row
.
OrderId
}}
)
</
template
>
<template
slot=
"CouponsName"
slot-scope=
"
{ row }">
<template
slot=
"CouponsName"
slot-scope=
"
{ row }">
<span
class=
"name-link"
@
click=
"editSpot(row)"
>
<span
class=
"name-link"
@
click=
"editSpot(row)"
>
{{
row
.
CouponsName
}}
{{
row
.
CouponsName
}}
...
@@ -444,7 +441,7 @@ export default {
...
@@ -444,7 +441,7 @@ export default {
let
newValue
=
value
;
let
newValue
=
value
;
// 如果是数组类型的多选筛选,转换为逗号分隔的字符串
// 如果是数组类型的多选筛选,转换为逗号分隔的字符串
if
(
Array
.
isArray
(
value
)
&&
(
key
!=
'DatelistUse'
||
key
!=
'Datelist'
))
{
if
(
Array
.
isArray
(
value
)
&&
(
key
!=
'DatelistUse'
&&
key
!=
'Datelist'
))
{
newValue
=
value
.
join
(
","
);
newValue
=
value
.
join
(
","
);
}
}
this
.
queryParams
[
actualKey
]
=
newValue
;
this
.
queryParams
[
actualKey
]
=
newValue
;
...
...
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