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
50df4003
Commit
50df4003
authored
Aug 07, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
单地接
parent
5cec0ee9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
44 additions
and
11 deletions
+44
-11
groupTourOrderByTuan.vue
src/components/SalesModule/groupTourOrderByTuan.vue
+9
-2
productQuery.vue
src/components/SalesModule/productQuery.vue
+9
-2
RegistrationList.vue
src/components/TravelManager/TravelList/RegistrationList.vue
+26
-7
No files found.
src/components/SalesModule/groupTourOrderByTuan.vue
View file @
50df4003
...
...
@@ -3989,23 +3989,30 @@
Number
(
this
.
addMsg
.
TripleRoomNum
);
},
getNumber
()
{
let
ChirdNum
=
Number
(
this
.
addMsg
.
ChirdNum
)
if
(
this
.
addMsg
.
GroupType
==
4
)
{
ChirdNum
=
0
}
this
.
addMsg
.
ChirdNum
=
this
.
addMsg
.
ChirdNoNeedBedNum
*
1
+
this
.
addMsg
.
ChirdNeedBedNum
*
1
this
.
addMsg
.
VisaNum
=
Number
(
this
.
addMsg
.
AirticketNum
)
+
Number
(
this
.
addMsg
.
ManNum
)
+
Number
(
this
.
addMsg
.
ChirdNum
)
+
ChirdNum
+
Number
(
this
.
addMsg
.
BabyNum
)
+
Number
(
this
.
addMsg
.
OldPeopleNum
);
this
.
addMsg
.
SafeNum
=
Number
(
this
.
addMsg
.
AirticketNum
)
+
Number
(
this
.
addMsg
.
ManNum
)
+
Number
(
this
.
addMsg
.
ChirdNum
)
+
ChirdNum
+
Number
(
this
.
addMsg
.
BabyNum
)
+
Number
(
this
.
addMsg
.
OldPeopleNum
);
var
SeatNum
=
(
Number
(
this
.
addMsg
.
ManNum
)
+
Number
(
this
.
addMsg
.
ChirdNum
)
+
Number
(
this
.
addMsg
.
OldPeopleNum
))
-
(
Number
(
this
.
addMsg
.
ESeatNum
)
+
Number
(
this
.
addMsg
.
FSeatNum
));
this
.
addMsg
.
YSeatNum
=
SeatNum
<
0
?
0
:
SeatNum
;
if
(
this
.
addMsg
.
GroupType
==
4
)
{
this
.
addMsg
.
YSeatNum
=
0
}
},
getTotalPrice
(
t
)
{
if
(
t
===
3
)
{
...
...
src/components/SalesModule/productQuery.vue
View file @
50df4003
...
...
@@ -1712,14 +1712,21 @@
this
.
$forceUpdate
()
return
}
let
ChirdNum
=
Number
(
this
.
addMsg
.
ChirdNum
)
if
(
this
.
addMsg
.
GroupType
==
4
)
{
ChirdNum
=
0
}
this
.
addMsg
.
ChirdNum
=
this
.
addMsg
.
ChirdNoNeedBedNum
*
1
+
this
.
addMsg
.
ChirdNeedBedNum
*
1
this
.
addMsg
.
VisaNum
=
(
Number
(
this
.
addMsg
.
AirticketNum
)
+
Number
(
this
.
addMsg
.
ManNum
)
+
Number
(
this
.
addMsg
.
ChirdNum
)
+
this
.
addMsg
.
VisaNum
=
(
Number
(
this
.
addMsg
.
AirticketNum
)
+
Number
(
this
.
addMsg
.
ManNum
)
+
ChirdNum
+
Number
(
this
.
addMsg
.
BabyNum
)
+
Number
(
this
.
addMsg
.
OldPeopleNum
))
this
.
addMsg
.
SafeNum
=
(
Number
(
this
.
addMsg
.
AirticketNum
)
+
Number
(
this
.
addMsg
.
ManNum
)
+
Number
(
this
.
addMsg
.
ChirdNum
)
+
this
.
addMsg
.
SafeNum
=
(
Number
(
this
.
addMsg
.
AirticketNum
)
+
Number
(
this
.
addMsg
.
ManNum
)
+
ChirdNum
+
Number
(
this
.
addMsg
.
BabyNum
)
+
Number
(
this
.
addMsg
.
OldPeopleNum
))
var
SeatNum
=
(
Number
(
this
.
addMsg
.
ManNum
)
+
Number
(
this
.
addMsg
.
ChirdNum
)
+
Number
(
this
.
addMsg
.
OldPeopleNum
))
-
(
Number
(
this
.
addMsg
.
ESeatNum
)
+
Number
(
this
.
addMsg
.
FSeatNum
));
this
.
addMsg
.
YSeatNum
=
SeatNum
<
0
?
0
:
SeatNum
;
if
(
this
.
addMsg
.
GroupType
==
4
)
{
this
.
addMsg
.
YSeatNum
=
0
}
this
.
autoRemarks
(
"VisaNum"
,
"不要签证数量"
)
},
getTotalPrice
(
t
)
{
...
...
src/components/TravelManager/TravelList/RegistrationList.vue
View file @
50df4003
...
...
@@ -1750,6 +1750,7 @@
@
click=
'EwMsg.OrderId = item.OrderId, EwMsg.ExtraRewardMoney = item.ExtraRewardMoney,EwMsg.ExtraDeductMoney=item.ExtraDeductMoney, OrderMoneyDialog = true'
>
设置额外金额
</div>
<div
@
click=
"SetShouSunClick(item.OrderId)"
>
设置收损金额
</div>
<div
@
click=
"ZhuiJiaTuanKuan(item.OrderId)"
>
追加团款
</div>
<div
@
click=
'deleteItem(item)'
>
删除
</div>
</div>
<el-button
slot=
"reference"
type=
"primary"
...
...
@@ -2036,6 +2037,7 @@
设置额外金额
</div>
<div
@
click=
"SetShouSunClick(childItem.OrderId)"
>
设置收损金额
</div>
<div
@
click=
"lianyunFY(childItem)"
>
联运返佣
</div>
<div
@
click=
"ZhuiJiaTuanKuan(childItem.OrderId)"
>
追加团款
</div>
<div
v-if=
"childItem.OrderState=='1'||childItem.OrderState=='2'||childItem.OrderState=='3'"
@
click=
'deleteItem(childItem)'
>
删除
...
...
@@ -2388,7 +2390,7 @@
@
click=
'EwMsg.OrderId = item.OrderId, EwMsg.ExtraRewardMoney = item.ExtraRewardMoney,EwMsg.ExtraDeductMoney=item.ExtraDeductMoney, OrderMoneyDialog = true'
>
设置额外金额
</div>
<div
@
click=
"SetShouSunClick(item.OrderId)"
>
设置收损金额
</div>
<div
@
click=
"ZhuiJiaTuanKuan(item.OrderId)"
>
追加团款
</div>
<div
v-if=
"item.OrderState=='2'||item.OrderState=='3'"
@
click=
'deleteItem(item)'
>
删除
</div>
</div>
<el-button
slot=
"reference"
type=
"primary"
...
...
@@ -3213,7 +3215,9 @@
OrderUnitPrice
:
0
},
SuperiorPeople
:
[],
Unit_Price
:
0
Unit_Price
:
0
,
zhuijiaShow
:
false
,
zhuijiaMsg
:
{},
};
},
components
:
{
...
...
@@ -3222,6 +3226,15 @@
commonShouSun
:
commonShouSun
},
methods
:
{
// 20190807 新增追加团款
ZhuiJiaTuanKuan
(
orderID
){
this
.
zhuijiaShow
=
true
this
.
zhuijiaMsg
=
{
OrderId
:
orderID
,
OP_Remarks
:
''
,
ChangePrice
:
''
,
}
},
setDanren
(
e
){
e
===
this
.
addMsg
.
OneSex
?
this
.
addMsg
.
OneSex
=
0
:
this
.
addMsg
.
OneSex
=
e
},
...
...
@@ -3919,28 +3932,34 @@
Number
(
this
.
addMsg
.
TripleRoomNum
);
},
getNumber
()
{
let
ChirdNum
=
Number
(
this
.
addMsg
.
ChirdNum
)
if
(
this
.
addMsg
.
GroupType
==
4
)
{
ChirdNum
=
0
}
this
.
addMsg
.
ChirdNum
=
this
.
addMsg
.
ChirdNoNeedBedNum
*
1
+
this
.
addMsg
.
ChirdNeedBedNum
*
1
this
.
addMsg
.
VisaNum
=
Number
(
this
.
addMsg
.
AirticketNum
)
+
Number
(
this
.
addMsg
.
ManNum
)
+
Number
(
this
.
addMsg
.
ChirdNum
)
+
ChirdNum
+
Number
(
this
.
addMsg
.
BabyNum
)
+
Number
(
this
.
addMsg
.
OldPeopleNum
);
this
.
addMsg
.
SafeNum
=
Number
(
this
.
addMsg
.
AirticketNum
)
+
Number
(
this
.
addMsg
.
ManNum
)
+
Number
(
this
.
addMsg
.
ChirdNum
)
+
ChirdNum
+
Number
(
this
.
addMsg
.
BabyNum
)
+
Number
(
this
.
addMsg
.
OldPeopleNum
);
var
SeatNum
=
(
Number
(
this
.
addMsg
.
ManNum
)
+
Number
(
this
.
addMsg
.
ChirdNum
)
+
Number
(
this
.
addMsg
.
OldPeopleNum
))
-
var
SeatNum
=
(
Number
(
this
.
addMsg
.
ManNum
)
+
ChirdNum
+
Number
(
this
.
addMsg
.
OldPeopleNum
))
-
(
Number
(
this
.
addMsg
.
ESeatNum
)
+
Number
(
this
.
addMsg
.
FSeatNum
));
this
.
addMsg
.
YSeatNum
=
SeatNum
<
0
?
0
:
SeatNum
;
if
(
this
.
addMsg
.
GroupType
==
4
)
{
this
.
addMsg
.
YSeatNum
=
0
}
let
totalNum
=
Number
(
this
.
addMsg
.
AirticketNum
)
+
Number
(
this
.
addMsg
.
ManNum
)
+
Number
(
this
.
addMsg
.
ChirdNum
)
+
ChirdNum
+
Number
(
this
.
addMsg
.
BabyNum
)
+
Number
(
this
.
addMsg
.
OldPeopleNum
);
if
(
totalNum
==
0
)
{
...
...
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