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
9293ba0e
Commit
9293ba0e
authored
Feb 06, 2024
by
吴春
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交行李数量
parent
1de644fb
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
70 additions
and
4 deletions
+70
-4
groupTourOrderByTuanOne.vue
src/components/SalesModule/groupTourOrderByTuanOne.vue
+14
-1
groupTourOrderOne.vue
src/components/SalesModule/groupTourOrderOne.vue
+14
-2
productQueryOne2.vue
src/components/SalesModule/productQueryOne2.vue
+7
-0
RegistrationList.vue
src/components/TravelManager/TravelList/RegistrationList.vue
+20
-1
order-form2.vue
src/components/orderCommon/order-form2.vue
+15
-0
No files found.
src/components/SalesModule/groupTourOrderByTuanOne.vue
View file @
9293ba0e
...
...
@@ -953,6 +953,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col
:span=
"4"
>
</el-col>
...
...
@@ -1221,6 +1222,11 @@
</el-select>
</el-form-item>
</el-col>
<el-col
:span=
"4"
>
<el-form-item
label=
"行李数量"
prop=
"LuggageNum"
>
<el-input
v-model=
"addMsg.LuggageNum"
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"4"
>
<el-form-item
label=
"所属平台"
prop=
"BrandId"
v-show=
"addMsg.ClientSource==1"
>
<el-select
v-model=
'addMsg.BrandId'
:disabled=
"false"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
...
...
@@ -1757,6 +1763,7 @@
<span
v-for=
"(childItem) in item.guestList"
>
{{childItem.userName}}
</span>
</span>
<span
style=
"display: block"
>
房间信息:{{item.orderGuestHouseStr}}
</span>
<p>
行李数量:{{item.luggageNum}}
</p>
<span
v-if=
"item.tipMoney"
style=
"color:red"
>
(小费:{{item.tipMoney}})
</span>
</td>
</tr>
...
...
@@ -2423,7 +2430,8 @@
CommissionSharePeople
:
"-1"
,
CommissionShareMoney
:
"0"
,
GuestList
:
[],
GatherAddress
:
""
GatherAddress
:
""
,
LuggageNum
:
''
,
},
GuestList
:
[{
SurName
:
''
,
...
...
@@ -2470,6 +2478,11 @@
message
:
"请选择出发城市"
,
trigger
:
"change"
}],
LuggageNum
:
[{
required
:
true
,
message
:
'请输入行李数量'
,
trigger
:
'blur'
}],
ReturnArriveCityId
:
[{
required
:
true
,
message
:
"请选择返回城市"
,
...
...
src/components/SalesModule/groupTourOrderOne.vue
View file @
9293ba0e
...
...
@@ -969,7 +969,11 @@
</el-select>
</el-form-item>
</el-col>
<el-col
:span=
"4"
>
<el-form-item
label=
"行李数量"
prop=
"LuggageNum"
>
<el-input
v-model=
"addMsg.LuggageNum"
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"4"
>
<el-form-item
:label=
"$t('salesModule.SSPT')"
prop=
"BrandId"
v-show=
"addMsg.ClientSource==1"
>
<el-select
v-model=
'addMsg.BrandId'
:disabled=
"false"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
...
...
@@ -1680,12 +1684,14 @@
</tr>
<tr
style=
"height:20px"
>
<td
colspan=
"16"
class=
"RL_Order"
style=
"height:20px"
>
<span
class=
"RL-remarkTitle"
v-if=
"item.guestList.length>0"
>
{{$t('salesModule.MD')}}:
</span>
<span
class=
"RL-redType RL-remarkCon"
v-if=
"item.guestList.length>0"
>
<span
v-for=
"(childItem) in item.guestList"
>
{{childItem.userName}}
</span>
</span>
<span
style=
"display: block"
>
{{$t('salesModule.RoomInfo')}}:{{item.orderGuestHouseStr}}
</span>
<p
>
行李数量:{{item.luggageNum}}
</p>
<span
v-if=
"item.tipMoney"
style=
"color:red"
>
({{$t('fnc.xiaofei')}}:{{item.tipMoney}})
</span>
<div
v-if=
"item.otherContractList"
>
<span
class=
"GO_Contract"
style=
"color:blue;cursor:pointer;"
@
click=
"goSingleContract(item)"
>
...
...
@@ -1978,7 +1984,8 @@
CommissionSharePeople
:
'-1'
,
CommissionShareMoney
:
'0'
,
GuestList
:
[],
GatherAddress
:
""
GatherAddress
:
""
,
LuggageNum
:
''
,
},
GuestList
:
[{
...
...
@@ -2081,6 +2088,11 @@
message
:
'请选择国籍'
,
trigger
:
'change'
},
],
LuggageNum
:
[{
required
:
true
,
message
:
'请输入行李数量'
,
trigger
:
'blur'
}],
PassportNo
:
[{
required
:
true
,
message
:
'请输入护照号'
,
...
...
src/components/SalesModule/productQueryOne2.vue
View file @
9293ba0e
...
...
@@ -491,6 +491,7 @@
GatherAddress
:
''
,
LureEmpId
:
0
,
//引流id
CRMGuestId
:
0
,
//客人ID
LuggageNum
:
''
//行李数量
},
GuestList
:
[{
SurName
:
''
,
...
...
@@ -598,6 +599,11 @@
message
:
'请输入护照号'
,
trigger
:
'blur'
},
],
LuggageNum
:
[{
required
:
true
,
message
:
'请输入行李数量'
,
trigger
:
'blur'
}],
MobilePhone
:
[{
required
:
true
,
message
:
'请输入联系人电话'
,
...
...
@@ -1456,6 +1462,7 @@
this
.
addMsg
.
TripleRoomNum
=
'0'
this
.
addMsg
.
TradeDate
=
''
this
.
addMsg
.
CostType
=
''
this
.
addMsg
.
LuggageNum
=
''
this
.
addMsg
.
PlatformOrder
=
''
this
.
ddlyList
=
[]
this
.
addMsg
.
Remarks
=
''
...
...
src/components/TravelManager/TravelList/RegistrationList.vue
View file @
9293ba0e
...
...
@@ -1252,6 +1252,9 @@
</el-select>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"4"
v-if=
"addMsg.TradeWay == 1"
>
<el-form-item
:label=
"$t('salesModule.PlatOrder')"
prop=
"PlatformOrder"
>
<el-input
v-model=
"addMsg.PlatformOrder"
@
input=
"platformOrderMethods"
:disabled=
"isAllowUpdate == 0"
>
...
...
@@ -1659,6 +1662,11 @@
</el-select>
</el-form-item>
</el-col>
<el-col
:span=
"4"
>
<el-form-item
label=
"行李数量"
v-if=
"addMsg.IsOneDay==1"
prop=
"LuggageNum"
>
<el-input
v-model=
"addMsg.LuggageNum"
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"4"
>
<el-form-item
:label=
"$t('salesModule.SSPT')"
prop=
"BrandId"
v-show=
"addMsg.ClientSource == 1 || addMsg.ClientSource == 4"
>
...
...
@@ -2677,7 +2685,7 @@
<span
v-for=
"subItem in childItem.CancelGuestList"
>
{{ subItem.userName }}
<span
style=
"color:#f56c6c"
>
{{subItem.VisaType==1?'(个签)':''}}
</span>
</span>
</span>
</p>
</p
>
<span
style=
"display: block"
>
{{ $t("salesModule.RoomInfo")
}}
<span
v-if=
"childItem.OneSex > 0"
...
...
@@ -2704,6 +2712,8 @@
style=
"color: #f56c6c; margin-left: 20px; cursor: pointer"
>
{{ $t("ground.tuiJingdian") }}
</span>
</el-popover>
</span>
<p
v-if=
"childItem.IsOneDay==1"
>
行李数量:{{childItem.LuggageNum}}
</p>
<div>
<span
v-if=
"
childItem.OPTipMoney == '' && childItem.TipMoney != ''
...
...
@@ -4055,6 +4065,8 @@
RefuseVisaNum
:
0
,
//拒签人数
OneSex
:
""
,
QuotationUrl
:
""
,
//单团附件
LuggageNum
:
""
,
IsOneDay
:
0
,
},
uploadLloading
:
false
,
fileFujianList
:
[],
...
...
@@ -4114,6 +4126,11 @@
message
:
"请输入联系人姓名"
,
trigger
:
"blur"
,
},
],
LuggageNum
:
[{
required
:
true
,
message
:
'请输入行李数量'
,
trigger
:
'blur'
}],
ContactMobile
:
[{
required
:
true
,
message
:
"请输入联系人电话"
,
...
...
@@ -4152,6 +4169,7 @@
trigger
:
"blur"
,
},
],
},
RemarksRules
:
{
Remarks
:
[{
required
:
true
,
...
...
@@ -5722,6 +5740,7 @@
this
.
ddlyList
=
[];
this
.
addMsg
.
Remarks
=
""
;
this
.
addMsg
.
MinOrderPrice
=
""
;
this
.
addMsg
.
LuggageNum
=
""
;
this
.
addMsg
.
VisaNum
=
"0"
;
this
.
addMsg
.
SafeNum
=
"0"
;
this
.
addMsg
.
AirticketNum
=
"0"
;
...
...
src/components/orderCommon/order-form2.vue
View file @
9293ba0e
...
...
@@ -553,6 +553,15 @@
</el-select>
</el-form-item>
</el-col>
<el-col
:span=
"4"
v-if=
"pagesTitle == '当地游产品'"
>
<!--联系人-->
<el-form-item
label=
"行李数量"
prop=
"LuggageNum"
>
<el-input
v-model=
"addMsg.LuggageNum"
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"4"
>
<!--交易方式-->
<el-form-item
:label=
"$t('tips.jiaoyifangshi')"
prop=
"TradeWay"
...
...
@@ -805,6 +814,7 @@
LureEmpId
:
0
,
//引流id
CRMGuestId
:
0
,
//客人ID
CouponAllotIds
:
''
,
LuggageNum
:
''
,
//行李数量
},
uploadLloading
:
false
,
rules
:
{
...
...
@@ -883,6 +893,11 @@
message
:
"请输入护照号"
,
trigger
:
"blur"
,
},
],
LuggageNum
:
[{
required
:
true
,
message
:
'请输入行李数量'
,
trigger
:
'blur'
}],
MobilePhone
:
[{
required
:
true
,
message
:
"请输入联系人电话"
,
...
...
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