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
29343cbb
Commit
29343cbb
authored
Sep 25, 2019
by
黄媛媛
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/luochao/superman
parents
0a7a1260
e6576fb3
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
243 additions
and
79 deletions
+243
-79
groupTourOrder.vue
src/components/SalesModule/groupTourOrder.vue
+4
-4
ShoppingReimbursement.vue
src/components/ShoppingStore/ShoppingReimbursement.vue
+42
-23
ShoppingReimbursementDetails.vue
...components/ShoppingStore/ShoppingReimbursementDetails.vue
+3
-3
TravelContractDetail.vue
src/components/TravelContractDetail.vue
+1
-0
CostNewPrice.vue
...ponents/TravelManager/TravelNewQuotation/CostNewPrice.vue
+169
-36
QuotationNewPrice.vue
...ts/TravelManager/TravelNewQuotation/QuotationNewPrice.vue
+24
-13
No files found.
src/components/SalesModule/groupTourOrder.vue
View file @
29343cbb
...
@@ -1846,14 +1846,14 @@
...
@@ -1846,14 +1846,14 @@
</span>
</span>
</div>
</div>
<div
v-if=
"item.ContractNum.length==0"
>
<
!--
<
div
v-if=
"item.ContractNum.length==0"
>
<span
class=
"GO_Contract"
@
click=
"goContract(item,
{})">领取合同
</span>
<span
class=
"GO_Contract"
@
click=
"goContract(item,
{})">领取合同
</span>
</div>
</div>
-->
<div
v-else
>
<
!--
<
div
v-else
>
<span
v-for=
"sItem in childItem.ContractNum"
class=
"GO_Contract"
@
click=
"goContract(item,sItem)"
>
<span
v-for=
"sItem in childItem.ContractNum"
class=
"GO_Contract"
@
click=
"goContract(item,sItem)"
>
{{
sItem
.
Client_Name
+
''
+
sItem
.
ContractNum
}}
{{
sItem
.
Client_Name
+
''
+
sItem
.
ContractNum
}}
</span>
</span>
</div>
</div>
-->
</td>
</td>
</tr>
</tr>
<tr>
<tr>
...
...
src/components/ShoppingStore/ShoppingReimbursement.vue
View file @
29343cbb
...
@@ -23,6 +23,12 @@
...
@@ -23,6 +23,12 @@
</el-select>
</el-select>
</span>
</span>
</li>
</li>
<li>
<span>
<em>
合团号
</em>
<el-input
v-model=
'msg.CombinationNum'
></el-input>
</span>
</li>
<li>
<li>
<span>
<span>
<em>
团号
</em>
<em>
团号
</em>
...
@@ -80,7 +86,7 @@
...
@@ -80,7 +86,7 @@
{{
subItem
.
StartCityNames
}}
{{
subItem
.
StartCityNames
}}
</td>
</td>
<td
:rowspan=
"outItem.rowspanCount"
v-if=
"index==0&&subIndex==0"
>
<td
:rowspan=
"outItem.rowspanCount"
v-if=
"index==0&&subIndex==0"
>
{{
subItem
.
TCNUMS
}}
{{
subItem
.
TCNUMS
}}
(
{{
subItem
.
TCID
}}
)
</td>
</td>
<td
:rowspan=
"outItem.rowspanCount"
v-if=
"index==0&&subIndex==0"
>
<td
:rowspan=
"outItem.rowspanCount"
v-if=
"index==0&&subIndex==0"
>
{{
subItem
.
LeaderName
}}
{{
subItem
.
LeaderName
}}
...
@@ -94,7 +100,7 @@
...
@@ -94,7 +100,7 @@
{{
subItem
.
StartCityNames
}}
{{
subItem
.
StartCityNames
}}
</td>
</td>
<td>
<td>
{{
subItem
.
TCNUMS
}}
{{
subItem
.
TCNUMS
}}
(
{{
subItem
.
TCID
}}
)
</td>
</td>
<td>
<td>
{{
subItem
.
LeaderName
}}
{{
subItem
.
LeaderName
}}
...
@@ -147,7 +153,8 @@
...
@@ -147,7 +153,8 @@
</div>
</div>
</td>
</td>
<td
:rowspan=
"outItem.rowspanCount"
v-if=
"index==0&&subIndex==0"
>
<td
:rowspan=
"outItem.rowspanCount"
v-if=
"index==0&&subIndex==0"
>
<p
style=
"cursor: pointer;color:blue;"
@
click=
"isShowFinaceDailog=true,CurrentOutItem=outItem"
>
生成单据
</p>
<p
style=
"cursor: pointer;color:blue;"
@
click=
"isShowFinaceDailog=true,CurrentOutItem=outItem"
>
生成单据
</p>
<p
style=
"cursor: pointer;color:blue;margin-top:5px;"
<p
style=
"cursor: pointer;color:blue;margin-top:5px;"
@
click=
"goHuiZhi(outItem.TCIDs, item.LeaderName, item.GuideName, item.StartCityNames, item.TCNUMS)"
>
@
click=
"goHuiZhi(outItem.TCIDs, item.LeaderName, item.GuideName, item.StartCityNames, item.TCNUMS)"
>
选择购物店
</p>
选择购物店
</p>
...
@@ -210,14 +217,15 @@
...
@@ -210,14 +217,15 @@
<
template
>
<
template
>
<el-form
label-width=
"100px"
>
<el-form
label-width=
"100px"
>
<el-form-item
label=
"付款方式"
>
<el-form-item
label=
"付款方式"
>
<el-select
v-model=
"PayType"
>
<el-select
v-model=
"PayType"
>
<el-option
label=
"常规付款"
:value=
"1"
:key=
"1"
></el-option>
<el-option
label=
"常规付款"
:value=
"1"
:key=
"1"
></el-option>
<el-option
label=
"资金池付款"
:value=
"2"
:key=
"2"
></el-option>
<el-option
label=
"资金池付款"
:value=
"2"
:key=
"2"
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-form>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<div
slot=
"footer"
class=
"dialog-footer"
>
<button
class=
"hollowFixedBtn"
@
click=
"isShowFinaceDailog=false,CurrentOutItem=
{}">
{{
$t
(
'pub.cancelBtn'
)
}}
</button>
<button
class=
"hollowFixedBtn"
@
click=
"isShowFinaceDailog=false,CurrentOutItem=
{}">
{{
$t
(
'pub.cancelBtn'
)
}}
</button>
<button
class=
"normalBtn"
type=
"primary"
@
click=
"CreateBill()"
>
{{
$t
(
'pub.sureBtn'
)
}}
</button>
<button
class=
"normalBtn"
type=
"primary"
@
click=
"CreateBill()"
>
{{
$t
(
'pub.sureBtn'
)
}}
</button>
</div>
</div>
</
template
>
</
template
>
...
@@ -229,7 +237,7 @@
...
@@ -229,7 +237,7 @@
data
()
{
data
()
{
return
{
return
{
loading
:
false
,
loading
:
false
,
PayType
:
1
,
//付款方式
PayType
:
1
,
//付款方式
msg
:
{
msg
:
{
pageIndex
:
1
,
pageIndex
:
1
,
pageSize
:
8
,
pageSize
:
8
,
...
@@ -241,16 +249,18 @@
...
@@ -241,16 +249,18 @@
EndDate
:
''
,
EndDate
:
''
,
currentPage
:
1
,
currentPage
:
1
,
total
:
0
,
total
:
0
,
CombinationNum
:
""
,
//合团号
TCNUM
:
""
,
//团号
},
},
LineList
:
[],
LineList
:
[],
LineTeamList
:
[],
LineTeamList
:
[],
shopDataList
:
[],
shopDataList
:
[],
CreateHandBillList
:
[],
CreateHandBillList
:
[],
zhuanjiaoBox
:
false
,
zhuanjiaoBox
:
false
,
isShowFinaceDailog
:
false
,
//是否显示生成财务单据对话框
isShowFinaceDailog
:
false
,
//是否显示生成财务单据对话框
CreateHandBillID
:
''
,
CreateHandBillID
:
''
,
CreateHandObj
:
{},
CreateHandObj
:
{},
CurrentOutItem
:
{}
//当前选中的团
CurrentOutItem
:
{}
//当前选中的团
}
}
},
},
methods
:
{
methods
:
{
...
@@ -425,17 +435,27 @@
...
@@ -425,17 +435,27 @@
var
nMsg
=
{
var
nMsg
=
{
TCIDs
:
that
.
CurrentOutItem
.
TCIDs
,
TCIDs
:
that
.
CurrentOutItem
.
TCIDs
,
PayType
:
that
.
PayType
,
PayType
:
that
.
PayType
,
uid
:
that
.
getLocalStorage
().
EmployeeId
uid
:
that
.
getLocalStorage
().
EmployeeId
};
};
let
fileName
=
"生成["
+
that
.
CurrentOutItem
.
NewCombinationNum
+
"]购物店数据.xls"
;
that
.
apipost
(
"dmcstatistics_post_CheckShopDetailsDMCRate"
,
nMsg
,
res
=>
{
that
.
GetLocalFile
(
"dmcstatistics_post_ShopCreateBillAndExport"
,
nMsg
,
fileName
,
if
(
res
.
data
.
resultCode
==
1
)
{
res
=>
{
if
(
res
.
data
.
data
==
0
)
{
that
.
loading
=
false
;
that
.
Error
(
"请检查汇率有为0的数据,请先在【操作】里面修改汇率再生成财务单据!"
);
this
.
isShowFinaceDailog
=
false
;
that
.
loading
=
false
;
that
.
Success
(
"导入成功!"
);
that
.
isShowFinaceDailog
=
false
;
that
.
getList
();
}
else
{
});
let
fileName
=
"生成["
+
that
.
CurrentOutItem
.
NewCombinationNum
+
"]购物店数据.xls"
;
that
.
GetLocalFile
(
"dmcstatistics_post_ShopCreateBillAndExport"
,
nMsg
,
fileName
,
res
=>
{
that
.
loading
=
false
;
this
.
isShowFinaceDailog
=
false
;
that
.
Success
(
"导入成功!"
);
that
.
getList
();
});
}
}
});
});
});
},
},
},
},
...
@@ -448,8 +468,8 @@
...
@@ -448,8 +468,8 @@
"-"
+
"-"
+
myDate
.
getDate
();
myDate
.
getDate
();
this
.
msg
.
StartDate
=
nowDate
;
this
.
msg
.
StartDate
=
nowDate
;
// this.msg.StartDate
=
'';
// this.msg.StartDate
=
'';
// this.msg.TCNUM
='NRTCA08190613
A';
// this.msg.TCNUM
= 'NRTCA07190704
A';
this
.
getLineList
();
this
.
getLineList
();
this
.
getList
();
this
.
getList
();
},
},
...
@@ -464,7 +484,6 @@
...
@@ -464,7 +484,6 @@
.more_td
>
div
{
.more_td
>
div
{
height
:
40px
;
height
:
40px
;
/*line-height: 40px;*/
border-bottom
:
1px
solid
rgb
(
204
,
204
,
204
);
border-bottom
:
1px
solid
rgb
(
204
,
204
,
204
);
}
}
...
...
src/components/ShoppingStore/ShoppingReimbursementDetails.vue
View file @
29343cbb
...
@@ -10,14 +10,14 @@
...
@@ -10,14 +10,14 @@
<div
style=
"width: 100%; overflow-x: auto;padding-bottom: 10px; "
>
<div
style=
"width: 100%; overflow-x: auto;padding-bottom: 10px; "
>
<table
border=
"0"
cellspacing=
"1"
cellpadding=
"0"
class=
"roomReservationsTalbe"
v-loading=
"loading"
>
<table
border=
"0"
cellspacing=
"1"
cellpadding=
"0"
class=
"roomReservationsTalbe"
v-loading=
"loading"
>
<tr>
<tr>
<th
colspan=
"
6
"
>
导游操作
</th>
<th
colspan=
"
5
"
>
导游操作
</th>
<th
colspan=
"8"
>
地接OP
</th>
<th
colspan=
"8"
>
地接OP
</th>
</tr>
</tr>
<tr>
<tr>
<th
width=
"120"
style=
"display:none;"
>
进店团号
</th>
<th
width=
"120"
style=
"display:none;"
>
进店团号
</th>
<th
width=
"180"
>
店名
</th>
<th
width=
"180"
>
店名
</th>
<th
width=
"90"
>
公司
</th>
<th
width=
"90"
>
公司
</th>
<th
width=
"120"
>
进店时间
</th>
<th
width=
"120"
style=
"display:none"
>
进店时间
</th>
<th
width=
"80"
>
进店人数
</th>
<th
width=
"80"
>
进店人数
</th>
<th
width=
"100"
>
总金额
</th>
<th
width=
"100"
>
总金额
</th>
<th
width=
"100"
>
佣金领取状况
</th>
<th
width=
"100"
>
佣金领取状况
</th>
...
@@ -49,7 +49,7 @@
...
@@ -49,7 +49,7 @@
{{
subItem
.
BName
}}
{{
subItem
.
BName
}}
<span
@
click=
"DeleteItem(subItem)"
style=
"color:blue;cursor:pointer;text-decoration:underline;"
>
删除
</span>
<span
@
click=
"DeleteItem(subItem)"
style=
"color:blue;cursor:pointer;text-decoration:underline;"
>
删除
</span>
</td>
</td>
<td
class=
"more_td"
v-if=
"subIndex==0"
:rowspan=
"item.ShopDetailsList.length"
>
<td
class=
"more_td"
v-if=
"subIndex==0"
:rowspan=
"item.ShopDetailsList.length"
style=
"display:none"
>
<el-input
v-model=
"item.ShopDetailsList[0].EnterTime"
placeholder=
"2019-01-01"
<el-input
v-model=
"item.ShopDetailsList[0].EnterTime"
placeholder=
"2019-01-01"
@
change=
"formatDateTime(item.ShopDetailsList[0].EnterTime,item)"
></el-input>
@
change=
"formatDateTime(item.ShopDetailsList[0].EnterTime,item)"
></el-input>
<!--EnterTime 进店时间-->
<!--EnterTime 进店时间-->
...
...
src/components/TravelContractDetail.vue
View file @
29343cbb
...
@@ -911,6 +911,7 @@
...
@@ -911,6 +911,7 @@
let
urlObj
=
this
.
domainManager
();
let
urlObj
=
this
.
domainManager
();
let
msg
=
{
let
msg
=
{
TCID
:
this
.
$route
.
query
.
TCID
,
TCID
:
this
.
$route
.
query
.
TCID
,
GuestId
:
this
.
msg
.
guestId
,
orderID
:
this
.
$route
.
query
.
orderID
,
orderID
:
this
.
$route
.
query
.
orderID
,
};
};
this
.
pdfLoading
=
true
;
this
.
pdfLoading
=
true
;
...
...
src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue
View file @
29343cbb
...
@@ -129,11 +129,11 @@
...
@@ -129,11 +129,11 @@
<tr>
<tr>
<td
class=
"CP_comBack"
>
汇率
</td>
<td
class=
"CP_comBack"
>
汇率
</td>
<td
v-for=
'item in CostCurrencyList'
>
<td
v-for=
'item in CostCurrencyList'
>
<el-input
class=
"w80"
v-model=
'item.ExchangeRate'
@
keyup
.
native=
"checkRate(item,'ExchangeRate')"
>
<el-input
class=
"w80"
v-model=
'item.ExchangeRate'
@
keyup
.
native=
"checkRate(item,'ExchangeRate')
,getchange()
"
>
</el-input>
</el-input>
</td>
</td>
<td>
<td>
<el-input
class=
"w100"
v-model=
'queryMsg.RateInput'
@
keyup
.
native=
"checkRate(queryMsg,'RateInput')"
>
<el-input
class=
"w100"
v-model=
'queryMsg.RateInput'
@
keyup
.
native=
"checkRate(queryMsg,'RateInput')
,getchange()
"
>
</el-input>
</el-input>
</td>
</td>
</tr>
</tr>
...
@@ -145,13 +145,13 @@
...
@@ -145,13 +145,13 @@
<el-input
class=
"w80"
v-model=
'item.PeopleNumber'
@
keyup
.
native=
"checkInteger(item,'PeopleNumber')"
>
<el-input
class=
"w80"
v-model=
'item.PeopleNumber'
@
keyup
.
native=
"checkInteger(item,'PeopleNumber')"
>
</el-input>
</el-input>
<span>
<span>
<i
class=
"iconfont icon-quxiao"
@
click=
"DeletePNumber(index)"
></i>
<i
class=
"iconfont icon-quxiao"
@
click=
"DeletePNumber(index)
,getchange()
"
></i>
</span>
</span>
</td>
</td>
<td
width=
"150"
>
<td
width=
"150"
>
<el-form-item>
<el-form-item>
<el-input
class=
"w80"
v-model=
'queryMsg.PeopleNumber'
<el-input
class=
"w80"
v-model=
'queryMsg.PeopleNumber'
@
keyup
.
native=
"checkInteger(queryMsg,'PeopleNumber')"
></el-input>
@
keyup
.
native=
"checkInteger(queryMsg,'PeopleNumber')
,getchange()
"
></el-input>
</el-form-item>
</el-form-item>
<div
class=
"AS_addPeoNumer"
>
<div
class=
"AS_addPeoNumer"
>
<i
class=
"iconfont icon-img_haha"
@
click=
"addPeoNunber"
></i>
<i
class=
"iconfont icon-img_haha"
@
click=
"addPeoNunber"
></i>
...
@@ -163,11 +163,10 @@
...
@@ -163,11 +163,10 @@
<td
v-if=
"checkExists(item.CurrencyId)"
v-for=
"childItem in getCurrencyNumberList(item.CurrencyId)"
>
<td
v-if=
"checkExists(item.CurrencyId)"
v-for=
"childItem in getCurrencyNumberList(item.CurrencyId)"
>
<el-form-item>
<el-form-item>
<el-input
class=
"w80"
v-model=
'childItem.Money'
<el-input
class=
"w80"
v-model=
'childItem.Money'
@
keyup
.
native=
"checkPrice(childItem,'Money',true),
ReCalc
()"
></el-input>
@
keyup
.
native=
"checkPrice(childItem,'Money',true),
getchange
()"
></el-input>
</el-form-item>
</el-form-item>
</td>
</td>
<td>
<td>
</td>
</td>
</tr>
</tr>
</table>
</table>
...
@@ -207,25 +206,25 @@
...
@@ -207,25 +206,25 @@
@
keyup
.
native=
"checkPrice(subItem,'HotelCostPrice')"
></el-input>
@
keyup
.
native=
"checkPrice(subItem,'HotelCostPrice')"
></el-input>
</td>
</td>
<td>
<td>
<el-input
type=
'text'
v-model=
"subItem.BusCostPrice"
@
keyup
.
native=
"checkPrice(subItem,'BusCostPrice')"
>
<el-input
type=
'text'
v-model=
"subItem.BusCostPrice"
@
keyup
.
native=
"checkPrice(subItem,'BusCostPrice')
,getchange()
"
>
</el-input>
</el-input>
</td>
</td>
<td>
<td>
<el-input
type=
'text'
v-model=
"subItem.ScenicCostPrice"
<el-input
type=
'text'
v-model=
"subItem.ScenicCostPrice"
@
keyup
.
native=
"checkPrice(subItem,'ScenicCostPrice')"
></el-input>
@
keyup
.
native=
"checkPrice(subItem,'ScenicCostPrice')
,getchange()
"
></el-input>
</td>
</td>
<td>
<td>
<el-input
type=
"text"
v-model=
'subItem.BreakfastCostPrice'
<el-input
type=
"text"
v-model=
'subItem.BreakfastCostPrice'
@
keyup
.
native=
"checkPrice(subItem,'BreakfastCostPrice')"
>
@
keyup
.
native=
"checkPrice(subItem,'BreakfastCostPrice')
,getchange()
"
>
</el-input>
</el-input>
</td>
</td>
<td>
<td>
<el-input
type=
"text"
v-model=
'subItem.LunchCostPrice'
<el-input
type=
"text"
v-model=
'subItem.LunchCostPrice'
@
keyup
.
native=
"checkPrice(subItem,'LunchCostPrice')"
></el-input>
@
keyup
.
native=
"checkPrice(subItem,'LunchCostPrice')
,getchange()
"
></el-input>
</td>
</td>
<td>
<td>
<el-input
type=
"text"
v-model=
'subItem.DinnerCostPrice'
<el-input
type=
"text"
v-model=
'subItem.DinnerCostPrice'
@
keyup
.
native=
"checkPrice(subItem,'DinnerCostPrice')"
></el-input>
@
keyup
.
native=
"checkPrice(subItem,'DinnerCostPrice')
,getchange()
"
></el-input>
</td>
</td>
</tr>
</tr>
</table>
</table>
...
@@ -247,7 +246,7 @@
...
@@ -247,7 +246,7 @@
<td>
<td>
<el-form-item>
<el-form-item>
<el-input
type=
'text'
class=
"w120"
v-model=
"OtherPrice.InlandAirTicketMoney"
<el-input
type=
'text'
class=
"w120"
v-model=
"OtherPrice.InlandAirTicketMoney"
@
keyup
.
native=
"checkPrice(OtherPrice,'InlandAirTicketMoney')"
></el-input>
@
keyup
.
native=
"checkPrice(OtherPrice,'InlandAirTicketMoney')
,getchange()
"
></el-input>
</el-form-item>
</el-form-item>
</td>
</td>
</tr>
</tr>
...
@@ -267,7 +266,7 @@
...
@@ -267,7 +266,7 @@
<td>
<td>
<el-form-item>
<el-form-item>
<el-input
type=
'text'
class=
"w120"
v-model=
"OtherPrice.InlandShipTicketMoney"
<el-input
type=
'text'
class=
"w120"
v-model=
"OtherPrice.InlandShipTicketMoney"
@
keyup
.
native=
"checkPrice(OtherPrice,'InlandShipTicketMoney')"
></el-input>
@
keyup
.
native=
"checkPrice(OtherPrice,'InlandShipTicketMoney')
,getchange()
"
></el-input>
</el-form-item>
</el-form-item>
</td>
</td>
</tr>
</tr>
...
@@ -287,7 +286,7 @@
...
@@ -287,7 +286,7 @@
<td>
<td>
<el-form-item>
<el-form-item>
<el-input
type=
'text'
class=
"w120"
v-model=
"OtherPrice.InlandTrainTicketMoney"
<el-input
type=
'text'
class=
"w120"
v-model=
"OtherPrice.InlandTrainTicketMoney"
@
keyup
.
native=
"checkPrice(OtherPrice,'InlandTrainTicketMoney')"
></el-input>
@
keyup
.
native=
"checkPrice(OtherPrice,'InlandTrainTicketMoney')
,getchange()
"
></el-input>
</el-form-item>
</el-form-item>
</td>
</td>
</tr>
</tr>
...
@@ -300,7 +299,7 @@
...
@@ -300,7 +299,7 @@
<td
colspan=
'3'
>
<td
colspan=
'3'
>
<el-form-item>
<el-form-item>
<el-input
type=
'text'
class=
"w120"
v-model=
"OtherPrice.VisaMoney"
<el-input
type=
'text'
class=
"w120"
v-model=
"OtherPrice.VisaMoney"
@
keyup
.
native=
"checkPrice(OtherPrice,'VisaMoney')"
></el-input>
@
keyup
.
native=
"checkPrice(OtherPrice,'VisaMoney')
,getchange()
"
></el-input>
</el-form-item>
</el-form-item>
</td>
</td>
</tr>
</tr>
...
@@ -310,7 +309,7 @@
...
@@ -310,7 +309,7 @@
<td>
<td>
<el-form-item>
<el-form-item>
<el-input
type=
'text'
class=
"w120"
v-model=
"OtherPrice.SafeMoney"
<el-input
type=
'text'
class=
"w120"
v-model=
"OtherPrice.SafeMoney"
@
keyup
.
native=
"checkPrice(OtherPrice,'SafeMoney')"
></el-input>
@
keyup
.
native=
"checkPrice(OtherPrice,'SafeMoney')
,getchange()
"
></el-input>
</el-form-item>
</el-form-item>
</td>
</td>
</tr>
</tr>
...
@@ -320,7 +319,7 @@
...
@@ -320,7 +319,7 @@
<td>
<td>
<el-form-item>
<el-form-item>
<el-input
type=
'text'
class=
"w120"
v-model=
"OtherPrice.LeaderTripMoney"
<el-input
type=
'text'
class=
"w120"
v-model=
"OtherPrice.LeaderTripMoney"
@
keyup
.
native=
"checkPrice(OtherPrice,'LeaderTripMoney')"
></el-input>
@
keyup
.
native=
"checkPrice(OtherPrice,'LeaderTripMoney')
,getchange()
"
></el-input>
</el-form-item>
</el-form-item>
</td>
</td>
</tr>
</tr>
...
@@ -330,7 +329,7 @@
...
@@ -330,7 +329,7 @@
<td>
<td>
<el-form-item>
<el-form-item>
<el-input
type=
'text'
class=
"w120"
v-model=
"OtherPrice.DriverGuideMoney"
<el-input
type=
'text'
class=
"w120"
v-model=
"OtherPrice.DriverGuideMoney"
@
keyup
.
native=
"checkPrice(OtherPrice,'DriverGuideMoney')"
></el-input>
@
keyup
.
native=
"checkPrice(OtherPrice,'DriverGuideMoney')
,getchange()
"
></el-input>
</el-form-item>
</el-form-item>
</td>
</td>
</tr>
</tr>
...
@@ -343,7 +342,7 @@
...
@@ -343,7 +342,7 @@
<td
colspan=
'3'
>
<td
colspan=
'3'
>
<el-form-item>
<el-form-item>
<el-input
type=
'text'
class=
"w120"
v-model=
"OtherPrice.SalesCommissionMoney"
<el-input
type=
'text'
class=
"w120"
v-model=
"OtherPrice.SalesCommissionMoney"
@
keyup
.
native=
"checkPrice(OtherPrice,'SalesCommissionMoney')"
></el-input>
@
keyup
.
native=
"checkPrice(OtherPrice,'SalesCommissionMoney')
,getchange()
"
></el-input>
</el-form-item>
</el-form-item>
</td>
</td>
</tr>
</tr>
...
@@ -353,7 +352,7 @@
...
@@ -353,7 +352,7 @@
<td>
<td>
<el-form-item>
<el-form-item>
<el-input
type=
'text'
class=
"w120"
v-model=
"OtherPrice.OfficeCommissionMoney"
<el-input
type=
'text'
class=
"w120"
v-model=
"OtherPrice.OfficeCommissionMoney"
@
keyup
.
native=
"checkPrice(OtherPrice,'OfficeCommissionMoney')"
></el-input>
@
keyup
.
native=
"checkPrice(OtherPrice,'OfficeCommissionMoney')
,getchange()
"
></el-input>
</el-form-item>
</el-form-item>
</td>
</td>
</tr>
</tr>
...
@@ -365,7 +364,7 @@
...
@@ -365,7 +364,7 @@
<td>
<td>
<el-form-item>
<el-form-item>
<el-input
type=
'text'
class=
"w120"
v-model=
"OtherPrice.AirTicketMoeny"
<el-input
type=
'text'
class=
"w120"
v-model=
"OtherPrice.AirTicketMoeny"
@
keyup
.
native=
"checkPrice(OtherPrice,'AirTicketMoeny')"
></el-input>
@
keyup
.
native=
"checkPrice(OtherPrice,'AirTicketMoeny')
,getchange()
"
></el-input>
</el-form-item>
</el-form-item>
</td>
</td>
</tr>
</tr>
...
@@ -378,7 +377,7 @@
...
@@ -378,7 +377,7 @@
<td
colspan=
'3'
>
<td
colspan=
'3'
>
<el-form-item>
<el-form-item>
<el-input
type=
'text'
class=
"w120"
v-model=
"OtherPrice.TripMoney"
<el-input
type=
'text'
class=
"w120"
v-model=
"OtherPrice.TripMoney"
@
keyup
.
native=
"checkPrice(OtherPrice,'TripMoney',true)"
></el-input>
@
keyup
.
native=
"checkPrice(OtherPrice,'TripMoney',true)
,getchange()
"
></el-input>
</el-form-item>
</el-form-item>
</td>
</td>
</tr>
</tr>
...
@@ -388,7 +387,7 @@
...
@@ -388,7 +387,7 @@
<td>
<td>
<el-form-item>
<el-form-item>
<el-input
type=
'text'
class=
"w120"
v-model=
"OtherPrice.GuidePeopleMoney"
<el-input
type=
'text'
class=
"w120"
v-model=
"OtherPrice.GuidePeopleMoney"
@
keyup
.
native=
"checkPrice(OtherPrice,'GuidePeopleMoney')"
></el-input>
@
keyup
.
native=
"checkPrice(OtherPrice,'GuidePeopleMoney')
,getchange()
"
></el-input>
</el-form-item>
</el-form-item>
</td>
</td>
</tr>
</tr>
...
@@ -419,7 +418,7 @@
...
@@ -419,7 +418,7 @@
<td>
<td>
<el-form-item>
<el-form-item>
<el-input
type=
'text'
class=
"w120"
v-model=
"OtherPrice.AirTicketShareMoney"
<el-input
type=
'text'
class=
"w120"
v-model=
"OtherPrice.AirTicketShareMoney"
@
keyup
.
native=
"checkPrice(OtherPrice,'AirTicketShareMoney')"
></el-input>
@
keyup
.
native=
"checkPrice(OtherPrice,'AirTicketShareMoney')
,getchange()
"
></el-input>
</el-form-item>
</el-form-item>
</td>
</td>
<td
v-for=
"item in CostNumberList"
:key=
"item.subCode"
>
<td
v-for=
"item in CostNumberList"
:key=
"item.subCode"
>
...
@@ -431,7 +430,7 @@
...
@@ -431,7 +430,7 @@
<td>
<td>
<el-form-item>
<el-form-item>
<el-input
type=
'text'
class=
"w120"
v-model=
"OtherPrice.TicketShareMoney"
<el-input
type=
'text'
class=
"w120"
v-model=
"OtherPrice.TicketShareMoney"
@
keyup
.
native=
"checkPrice(OtherPrice,'TicketShareMoney')"
></el-input>
@
keyup
.
native=
"checkPrice(OtherPrice,'TicketShareMoney')
,getchange()
"
></el-input>
</el-form-item>
</el-form-item>
</td>
</td>
<td
v-for=
"item in CostNumberList"
:key=
"item.subCode"
>
<td
v-for=
"item in CostNumberList"
:key=
"item.subCode"
>
...
@@ -443,7 +442,7 @@
...
@@ -443,7 +442,7 @@
<td>
<td>
<el-form-item>
<el-form-item>
<el-input
type=
'text'
class=
"w120"
v-model=
"OtherPrice.SingleRoomShareMoney"
<el-input
type=
'text'
class=
"w120"
v-model=
"OtherPrice.SingleRoomShareMoney"
@
keyup
.
native=
"checkPrice(OtherPrice,'SingleRoomShareMoney')"
></el-input>
@
keyup
.
native=
"checkPrice(OtherPrice,'SingleRoomShareMoney')
,getchange()
"
></el-input>
</el-form-item>
</el-form-item>
</td>
</td>
<td
v-for=
"item in CostNumberList"
:key=
"item.subCode"
>
<td
v-for=
"item in CostNumberList"
:key=
"item.subCode"
>
...
@@ -455,25 +454,31 @@
...
@@ -455,25 +454,31 @@
<td>
<td>
<el-form-item>
<el-form-item>
<el-input
type=
'text'
class=
"w120"
v-model=
"OtherPrice.InlandTrafficShareMoney"
<el-input
type=
'text'
class=
"w120"
v-model=
"OtherPrice.InlandTrafficShareMoney"
@
keyup
.
native=
"checkPrice(OtherPrice,'InlandTrafficShareMoney')"
></el-input>
@
keyup
.
native=
"checkPrice(OtherPrice,'InlandTrafficShareMoney')
,getchange()
"
></el-input>
</el-form-item>
</el-form-item>
</td>
</td>
<td
v-for=
"item in CostNumberList"
:key=
"item.subCode"
>
{{item.InlandTrafficMoney}}
</td>
</tr>
</tr>
<tr>
<tr>
<td>
杂费
</td>
<td>
杂费
</td>
<td>
<td>
<el-form-item>
<el-form-item>
<el-input
type=
'text'
class=
"w120"
v-model=
"OtherPrice.OtherShareMoney"
<el-input
type=
'text'
class=
"w120"
v-model=
"OtherPrice.OtherShareMoney"
@
keyup
.
native=
"checkPrice(OtherPrice,'OtherShareMoney')"
></el-input>
@
keyup
.
native=
"checkPrice(OtherPrice,'OtherShareMoney')
,getchange()
"
></el-input>
</el-form-item>
</el-form-item>
</td>
</td>
<td
v-for=
"item in CostNumberList"
:key=
"item.subCode"
>
{{item.OtherMoney}}
</td>
</tr>
</tr>
<tr>
<tr>
<td>
小计
</td>
<td>
小计
</td>
<td></td>
<td></td>
<td
v-for=
"item in CostNumberList"
:key=
"item.subCode"
>
{{item.SubtotalMoney}}
</td>
</tr>
</tr>
</table>
</table>
<div
class=
"Cost_Line"
></div>
<div
class=
"Cost_Line"
></div>
...
@@ -483,14 +488,17 @@
...
@@ -483,14 +488,17 @@
<td
width=
'250'
rowspan=
"2"
class=
"CP_comBack"
>
<td
width=
'250'
rowspan=
"2"
class=
"CP_comBack"
>
人数统计
人数统计
</td>
</td>
<td
v-for=
"item in CostNumberList"
:key=
"item.subCode"
class=
"CP_comBack"
>
{{item.PeopleNumber}}+1
</td>
</tr>
</tr>
<tr>
<tr>
<td
v-for=
"item in CostNumberList"
:key=
"item.subCode"
>
{{item.TotalMoney}}
</td>
</tr>
</tr>
</table>
</table>
</el-form>
</el-form>
</div>
</div>
</div>
</div>
</template>
</template>
...
@@ -524,6 +532,16 @@
...
@@ -524,6 +532,16 @@
// );
// );
// this.$emit("headCallBack", this.OfferCostPriceObj);
// this.$emit("headCallBack", this.OfferCostPriceObj);
},
},
//获取汇率
getCurrencyMoney
(
currencyId
)
{
let
currency
=
0.0
;
this
.
CostCurrencyList
.
forEach
(
x
=>
{
if
(
x
.
CurrencyId
==
currencyId
)
{
currency
=
x
.
ExchangeRate
;
}
});
return
currency
;
},
//判断币种是否相等
//判断币种是否相等
checkExists
(
CurrencyId
)
{
checkExists
(
CurrencyId
)
{
var
flag
=
false
;
var
flag
=
false
;
...
@@ -534,6 +552,47 @@
...
@@ -534,6 +552,47 @@
});
});
return
flag
;
return
flag
;
},
},
//获取不同人数组合价
getCurrencyNumberTotalMoney
(
peopleNumber
)
{
let
totalMoney
=
0.0
;
this
.
CurrencyNumberListExt
.
forEach
(
x
=>
{
x
.
currencyNumberList
.
forEach
(
y
=>
{
if
(
peopleNumber
===
y
.
PeopleNumber
)
{
totalMoney
+=
this
.
getConvertMoney
(
y
.
Money
)
*
this
.
getCurrencyMoney
(
y
.
CurrencyId
);
}
});
});
return
totalMoney
;
},
//获取主成本价
getCostTotalMoney
()
{
let
totalMoney
=
this
.
getConvertMoney
(
this
.
OtherPrice
.
InlandAirTicketMoney
)
*
this
.
getCurrencyMoney
(
this
.
OtherPrice
.
InlandAirTicketCurrency
)
+
this
.
getConvertMoney
(
this
.
OtherPrice
.
InlandShipTicketMoney
)
*
this
.
getCurrencyMoney
(
this
.
OtherPrice
.
InlandShipTicketCurrency
)
+
this
.
getConvertMoney
(
this
.
OtherPrice
.
InlandTrainTicketMoney
)
*
this
.
getCurrencyMoney
(
this
.
OtherPrice
.
InlandTrainTicketCurrency
)
+
this
.
getConvertMoney
(
this
.
OtherPrice
.
DriverGuideMoney
)
+
this
.
getConvertMoney
(
this
.
OtherPrice
.
LeaderTripMoney
)
+
this
.
getConvertMoney
(
this
.
OtherPrice
.
OfficeCommissionMoney
)
+
this
.
getConvertMoney
(
this
.
OtherPrice
.
SafeMoney
)
+
this
.
getConvertMoney
(
this
.
OtherPrice
.
SalesCommissionMoney
)
+
this
.
getConvertMoney
(
this
.
OtherPrice
.
TripMoney
)
+
this
.
getConvertMoney
(
this
.
OtherPrice
.
GuidePeopleMoney
)
+
this
.
getConvertMoney
(
this
.
OtherPrice
.
AirTicketMoeny
)
+
this
.
getConvertMoney
(
this
.
OtherPrice
.
KBMoney
)
+
this
.
getConvertMoney
(
this
.
OtherPrice
.
VisaMoney
);
return
totalMoney
;
},
//获取系列列表
//获取系列列表
getLineTeamList
(
lineId
)
{
getLineTeamList
(
lineId
)
{
this
.
postConfig
.
LineteamId
=
0
;
this
.
postConfig
.
LineteamId
=
0
;
...
@@ -711,11 +770,85 @@
...
@@ -711,11 +770,85 @@
err
=>
{}
err
=>
{}
);
);
},
},
//计算总价
getSubtotalMoney
()
{
let
that
=
this
;
this
.
CostNumberList
.
forEach
(
x
=>
{
x
.
SubtotalMoney
=
(
this
.
getConvertMoney
(
x
.
AirTicketMoney
)
+
this
.
getConvertMoney
(
x
.
TicketMoney
)
+
this
.
getConvertMoney
(
x
.
SingleRoomMoney
)
+
this
.
getConvertMoney
(
x
.
InlandTrafficMoney
)
+
this
.
getConvertMoney
(
x
.
OtherMoney
)
).
toFixed
(
2
);
x
.
TotalMoney
=
(
that
.
getLocalTotalMoney
()
+
that
.
getCostTotalMoney
()
+
this
.
getConvertMoney
(
x
.
SubtotalMoney
)
+
this
.
getCurrencyNumberTotalMoney
(
x
.
PeopleNumber
)
).
toFixed
(
2
);
});
},
//价格转换器
getConvertMoney
(
value
)
{
if
(
value
===
""
||
value
===
undefined
||
value
===
null
)
{
value
=
0.0
;
}
return
parseFloat
(
value
);
},
//获取地接项目报价
getLocalTotalMoney
()
{
let
totalMoney
=
0.0
;
this
.
dayCostPrice
.
forEach
(
x
=>
{
let
subTotalMoney
=
0.0
;
subTotalMoney
=
(
this
.
getConvertMoney
(
x
.
HotelCostPrice
)
+
this
.
getConvertMoney
(
x
.
BusCostPrice
)
+
this
.
getConvertMoney
(
x
.
ScenicCostPrice
)
+
this
.
getConvertMoney
(
x
.
BreakfastCostPrice
)
+
this
.
getConvertMoney
(
x
.
LunchCostPrice
)
+
this
.
getConvertMoney
(
x
.
DinnerCostPrice
))
*
this
.
getCurrencyMoney
(
x
.
CurrencyId
);
totalMoney
+=
subTotalMoney
;
});
return
totalMoney
;
},
//计算领队分摊
getLeaderShare
()
{
let
that
=
this
;
var
AirTicketShareMoney
=
this
.
OtherPrice
.
AirTicketShareMoney
;
var
TicketShareMoney
=
this
.
OtherPrice
.
TicketShareMoney
;
var
SingleRoomShareMoney
=
this
.
OtherPrice
.
SingleRoomShareMoney
;
var
InlandTrafficShareMoney
=
this
.
OtherPrice
.
InlandTrafficShareMoney
;
var
OtherShareMoney
=
this
.
OtherPrice
.
OtherShareMoney
;
this
.
CostNumberList
.
forEach
(
x
=>
{
x
.
AirTicketMoney
=
(
AirTicketShareMoney
/
x
.
PeopleNumber
).
toFixed
(
2
);
x
.
TicketMoney
=
(
TicketShareMoney
/
x
.
PeopleNumber
).
toFixed
(
2
);
x
.
SingleRoomMoney
=
(
SingleRoomShareMoney
/
x
.
PeopleNumber
).
toFixed
(
2
);
x
.
InlandTrafficMoney
=
(
InlandTrafficShareMoney
/
x
.
PeopleNumber
).
toFixed
(
2
);
x
.
OtherMoney
=
(
OtherShareMoney
/
x
.
PeopleNumber
).
toFixed
(
2
);
});
},
getchange
()
{
this
.
getLeaderShare
();
this
.
getSubtotalMoney
();
}
},
},
mounted
()
{
mounted
()
{
this
.
getAllCurrency
();
this
.
getAllCurrency
();
},
},
created
()
{},
created
()
{},
watch
:
{}
watch
:
{
CostNumberList
:
{
handler
:
function
(
val
,
oldVal
)
{
console
.
log
(
"111"
);
this
.
getchange
()
},
deep
:
true
},
},
};
};
</
script
>
\ No newline at end of file
</
script
>
src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue
View file @
29343cbb
...
@@ -122,15 +122,24 @@
...
@@ -122,15 +122,24 @@
},
},
//保存数据
//保存数据
SaveData
()
{
SaveData
()
{
var
currencyNumList
=
[];
if
(
this
.
CurrencyNumberListExt
!=
null
&&
this
.
CurrencyNumberListExt
.
length
>
0
)
{
this
.
CurrencyNumberListExt
.
forEach
((
item
,
index
)
=>
{
item
.
currencyNumberList
.
forEach
(
subItem
=>
{
currencyNumList
.
push
(
subItem
);
});
});
}
var
nObj
=
{
var
nObj
=
{
config
:
this
.
postData
,
config
:
this
.
postData
,
dayCostPriceList
:
this
.
dayCostPriceList
,
dayCostPriceList
:
this
.
dayCostPriceList
,
otherPrice
:
this
.
otherPrice
,
otherPrice
:
this
.
otherPrice
,
teamPrice
:
this
.
teamPrice
,
teamPrice
:
this
.
teamPrice
,
CostCurrencyList
:
this
.
CostCurrencyList
,
CostCurrencyList
:
this
.
CostCurrencyList
,
CostNumberList
:
this
.
CostNumberList
CostNumberList
:
this
.
CostNumberList
,
CurrencyNumberListExt
:
currencyNumList
};
};
console
.
log
(
"请求参数"
,
nObj
);
this
.
apipost
(
this
.
apipost
(
"travel_post_SetConfigOffer_V2"
,
nObj
,
"travel_post_SetConfigOffer_V2"
,
nObj
,
res
=>
{
res
=>
{
...
@@ -161,7 +170,6 @@
...
@@ -161,7 +170,6 @@
"travel_get_GetMyTravelInfo_V2"
,
"travel_get_GetMyTravelInfo_V2"
,
msg
,
msg
,
res
=>
{
res
=>
{
console
.
log
(
"res.data.data"
,
res
.
data
);
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
var
tempData
=
res
.
data
.
data
;
var
tempData
=
res
.
data
.
data
;
if
(
tempData
.
ID
&&
tempData
.
ID
>
0
)
{
if
(
tempData
.
ID
&&
tempData
.
ID
>
0
)
{
...
@@ -205,13 +213,16 @@
...
@@ -205,13 +213,16 @@
if
(
tempData
.
teamPrice
)
{
if
(
tempData
.
teamPrice
)
{
this
.
teamPrice
=
tempData
.
teamPrice
;
this
.
teamPrice
=
tempData
.
teamPrice
;
}
}
if
(
tempData
.
CostNumberList
&&
tempData
.
CostNumberList
!=
null
&&
tempData
.
CostNumberList
.
length
>
0
)
if
(
tempData
.
CostNumberList
&&
tempData
.
CostNumberList
!=
null
&&
tempData
.
CostNumberList
.
length
>
0
)
{
{
this
.
CostNumberList
=
tempData
.
CostNumberList
;
this
.
CostNumberList
=
tempData
.
CostNumberList
;
}
}
if
(
tempData
.
CostCurrencyList
&&
tempData
.
CostCurrencyList
!=
null
&&
tempData
.
CostCurrencyList
.
length
>
0
)
if
(
tempData
.
CostCurrencyList
&&
tempData
.
CostCurrencyList
!=
null
&&
tempData
.
CostCurrencyList
.
length
>
{
0
)
{
this
.
CostCurrencyList
=
tempData
.
CostCurrencyList
;
this
.
CostCurrencyList
=
tempData
.
CostCurrencyList
;
}
if
(
tempData
.
CurrencyNumberListExt
&&
tempData
.
CurrencyNumberListExt
!=
null
&&
tempData
.
CurrencyNumberListExt
.
length
>
0
)
{
this
.
CurrencyNumberListExt
=
tempData
.
CurrencyNumberListExt
;
}
}
}
else
{
}
else
{
this
.
Error
(
res
.
data
.
message
);
this
.
Error
(
res
.
data
.
message
);
...
@@ -219,14 +230,14 @@
...
@@ -219,14 +230,14 @@
},
},
err
=>
{}
err
=>
{}
);
);
}
},
},
},
created
()
{
created
()
{
this
.
getPostData
();
this
.
getPostData
();
},
},
components
:
{
components
:
{
DirectQuotation
:
DirectQuotation
DirectQuotation
:
DirectQuotation
}
}
};
};
</
script
>
</
script
>
\ No newline at end of file
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