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
301369a8
Commit
301369a8
authored
Jun 20, 2019
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改订房查询及订房管理
parent
c297895b
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
140 additions
and
124 deletions
+140
-124
roomReservations.vue
src/components/Hotel/roomReservations.vue
+1
-1
roomReservationsDetails.vue
src/components/Hotel/roomReservationsDetails.vue
+19
-1
roomQuery2.vue
src/components/Supplier/roomQuery2.vue
+120
-122
No files found.
src/components/Hotel/roomReservations.vue
View file @
301369a8
...
...
@@ -117,7 +117,7 @@
<th>
备注
</th>
</tr>
<tr
v-if=
"list.length==0"
>
<td
colspan=
"1
0
"
>
暂无数据
</td>
<td
colspan=
"1
1
"
>
暂无数据
</td>
</tr>
<tbody
v-for=
"(outItem,outindex) in list"
:class=
"
{roomReservationsSplitTrCss:outindex%2!=0}">
<template
v-for=
"(item,index) in outItem.StaticsReportList"
>
...
...
src/components/Hotel/roomReservationsDetails.vue
View file @
301369a8
...
...
@@ -5,6 +5,12 @@
margin
:
5px
auto
;
font-size
:
12px
;
}
.rq_importNote
{
color
:
red
;
}
.rq_disImNote
{
color
:
#ea6d6d
;
}
</
style
>
...
...
@@ -294,7 +300,9 @@
<tr
v-if=
"subItem.SupplierToDmcRemarks"
>
<td
width=
"70"
style=
"text-align:right;"
>
供应商对地接备注:
</td>
<td>
<span
:class=
"
{'rq_disImNote':subItem.SupplierToDmcHotelStatus==1
&&
DateMinus(subItem.SupplierToDmcHotelStatusTime)
<
=
5
,'
rq_importNote
'
:subItem
.
SupplierToDmcHotelStatus=
=2&&DateMinus(subItem.SupplierToDmcHotelStatusTime)
<
=
5
}"
>
{{
subItem
.
SupplierToDmcRemarks
}}
</span>
</td>
</tr>
</table>
...
...
@@ -330,6 +338,7 @@
</div>
</template>
<
script
>
import
moment
from
'moment'
import
comCheckHotel
from
"../commonPage/comCheckHotel.vue"
;
export
default
{
data
()
{
...
...
@@ -388,6 +397,14 @@
let
str
=
`comCheckHotel
${
index
}${
subIndex
}
`
this
.
$refs
[
str
][
0
].
getCheckHotel
();
},
DateMinus
(
sDate
)
{
var
newDate
=
moment
(
sDate
).
format
(
"YYYY-MM-DD"
);
var
sdate
=
new
Date
(
newDate
.
replace
(
/-/g
,
"/"
));
var
now
=
new
Date
();
var
days
=
now
.
getTime
()
-
sdate
.
getTime
();
var
day
=
Math
.
abs
(
parseInt
(
days
/
(
1000
*
60
*
60
*
24
)));
return
day
;
},
getItem
(
index
,
subIndex
)
{
this
.
checkedIndex
=
index
this
.
checkedsubIndex
=
subIndex
...
...
@@ -528,6 +545,7 @@
})
});
this
.
list
=
list
;
console
.
log
(
this
.
list
,
'listttt'
);
this
.
$forceUpdate
();
}
}
else
{
...
...
src/components/Supplier/roomQuery2.vue
View file @
301369a8
...
...
@@ -65,8 +65,42 @@
{{item.LeaderName}}
<
template
v-if=
"item.LeaderTel"
>
(电话:
{{
item
.
LeaderTel
}}
)
</
template
>
</td>
<td>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"酒店信息"
placement=
"top-start"
>
<el-popover
placement=
"bottom"
width=
"800"
trigger=
"click"
popper-class=
"rq_HotelDetails"
>
<a
class=
"hotelLink"
slot=
"reference"
@
click=
"getHotelList(item.TCID,item.NewCombinationNum),hotelUseDetail=true"
>
酒店使用情况
</a>
<a
class=
"hotelLink"
slot=
"reference"
@
click=
"getClickItem(item),dijieDialog=true"
>
备注
</a>
</td>
</tr>
<tr>
<td
colspan=
"8"
style=
"text-align:left;padding-left:5px;"
>
<div
class=
"rq_remark"
v-if=
"item.IsBookTeam==2&&item.Numbers>=0"
>
<span
class=
"rq_reSpan"
>
取消团体提醒
</span>
<span
class=
"rQ_HtList"
>
<span
v-for=
"subItem in item.Numbers"
></span>
</span>
</div>
<div
class=
"rq_remark"
v-if=
"item.SupplierHotelStatus==1||item.SupplierHotelStatus==2&&item.Numbers>=0"
>
<span
class=
"rq_reSpan"
>
酒店提醒
</span>
<span
class=
"rQ_HTremark"
>
<span
v-for=
"subItem in item.Numbers"
></span>
</span>
</div>
<div><span
class=
"rq_reSpan"
>
注意事项
</span>
{{item.SupplierRemarks}}
</div>
</td>
</tr>
<tr>
<td
colspan=
"8"
style=
"text-align:left;padding-left:5px;"
>
对地接备注: {{item.SupplierToDmcRemarks}}
</td>
</tr>
</tbody>
</table>
</div>
<transition
name=
"el-zoom-in-top"
>
<div
class=
"page-component-up"
v-show=
"top>100"
@
click=
"goTop"
>
<i
class=
"el-icon-arrow-up"
></i>
</div>
</transition>
<el-dialog
custom-class=
'w800'
title=
"酒店信息"
:visible
.
sync=
"hotelUseDetail"
center
>
<table
class=
"rq_HotelTable"
v-loading=
"hotelLoading"
>
<tr>
<th
width=
"120"
>
...
...
@@ -151,21 +185,14 @@
</template>
</tbody>
</template>
<tfoot>
<tr>
<td
colspan=
"7"
>
<input
type=
"button"
value=
"保存"
@
click=
"saveSupplierjourneyorder(HotelList)"
class=
"normalBtn SaveR_Btn"
/>
</td>
</tr>
</tfoot>
</table>
<a
class=
"hotelLink"
slot=
"reference"
@
click=
"getHotelList(item.TCID,item.NewCombinationNum)"
>
酒店使用情况
</a>
</el-popover>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"酒店信息"
placement=
"top-start"
>
<el-popover
placement=
"bottom"
width=
"400"
trigger=
"click"
popper-class=
"rq_HotelDetails"
>
<div
slot=
"footer"
class=
"dialog-footer"
>
<button
class=
"hollowFixedBtn"
@
click=
"hotelUseDetail = false"
>
{{$t('pub.cancelBtn')}}
</button>
<input
type=
"button"
value=
"保存"
@
click=
"saveSupplierjourneyorder(HotelList)"
class=
"normalBtn"
/>
</div>
</el-dialog>
<el-dialog
custom-class=
'w500'
title=
"对地接备注"
:visible
.
sync=
"dijieDialog"
center
>
<table>
<tr>
<td
class=
"SP_RemarkTitle"
>
...
...
@@ -176,47 +203,13 @@
</el-input>
</td>
</tr>
<tr>
<td
colspan=
"2"
>
<input
type=
"button"
value=
"保存"
@
click=
"saveSupplierToDmcRemarks"
class=
"normalBtn SaveR_Btn"
/>
</td>
</tr>
</table>
<a
class=
"hotelLink"
slot=
"reference"
@
click=
"getClickItem(item)"
>
备注
</a>
</el-popover>
</el-tooltip>
</td>
</tr>
<tr>
<td
colspan=
"8"
style=
"text-align:left;padding-left:5px;"
>
<div
class=
"rq_remark"
v-if=
"item.IsBookTeam==2&&item.Numbers>=0"
>
<span
class=
"rq_reSpan"
>
取消团体提醒
</span>
<span
class=
"rQ_HtList"
>
<span
v-for=
"subItem in item.Numbers"
></span>
</span>
</div>
<div
class=
"rq_remark"
v-if=
"item.SupplierHotelStatus==1||item.SupplierHotelStatus==2&&item.Numbers>=0"
>
<span
class=
"rq_reSpan"
>
酒店提醒
</span>
<span
class=
"rQ_HTremark"
>
<span
v-for=
"subItem in item.Numbers"
></span>
</span>
</div>
<div><span
class=
"rq_reSpan"
>
注意事项
</span>
{{item.SupplierRemarks}}
</div>
</td>
</tr>
<tr>
<td
colspan=
"8"
style=
"text-align:left;padding-left:5px;"
>
对地接备注: {{item.SupplierToDmcRemarks}}
</td>
</tr>
</tbody>
</table>
<div
slot=
"footer"
class=
"dialog-footer"
>
<button
class=
"hollowFixedBtn"
@
click=
"dijieDialog = false"
>
{{$t('pub.cancelBtn')}}
</button>
<input
type=
"button"
value=
"保存"
@
click=
"saveSupplierToDmcRemarks"
class=
"normalBtn"
/>
</div>
<transition
name=
"el-zoom-in-top"
>
<div
class=
"page-component-up"
v-show=
"top>100"
@
click=
"goTop"
>
<i
class=
"el-icon-arrow-up"
></i>
</div>
</transition>
</el-dialog>
</div>
</template>
<
script
>
...
...
@@ -225,6 +218,8 @@
return
{
loading
:
false
,
hotelLoading
:
false
,
hotelUseDetail
:
false
,
dijieDialog
:
false
,
total
:
0
,
top
:
0
,
msg
:
{
...
...
@@ -294,6 +289,7 @@
this
.
hotelLoading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
Success
(
res
.
data
.
message
)
this
.
hotelUseDetail
=
false
;
this
.
getList
();
}
else
{
this
.
Error
(
res
.
data
.
message
)
...
...
@@ -313,7 +309,6 @@
}
})
}
console
.
log
(
this
.
dataList
,
'data'
);
}
else
{
this
.
Error
(
res
.
data
.
message
)
}
...
...
@@ -350,9 +345,12 @@
},
//保存供应商对地接备注
saveSupplierToDmcRemarks
()
{
this
.
loading
=
true
this
.
ApiPost2
(
'dmcstatistics_post_SetSupplierToDmcRemarksService'
,
this
.
RemarkObj
,
res
=>
{
this
.
hotelL
oading
=
false
;
this
.
l
oading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
Success
(
res
.
data
.
message
);
this
.
dijieDialog
=
false
;
this
.
getList
();
}
else
{
this
.
Error
(
res
.
data
.
message
);
...
...
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