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
cc38e6df
Commit
cc38e6df
authored
Jun 27, 2019
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改手配书
parent
d3ef6dab
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
134 additions
and
95 deletions
+134
-95
TravelControlList.vue
...components/TravelManager/TravelList/TravelControlList.vue
+23
-3
commonHotelInfo.vue
src/components/commonPage/commonHotelInfo.vue
+110
-91
dmcTotalTable.vue
src/components/dmc/manager/dmcTotalTable.vue
+1
-1
No files found.
src/components/TravelManager/TravelList/TravelControlList.vue
View file @
cc38e6df
...
...
@@ -491,7 +491,7 @@
</p>
<p
v-if=
"item.LineID==14 && item.HotelOrderListReports && item.HotelOrderListReports.length>0 "
>
<el-popover
width=
"750"
trigger=
"click"
popper-class=
"TC_HotelPop"
>
<commonHotelInfo
:HotelObj=
"item.HotelOrderListReports"
:showHotelObj=
"showHotelObj"
></commonHotelInfo>
<commonHotelInfo
:HotelObj=
"item.HotelOrderListReports"
:showHotelObj=
"showHotelObj"
@
SetShouPeiShu=
"SetShouPeiShu(item.TCID,item.ShouPeiStatus)"
></commonHotelInfo>
<span
slot=
"reference"
class=
"price"
style=
"cursor:pointer;text-decoration:underline;"
>
酒店预订状况
</span>
</el-popover>
...
...
@@ -1064,7 +1064,10 @@
showHotelObj
:{
showPrice
:
true
,
showPay
:
true
,
showZhan
:
true
showZhan
:
true
,
showBtnList
:
true
,
showCaozuoTime
:
true
,
isFromTCList
:
true
},
pickerBeginDateBefore
:
{
disabledDate
:
time
=>
{
...
...
@@ -1099,7 +1102,24 @@
}
});
},
//更新手配书状态
SetShouPeiShu
(
TCID
,
ShouPeiStatus
)
{
var
msg
=
{
TCID
:
TCID
,
ShouPeiStatus
:(
ShouPeiStatus
==
0
?
1
:
0
)
};
console
.
log
(
ShouPeiStatus
,
'ShouPeiStatus'
);
this
.
apipost
(
'dmcstatistics_post_SetPriceShouPeiShuService'
,
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
$message
.
success
(
res
.
data
.
message
);
this
.
getList
();
}
else
{
this
.
$message
.
error
(
res
.
data
.
message
);
}
},
err
=>
{})
},
SetGroupRecommendType
(
item
,
num
)
{
let
msg
=
{};
msg
.
groupRecommendType
=
num
;
...
...
src/components/commonPage/commonHotelInfo.vue
View file @
cc38e6df
<
style
>
.comHotelOperation
{
margin-top
:
10px
;}
.comHotelOperation
tr
td
{
text-align
:
left
;
width
:
50%
;
padding
:
5px
0
;
}
</
style
>
<
template
>
<table
width=
"100%"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
class=
"singeRowTable"
>
<tr>
<th
width=
"100"
>
日期
</th>
<th
style=
"width:150px;"
>
酒店
</th>
<th
style=
"width:150px;"
>
更换酒店
</th>
<th
style=
"width:100px;"
>
状态
</th>
<th
style=
"width:150px;"
v-if=
"showHotelObj.showPrice"
>
使用数量/价格
</th>
<th
style=
"width:100px;"
v-if=
"showHotelObj.showPay"
>
付款方式
</th>
<th
style=
"width:120px"
v-if=
"showHotelObj.showZhan"
>
占房时间
</th>
<th
style=
"width:100px"
v-if=
"showHotelObj.showZhan"
>
确认时间
</th>
</tr>
<template
v-for=
"hotelItem in HotelObj"
>
<tr
v-for=
"(hotelSubItem,hotelSubIndex) in hotelItem.SubList"
>
<td
width=
"100"
v-if=
"hotelSubIndex==0"
:rowspan=
"hotelItem.SubList.length"
>
{{
hotelItem
.
UseDay
}}
</td>
<td
style=
"text-align:left;padding-left:3px;"
>
{{
hotelSubItem
.
HotelName
}}
</td>
<td
style=
"text-align:left;padding-left:3px;color:red"
>
{{
hotelSubItem
.
HotelName
!=
hotelSubItem
.
NewHotelName
?
""
+
hotelSubItem
.
NewHotelName
:
""
}}
</td>
<td
style=
"text-align:left;padding-left:3px;"
>
<span
v-if=
"hotelSubItem.HotelName!='温馨的家'"
>
<template
v-if=
"hotelSubItem.OPState==1"
>
<a
style=
"color:green"
>
OP-OK
</a>
</
template
>
<
template
v-else-if=
"hotelSubItem.OPState==2&&hotelSubItem.DMCState==0"
>
<a
style=
"color:red"
>
OP-暂定
</a>
</
template
>
<
template
v-else
>
<template
v-if=
"hotelSubItem.DMCState==1"
>
<a
style=
"color:green"
>
地接-OK
</a>
</
template
>
<
template
v-else
>
<a
style=
"color:red"
>
{{
hotelSubItem
.
DMCState
==
2
?
"地接-暂定"
:
"地接-未操作"
}}
</a>
</
template
>
</template>
</span>
</td>
<td
v-if=
"showHotelObj.showPrice"
>
<a
v-if=
"(hotelSubItem.OPState==1|| hotelSubItem.OPState==2 || hotelSubItem.DMCState==1 )"
>
{{hotelSubItem.UseCount>0? hotelSubItem.UseCount+" 间" :""}}
{{hotelSubItem.CostPriceNew>0?" 价格:"+hotelSubItem.CostPriceNew:(hotelSubItem.CostPrice!=0?" 价格:"+hotelSubItem.CostPrice:"")}}
</a>
</td>
<td
v-if=
"showHotelObj.showPay"
>
{{hotelSubItem.PayTypeStr}}
</td>
<td
v-if=
"showHotelObj.showZhan"
>
<
template
v-if=
"hotelSubItem.OPState==1||(hotelSubItem.OPState==2 && hotelSubItem.DMCState==0)"
>
{{
hotelSubItem
.
CreateDateStr
}}
</
template
>
</td>
<td
v-if=
"showHotelObj.showZhan"
>
{{hotelSubItem.SureTimeStr}}
</td>
</tr>
</template>
<
template
v-if=
"HotelObj&&HotelObj.length>0"
>
<tfoot>
<tr
style=
"display:none;"
>
<td>
开团时间:
</td>
<td>
{{
HotelObj
[
0
].
PriceCreateDateStr
}}
</td>
<td>
吃房时间:
</td>
<td>
{{
HotelObj
[
0
].
UseHotelTimeStr
}}
</td>
<td>
操作时间:
</td>
<td>
{{
HotelObj
[
0
].
DMCNumCreateTimeStr
}}
</td>
<td>
操作时间:
</td>
<td>
{{
HotelObj
[
0
].
ShouPeiStatusTimeStr
}}
</td>
<div>
<div>
<table
width=
"100%"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
class=
"singeRowTable"
>
<tr>
<th
width=
"100"
>
日期
</th>
<th
style=
"width:150px;"
>
酒店
</th>
<th
style=
"width:150px;"
>
更换酒店
</th>
<th
style=
"width:100px;"
>
状态
</th>
<th
style=
"width:150px;"
v-if=
"showHotelObj.showPrice"
>
使用数量/价格
</th>
<th
style=
"width:100px;"
v-if=
"showHotelObj.showPay"
>
付款方式
</th>
<th
style=
"width:120px"
v-if=
"showHotelObj.showZhan"
>
占房时间
</th>
<th
style=
"width:100px"
v-if=
"showHotelObj.showZhan"
>
确认时间
</th>
</tr>
<template
v-for=
"hotelItem in HotelObj"
>
<tr
v-for=
"(hotelSubItem,hotelSubIndex) in hotelItem.SubList"
>
<td
width=
"100"
v-if=
"hotelSubIndex==0"
:rowspan=
"hotelItem.SubList.length"
>
{{
hotelItem
.
UseDay
}}
</td>
<td
style=
"text-align:left;padding-left:3px;"
>
{{
hotelSubItem
.
HotelName
}}
</td>
<td
style=
"text-align:left;padding-left:3px;color:red"
>
{{
hotelSubItem
.
HotelName
!=
hotelSubItem
.
NewHotelName
?
""
+
hotelSubItem
.
NewHotelName
:
""
}}
</td>
<td
style=
"text-align:left;padding-left:3px;"
>
<span
v-if=
"hotelSubItem.HotelName!='温馨的家'"
>
<template
v-if=
"hotelSubItem.OPState==1"
>
<a
style=
"color:green"
>
OP-OK
</a>
</
template
>
<
template
v-else-if=
"hotelSubItem.OPState==2&&hotelSubItem.DMCState==0"
>
<a
style=
"color:red"
>
OP-暂定
</a>
</
template
>
<
template
v-else
>
<template
v-if=
"hotelSubItem.DMCState==1"
>
<a
style=
"color:green"
>
地接-OK
</a>
</
template
>
<
template
v-else
>
<a
style=
"color:red"
>
{{
hotelSubItem
.
DMCState
==
2
?
"地接-暂定"
:
"地接-未操作"
}}
</a>
</
template
>
</template>
</span>
</td>
<td
v-if=
"showHotelObj.showPrice"
>
<a
v-if=
"(hotelSubItem.OPState==1|| hotelSubItem.OPState==2 || hotelSubItem.DMCState==1 )"
>
{{hotelSubItem.UseCount>0? hotelSubItem.UseCount+" 间" :""}}
{{hotelSubItem.CostPriceNew>0?" 价格:"+hotelSubItem.CostPriceNew:(hotelSubItem.CostPrice!=0?" 价格:"+hotelSubItem.CostPrice:"")}}
</a>
</td>
<td
v-if=
"showHotelObj.showPay"
>
{{hotelSubItem.PayTypeStr}}
</td>
<td
v-if=
"showHotelObj.showZhan"
>
<
template
v-if=
"hotelSubItem.OPState==1||(hotelSubItem.OPState==2 && hotelSubItem.DMCState==0)"
>
{{
hotelSubItem
.
CreateDateStr
}}
</
template
>
</td>
<td
v-if=
"showHotelObj.showZhan"
>
{{hotelSubItem.SureTimeStr}}
</td>
</tr>
</template>
</table>
</div>
<div>
<table
width=
"100%"
class=
"comHotelOperation"
>
<
template
v-if=
"HotelObj&&HotelObj.length>0&&showHotelObj.showCaozuoTime"
>
<tr>
<td>
开团时间:
<span
v-if=
"HotelObj[0].PriceCreateDateStr"
>
{{
HotelObj
[
0
].
PriceCreateDateStr
}}
</span>
<span
v-else
>
暂无
</span>
</td>
<td
style=
"padding-left:26px;"
>
吃房时间:
<span
v-if=
"HotelObj[0].UseHotelTimeStr"
>
{{
HotelObj
[
0
].
UseHotelTimeStr
}}
</span>
<span
v-else
>
暂无
</span>
</td>
</tr>
<tr>
<td>
地接团号操作时间:
<span
v-if=
"HotelObj[0].DMCNumCreateTimeStr"
>
{{
HotelObj
[
0
].
DMCNumCreateTimeStr
}}
</span>
<span
v-else
>
暂无
</span>
</td>
<td>
手配确认时间:
<span
v-if=
"HotelObj[0].ShouPeiStatusTimeStr"
>
{{
HotelObj
[
0
].
ShouPeiStatusTimeStr
}}
</span>
<span
v-else
>
暂无
</span>
</td>
</tr>
</
template
>
<
template
v-if=
"showHotelObj.showBtnList"
>
<tr>
<td
colspan=
"
8"
style=
"padding:10px 0
"
>
<td
colspan=
"
2"
style=
"padding:10px 0;text-align:center;
"
>
<input
type=
"button"
class=
"normalBtn"
:value=
"HotelObj[0].ShouPeiStatus==0?'手配书(确定)':'手配书(暂定)'"
v-if=
"showHotelObj.ShowShouPeiStatus"
@
click=
"subSetShouPeiShu(HotelObj[0].ShouPeiStatus)"
/>
<input
type=
"button"
class=
"normalBtn"
value=
"下载"
@
click=
"DownLoadShouPeiShu()"
/>
<template
v-if=
"showHotelObj.isFromTCList"
>
<input
type=
"button"
v-if=
"HotelObj[0].ShouPeiStatus==1"
class=
"normalBtn"
value=
"下载"
@
click=
"DownLoadShouPeiShu()"
/>
</
template
>
<
template
v-else
>
<input
type=
"button"
class=
"normalBtn"
value=
"下载"
@
click=
"DownLoadShouPeiShu()"
/>
</
template
>
</td>
</tr>
</template>
</tfoot>
</template>
</table>
</table>
</div>
</div>
</template>
<
script
>
export
default
{
props
:
[
"HotelObj"
,
"showHotelObj"
,
"TCID"
,
"DMCNum"
,
"TCNUM"
],
...
...
@@ -127,7 +144,9 @@
});
}
},
mounted
()
{}
mounted
()
{
console
.
log
(
this
.
HotelObj
,
'HotelObjHotelObj'
);
}
};
</
script
>
src/components/dmc/manager/dmcTotalTable.vue
View file @
cc38e6df
...
...
@@ -553,6 +553,7 @@
showPay
:
true
,
showZhan
:
true
,
showBtnList
:
true
,
showCaozuoTime
:
true
,
ShowShouPeiStatus
:
true
,
//显示手配置暂定确定按钮
},
pickerBeginDateBefore
:
{
...
...
@@ -912,7 +913,6 @@
this
.
$message
.
error
(
res
.
data
.
message
);
}
},
err
=>
{})
}
},
mounted
()
{
...
...
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