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
b79867e7
Commit
b79867e7
authored
1 year ago
by
吴春
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
显示酒店对应的成本单据信息
parent
f51c3b05
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
48 additions
and
3 deletions
+48
-3
TravelControlList.vue
...components/TravelManager/TravelList/TravelControlList.vue
+2
-1
commonHotelInfo.vue
src/components/commonPage/commonHotelInfo.vue
+44
-1
dmcTotalTable.vue
src/components/dmc/manager/dmcTotalTable.vue
+2
-1
No files found.
src/components/TravelManager/TravelList/TravelControlList.vue
View file @
b79867e7
...
@@ -1526,8 +1526,9 @@
...
@@ -1526,8 +1526,9 @@
showBtnList
:
false
,
//是否下载、确认按钮
showBtnList
:
false
,
//是否下载、确认按钮
ShowTaxType
:
false
,
//显示税入税别
ShowTaxType
:
false
,
//显示税入税别
ShowRebateRatio
:
false
,
//显示返佣比列
ShowRebateRatio
:
false
,
//显示返佣比列
ShowSupplier
:
tru
e
,
//是否显示供应商
ShowSupplier
:
fals
e
,
//是否显示供应商
showCaozuoTime
:
true
,
//操作时间
showCaozuoTime
:
true
,
//操作时间
caiwu
:
true
,
//显示财务单据
colspanLength
:
5
//跨行
colspanLength
:
5
//跨行
},
},
//更新可售机票数量
//更新可售机票数量
...
...
This diff is collapsed.
Click to expand it.
src/components/commonPage/commonHotelInfo.vue
View file @
b79867e7
...
@@ -53,7 +53,9 @@
...
@@ -53,7 +53,9 @@
{{
$t
(
'fnc.fkfangshi'
)
}}
<br
/>
{{
$t
(
'restaurant.res_commissionColumn'
)
}}
</th>
{{
$t
(
'fnc.fkfangshi'
)
}}
<br
/>
{{
$t
(
'restaurant.res_commissionColumn'
)
}}
</th>
<th
width=
"130"
v-if=
"showHotelObj.showZhan"
>
{{
$t
(
'salesModule.UseRoomTime'
)
}}
</th>
<th
width=
"130"
v-if=
"showHotelObj.showZhan"
>
{{
$t
(
'salesModule.UseRoomTime'
)
}}
</th>
<th
width=
"100"
v-if=
"showHotelObj.showZhan"
>
{{
$t
(
'salesModule.SureTime'
)
}}
</th>
<th
width=
"100"
v-if=
"showHotelObj.showZhan"
>
{{
$t
(
'salesModule.SureTime'
)
}}
</th>
<th
width=
"100"
v-if=
"showHotelObj.ShowSupplier"
>
{{
$t
(
'hotel.hotel_Supplier'
)
}}
</th>
<th
width=
"100"
v-if=
"showHotelObj.ShowSupplier"
>
{{
$t
(
'hotel.hotel_Supplier'
)
}}
</th>
<th
width=
"180"
v-if=
"showHotelObj.caiwu"
>
{{
$t
(
'salesModule.DJNUM'
)
}}{{
$t
(
'hotel.hotel_corrlelatition'
)
}}
</th>
<th
width=
"70"
v-if=
"showHotelObj.showPrice"
>
<th
width=
"70"
v-if=
"showHotelObj.showPrice"
>
{{
$t
(
'fnc.rizhi'
)
}}
{{
$t
(
'fnc.rizhi'
)
}}
</th>
</th>
...
@@ -126,6 +128,19 @@
...
@@ -126,6 +128,19 @@
<td
v-if=
"showHotelObj.ShowSupplier"
>
<td
v-if=
"showHotelObj.ShowSupplier"
>
{{hotelSubItem.SupplierName}}
{{hotelSubItem.SupplierName}}
</td>
</td>
<td
v-if=
"showHotelObj.caiwu"
>
<div>
<div
v-if=
"hotelSubItem.FrList&&hotelSubItem.FrList.length > 0"
v-for=
"(item2, index2) in hotelSubItem.FrList"
:key=
"index2"
>
<span
style=
"cursor:pointer;text-decoration:underline;"
@
click=
"goUrl('财务单据','FinancialDocumentsDetail',item2.FrID,'')"
>
{{ item2.FrID }}({{item2.StatusStr}})
</span>
</div>
<span
v-else
style=
"cursor: default"
>
{{ $t("system.content_noData") }}
</span>
</div>
</td>
<td
v-if=
"showHotelObj.showPrice"
>
<td
v-if=
"showHotelObj.showPrice"
>
<el-popover
width=
"200"
trigger=
"click"
popper-class=
"Bus_HotelPop"
>
<el-popover
width=
"200"
trigger=
"click"
popper-class=
"Bus_HotelPop"
>
<commonHotelLog
:ref=
"'comHotelLog'+index+hotelSubIndex+''"
>
</commonHotelLog>
<commonHotelLog
:ref=
"'comHotelLog'+index+hotelSubIndex+''"
>
</commonHotelLog>
...
@@ -173,7 +188,24 @@
...
@@ -173,7 +188,24 @@
<span
v-else
>
{{
$t
(
'active.cl_zanwu'
)
}}
</span>
<span
v-else
>
{{
$t
(
'active.cl_zanwu'
)
}}
</span>
</td>
</td>
</tr>
</tr>
<tr
v-if=
"showHotelObj.caiwu&&HotelObj&&HotelObj.length>0&&HotelObj[0].FrList&&HotelObj[0].FrList.length > 0"
>
<td
class=
"tdRight"
>
{{
$t
(
'salesModule.DJNUM'
)
}}
:
</td>
<td
class=
"tdLeft"
colspan=
"3"
style=
"padding:10px 0;text-align:left;"
>
<div
v-for=
"(item2, index2) in HotelObj[0].FrList"
:key=
"index2"
>
<span
style=
"cursor:pointer;text-decoration:underline;"
@
click=
"goUrl('财务单据','FinancialDocumentsDetail',item2.FrID,'')"
>
{{
item2
.
FrID
}}
(
{{
item2
.
StatusStr
}}
)
</span>
</div>
</td>
</tr>
</
template
>
</
template
>
<
template
v-if=
"showHotelObj.showBtnList"
>
<
template
v-if=
"showHotelObj.showBtnList"
>
<tr>
<tr>
<td
colspan=
"4"
style=
"padding:10px 0;text-align:center;"
>
<td
colspan=
"4"
style=
"padding:10px 0;text-align:center;"
>
...
@@ -226,6 +258,17 @@
...
@@ -226,6 +258,17 @@
that
.
$emit
(
'SetShouPeiShu'
);
that
.
$emit
(
'SetShouPeiShu'
);
});
});
},
},
goUrl
(
name
,
path
,
id
,
tcmun
)
{
this
.
$router
.
push
({
name
:
path
,
query
:
{
id
:
id
,
tcmun
:
tcmun
,
blank
:
"y"
,
tab
:
name
,
},
});
},
//根据日期返回星期几
//根据日期返回星期几
getDayByDate
(
dateString
)
{
getDayByDate
(
dateString
)
{
if
(
dateString
)
{
if
(
dateString
)
{
...
...
This diff is collapsed.
Click to expand it.
src/components/dmc/manager/dmcTotalTable.vue
View file @
b79867e7
...
@@ -681,7 +681,8 @@
...
@@ -681,7 +681,8 @@
showBtnList
:
true
,
//是否下载、确认按钮
showBtnList
:
true
,
//是否下载、确认按钮
ShowTaxType
:
true
,
//显示税入税别
ShowTaxType
:
true
,
//显示税入税别
ShowRebateRatio
:
true
,
//显示返佣比列
ShowRebateRatio
:
true
,
//显示返佣比列
ShowSupplier
:
true
,
//是否显示供应商
ShowSupplier
:
false
,
//是否显示供应商
caiwu
:
true
,
//操作时间
showCaozuoTime
:
true
,
//操作时间
showCaozuoTime
:
true
,
//操作时间
colspanLength
:
6
//跨行
colspanLength
:
6
//跨行
},
},
...
...
This diff is collapsed.
Click to expand it.
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