Skip to content

S
SuperMan
Commit ffc46466 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 404e6eb0 1eb9a8db
Expand all Show whitespace changes
Inline Side-by-side
Showing with 785 additions and 850 deletions
src/components/LeaderManagement/leaderPay.vue
View file @ ffc46466
...@@ -222,8 +222,7 @@ ...@@ -222,8 +222,7 @@
<tr class="splitP ScenicTr" v-for='(titem,tindex) in item.DiningSummaryList'> <tr class="splitP ScenicTr" v-for='(titem,tindex) in item.DiningSummaryList'>
<td>{{titem.UseTimeStr}}</td> <td>{{titem.UseTimeStr}}</td>
<td> <td>
<p style="height: 60px!important; display: flex;align-items: center; padding:0 20px;" <p style="height: 60px!important; display: flex;align-items: center; padding:0 20px;" v-for="subItem in item.DiningSummaryList">
v-for="subItem in item.DiningSummaryList">
{{subItem.DiningName}} {{subItem.DiningName}}
</p> </p>
</td> </td>
...@@ -278,9 +277,10 @@ ...@@ -278,9 +277,10 @@
<td>备注</td> <td>备注</td>
<td>凭证</td> <td>凭证</td>
</tr> </tr>
<template v-for='(item,index) in list.ScenicList'> <template v-for='(item,index) in list.ScenicList'>
<tr class="splitP ScenicTr" v-for='(sitem,sindex) in item.ScenicStatisticsList'> <tr class="splitP ScenicTr">
<td>{{sitem.UseTimeStr}}</td> <td>{{item.UseTimeStr}}</td>
<td> <td>
<div v-for="subItem in item.ScenicStatisticsList"> <div v-for="subItem in item.ScenicStatisticsList">
{{subItem.ScenicName}} {{subItem.ScenicName}}
...@@ -299,30 +299,43 @@ ...@@ -299,30 +299,43 @@
</div> </div>
</td> </td>
<td> <td>
<template v-for='(sitem,sindex) in item.ScenicStatisticsList'>
<template v-for="(ssItem,ssIndex) in sitem.ReimburseList.ReimburseDetailsList"> <template v-for="(ssItem,ssIndex) in sitem.ReimburseList.ReimburseDetailsList">
<div v-if="ssItem.ID!==0"> <div :style="{height:60/sitem.ReimburseList.ReimburseDetailsList.length+'px',lineHeight:60/sitem.ReimburseList.ReimburseDetailsList.length+'px'}">
{{ssItem.UserTypeStr}}：{{ssItem.UserNum}}*{{ssItem.UnitPrice}} {{ssItem.UserTypeStr}}：{{ssItem.UserNum}}*{{ssItem.UnitPrice}}
</div> </div>
</template> </template>
</template>
</td> </td>
<td> <td>
<div v-for="subItem in item.ScenicStatisticsList"> <div v-for="subItem in item.ScenicStatisticsList" >
{{diningTotalPrice(subItem.ReimburseList.ReimburseDetailsList)}} {{diningTotalPrice(subItem.ReimburseList.ReimburseDetailsList)}}
</div> </div>
</td> </td>
<td> <td>
<template v-for='(sitem,sindex) in item.ScenicStatisticsList'>
{{sitem.Remarks}} {{sitem.Remarks}}
</template>
</td> </td>
<td> <td>
<div class="uploadListDiv ownScrollbarStyle" style="overflow-y: auto;"> <div class="uploadListDiv ownScrollbarStyle" style="overflow-y: auto;">
<template v-for='(sitem,sindex) in item.ScenicStatisticsList'>
<p v-for="(img,index) in sitem.ReimburseList.VoucherPicList" @click="analyzeItem(sitem.VoucherPicList,index)"> <p v-for="(img,index) in sitem.ReimburseList.VoucherPicList" @click="analyzeItem(sitem.VoucherPicList,index)">
{{img.FileName}} {{img.FileName}}
</p> </p>
</template>
</div> </div>
</td> </td>
</tr> </tr>
</template> </template>
</tbody> </tbody>
<!-- <tfoot>
<tr>
<td colspan="9">
{{list.ScenicList}}
</td>
</tr>
</tfoot> -->
</table> </table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0"> <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
...@@ -343,7 +356,8 @@ ...@@ -343,7 +356,8 @@
</tr> </tr>
<tr v-for='(item,index) in list.OtherOrderInfo.OtherList'> <tr v-for='(item,index) in list.OtherOrderInfo.OtherList'>
<td> <td>
<el-date-picker v-model='item.UseDate' prefix-icon="s" class='w105' value-format="yyyy-MM-dd" type="date" :disabled="true"></el-date-picker> <el-date-picker v-model='item.UseDate' prefix-icon="s" class='w105' value-format="yyyy-MM-dd" type="date"
:disabled="true"></el-date-picker>
</td> </td>
<td> <td>
<el-select class='w120 sel' v-model='item.CostProject' :placeholder="$t('pub.pleaseSel')" :disabled="true"> <el-select class='w120 sel' v-model='item.CostProject' :placeholder="$t('pub.pleaseSel')" :disabled="true">
...@@ -444,7 +458,8 @@ ...@@ -444,7 +458,8 @@
</tr> </tr>
<tr v-for='(item,index) in list.OtherOrderInfo.SelfPlayingIncomeList'> <tr v-for='(item,index) in list.OtherOrderInfo.SelfPlayingIncomeList'>
<td> <td>
<el-date-picker prefix-icon="s" v-model='item.UseDate' class='w105' value-format="yyyy-MM-dd" type="date" :disabled="true"></el-date-picker> <el-date-picker prefix-icon="s" v-model='item.UseDate' class='w105' value-format="yyyy-MM-dd" type="date"
:disabled="true"></el-date-picker>
</td> </td>
<td> <td>
{{item.TotalNum}} {{item.TotalNum}}
...@@ -488,7 +503,8 @@ ...@@ -488,7 +503,8 @@
</tr> </tr>
<tr v-for='(item,index) in list.OtherOrderInfo.SelfPlayingExpendList'> <tr v-for='(item,index) in list.OtherOrderInfo.SelfPlayingExpendList'>
<td> <td>
<el-date-picker prefix-icon="s" :disabled="true" v-model='item.UseDate' class='w105' value-format="yyyy-MM-dd" type="date"></el-date-picker> <el-date-picker prefix-icon="s" :disabled="true" v-model='item.UseDate' class='w105' value-format="yyyy-MM-dd"
type="date"></el-date-picker>
</td> </td>
<td> <td>
{{item.TotalNum}} {{item.TotalNum}}
...@@ -518,13 +534,13 @@ ...@@ -518,13 +534,13 @@
</table> </table>
<p class="alcenter"> <p class="alcenter">
<input type="button" value="保存" class="normalBtn" @click="saveData()"/> <input type="button" value="保存" class="normalBtn" @click="saveData()" />
</p> </p>
<div v-if='picIsShow' class="viewBigPicLayer"> <div v-if='picIsShow' class="viewBigPicLayer">
<i class="el-icon-circle-close-outline clolseViewBigPicLayer" @click="picIsShow=false,picObj=[]"></i> <i class="el-icon-circle-close-outline clolseViewBigPicLayer" @click="picIsShow=false,picObj=[]"></i>
<el-carousel height="600px" :initial-index='initialIndex' :interval="5000" trigger="click"> <el-carousel height="600px" :initial-index='initialIndex' :interval="5000" trigger="click">
<el-carousel-item v-for="(item,index) in picObj" :key="index"> <el-carousel-item v-for="(item,index) in picObj" :key="index">
<div class="inlineDiv ownScrollbarStyle"><img :src="item"/></div> <div class="inlineDiv ownScrollbarStyle"><img :src="item" /></div>
</el-carousel-item> </el-carousel-item>
</el-carousel> </el-carousel>
</div> </div>
...@@ -551,7 +567,7 @@ ...@@ -551,7 +567,7 @@
nav: [], nav: [],
TravelDayNum: 0, TravelDayNum: 0,
RealityNum: 0, RealityNum: 0,
isShow:false isShow: false
} }
}, },
methods: { methods: {
...@@ -655,8 +671,7 @@ ...@@ -655,8 +671,7 @@
} else { } else {
this.$message.error(res.data.message) this.$message.error(res.data.message)
} }
}, err => { }, err => {})
})
}, },
saveitem(obj) { saveitem(obj) {
this.TemporaryItem = obj this.TemporaryItem = obj
...@@ -686,14 +701,15 @@ ...@@ -686,14 +701,15 @@
return '晚餐' return '晚餐'
}, },
getNav() { getNav() {
this.apipost('dmcstatistics_post_GetHotelStaticsByTCIDs', {TCIDs: this.$route.query.id}, res => { this.apipost('dmcstatistics_post_GetHotelStaticsByTCIDs', {
TCIDs: this.$route.query.id
}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.nav = res.data.data this.nav = res.data.data
} else { } else {
this.$message.error(res.data.message) this.$message.error(res.data.message)
} }
}, err => { }, err => {})
})
}, },
getList() { getList() {
this.loading = true this.loading = true
...@@ -710,8 +726,7 @@ ...@@ -710,8 +726,7 @@
this.loading = false this.loading = false
this.$message.error(res.data.message) this.$message.error(res.data.message)
} }
}, err => { }, err => {})
})
}, },
uploadImg(file) { uploadImg(file) {
//上传 //上传
...@@ -736,6 +751,7 @@ ...@@ -736,6 +751,7 @@
} }
} }
</script> </script>
<style> <style>
...@@ -820,11 +836,11 @@ ...@@ -820,11 +836,11 @@
border-bottom: none; border-bottom: none;
} }
.leaderReimbursementTable tr td .pDateStyle > span:after { .leaderReimbursementTable tr td .pDateStyle>span:after {
content: '/'; content: '/';
} }
.leaderReimbursementTable tr td .pDateStyle > span:last-child:after { .leaderReimbursementTable tr td .pDateStyle>span:last-child:after {
content: '' content: ''
} }
...@@ -848,51 +864,51 @@ ...@@ -848,51 +864,51 @@
height: 34px !important; height: 34px !important;
} }
.leaderReimbursementTable .splitP td > p { .leaderReimbursementTable .splitP td>p {
height: 20px; height: 20px;
line-height: 20px; line-height: 20px;
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
} }
.leaderReimbursementTable .splitP td > p:last-child { .leaderReimbursementTable .splitP td>p:last-child {
border-bottom: none; border-bottom: none;
} }
.leaderReimbursementTable .ScenicTr td > div { .leaderReimbursementTable .ScenicTr td>div {
height: 60px; height: 60px;
line-height: 60px; line-height: 60px;
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
} }
.leaderReimbursementTable .ScenicTr td > div:last-child { .leaderReimbursementTable .ScenicTr td>div:last-child {
border-bottom: none; border-bottom: none;
} }
.leaderReimbursementTable .ScenicTr td > div p { .leaderReimbursementTable .ScenicTr td>div p {
line-height: 20px; line-height: 20px;
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
} }
.leaderReimbursementTable .ScenicTr td > div p:last-child { .leaderReimbursementTable .ScenicTr td>div p:last-child {
border-bottom: none; border-bottom: none;
} }
.leaderReimbursementTable .HotelTr td > div { .leaderReimbursementTable .HotelTr td>div {
/*height: 100px;*/ /*height: 100px;*/
/*line-height: 100px;*/ /*line-height: 100px;*/
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
} }
.leaderReimbursementTable .HotelTr td > div:last-child { .leaderReimbursementTable .HotelTr td>div:last-child {
border-bottom: none; border-bottom: none;
} }
.leaderReimbursementTable .HotelTr td > div p { .leaderReimbursementTable .HotelTr td>div p {
line-height: 19px; line-height: 19px;
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
} }
.leaderReimbursementTable .HotelTr td > div p:last-child { .leaderReimbursementTable .HotelTr td>div p:last-child {
border-bottom: none; border-bottom: none;
} }
...@@ -906,23 +922,23 @@ ...@@ -906,23 +922,23 @@
width: 100%; width: 100%;
} }
.leaderReimbursementTable .uploadListDiv > p { .leaderReimbursementTable .uploadListDiv>p {
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
cursor: pointer; cursor: pointer;
width: 100% !important; width: 100% !important;
} }
.leaderReimbursementTable .uploadListDiv > p:last-child { .leaderReimbursementTable .uploadListDiv>p:last-child {
border-bottom: none; border-bottom: none;
} }
.leaderReimbursementTable .uploadListDiv > p i { .leaderReimbursementTable .uploadListDiv>p i {
color: #999; color: #999;
vertical-align: sub; vertical-align: sub;
margin: 3px; margin: 3px;
} }
.leaderReimbursementTable .jdtd > div { .leaderReimbursementTable .jdtd>div {
height: auto !important; height: auto !important;
padding: 0 10px; padding: 0 10px;
} }
...@@ -930,4 +946,5 @@ ...@@ -930,4 +946,5 @@
.leaderReimbursementTable .leaderPayTable .el-input__prefix { .leaderReimbursementTable .leaderPayTable .el-input__prefix {
display: none; display: none;
} }
</style> </style>
src/components/LeaderManagement/leaderReimbursement.vue
View file @ ffc46466
...@@ -104,7 +104,6 @@ ...@@ -104,7 +104,6 @@
<div v-for="subItem in outItem.HotelOrderList"> <div v-for="subItem in outItem.HotelOrderList">
{{subItem.HotelName}} {{subItem.HotelName}}
</div> </div>
<!-- <div style="width: 100%;">{{item.HotelName}}</div> -->
</td> </td>
<td> <td>
<div v-for="subItem in outItem.HotelOrderList"> <div v-for="subItem in outItem.HotelOrderList">
...@@ -123,10 +122,6 @@ ...@@ -123,10 +122,6 @@
{{childItem.HouseTypeName}} {{childItem.HouseTypeName}}
</p> </p>
</div> </div>
<!-- <p v-for="x in item.HouseStatistics.HouseTypeList">
{{x.HouseTypeName}}
</p> -->
</div> </div>
</td> </td>
<td> <td>
...@@ -138,9 +133,6 @@ ...@@ -138,9 +133,6 @@
</p> </p>
</div> </div>
</div> </div>
<!-- <p v-for="x in item.HouseStatistics.HouseTypeList">
{{x.HouseTypeCount}}
</p> -->
</div> </div>
</td> </td>
<td> <td>
...@@ -150,9 +142,6 @@ ...@@ -150,9 +142,6 @@
{{childItem.HotelDiscount}} {{childItem.HotelDiscount}}
</p> </p>
</div> </div>
<!-- <p v-for="x in item.HouseStatistics.HouseTypeList">
{{x.HotelDiscount}}
</p> -->
</div> </div>
</td> </td>
<td> <td>
...@@ -162,9 +151,6 @@ ...@@ -162,9 +151,6 @@
{{childItem.UnitPrice}} {{childItem.UnitPrice}}
</p> </p>
</div> </div>
<!-- <p v-for="x in item.HouseStatistics.HouseTypeList">
{{x.UnitPrice}}
</p> -->
</div> </div>
</td> </td>
<td> <td>
...@@ -174,9 +160,6 @@ ...@@ -174,9 +160,6 @@
{{childItem.UnitPrice*(childItem.HouseGuestNum-childItem.HotelDiscount)}} {{childItem.UnitPrice*(childItem.HouseGuestNum-childItem.HotelDiscount)}}
</p> </p>
</div> </div>
<!-- <p v-for="x in item.HouseStatistics.HouseTypeList">
{{x.UnitPrice*(x.HouseGuestNum-x.HotelDiscount)}}
</p> -->
</div> </div>
</td> </td>
<td> <td>
...@@ -186,23 +169,16 @@ ...@@ -186,23 +169,16 @@
{{childItem.RebateRatio}}% {{childItem.RebateRatio}}%
</p> </p>
</div> </div>
<!-- <p v-for="x in item.HouseStatistics.HouseTypeList">
{{item.RebateRatio}}%
</p> -->
</div> </div>
</td> </td>
<td> <td>
<div class="alcenter"> <div class="alcenter">
<div v-for="subItem in outItem.HotelOrderList"> <div v-for="subItem in outItem.HotelOrderList">
<!-- <p v-for="childItem in subItem.HouseStatistics.HouseTypeList"> -->
{{hotelTotalPrice(subItem.OrderDetailsList)}} {{hotelTotalPrice(subItem.OrderDetailsList)}}
<!-- </p> -->
</div> </div>
</div> </div>
<!-- {{hotelTotalPrice(item.HouseStatistics.HouseTypeList)}} -->
</td> </td>
<td> <td>
<div class="alcenter"> <div class="alcenter">
<div v-for="subItem in outItem.HotelOrderList"> <div v-for="subItem in outItem.HotelOrderList">
<p> <p>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment