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
c1914762
Commit
c1914762
authored
Jun 10, 2019
by
Mac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改跟团游 产品和订单的少价管理
parent
1c7c83ea
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
229 additions
and
30 deletions
+229
-30
groupTourOrder.vue
src/components/SalesModule/groupTourOrder.vue
+151
-17
productQuery.vue
src/components/SalesModule/productQuery.vue
+78
-13
No files found.
src/components/SalesModule/groupTourOrder.vue
View file @
c1914762
This diff is collapsed.
Click to expand it.
src/components/SalesModule/productQuery.vue
View file @
c1914762
...
@@ -176,7 +176,7 @@
...
@@ -176,7 +176,7 @@
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"参团类型"
prop=
"GroupType"
>
<el-form-item
label=
"参团类型"
prop=
"GroupType"
>
<el-select
v-model=
'addMsg.GroupType'
@
change=
"groupTypeChange()"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-select
v-model=
'addMsg.GroupType'
@
change=
"groupTypeChange()
,gettypechange(addMsg.GroupType)
"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
v-for=
"item in ctlxList"
v-if=
"item.Id!=5"
:label=
'item.Name'
:value=
'item.Id'
:key=
'item.Id'
>
<el-option
v-for=
"item in ctlxList"
v-if=
"item.Id!=5"
:label=
'item.Name'
:value=
'item.Id'
:key=
'item.Id'
>
</el-option>
</el-option>
</el-select>
</el-select>
...
@@ -233,7 +233,8 @@
...
@@ -233,7 +233,8 @@
</el-col>
</el-col>
<el-col
:span=
"4"
>
<el-col
:span=
"4"
>
<el-form-item
label=
"本团单价"
prop=
"TC_Price"
>
<el-form-item
label=
"本团单价"
prop=
"TC_Price"
>
<el-input
v-model=
'addMsg.TC_Price'
:disabled=
"true"
@
input=
"getTotalPrice()"
></el-input>
<el-input
v-if=
"addMsg.GroupType!= 4"
v-model=
'addMsg.TC_Price'
:disabled=
"true"
@
input=
"getTotalPrice()"
></el-input>
<el-input
v-else
v-model=
'SingleDMCPricex'
:disabled=
"true"
@
input=
"getTotalPrice()"
></el-input>
</el-form-item>
</el-form-item>
<el-form-item
label=
"出发联运价"
v-show=
'addMsg.IsIntermodal==1&&addMsg.DepartureCityId!=addObj.StartCityID'
>
<el-form-item
label=
"出发联运价"
v-show=
'addMsg.IsIntermodal==1&&addMsg.DepartureCityId!=addObj.StartCityID'
>
<el-input
v-model=
'stratPrice'
v-show=
'stratPriceShow'
:disabled=
"true"
></el-input>
<el-input
v-model=
'stratPrice'
v-show=
'stratPriceShow'
:disabled=
"true"
></el-input>
...
@@ -256,13 +257,14 @@
...
@@ -256,13 +257,14 @@
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"成交单价"
prop=
"Unit_Price"
v-else
>
<el-form-item
label=
"成交单价"
prop=
"Unit_Price"
v-else
>
<el-input
v-model=
'addMsg.Unit_Price'
@
change=
"getTotalPrice(3)"
></el-input>
<el-input
v-if=
"addMsg.GroupType!= 4"
v-model=
'addMsg.Unit_Price'
@
change=
"getTotalPrice(3)"
></el-input>
<el-input
v-else
v-model=
'SingleDMCPrice'
@
change=
"getTotalPrice(3)"
></el-input>
</el-form-item>
</el-form-item>
</
template
>
</
template
>
<el-form-item
label=
"高于本团单价"
>
<el-form-item
label=
"高于本团单价"
>
<el-switch
v-model=
"HightUnitPrice"
active-value=
"1"
inactive-value=
"2"
></el-switch>
<el-switch
v-model=
"HightUnitPrice"
active-value=
"1"
inactive-value=
"2"
></el-switch>
</el-form-item>
</el-form-item>
<el-form-item>
<el-form-item
v-show=
"addMsg.GroupType!='4'"
>
<p
v-if=
"LessMoney==0"
style=
"line-height: 18px; color: #E95252;"
>
注:如果超出本团的最低让价,差价将由你来承担
</p>
<p
v-if=
"LessMoney==0"
style=
"line-height: 18px; color: #E95252;"
>
注:如果超出本团的最低让价,差价将由你来承担
</p>
<p
v-else=
"LessMoney>0"
style=
"line-height: 18px; color: #E95252;"
>
注:最多少价{{LessMoney}}元,如需少价更多请联系上级主管
</p>
<p
v-else=
"LessMoney>0"
style=
"line-height: 18px; color: #E95252;"
>
注:最多少价{{LessMoney}}元,如需少价更多请联系上级主管
</p>
</el-form-item>
</el-form-item>
...
@@ -709,7 +711,7 @@
...
@@ -709,7 +711,7 @@
<th
width=
"100"
>
日期
</th>
<th
width=
"100"
>
日期
</th>
<th
style=
"border-right:1px solid #E5E5E5;width:150px;"
>
酒店
</th>
<th
style=
"border-right:1px solid #E5E5E5;width:150px;"
>
酒店
</th>
<th
style=
"border-right:1px solid #E5E5E5;width:240px;"
>
酒店情况
</th>
<th
style=
"border-right:1px solid #E5E5E5;width:240px;"
>
酒店情况
</th>
</tr>
</tr>
<
template
v-for=
"subItem in item.HotelOrderListReports"
>
<
template
v-for=
"subItem in item.HotelOrderListReports"
>
<tr
v-for=
"(childItem,childIndex) in subItem.SubList"
>
<tr
v-for=
"(childItem,childIndex) in subItem.SubList"
>
...
@@ -839,7 +841,7 @@
...
@@ -839,7 +841,7 @@
<span
style=
"cursor:pointer;text-decoration: underline;"
@
click=
"downloadFile(item2)"
>
{{item2.Name}}
</span>
<span
style=
"cursor:pointer;text-decoration: underline;"
@
click=
"downloadFile(item2)"
>
{{item2.Name}}
</span>
</p>
</p>
<p>
<p>
<span>
出票状态:
</span>
<span>
出票状态:
</span>
<span
class=
"fz16 fbold"
>
<span
class=
"fz16 fbold"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"全部出票"
placement=
"top"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"全部出票"
placement=
"top"
>
<span
style=
"color: #4BCA81;"
v-if=
"item.MakeInvoice==1"
>
√
</span>
<span
style=
"color: #4BCA81;"
v-if=
"item.MakeInvoice==1"
>
√
</span>
...
@@ -1137,7 +1139,10 @@
...
@@ -1137,7 +1139,10 @@
configId
:
0
,
configId
:
0
,
cityId
:
0
,
cityId
:
0
,
orderId
:
0
orderId
:
0
}
},
SingleDMCPricex
:
0
,
// 单地接;
SingleDMCPrice
:
0
,
// 单地接;
}
}
},
},
components
:
{
components
:
{
...
@@ -1200,6 +1205,40 @@
...
@@ -1200,6 +1205,40 @@
this
.
getTotalPrice
()
this
.
getTotalPrice
()
}
}
},
},
gettypechange
(
type
){
if
(
type
==
4
){
this
.
HightUnitPrice
=
'1'
;
this
.
addMsg
.
AirticketNum
=
0
;
this
.
addMsg
.
ManNum
=
0
;
// this.addMsg.ChirdNum = 0;
this
.
addMsg
.
BabyNum
=
0
;
this
.
addMsg
.
OldPeopleNum
=
0
;
this
.
addMsg
.
ChirdNoNeedBedNum
=
0
;
this
.
addMsg
.
ChirdNeedBedNum
=
0
;
this
.
addMsg
.
PreferPrice
=
0
;
this
.
addMsg
.
SafeNum
=
0
;
this
.
addMsg
.
VisaNum
=
0
;
this
.
addMsg
.
PredictRoomNum
=
0
;
this
.
addMsg
.
YSeatNum
=
0
;
}
else
{
this
.
HightUnitPrice
=
'2'
;
this
.
addMsg
.
AirticketNum
=
0
;
this
.
addMsg
.
ManNum
=
0
;
// this.addMsg.ChirdNum = 0;
this
.
addMsg
.
BabyNum
=
0
;
this
.
addMsg
.
OldPeopleNum
=
0
;
this
.
addMsg
.
ChirdNoNeedBedNum
=
0
;
this
.
addMsg
.
ChirdNeedBedNum
=
0
;
this
.
addMsg
.
PreferPrice
=
0
;
this
.
addMsg
.
SafeNum
=
0
;
this
.
addMsg
.
VisaNum
=
0
;
this
.
addMsg
.
PredictRoomNum
=
0
;
this
.
addMsg
.
YSeatNum
=
0
;
}
this
.
Unit_PriceList
=
[]
},
downloadFile
:
function
(
item
)
{
downloadFile
:
function
(
item
)
{
let
reg
=
/^http
(
s
)?
:
\/\/(
.*
?)\/
/
let
reg
=
/^http
(
s
)?
:
\/\/(
.*
?)\/
/
this
.
downloadFileRename
(
item
.
FullUrl
.
replace
(
reg
,
''
),
item
.
Name
);
this
.
downloadFileRename
(
item
.
FullUrl
.
replace
(
reg
,
''
),
item
.
Name
);
...
@@ -1675,10 +1714,19 @@
...
@@ -1675,10 +1714,19 @@
this
.
addMsg
.
Unit_Price
=
this
.
addMsg
.
TC_Price
this
.
addMsg
.
Unit_Price
=
this
.
addMsg
.
TC_Price
return
return
}
}
if
(
parseFloat
(
this
.
SingleDMCPrice
)
<
this
.
SingleDMCPricex
){
this
.
$message
.
error
(
'成交单价必须大于等于本团单价!'
)
this
.
SingleDMCPrice
=
this
.
SingleDMCPricex
return
}
}
}
this
.
addMsg
.
ChirdNum
=
this
.
addMsg
.
ChirdNoNeedBedNum
*
1
+
this
.
addMsg
.
ChirdNeedBedNum
*
1
this
.
addMsg
.
ChirdNum
=
this
.
addMsg
.
ChirdNoNeedBedNum
*
1
+
this
.
addMsg
.
ChirdNeedBedNum
*
1
//
//
//console.log(this.addObj)
//console.log(this.addObj)
// if(this.addMsg.GroupType == 4){ //如果是地接 传入的成交单价改变
// this.addMsg.Unit_Price = this.SingleDMCPrice
// }
if
(
this
.
addObj
.
IsBirdDiscount
==
1
)
{
//早鸟优惠
if
(
this
.
addObj
.
IsBirdDiscount
==
1
)
{
//早鸟优惠
//this.addMsg.Unit_Price //成交单价
//this.addMsg.Unit_Price //成交单价
//BabyPrice 婴儿价
//BabyPrice 婴儿价
...
@@ -1687,10 +1735,11 @@
...
@@ -1687,10 +1735,11 @@
//DiscountPrice 早鸟优惠
//DiscountPrice 早鸟优惠
let
chengren
=
Number
(
this
.
addMsg
.
ManNum
)
*
(
Number
(
this
.
addMsg
.
Unit_Price
)
-
this
.
addObj
.
DiscountPrice
)
let
chengren
=
Number
(
this
.
addMsg
.
ManNum
)
*
(
Number
(
this
.
addMsg
.
Unit_Price
)
-
this
.
addObj
.
DiscountPrice
)
let
ertong
=
Number
(
this
.
addMsg
.
ChirdNum
)
*
(
Number
(
this
.
addMsg
.
Unit_Price
)
-
this
.
addObj
.
DiscountPrice
+
let
ertong
=
Number
(
this
.
addMsg
.
ChirdNum
)
*
(
Number
(
this
.
addMsg
.
Unit_Price
)
-
this
.
addObj
.
DiscountPrice
+
this
.
addObj
.
BabyChargePrice
)
this
.
addObj
.
BabyChargePrice
)
let
yinger
=
Number
(
this
.
addMsg
.
BabyNum
)
*
this
.
addObj
.
BabyPrice
let
yinger
=
Number
(
this
.
addMsg
.
BabyNum
)
*
this
.
addObj
.
BabyPrice
let
laoren
=
Number
(
this
.
addMsg
.
OldPeopleNum
)
*
(
Number
(
this
.
addMsg
.
Unit_Price
)
-
this
.
addObj
.
DiscountPrice
+
let
laoren
=
Number
(
this
.
addMsg
.
OldPeopleNum
)
*
(
Number
(
this
.
addMsg
.
Unit_Price
)
-
this
.
addObj
.
DiscountPrice
+
this
.
addObj
.
OldManChargePrice
)
this
.
addObj
.
OldManChargePrice
)
let
zafeiqianzhen
=
this
.
addObj
.
OtherPrice
*
(
Number
(
this
.
addMsg
.
ManNum
)
+
Number
(
this
.
addMsg
.
ChirdNum
)
+
let
zafeiqianzhen
=
this
.
addObj
.
OtherPrice
*
(
Number
(
this
.
addMsg
.
ManNum
)
+
Number
(
this
.
addMsg
.
ChirdNum
)
+
Number
(
this
.
addMsg
.
OldPeopleNum
))
+
this
.
addObj
.
VisaPrice
*
(
Number
(
this
.
addMsg
.
AirticketNum
)
+
Number
(
Number
(
this
.
addMsg
.
OldPeopleNum
))
+
this
.
addObj
.
VisaPrice
*
(
Number
(
this
.
addMsg
.
AirticketNum
)
+
Number
(
this
.
addMsg
.
ManNum
)
+
Number
(
this
.
addMsg
.
ChirdNum
)
+
Number
(
this
.
addMsg
.
OldPeopleNum
))
-
this
.
addObj
.
BackVisaPrice
*
this
.
addMsg
.
ManNum
)
+
Number
(
this
.
addMsg
.
ChirdNum
)
+
Number
(
this
.
addMsg
.
OldPeopleNum
))
-
this
.
addObj
.
BackVisaPrice
*
...
@@ -1701,13 +1750,16 @@
...
@@ -1701,13 +1750,16 @@
(
Number
(
this
.
addMsg
.
ChirdNum
)
-
Number
(
this
.
addMsg
.
ChirdNeedBedNum
))
(
Number
(
this
.
addMsg
.
ChirdNum
)
-
Number
(
this
.
addMsg
.
ChirdNeedBedNum
))
let
lianyun
=
(
Number
(
this
.
addMsg
.
ManNum
)
+
Number
(
this
.
addMsg
.
ChirdNum
)
+
Number
(
this
.
addMsg
.
OldPeopleNum
))
*
let
lianyun
=
(
Number
(
this
.
addMsg
.
ManNum
)
+
Number
(
this
.
addMsg
.
ChirdNum
)
+
Number
(
this
.
addMsg
.
OldPeopleNum
))
*
(
Number
(
this
.
stratPrice
)
+
Number
(
this
.
returnPrice
))
(
Number
(
this
.
stratPrice
)
+
Number
(
this
.
returnPrice
))
let
dandijie
=
this
.
addObj
.
SingleDMCPrice
*
Number
(
this
.
addMsg
.
AirticketNum
)
let
dandijie
if
(
this
.
addMsg
.
GroupType
==
4
){
dandijie
=
this
.
SingleDMCPrice
*
Number
(
this
.
addMsg
.
AirticketNum
)
}
else
{
dandijie
=
this
.
addObj
.
SingleDMCPrice
*
Number
(
this
.
addMsg
.
AirticketNum
)
}
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
));
}
else
{
}
else
{
let
chengren
=
Number
(
this
.
addMsg
.
ManNum
)
*
(
Number
(
this
.
addMsg
.
Unit_Price
))
let
chengren
=
Number
(
this
.
addMsg
.
ManNum
)
*
(
Number
(
this
.
addMsg
.
Unit_Price
))
let
ertong
=
Number
(
this
.
addMsg
.
ChirdNum
)
*
(
Number
(
this
.
addMsg
.
Unit_Price
)
+
this
.
addObj
.
BabyChargePrice
)
let
ertong
=
Number
(
this
.
addMsg
.
ChirdNum
)
*
(
Number
(
this
.
addMsg
.
Unit_Price
)
+
this
.
addObj
.
BabyChargePrice
)
let
yinger
=
Number
(
this
.
addMsg
.
BabyNum
)
*
this
.
addObj
.
BabyPrice
let
yinger
=
Number
(
this
.
addMsg
.
BabyNum
)
*
this
.
addObj
.
BabyPrice
...
@@ -1722,7 +1774,12 @@
...
@@ -1722,7 +1774,12 @@
(
Number
(
this
.
addMsg
.
ChirdNum
)
-
Number
(
this
.
addMsg
.
ChirdNeedBedNum
))
(
Number
(
this
.
addMsg
.
ChirdNum
)
-
Number
(
this
.
addMsg
.
ChirdNeedBedNum
))
let
lianyun
=
(
Number
(
this
.
addMsg
.
ManNum
)
+
Number
(
this
.
addMsg
.
ChirdNum
)
+
Number
(
this
.
addMsg
.
OldPeopleNum
))
*
let
lianyun
=
(
Number
(
this
.
addMsg
.
ManNum
)
+
Number
(
this
.
addMsg
.
ChirdNum
)
+
Number
(
this
.
addMsg
.
OldPeopleNum
))
*
(
Number
(
this
.
stratPrice
)
+
Number
(
this
.
returnPrice
))
(
Number
(
this
.
stratPrice
)
+
Number
(
this
.
returnPrice
))
let
dandijie
=
this
.
addObj
.
SingleDMCPrice
*
Number
(
this
.
addMsg
.
AirticketNum
)
let
dandijie
if
(
this
.
addMsg
.
GroupType
==
4
){
dandijie
=
this
.
SingleDMCPrice
*
Number
(
this
.
addMsg
.
AirticketNum
)
}
else
{
dandijie
=
this
.
addObj
.
SingleDMCPrice
*
Number
(
this
.
addMsg
.
AirticketNum
)
}
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
));
...
@@ -1880,6 +1937,12 @@
...
@@ -1880,6 +1937,12 @@
}
}
}
}
if
(
this
.
addMsg
.
GroupType
==
4
){
this
.
addMsg
.
TC_Price
=
this
.
SingleDMCPricex
;
//地接时 本团单价
this
.
addMsg
.
Unit_Price
=
this
.
SingleDMCPrice
;
// 地接时 成交单价
}
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
)
+
Number
(
this
.
addMsg
.
ChirdNum
)
+
Number
(
this
.
addMsg
.
OldPeopleNum
)
+
...
@@ -1918,6 +1981,8 @@
...
@@ -1918,6 +1981,8 @@
}
}
this
.
addMsg
.
Remarks
=
str
this
.
addMsg
.
Remarks
=
str
this
.
otherRemark
=
str
;
this
.
otherRemark
=
str
;
this
.
SingleDMCPrice
=
obj
.
SingleDMCPrice
;
this
.
SingleDMCPricex
=
obj
.
SingleDMCPrice
;
},
},
getPlatformAccount
(
typeIdtwo
)
{
getPlatformAccount
(
typeIdtwo
)
{
let
platBranchId
=
this
.
getLocalStorage
().
RB_Branch_id
;
let
platBranchId
=
this
.
getLocalStorage
().
RB_Branch_id
;
...
...
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