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
e6bb6d93
Commit
e6bb6d93
authored
Apr 21, 2023
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
99084eea
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
1553 additions
and
1520 deletions
+1553
-1520
index.html
index.html
+0
-1
ListCar.vue
src/components/Hotel/singleProduct/components/ListCar.vue
+0
-1
VisaProductAddOrder.vue
src/components/SalesVisa/VisaProductAddOrder.vue
+0
-2
TicketOrder.vue
src/components/SingleAirTicket/components/TicketOrder.vue
+658
-637
CostNewPrice.vue
...ponents/TravelManager/TravelNewQuotation/CostNewPrice.vue
+18
-5
newQuotation.vue
...ponents/TravelManager/TravelNewQuotation/newQuotation.vue
+0
-1
editTeamInfo.vue
src/components/TravelManager/TravelTeam/editTeamInfo.vue
+0
-3
travelPayList.vue
src/components/TravelManager/TravelTeam/travelPayList.vue
+0
-1
OrderList.vue
src/components/myOrdersAllType/components/OrderList.vue
+648
-628
TravelPriceFlightList.vue
...ravelmanager/TravelGroupControl/TravelPriceFlightList.vue
+0
-1
order-form.vue
src/components/orderCommon/order-form.vue
+227
-219
menuManagement.vue
src/components/platformModule/menuManagement.vue
+1
-5
scenicSpotPackagePrice.vue
src/components/scenicSpot/scenicSpotPackagePrice.vue
+1
-1
buyGroup.vue
src/pubComponents/buyGroup.vue
+0
-15
No files found.
index.html
View file @
e6bb6d93
...
...
@@ -25,7 +25,6 @@
return _load
},
set: function set(v) {
//console.log(v.toString()),
eval("_load = " + v.toString().replace("maps.google.cn", "www.google.cn"))
}
});
...
...
src/components/Hotel/singleProduct/components/ListCar.vue
View file @
e6bb6d93
...
...
@@ -198,7 +198,6 @@
crmOrderObj
:
{
handler
:
function
(
val
,
oldVal
)
{
this
.
crmOrderObj
=
val
console
.
log
(
this
.
crmOrderObj
)
if
(
this
.
crmOrderObj
){
this
.
parameters
.
LureEmpId
=
val
.
LureEmpId
//引流id
this
.
parameters
.
CRMGuestId
=
val
.
CRMGuestId
//客人ID
...
...
src/components/SalesVisa/VisaProductAddOrder.vue
View file @
e6bb6d93
...
...
@@ -712,8 +712,6 @@
},
err
=>
{})
},
saveVisa
()
{
// 保存
console
.
log
(
this
.
addMsg
,
'==='
)
// return
this
.
$refs
[
'addMsg'
].
validate
((
valid
)
=>
{
if
(
valid
)
{
this
.
apipost
(
'dmc_get_visa_SetVisaOrder'
,
this
.
addMsg
,
res
=>
{
...
...
src/components/SingleAirTicket/components/TicketOrder.vue
View file @
e6bb6d93
This diff is collapsed.
Click to expand it.
src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue
View file @
e6bb6d93
...
...
@@ -75,7 +75,7 @@
<td
width=
"80"
class=
"txtRightCost"
>
线路
</td>
<td>
<el-select
style=
"width:100%"
v-model=
"postConfig.LineId"
:placeholder=
"$t('pub.pleaseSel')"
@
change=
"
getLineTeamList(postConfig.LineId,1
)"
filterable
>
@
change=
"
changeLine(
)"
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>
...
...
@@ -124,7 +124,7 @@
<tr>
<td
width=
"80"
class=
"txtRightCost"
>
出团公司
</td>
<td>
<el-select
class=
"
multiple_input"
v-model=
"postConfig.OutBranchId"
filterable
>
<el-select
class=
"multiple_input"
v-model=
"postConfig.OutBranchId"
filterable
>
<el-option
v-for=
'item in companyList'
:key=
"item.id"
:label=
"item.bName"
:value=
"item.id"
>
</el-option>
</el-select>
...
...
@@ -136,7 +136,7 @@
</td>
<td
width=
"80"
class=
"txtRightCost"
>
出团类型
</td>
<td>
<el-select
class=
"
multiple_input"
v-model=
"postConfig.TeamType"
filterable
>
<el-select
class=
"multiple_input"
v-model=
"postConfig.TeamType"
filterable
>
<el-option
v-for=
'item in teamList'
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.ID"
>
</el-option>
</el-select>
...
...
@@ -1113,8 +1113,9 @@
<tr>
<td
class=
"CP_ComTitle2"
>
附件
</td>
<td
colspan=
"13"
>
<el-upload
v-if=
"!teamPrice.ContractArray || !teamPrice.ContractArray.length"
class=
"upload-demo"
style=
"display:inline-block;position:relative;top:-1px;left:3px;"
:http-request=
"uploadFileBtn"
:show-file-list=
"false"
action=
""
>
<el-upload
v-if=
"!teamPrice.ContractArray || !teamPrice.ContractArray.length"
class=
"upload-demo"
style=
"display:inline-block;position:relative;top:-1px;left:3px;"
:http-request=
"uploadFileBtn"
:show-file-list=
"false"
action=
""
>
<el-button
size=
"small"
type=
"primary"
>
报价单附件
</el-button>
</el-upload>
<
template
v-if=
"teamPrice.ContractArray&& teamPrice.ContractArray.length>0"
>
...
...
@@ -1475,6 +1476,18 @@
// this.getConvertMoney(this.OtherPrice.AirTicketMoeny) +
return
totalMoney
;
},
//线路切换
changeLine
()
{
this
.
getLineTeamList
(
this
.
postConfig
.
LineId
,
1
);
//欧洲线(2)和韩国线(5)默认小包团(1)
if
(
this
.
postConfig
.
LineId
==
2
||
this
.
postConfig
.
LineId
==
5
)
{
this
.
postConfig
.
TeamType
=
1
;
}
else
{
this
.
postConfig
.
TeamType
=
0
;
}
},
//获取系列列表
getLineTeamList
(
lineId
,
isClear
)
{
if
(
isClear
&&
isClear
==
1
)
{
...
...
src/components/TravelManager/TravelNewQuotation/newQuotation.vue
View file @
e6bb6d93
...
...
@@ -423,7 +423,6 @@
//根据当前员工所在部门获取该部门及子部门员工信息
getEmployeeList
()
{
let
userInfo
=
this
.
getLocalStorage
();
// console.log('userInfo', userInfo)
this
.
queryData
.
CreateBy
=
userInfo
.
EmployeeId
let
msg
=
{
GroupId
:
userInfo
.
RB_Group_id
,
...
...
src/components/TravelManager/TravelTeam/editTeamInfo.vue
View file @
e6bb6d93
...
...
@@ -728,9 +728,7 @@
that
.
selectFilghtList
.
push
(
x
);
});
that
.
selectFilghtList
.
forEach
(
y
=>
{
if
(
y
.
AirticketId
==
that
.
editForm
.
TicketId
)
{
console
.
log
(
"1111"
);
y
.
IsSelected
=
true
;
y
.
BindNum
=
that
.
editForm
.
TicketNum
;
that
.
TicketMsg
=
y
.
AlName
+
"/"
+
y
.
FlightDate
;
...
...
@@ -832,7 +830,6 @@
if
(
tempObj
.
TravelTeamPartnerList
&&
tempObj
.
TravelTeamPartnerList
.
length
>
0
)
{
this
.
friendList
=
tempObj
.
TravelTeamPartnerList
;
}
console
.
log
(
'flightList>>>'
,
this
.
addMsg
.
flightList
)
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
...
...
src/components/TravelManager/TravelTeam/travelPayList.vue
View file @
e6bb6d93
...
...
@@ -165,7 +165,6 @@
},
},
mounted
()
{
console
.
log
(
'mounted'
,
this
.
$route
)
this
.
queryMsg
.
TCID
=
this
.
$route
.
query
.
id
this
.
getTravelTeamList
();
},
...
...
src/components/myOrdersAllType/components/OrderList.vue
View file @
e6bb6d93
This diff is collapsed.
Click to expand it.
src/components/newTravelmanager/TravelGroupControl/TravelPriceFlightList.vue
View file @
e6bb6d93
...
...
@@ -353,7 +353,6 @@
},
//保存航班信息
savePriceFlight
(
item
)
{
console
.
log
(
'保存航班信息'
,
item
)
if
(
!
/
([
0|1
][
0-9
])
|
(
2
[
0|1|2|3
])
:
[
0|1|2|3|4|5
][
0-9
]
/
.
test
(
item
.
DepartureTime
))
{
this
.
$message
.
error
(
'起飞时间格式不对, 格式如02:06, 23:00'
)
return
...
...
src/components/orderCommon/order-form.vue
View file @
e6bb6d93
This diff is collapsed.
Click to expand it.
src/components/platformModule/menuManagement.vue
View file @
e6bb6d93
...
...
@@ -363,14 +363,10 @@
this
.
addMsg
.
menutype
=
updateList
.
MenuType
?
updateList
.
MenuType
:
1
this
.
addMsg
.
MenuStatus
=
updateList
.
MenuStatus
.
toString
()
let
style
=
JSON
.
parse
(
updateList
.
MenuStyle
)
// this.addMsg.MenuStyleIcon = style.icon
console
.
log
(
updateList
.
MenuType
,
'----'
)
this
.
addMsg
.
MenuStyleIcon
=
style
.
icon
this
.
addMsg
.
MenuStyleColor
=
style
.
color
this
.
addMsg
.
MenuStyleColor
=
style
.
color
this
.
currentUpdateIndex
=
index
},
err
=>
{})
this
.
getChildMenu
();
if
(
this
.
addMsg
.
MenuStyle
&&
this
.
addMsg
.
MenuStyle
!=
""
)
{
let
style
=
JSON
.
parse
(
this
.
DataList
[
index
].
MenuStyle
)
...
...
src/components/scenicSpot/scenicSpotPackagePrice.vue
View file @
e6bb6d93
...
...
@@ -786,7 +786,7 @@ export default {
}
},
e
=>
{
console
.
log
(
e
.
message
)
}
);
},
...
...
src/pubComponents/buyGroup.vue
View file @
e6bb6d93
...
...
@@ -1374,7 +1374,6 @@
},
// 计算价格
getTotalPrice
(
t
)
{
console
.
log
(
'getTotalPrice'
,
this
.
addObj
)
if
(
t
===
3
)
{
if
(
parseFloat
(
this
.
addMsg
.
Unit_Price
).
toString
()
===
"NaN"
)
{
this
.
$message
.
error
(
"请输入正确的价格!"
);
...
...
@@ -1525,18 +1524,6 @@
dandijie
=
this
.
addObj
.
SingleDMCPrice
*
Number
(
this
.
addMsg
.
AirticketNum
);
}
console
.
log
(
'this.addObj.OtherPrice'
,
this
.
addObj
.
OtherPrice
,
(
Number
(
this
.
addMsg
.
ManNum
)
+
Number
(
this
.
addMsg
.
ChirdNum
)
+
Number
(
this
.
addMsg
.
OldPeopleNum
)),
this
.
addObj
.
VisaPrice
,(
Number
(
this
.
addMsg
.
AirticketNum
)
+
Number
(
this
.
addMsg
.
ManNum
)
+
Number
(
this
.
addMsg
.
ChirdNum
)
+
Number
(
this
.
addMsg
.
OldPeopleNum
)),(
Number
(
this
.
addMsg
.
AirticketNum
)
+
Number
(
this
.
addMsg
.
ManNum
)
+
Number
(
this
.
addMsg
.
ChirdNum
)
+
Number
(
this
.
addMsg
.
BabyNum
)
+
Number
(
this
.
addMsg
.
OldPeopleNum
)
-
Number
(
this
.
addMsg
.
VisaNum
)))
this
.
addMsg
.
PreferPrice
=
dandijie
+
lianyun
+
...
...
@@ -1689,12 +1676,10 @@
},
saveOrder
()
{
this
.
addMsg
.
TCID
=
this
.
addObj
.
TCID
console
.
log
(
'saveOrder'
,
this
.
addMsg
)
this
.
$emit
(
'change'
,
this
.
addMsg
)
},
// todo 购买的产品信息,需要从外部传入
goBuy
(
obj
)
{
console
.
log
(
'goBuy'
,
obj
)
if
(
!
obj
)
return
this
.
isUpdateSharePeople
=
false
;
this
.
isShowLayer
=
true
;
...
...
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