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
aed92c83
Commit
aed92c83
authored
Aug 07, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
单地接
parent
8d74b499
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
10 deletions
+26
-10
groupTourOrderByTuan.vue
src/components/SalesModule/groupTourOrderByTuan.vue
+5
-1
productQuery.vue
src/components/SalesModule/productQuery.vue
+5
-4
RegistrationList.vue
src/components/TravelManager/TravelList/RegistrationList.vue
+16
-5
No files found.
src/components/SalesModule/groupTourOrderByTuan.vue
View file @
aed92c83
...
@@ -4420,10 +4420,14 @@
...
@@ -4420,10 +4420,14 @@
this
.
$message
.
warning
(
"儿童占床数量不足!"
);
this
.
$message
.
warning
(
"儿童占床数量不足!"
);
return
;
return
;
}
}
let
ChirdNum
=
Number
(
this
.
addMsg
.
ChirdNum
)
if
(
this
.
addMsg
.
GroupType
==
4
)
{
ChirdNum
=
0
}
this
.
addMsg
.
TCID
=
this
.
addObj
.
TCID
;
this
.
addMsg
.
TCID
=
this
.
addObj
.
TCID
;
this
.
addMsg
.
GuestNum
=
this
.
addMsg
.
GuestNum
=
Number
(
this
.
addMsg
.
ManNum
)
+
Number
(
this
.
addMsg
.
ManNum
)
+
Number
(
this
.
addMsg
.
ChirdNum
)
+
ChirdNum
+
Number
(
this
.
addMsg
.
OldPeopleNum
)
+
Number
(
this
.
addMsg
.
OldPeopleNum
)
+
Number
(
this
.
addMsg
.
BabyNum
)
+
Number
(
this
.
addMsg
.
BabyNum
)
+
Number
(
this
.
addMsg
.
AirticketNum
);
Number
(
this
.
addMsg
.
AirticketNum
);
...
...
src/components/SalesModule/productQuery.vue
View file @
aed92c83
...
@@ -1817,7 +1817,6 @@
...
@@ -1817,7 +1817,6 @@
this
.
addMsg
.
PreferPrice
=
dandijie
+
lianyun
+
chengren
+
ertong
+
yinger
+
laoren
+
zafeiqianzhen
+
danfang
+
this
.
addMsg
.
PreferPrice
=
dandijie
+
lianyun
+
chengren
+
ertong
+
yinger
+
laoren
+
zafeiqianzhen
+
danfang
+
ertongbed
-
this
.
ScenicRefundMoney
*
(
Number
(
this
.
addMsg
.
ManNum
)
+
Number
(
this
.
addMsg
.
ChirdNum
)
+
Number
(
ertongbed
-
this
.
ScenicRefundMoney
*
(
Number
(
this
.
addMsg
.
ManNum
)
+
Number
(
this
.
addMsg
.
ChirdNum
)
+
Number
(
this
.
addMsg
.
OldPeopleNum
));
this
.
addMsg
.
OldPeopleNum
));
console
.
log
(
dandijie
,
lianyun
,
chengren
,
ertong
,
yinger
,
laoren
,
zafeiqianzhen
,
danfang
,
ertongbed
)
}
}
this
.
getTicheng
();
this
.
getTicheng
();
if
(
!
t
)
{
if
(
!
t
)
{
...
@@ -1937,7 +1936,6 @@
...
@@ -1937,7 +1936,6 @@
}
}
}
}
//验证人数和机位数 20190807 修改 如果是不是单地接才判断
//验证人数和机位数 20190807 修改 如果是不是单地接才判断
alert
(
this
.
addMsg
.
GroupType
)
if
(
this
.
addMsg
.
GroupType
!==
'4'
)
{
if
(
this
.
addMsg
.
GroupType
!==
'4'
)
{
if
((
Number
(
this
.
addMsg
.
ManNum
)
+
Number
(
this
.
addMsg
.
ChirdNum
)
+
Number
(
this
.
addMsg
.
OldPeopleNum
))
!=
Number
(
if
((
Number
(
this
.
addMsg
.
ManNum
)
+
Number
(
this
.
addMsg
.
ChirdNum
)
+
Number
(
this
.
addMsg
.
OldPeopleNum
))
!=
Number
(
this
.
addMsg
.
YSeatNum
)
+
Number
(
this
.
addMsg
.
ESeatNum
)
+
Number
(
this
.
addMsg
.
FSeatNum
))
{
this
.
addMsg
.
YSeatNum
)
+
Number
(
this
.
addMsg
.
ESeatNum
)
+
Number
(
this
.
addMsg
.
FSeatNum
))
{
...
@@ -1991,9 +1989,12 @@
...
@@ -1991,9 +1989,12 @@
}
}
let
ChirdNum
=
Number
(
this
.
addMsg
.
ChirdNum
)
if
(
this
.
addMsg
.
GroupType
==
4
)
{
ChirdNum
=
0
}
this
.
addMsg
.
TCID
=
this
.
addObj
.
TCID
this
.
addMsg
.
TCID
=
this
.
addObj
.
TCID
this
.
addMsg
.
GuestNum
=
Number
(
this
.
addMsg
.
ManNum
)
+
Number
(
this
.
addMsg
.
ChirdNum
)
+
Number
(
this
.
addMsg
.
OldPeopleNum
)
+
this
.
addMsg
.
GuestNum
=
Number
(
this
.
addMsg
.
ManNum
)
+
ChirdNum
+
Number
(
this
.
addMsg
.
OldPeopleNum
)
+
Number
(
this
.
addMsg
.
BabyNum
)
+
Number
(
this
.
addMsg
.
AirticketNum
)
Number
(
this
.
addMsg
.
BabyNum
)
+
Number
(
this
.
addMsg
.
AirticketNum
)
this
.
addMsg
.
IsChildrenTour
=
this
.
addObj
.
IsSupportChildren
this
.
addMsg
.
IsChildrenTour
=
this
.
addObj
.
IsSupportChildren
this
.
addMsg
.
IsBirdDiscount
=
this
.
addObj
.
IsBirdDiscount
this
.
addMsg
.
IsBirdDiscount
=
this
.
addObj
.
IsBirdDiscount
...
...
src/components/TravelManager/TravelList/RegistrationList.vue
View file @
aed92c83
...
@@ -3244,12 +3244,20 @@
...
@@ -3244,12 +3244,20 @@
methods
:
{
methods
:
{
// 20190807 新增追加团款 提交按钮
// 20190807 新增追加团款 提交按钮
submitZhuiJiaTuanKuan
(){
submitZhuiJiaTuanKuan
(){
this
.
apipost
(
'sellorder_get_SetOrderOPTotalPrice'
,
msg
,
res
=>
{
if
(
!
this
.
zhuijiaMsg
.
ChangePrice
)
{
this
.
$message
.
error
(
'请输入追加金额!'
)
return
}
if
(
!
this
.
zhuijiaMsg
.
OP_Remarks
)
{
this
.
$message
.
error
(
'请输入备注!'
)
return
}
this
.
apipost
(
'sellorder_get_SetOrderOPTotalPrice'
,
this
.
zhuijiaMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
$message
.
success
(
res
.
dat
e
.
message
)
this
.
$message
.
success
(
res
.
dat
a
.
message
)
this
.
zhuijiaShow
=
false
this
.
zhuijiaShow
=
false
}
else
{
}
else
{
this
.
$message
.
error
(
res
.
dat
e
.
message
)
this
.
$message
.
error
(
res
.
dat
a
.
message
)
}
}
},
err
=>
{})
},
err
=>
{})
},
},
...
@@ -4380,11 +4388,14 @@
...
@@ -4380,11 +4388,14 @@
this
.
addMsg
.
CommissionShareMoney
=
"0"
;
this
.
addMsg
.
CommissionShareMoney
=
"0"
;
}
}
}
}
let
ChirdNum
=
Number
(
this
.
addMsg
.
ChirdNum
)
if
(
this
.
addMsg
.
GroupType
==
4
)
{
ChirdNum
=
0
}
this
.
addMsg
.
TCID
=
this
.
addObj
.
TCID
;
this
.
addMsg
.
TCID
=
this
.
addObj
.
TCID
;
this
.
addMsg
.
GuestNum
=
this
.
addMsg
.
GuestNum
=
Number
(
this
.
addMsg
.
ManNum
)
+
Number
(
this
.
addMsg
.
ManNum
)
+
Number
(
this
.
addMsg
.
ChirdNum
)
+
ChirdNum
+
Number
(
this
.
addMsg
.
OldPeopleNum
)
+
Number
(
this
.
addMsg
.
OldPeopleNum
)
+
Number
(
this
.
addMsg
.
BabyNum
)
+
Number
(
this
.
addMsg
.
BabyNum
)
+
Number
(
this
.
addMsg
.
AirticketNum
);
Number
(
this
.
addMsg
.
AirticketNum
);
...
...
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