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
0a7374d4
Commit
0a7374d4
authored
Mar 23, 2023
by
youjie
Browse files
Options
Browse Files
Download
Plain Diff
no message
parents
157e3ee8
bc8c84d9
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
17772 additions
and
449 deletions
+17772
-449
package-lock.json
package-lock.json
+17630
-394
tripUtils.js
src/assets/utils/tripUtils.js
+3
-1
ModifyVisaProduct.vue
src/components/SalesVisa/ModifyVisaProduct.vue
+46
-6
VisaProductOrder.vue
src/components/SalesVisa/VisaProductOrder.vue
+2
-1
TravelControlList.vue
...components/TravelManager/TravelList/TravelControlList.vue
+6
-0
CostNewPrice.vue
...ponents/TravelManager/TravelNewQuotation/CostNewPrice.vue
+48
-4
CostNewPriceAudit.vue
...ts/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue
+27
-37
QuotationAduit.vue
...nents/TravelManager/TravelNewQuotation/QuotationAduit.vue
+3
-1
QuotationNewPrice.vue
...ts/TravelManager/TravelNewQuotation/QuotationNewPrice.vue
+1
-0
TravelPrice3.vue
...ents/newTravelmanager/TravelGroupControl/TravelPrice3.vue
+1
-1
TravelManager5.vue
...newTravelmanager/oldTravelGroupControl/TravelManager5.vue
+2
-2
index.js
src/plug/index.js
+3
-2
No files found.
package-lock.json
View file @
0a7374d4
This diff is collapsed.
Click to expand it.
src/assets/utils/tripUtils.js
View file @
0a7374d4
...
@@ -287,7 +287,9 @@ var tripUtils = {
...
@@ -287,7 +287,9 @@ var tripUtils = {
OtherMoney
:
0.00
,
//杂费分摊费用
OtherMoney
:
0.00
,
//杂费分摊费用
SubtotalMoney
:
0.00
,
//小计
SubtotalMoney
:
0.00
,
//小计
TotalMoney
:
0.00
,
//总费用
TotalMoney
:
0.00
,
//总费用
ShouPeiFee
:
0.00
//手配费
ShouPeiFee
:
0.00
,
//手配费
JPYSalePrice
:
0.00
,
//日元销售价格
JPYTotalMoney
:
0.00
,
//日元成本价
}
}
},
},
//团控列表下拉菜单
//团控列表下拉菜单
...
...
src/components/SalesVisa/ModifyVisaProduct.vue
View file @
0a7374d4
...
@@ -382,6 +382,17 @@
...
@@ -382,6 +382,17 @@
ref=
"addMsg"
ref=
"addMsg"
label-width=
"120px"
label-width=
"120px"
>
>
<el-form-item
label=
"出团公司"
prop=
"RB_Branch_Id"
>
<el-select
v-model=
"addMsg.RB_Branch_Id"
>
<el-option
label=
"不限"
:value=
"-1"
key=
"-1"
></el-option>
<el-option
v-for=
"item in companyList"
:label=
"item.BName"
:value=
"item.Id"
:key=
"item.Id"
></el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"产品名称"
prop=
"Name"
>
<el-form-item
label=
"产品名称"
prop=
"Name"
>
<el-input
v-model=
"addMsg.Name"
placeholder=
"请输入"
></el-input>
<el-input
v-model=
"addMsg.Name"
placeholder=
"请输入"
></el-input>
</el-form-item>
</el-form-item>
...
@@ -422,7 +433,7 @@
...
@@ -422,7 +433,7 @@
<el-form-item
label=
"提前预定天数"
prop=
"BookAdvance"
>
<el-form-item
label=
"提前预定天数"
prop=
"BookAdvance"
>
<el-input
v-model=
"addMsg.BookAdvance"
@
keyup
.
native=
"checkInteger(addMsg,'BookAdvance')"
placeholder=
"工作日"
></el-input>
<el-input
v-model=
"addMsg.BookAdvance"
@
keyup
.
native=
"checkInteger(addMsg,'BookAdvance')"
placeholder=
"工作日"
></el-input>
</el-form-item>
</el-form-item>
<el-form-item
label=
"价格有效日期"
>
<el-form-item
label=
"价格有效日期"
style=
"width:588px"
>
<el-date-picker
<el-date-picker
v-model=
"PriceDates"
v-model=
"PriceDates"
type=
"daterange"
type=
"daterange"
...
@@ -736,7 +747,7 @@ export default {
...
@@ -736,7 +747,7 @@ export default {
saveBtn
:
true
,
saveBtn
:
true
,
fileList
:[],
fileList
:[],
checkList
:[],
checkList
:[],
companyList
:
[],
fonts
:
[
fonts
:
[
"SimSun"
,
"SimSun"
,
"SimHei"
,
"SimHei"
,
...
@@ -760,6 +771,7 @@ export default {
...
@@ -760,6 +771,7 @@ export default {
loading
:
false
,
loading
:
false
,
value6
:
""
,
value6
:
""
,
VisaManagementList
:[],
VisaManagementList
:[],
companyList
:[],
addMsg
:
{
addMsg
:
{
Id
:
0
,
Id
:
0
,
Name
:
""
,
Name
:
""
,
...
@@ -777,7 +789,7 @@ export default {
...
@@ -777,7 +789,7 @@ export default {
},
},
CoverImageList
:
[],
CoverImageList
:
[],
VisaCountryId
:
""
,
VisaCountryId
:
""
,
RB_Branch_Id
:
-
1
,
},
},
rules
:
{
rules
:
{
...
@@ -847,7 +859,7 @@ export default {
...
@@ -847,7 +859,7 @@ export default {
}
}
// this.ScrollMethod();
// this.ScrollMethod();
this
.
Getvisacountry
();
this
.
Getvisacountry
();
this
.
getCompanyList
();
this
.
getVisaManagementList
();
this
.
getVisaManagementList
();
this
.
initFileList
();
this
.
initFileList
();
},
},
...
@@ -890,7 +902,34 @@ export default {
...
@@ -890,7 +902,34 @@ export default {
});
});
},
},
getCompanyList
()
{
this
.
companyList
=
[];
let
userInfo
=
this
.
getLocalStorage
();
let
RB_Group_id
=
userInfo
.
RB_Group_id
;
let
msg
=
{
Status
:
0
,
is_show
:
0
,
RB_Group_Id
:
RB_Group_id
};
this
.
apipost
(
"admin_get_BranchGetList"
,
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
res
.
data
.
data
.
forEach
(
x
=>
{
var
obj
=
{
Id
:
""
,
BName
:
""
};
obj
.
Id
=
x
.
Id
.
toString
();
obj
.
BName
=
x
.
BName
;
this
.
companyList
.
push
(
obj
);
});
}
},
err
=>
{}
);
},
// 请求签证产品详情
// 请求签证产品详情
GetVisaProductDetails
(
Pid
){
GetVisaProductDetails
(
Pid
){
this
.
PriceDates
=
[];
this
.
PriceDates
=
[];
...
@@ -900,6 +939,7 @@ export default {
...
@@ -900,6 +939,7 @@ export default {
res
=>
{
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
let
data
=
res
.
data
.
data
;
let
data
=
res
.
data
.
data
;
data
.
RB_Branch_Id
=
String
(
data
.
RB_Branch_Id
)
this
.
addMsg
=
res
.
data
.
data
;
this
.
addMsg
=
res
.
data
.
data
;
this
.
PriceDates
.
push
(
data
.
EffectiveStartDate
)
this
.
PriceDates
.
push
(
data
.
EffectiveStartDate
)
this
.
PriceDates
.
push
(
data
.
SendVisaDate
)
this
.
PriceDates
.
push
(
data
.
SendVisaDate
)
...
@@ -944,7 +984,7 @@ export default {
...
@@ -944,7 +984,7 @@ export default {
VisaB2CPrice
:
""
,
VisaB2CPrice
:
""
,
VisaProductInfo
:
{},
VisaProductInfo
:
{},
CoverImageList
:
[],
CoverImageList
:
[],
RB_Branch_Id
:
-
1
,
};
};
this
.
PriceDates
=
[]
this
.
PriceDates
=
[]
},
},
...
...
src/components/SalesVisa/VisaProductOrder.vue
View file @
0a7374d4
...
@@ -443,7 +443,8 @@
...
@@ -443,7 +443,8 @@
</span>
</span>
</td>
</td>
<td
class=
"groupTourOrderIcon"
>
<td
class=
"groupTourOrderIcon"
>
<el-tooltip
effect=
"dark"
content=
"签证详情"
placement=
"top-start"
>
<el-tooltip
effect=
"dark"
content=
"签证详情"
placement=
"top-start"
v-if=
"item.VisaPlanIdStr !=''"
>
<el-button
type=
"primary"
@
click=
"goUrlVisaList(item)"
style=
'background:#00C6FF; border-color:#00C6FF'
<el-button
type=
"primary"
@
click=
"goUrlVisaList(item)"
style=
'background:#00C6FF; border-color:#00C6FF'
icon=
"iconfont icon-sousuo"
></el-button>
icon=
"iconfont icon-sousuo"
></el-button>
</el-tooltip>
</el-tooltip>
...
...
src/components/TravelManager/TravelList/TravelControlList.vue
View file @
0a7374d4
...
@@ -483,6 +483,12 @@
...
@@ -483,6 +483,12 @@
style=
"display:inline-block;margin:0 5px;position:relative;top:-3px;"
>
.
</span>
{{item.BusNumber}}
style=
"display:inline-block;margin:0 5px;position:relative;top:-3px;"
>
.
</span>
{{item.BusNumber}}
</div>
</div>
</div>
</div>
<div
v-if=
"item.CustomerName"
class=
"TC_TravelSalePlat clearfix"
style=
"font-size: 11px;font-weight:bold;color:red"
>
<span
v-if=
"item.CustomerName"
>
客户名称:{{item.CustomerName}}
</span>
<span
v-if=
"item.OfferPayTypeStr"
>
({{item.OfferPayTypeStr}})
</span>
</div>
</div>
</div>
</div>
</div>
<div
class=
"el-col"
style=
"width:200px;"
>
<div
class=
"el-col"
style=
"width:200px;"
>
...
...
src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue
View file @
0a7374d4
...
@@ -938,18 +938,25 @@
...
@@ -938,18 +938,25 @@
</tr>
</tr>
<tr>
<tr>
<td
class=
"CP_ComTitle2"
>
人数统计
</td>
<td
class=
"CP_ComTitle2"
>
人数统计
</td>
<td
class=
"CP_ComTitle2"
>
成本价
</td>
<td
class=
"CP_ComTitle2"
>
成本价(人民币)
</td>
<td
class=
"CP_ComTitle2"
colspan=
"2"
>
销售价格
</td>
<td
class=
"CP_ComTitle2"
>
成本价(日元)
</td>
<td
class=
"CP_ComTitle2"
colspan=
"2"
>
销售价格(人民币)
</td>
<td
class=
"CP_ComTitle2"
colspan=
"2"
>
销售价格(日元)
</td>
<td
class=
"CP_ComTitle2"
colspan=
"2"
>
手配费
</td>
<td
class=
"CP_ComTitle2"
colspan=
"2"
>
手配费
</td>
<td
colspan=
"6"
class=
"CP_ComTitle2"
>
备注
</td>
<td
colspan=
"6"
class=
"CP_ComTitle2"
>
备注
</td>
</tr>
</tr>
<tr
v-for=
"item in CostNumberList"
:key=
"item.subCode"
>
<tr
v-for=
"item in CostNumberList"
:key=
"item.subCode"
>
<td>
{{item.PeopleNumber}}+1
</td>
<td>
{{item.PeopleNumber}}+1
</td>
<td>
{{item.TotalMoney}}
</td>
<td>
{{item.TotalMoney}}
</td>
<td>
{{item.JPYTotalMoney}}
</td>
<td
colspan=
"2"
>
<td
colspan=
"2"
>
<el-input
type=
'text'
class=
"w70"
v-model=
"item.SalePrice"
<el-input
type=
'text'
class=
"w70"
v-model=
"item.SalePrice"
@
keyup
.
native=
"checkPrice(item,'SalePrice',true)"
maxlength=
"8"
></el-input>
@
keyup
.
native=
"checkPrice(item,'SalePrice',true)"
maxlength=
"8"
></el-input>
</td>
</td>
<td
colspan=
"2"
>
<el-input
type=
'text'
class=
"w70"
v-model=
"item.JPYSalePrice"
@
keyup
.
native=
"checkPrice(item,'JPYSalePrice',true)"
maxlength=
"8"
></el-input>
</td>
<td
colspan=
"2"
>
<td
colspan=
"2"
>
<el-input
type=
'text'
class=
"w70"
v-model=
"item.ShouPeiFee"
<el-input
type=
'text'
class=
"w70"
v-model=
"item.ShouPeiFee"
@
keyup
.
native=
"checkPrice(item,'ShouPeiFee',true)"
maxlength=
"8"
></el-input>
@
keyup
.
native=
"checkPrice(item,'ShouPeiFee',true)"
maxlength=
"8"
></el-input>
...
@@ -1328,6 +1335,29 @@
...
@@ -1328,6 +1335,29 @@
// this.getConvertMoney(this.OtherPrice.AirTicketMoeny) +
// this.getConvertMoney(this.OtherPrice.AirTicketMoeny) +
return
totalMoney
;
return
totalMoney
;
},
},
//获取主成本价
getCostJpyTotalMoney
()
{
let
totalMoney
=
this
.
getConvertMoney
(
this
.
OtherPrice
.
InlandAirTicketMoney
)
+
this
.
getConvertMoney
(
this
.
OtherPrice
.
InlandShipTicketMoney
)
+
this
.
getConvertMoney
(
this
.
OtherPrice
.
InlandTrainTicketMoney
)
+
this
.
getConvertMoney
(
this
.
OtherPrice
.
InternationalAirTicket
)
+
this
.
getConvertMoney
(
this
.
OtherPrice
.
DriverGuideMoney
)
+
this
.
getConvertMoney
(
this
.
OtherPrice
.
GuideMoney
)
+
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
.
KBMoney
)
+
this
.
getConvertMoney
(
this
.
OtherPrice
.
VisaMoney
)
-
this
.
getConvertMoney
(
this
.
OtherPrice
.
TipComplement
)
-
this
.
getConvertMoney
(
this
.
OtherPrice
.
GuideComplement
);
//KBMoney[团负费用减法]
// this.getConvertMoney(this.OtherPrice.AirTicketMoeny) +
return
totalMoney
;
},
//获取系列列表
//获取系列列表
getLineTeamList
(
lineId
,
isClear
)
{
getLineTeamList
(
lineId
,
isClear
)
{
if
(
isClear
&&
isClear
==
1
)
{
if
(
isClear
&&
isClear
==
1
)
{
...
@@ -1540,13 +1570,14 @@
...
@@ -1540,13 +1570,14 @@
//房餐车景点价格
//房餐车景点价格
var
trip
=
Number
(
that
.
getLocalTotalMoney
(
x
.
PeopleNumber
));
var
trip
=
Number
(
that
.
getLocalTotalMoney
(
x
.
PeopleNumber
));
var
jpyTrip
=
Number
(
that
.
getLocalJpyTotalMoney
(
x
.
PeopleNumber
));
//其他价格
//其他价格
var
otherPrice
=
Number
(
that
.
getCostTotalMoney
());
var
otherPrice
=
Number
(
that
.
getCostTotalMoney
());
var
jpyotherPrice
=
Number
(
that
.
getCostJpyTotalMoney
());
x
.
TotalMoney
=
(
trip
+
otherPrice
+
x
.
TotalMoney
=
(
trip
+
otherPrice
+
Number
(
that
.
getConvertMoney
(
x
.
SubtotalMoney
))
Number
(
that
.
getConvertMoney
(
x
.
SubtotalMoney
))
).
toFixed
(
0
);
).
toFixed
(
0
);
x
.
JPYTotalMoney
=
(
jpyTrip
+
jpyotherPrice
).
toFixed
(
2
);
});
});
},
},
//价格转换器
//价格转换器
...
@@ -1568,6 +1599,19 @@
...
@@ -1568,6 +1599,19 @@
Number
(
this
.
getDayXiaoJi
(
7
,
2
))
/
Number
(
PeopleNumber
);
Number
(
this
.
getDayXiaoJi
(
7
,
2
))
/
Number
(
PeopleNumber
);
return
totalMoney
.
toFixed
(
0
);
return
totalMoney
.
toFixed
(
0
);
},
},
//获取地接项目报价
getLocalJpyTotalMoney
(
PeopleNumber
)
{
let
totalMoney
=
0.0
;
totalMoney
=
Number
(
this
.
getDayXiaoJi
(
1
,
1
))
+
Number
(
this
.
getDayXiaoJi
(
3
,
1
))
+
Number
(
this
.
getDayXiaoJi
(
4
,
1
))
+
Number
(
this
.
getDayXiaoJi
(
5
,
1
))
+
Number
(
this
.
getDayXiaoJi
(
6
,
1
))
+
Number
(
this
.
getDayXiaoJi
(
2
,
1
))
/
Number
(
PeopleNumber
)
+
Number
(
this
.
getDayXiaoJi
(
7
,
1
))
/
Number
(
PeopleNumber
);
return
totalMoney
.
toFixed
(
0
);
},
//计算领队分摊
//计算领队分摊
getLeaderShare
()
{
getLeaderShare
()
{
let
that
=
this
;
let
that
=
this
;
...
...
src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue
View file @
0a7374d4
...
@@ -677,18 +677,24 @@
...
@@ -677,18 +677,24 @@
<tr>
<tr>
<td
class=
"CP_ComTitle2"
>
人数统计
<td
class=
"CP_ComTitle2"
>
人数统计
</td>
</td>
<td
class=
"CP_ComTitle2"
>
成本价
</td>
<td
class=
"CP_ComTitle2"
>
成本价(人民币)
</td>
<td
class=
"CP_ComTitle2"
colspan=
"2"
>
销售价格
</td>
<td
class=
"CP_ComTitle2"
>
成本价(日元)
</td>
<td
class=
"CP_ComTitle2"
colspan=
"2"
>
手配费
</td>
<td
class=
"CP_ComTitle2"
colspan=
"2"
>
销售价格(人民币)
</td>
<td
class=
"CP_ComTitle2"
colspan=
"2"
>
销售价格(日元)
</td>
<td
class=
"CP_ComTitle2"
colspan=
"2"
>
手配费
</td>
<td
colspan=
"6"
class=
"CP_ComTitle2"
>
备注
</td>
<td
colspan=
"6"
class=
"CP_ComTitle2"
>
备注
</td>
</tr>
</tr>
<tr
v-for=
"item in CostNumberList"
:key=
"item.subCode"
>
<tr
v-for=
"item in CostNumberList"
:key=
"item.subCode"
>
<td>
{{item.PeopleNumber}}+1
</td>
<td>
{{item.PeopleNumber}}+1
</td>
<td>
{{item.TotalMoney}}
</td>
<td>
{{item.TotalMoney}}
</td>
<td>
{{item.JPYTotalMoney}}
</td>
<td
colspan=
"2"
>
<td
colspan=
"2"
>
{{item.SalePrice}}
{{item.SalePrice}}
</td>
</td>
<td
colspan=
"2"
>
<td
colspan=
"2"
>
{{item.JPYSalePrice}}
</td>
<td
colspan=
"2"
>
{{item.ShouPeiFee}}
{{item.ShouPeiFee}}
</td>
</td>
<td
colspan=
"6"
>
<td
colspan=
"6"
>
...
@@ -759,18 +765,27 @@
...
@@ -759,18 +765,27 @@
<tr>
<tr>
<td
class=
"CP_ComTitle2"
>
附件
</td>
<td
class=
"CP_ComTitle2"
>
附件
</td>
<td
colspan=
"11"
>
<td
colspan=
"11"
>
<a
style=
"margin-left:20px;color:blue;"
:href=
"teamPrice.ContractArray[0].Url"
<a
style=
"margin-left:20px;color:blue;"
:href=
"teamPrice.ContractArray[0].Url"
v-if=
"teamPrice.ContractArray&&teamPrice.ContractArray.length>0"
target=
"_blank"
>
预览
</a>
v-if=
"teamPrice.ContractArray&&teamPrice.ContractArray.length>0"
target=
"_blank"
>
预览
</a>
</td>
</td>
</tr>
</tr>
<tr>
<tr>
<td
class=
"CP_ComTitle2"
>
审核备注
</td>
<td
class=
"CP_ComTitle2"
>
审核备注
</td>
<td
colspan=
"
12
"
>
<td
colspan=
"
7
"
>
<el-input
type=
"textarea"
v-model=
"postConfig.AuditContent"
></el-input>
<el-input
type=
"textarea"
v-model=
"postConfig.AuditContent"
></el-input>
</td>
</td>
<td
class=
"CP_ComTitle2"
>
付款方式
</td>
<td
colspan=
"5"
>
<el-select
style=
"width:100%"
v-model=
"postConfig.OfferPayType"
:placeholder=
"$t('pub.pleaseSel')"
filterable
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
'0'
></el-option>
<el-option
v-for=
"item in payTypeList"
:label=
'item.label'
:value=
'item.value'
:key=
'item.value'
>
</el-option>
</el-select>
</td>
</tr>
</tr>
<tr
>
<tr>
<td
colspan=
"13"
style=
"text-align:center;"
>
<td
colspan=
"13"
style=
"text-align:center;"
>
<input
type=
"button"
class=
"normalBtn"
value=
"同意"
@
click=
"SubSaveType(3)"
/>
<input
type=
"button"
class=
"normalBtn"
value=
"同意"
@
click=
"SubSaveType(3)"
/>
<input
type=
"button"
class=
"normalBtn"
value=
"拒绝"
@
click=
"SubSaveType(4)"
/>
<input
type=
"button"
class=
"normalBtn"
value=
"拒绝"
@
click=
"SubSaveType(4)"
/>
...
@@ -792,7 +807,8 @@
...
@@ -792,7 +807,8 @@
//审核信息
//审核信息
AduitMsg
:
{
AduitMsg
:
{
}
},
payTypeList
:
[{
value
:
1
,
label
:
'收现'
},{
value
:
2
,
label
:
'汇款'
},{
value
:
3
,
label
:
'外站自理'
},]
}
}
},
},
methods
:
{
methods
:
{
...
@@ -997,27 +1013,6 @@
...
@@ -997,27 +1013,6 @@
//KBMoney[团负费用减法]
//KBMoney[团负费用减法]
return
totalMoney
;
return
totalMoney
;
},
},
//计算总价
getSubtotalMoney
()
{
let
that
=
this
;
this
.
CostNumberList
.
forEach
(
x
=>
{
x
.
SubtotalMoney
=
(
that
.
getConvertMoney
(
x
.
AirTicketMoney
)
+
that
.
getConvertMoney
(
x
.
TicketMoney
)
+
that
.
getConvertMoney
(
x
.
SingleRoomMoney
)
+
that
.
getConvertMoney
(
x
.
InlandTrafficMoney
)
+
that
.
getConvertMoney
(
x
.
OtherMoney
)
+
that
.
getConvertMoney
(
x
.
LeaderGuideDriveZhuSu
)
).
toFixed
(
0
);
//房餐车景点价格
var
trip
=
Number
(
that
.
getLocalTotalMoney
(
x
.
PeopleNumber
));
//其他价格
var
otherPrice
=
Number
(
that
.
getCostTotalMoney
())
x
.
TotalMoney
=
(
trip
+
otherPrice
+
Number
(
that
.
getConvertMoney
(
x
.
SubtotalMoney
))
).
toFixed
(
0
);
});
},
//价格转换器
//价格转换器
getConvertMoney
(
value
)
{
getConvertMoney
(
value
)
{
if
(
value
===
""
||
value
===
undefined
||
value
===
null
)
{
if
(
value
===
""
||
value
===
undefined
||
value
===
null
)
{
...
@@ -1058,20 +1053,15 @@
...
@@ -1058,20 +1053,15 @@
},
},
getchange
()
{
getchange
()
{
this
.
getLeaderShare
();
this
.
getLeaderShare
();
this
.
getSubtotalMoney
();
}
}
},
},
mounted
()
{
mounted
()
{
this
.
getSubtotalMoney
();
},
},
created
()
{},
created
()
{},
watch
:
{
watch
:
{
CostNumberList
:
{
handler
:
function
(
val
,
oldVal
)
{
this
.
getchange
()
},
deep
:
true
},
},
},
};
};
...
...
src/components/TravelManager/TravelNewQuotation/QuotationAduit.vue
View file @
0a7374d4
...
@@ -61,6 +61,7 @@
...
@@ -61,6 +61,7 @@
OutBranchId
:
-
1
,
//出团公司
OutBranchId
:
-
1
,
//出团公司
OutBranchName
:
""
,
//出团公司名称
OutBranchName
:
""
,
//出团公司名称
OutDateTime
:
""
,
//出发时间
OutDateTime
:
""
,
//出发时间
OfferPayType
:
0
,
//报价单付款方式()
},
},
dayCostPriceList
:
[],
//报价列表
dayCostPriceList
:
[],
//报价列表
isSubmit
:
true
,
isSubmit
:
true
,
...
@@ -147,7 +148,8 @@
...
@@ -147,7 +148,8 @@
var
nObj
=
{
var
nObj
=
{
ID
:
this
.
$route
.
query
.
configId
,
ID
:
this
.
$route
.
query
.
configId
,
AuditContent
:
this
.
postData
.
AuditContent
,
AuditContent
:
this
.
postData
.
AuditContent
,
TravelState
:
Type
TravelState
:
Type
,
OfferPayType
:
this
.
postData
.
OfferPayType
,
};
};
this
.
loading
=
true
;
this
.
loading
=
true
;
this
.
apipost
(
this
.
apipost
(
...
...
src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue
View file @
0a7374d4
...
@@ -56,6 +56,7 @@
...
@@ -56,6 +56,7 @@
TravelState
:
1
,
//团控状态(1-草稿,2-待审核,3-审核通过,4-审核拒绝,5已撤销)
TravelState
:
1
,
//团控状态(1-草稿,2-待审核,3-审核通过,4-审核拒绝,5已撤销)
OutBranchId
:
-
1
,
//出团公司
OutBranchId
:
-
1
,
//出团公司
OutDateTime
:
""
,
//出发时间
OutDateTime
:
""
,
//出发时间
OfferPayType
:
0
,
//报价单付款方式()
},
},
dayCostPriceList
:
[],
//报价列表
dayCostPriceList
:
[],
//报价列表
isSubmit
:
true
,
isSubmit
:
true
,
...
...
src/components/newTravelmanager/TravelGroupControl/TravelPrice3.vue
View file @
0a7374d4
...
@@ -543,7 +543,7 @@
...
@@ -543,7 +543,7 @@
</el-form-item>
</el-form-item>
</div>
</div>
</div>
</div>
<div
class=
"clearfix"
style=
"display:none;"
>
<div
class=
"clearfix"
>
<div
class=
"leftSetInfo"
>
<div
class=
"leftSetInfo"
>
<span
class=
"TPbaseSet"
></span>
<span
class=
"TPbaseSet"
></span>
<span
class=
"TPsecondTitle"
>
{{$t('Operation.Op_jianmian')}}
</span>
<span
class=
"TPsecondTitle"
>
{{$t('Operation.Op_jianmian')}}
</span>
...
...
src/components/newTravelmanager/oldTravelGroupControl/TravelManager5.vue
View file @
0a7374d4
...
@@ -53,9 +53,9 @@
...
@@ -53,9 +53,9 @@
<div
v-if=
"modifyType==2"
class=
"DTSaveBtn"
:class=
"
{'disClick':!isSubmit}" @click="submitForm(3)"
<div
v-if=
"modifyType==2"
class=
"DTSaveBtn"
:class=
"
{'disClick':!isSubmit}" @click="submitForm(3)"
:title="$t('sm.lcwxmb')">
{{
$t
(
'pub.saveBtn'
)
}}
:title="$t('sm.lcwxmb')">
{{
$t
(
'pub.saveBtn'
)
}}
</div>
</div>
<!--
<div
v-if=
"ConfigId>0"
class=
"DTSaveBtn"
:class=
"
{'disClick':!isSubmit}" @click="goB2B()">
{{
$t
(
'sm.yulan'
)
}}
</div>
<div
v-if=
"ConfigId>0"
class=
"DTSaveBtn"
:class=
"
{'disClick':!isSubmit}" @click="goB2B()">
{{
$t
(
'sm.yulan'
)
}}
</div>
<div
class=
"DTSaveBtn"
v-if=
"ConfigId>0"
@
click=
"getMapList()"
>
{{
$t
(
'sm.ditu'
)
}}
</div>
<div
class=
"DTSaveBtn"
v-if=
"ConfigId>0"
@
click=
"getMapList()"
>
{{
$t
(
'sm.ditu'
)
}}
</div>
-->
</div>
</div>
</div>
</div>
</div>
</div>
...
...
src/plug/index.js
View file @
0a7374d4
...
@@ -119,9 +119,9 @@ export default {
...
@@ -119,9 +119,9 @@ export default {
let
crmUrl
=
""
;
//crm API
let
crmUrl
=
""
;
//crm API
let
locationName
=
window
.
location
.
hostname
;
let
locationName
=
window
.
location
.
hostname
;
domainUrl
=
"http://192.168.10.128"
;
domainUrl
=
"http://192.168.10.128"
;
domainUrl
=
"http://192.168.10.9
:8083"
// 刘东电脑
// domainUrl = "http://192.168.10.11
:8083" // 刘东电脑
// domainUrl = "http://192.168.10.206";
// domainUrl = "http://192.168.10.206";
domainUrl
=
"http://reborn.oytour.com"
;
//
domainUrl = "http://reborn.oytour.com";
let
crmLocalFileStreamDownLoadUrl
=
""
;
let
crmLocalFileStreamDownLoadUrl
=
""
;
crmLocalFileStreamDownLoadUrl
=
locationName
.
indexOf
(
'oytour'
)
!==
-
1
?
"http://crm.oytour.com"
:
"http://testcrm.oytour.com"
;
crmLocalFileStreamDownLoadUrl
=
locationName
.
indexOf
(
'oytour'
)
!==
-
1
?
"http://crm.oytour.com"
:
"http://testcrm.oytour.com"
;
let
javaUrldo
=
""
;
let
javaUrldo
=
""
;
...
@@ -1090,6 +1090,7 @@ export default {
...
@@ -1090,6 +1090,7 @@ export default {
// h : 高
// h : 高
Vue
.
prototype
.
compressImg
=
function
(
path
,
type
,
w
,
h
)
{
Vue
.
prototype
.
compressImg
=
function
(
path
,
type
,
w
,
h
)
{
if
(
!
path
||
path
==
''
)
return
''
if
(
!
path
||
path
==
''
)
return
''
let
url
=
this
.
domainManager
().
UploadUrl
;
let
url
=
this
.
domainManager
().
UploadUrl
;
let
poise
=
'm_filt'
;
let
poise
=
'm_filt'
;
w
=
w
?
w
:
''
w
=
w
?
w
:
''
...
...
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