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
6a2515f8
Commit
6a2515f8
authored
Sep 29, 2019
by
黄媛媛
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/luochao/superman
parents
b5d73aba
c3d0d948
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
63 additions
and
21 deletions
+63
-21
CostNewPrice.vue
...ponents/TravelManager/TravelNewQuotation/CostNewPrice.vue
+45
-18
QuotationNewPrice.vue
...ts/TravelManager/TravelNewQuotation/QuotationNewPrice.vue
+4
-2
confirmationOrderDownLoad.vue
src/components/confirmationOrderDownLoad.vue
+7
-0
index.vue
src/components/index.vue
+7
-1
No files found.
src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue
View file @
6a2515f8
...
...
@@ -9,12 +9,15 @@
.CostNewPrice
.CP_halfWi
{
width
:
45%
;
}
.CostNewPrice
.QuotationFirstDiv1
{
padding-top
:
30px
;
.CostNewPrice
.QuotationFirstDiv1
{
padding-top
:
30px
;
}
.CostNewPrice
.QuotationFirstDiv1
.el-form-item__content
.el-select
{
.CostNewPrice
.QuotationFirstDiv1
.el-form-item__content
.el-select
{
width
:
calc
(
100%
-
100px
);
}
}
</
style
>
<
template
>
...
...
@@ -26,7 +29,7 @@
<el-col
:span=
"12"
>
<el-form-item
label=
"线路"
label-width=
"100px"
>
<el-select
v-model=
"postConfig.LineId"
:placeholder=
"$t('pub.pleaseSel')"
@
change=
"getLineTeamList(postConfig.LineId)"
filterable
>
@
change=
"getLineTeamList(postConfig.LineId
,1
)"
filterable
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
'0'
></el-option>
<el-option
v-for=
"item in LineList"
:label=
'item.LineName'
:value=
'item.LineID'
:key=
'item.LineID'
>
</el-option>
...
...
@@ -46,8 +49,8 @@
<el-row>
<el-col
:span=
"24"
>
<el-form-item
label=
"团队标题"
label-width=
"100px"
>
<el-input
v-model=
"postConfig.Title"
type=
"textarea"
style=
"width:94%"
:autosize=
"
{minRows: 1, maxRows: 2 }" resize="none"
placeholder="请填写团队标题" maxlength="200">
</el-input>
<el-input
v-model=
"postConfig.Title"
type=
"textarea"
style=
"width:94%"
:autosize=
"
{minRows: 1, maxRows: 2 }" resize="none"
placeholder="请填写团队标题" maxlength="200">
</el-input>
</el-form-item>
</el-col>
</el-row>
...
...
@@ -130,11 +133,13 @@
<tr>
<td
class=
"CP_comBack"
>
汇率
</td>
<td
v-for=
'item in CostCurrencyList'
>
<el-input
class=
"w80"
v-model=
'item.ExchangeRate'
@
keyup
.
native=
"checkRate(item,'ExchangeRate'),getchange()"
>
<el-input
class=
"w80"
v-model=
'item.ExchangeRate'
@
keyup
.
native=
"checkRate(item,'ExchangeRate'),getchange()"
>
</el-input>
</td>
<td>
<el-input
class=
"w100"
v-model=
'queryMsg.RateInput'
@
keyup
.
native=
"checkRate(queryMsg,'RateInput'),getchange()"
>
<el-input
class=
"w100"
v-model=
'queryMsg.RateInput'
@
keyup
.
native=
"checkRate(queryMsg,'RateInput'),getchange()"
>
</el-input>
</td>
</tr>
...
...
@@ -207,7 +212,8 @@
@
keyup
.
native=
"checkPrice(subItem,'HotelCostPrice')"
></el-input>
</td>
<td>
<el-input
type=
'text'
v-model=
"subItem.BusCostPrice"
@
keyup
.
native=
"checkPrice(subItem,'BusCostPrice'),getchange()"
>
<el-input
type=
'text'
v-model=
"subItem.BusCostPrice"
@
keyup
.
native=
"checkPrice(subItem,'BusCostPrice'),getchange()"
>
</el-input>
</td>
<td>
...
...
@@ -595,8 +601,12 @@
return
totalMoney
;
},
//获取系列列表
getLineTeamList
(
lineId
)
{
this
.
postConfig
.
LineteamId
=
0
;
getLineTeamList
(
lineId
,
isClear
)
{
if
(
isClear
&&
isClear
==
1
)
{
this
.
postConfig
.
LineteamId
=
0
;
}
let
msg
=
{
lineID
:
lineId
,
isTOOP
:
1
...
...
@@ -740,6 +750,16 @@
this
.
queryMsg
.
Money
=
""
;
this
.
shortPeopleNumber
();
},
//删除币种
DeleteCurrency
(
index
)
{
this
.
CostCurrencyList
.
splice
(
index
,
1
);
},
//删除人数
DeletePNumber
(
index
)
{
this
.
CostNumberList
.
splice
(
index
,
1
);
},
//人数排序
shortPeopleNumber
()
{
this
.
CurrencyNumberListExt
.
forEach
(
x
=>
{
...
...
@@ -831,20 +851,27 @@
x
.
OtherMoney
=
(
OtherShareMoney
/
x
.
PeopleNumber
).
toFixed
(
2
);
});
},
getchange
()
{
this
.
getLeaderShare
();
this
.
getSubtotalMoney
();
getchange
()
{
this
.
getLeaderShare
();
this
.
getSubtotalMoney
();
}
},
mounted
()
{
this
.
getAllCurrency
();
},
created
()
{},
created
()
{
},
watch
:
{
postConfig
:
{
handler
:
function
(
val
,
oldVal
)
{
this
.
getLineTeamList
(
this
.
postConfig
.
LineId
);
},
deep
:
true
},
CostNumberList
:
{
handler
:
function
(
val
,
oldVal
)
{
console
.
log
(
"111"
);
this
.
getchange
()
},
deep
:
true
...
...
src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue
View file @
6a2515f8
<
template
>
<div
class=
"DirectQuotation clearfix"
>
<div
class=
"DirectQuotation clearfix"
v-loading=
"loading"
>
<DirectQuotation
ref=
"QuotationPrice"
:postConfig=
"postData"
:dayCostPrice=
"dayCostPriceList"
:otherPrice=
"otherPrice"
:teamPrice=
"teamPrice"
:LineList=
"LineList"
:CostCurrencyList=
"CostCurrencyList"
:CostNumberList=
"CostNumberList"
:CurrencyNumberListExt=
"CurrencyNumberListExt"
></DirectQuotation>
...
...
@@ -113,6 +113,7 @@
ContractUrl
:
""
,
//合同地址
},
LineList
:
[],
//线路列表
loading
:
false
};
},
methods
:
{
...
...
@@ -139,10 +140,11 @@
CostNumberList
:
this
.
CostNumberList
,
CurrencyNumberListExt
:
currencyNumList
};
this
.
loading
=
true
;
this
.
apipost
(
"travel_post_SetConfigOffer_V2"
,
nObj
,
res
=>
{
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
Success
(
res
.
data
.
message
);
this
.
goUrl
(
'newQuotation'
);
...
...
src/components/confirmationOrderDownLoad.vue
View file @
6a2515f8
...
...
@@ -38,6 +38,7 @@
<el-option
label=
"仲夏花火夜"
:value=
"-2"
></el-option>
<el-option
label=
"寻觅日本美食"
:value=
"-3"
></el-option>
<el-option
label=
"邂逅北海道的雪"
:value=
"-4"
></el-option>
<el-option
label=
"日本趣味滑雪乐"
:value=
"-5"
></el-option>
<el-option
v-for=
"item in titleList"
:key=
"item.subCode"
...
...
@@ -738,6 +739,9 @@
if
(
this
.
Typevalue
==-
4
){
title
+=
"邂逅北海道的雪"
}
if
(
this
.
Typevalue
==-
5
){
title
+=
"日本趣味滑雪乐"
}
if
(
this
.
Typevalue
>
0
){
this
.
titleList
.
forEach
(
item
=>
{
if
(
item
.
id
==
this
.
Typevalue
){
...
...
@@ -790,6 +794,9 @@
else
if
(
this
.
Typevalue
==-
4
){
window
.
open
(
"http://www.oytour.com/#/FoodImg4"
);
}
else
if
(
this
.
Typevalue
==-
5
){
window
.
open
(
"http://www.oytour.com/#/Juanski"
);
}
else
{
window
.
open
(
"http://www.oytour.com/#/JuanDetails?id="
+
this
.
Typevalue
);
}
...
...
src/components/index.vue
View file @
6a2515f8
...
...
@@ -1139,7 +1139,13 @@ export default {
},
detailMessage
:
{},
downLoadList
:
[],
NewSaleRnkInfo
:
{},
NewSaleRnkInfo
:
{
List
:
[
{
EmployeeImg
:
''
}
]
},
};
},
filters
:
{
...
...
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