Skip to content

S
SuperMan
Commit 721a4c40 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

update

parent 69b9dbe0
Hide whitespace changes
Inline Side-by-side
Showing with 250 additions and 52 deletions
src/components/LeaderManagement/CarDetails.vue
View file @ 721a4c40
...@@ -49,15 +49,12 @@ ...@@ -49,15 +49,12 @@
{{s.UnitPrice}} {{s.UnitPrice}}
</p> </p>
</td> </td>
<td>{{item.ReimburseList.CurrencyId}}</td> <td>{{urrencyTypeObj[item.ReimburseList.CurrencyId]}}</td>
<td> <td>
<p v-if="item.RefundStatus!=1"> <p v-if="item.ReimburseList.SettlementType==1">现金支付</p>
<span v-if="item.RefundStatus==2">退款中</span> <p v-if="item.ReimburseList.SettlementType==2">公司结算</p>
<span v-if="item.RefundStatus==3">已退款</span>
</p>
</td> </td>
<td>{{item.ReimburseList.Remarks}}</td>
</tr> </tr>
</tbody> </tbody>
...@@ -92,7 +89,7 @@ export default { ...@@ -92,7 +89,7 @@ export default {
created() { created() {
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.msg.TCIDs=this.$route.query.TCIDs?this.$route.query.TCIDs:""; this.msg.TCIDs=this.$route.query.TCIDs?this.$route.query.TCIDs:"";
console.log("this.msg.TCIDs",this.msg.TCIDs) this.msg.date=this.$route.query.date?this.$route.query.date:"";
this.financeinfo_post_GetList(); this.financeinfo_post_GetList();
}, },
methods: { methods: {
...@@ -100,32 +97,16 @@ export default { ...@@ -100,32 +97,16 @@ export default {
this.apipost('financeinfo_post_GetList',{Name:''},res=>{ this.apipost('financeinfo_post_GetList',{Name:''},res=>{
if(res.data.resultCode==1){ if(res.data.resultCode==1){
let data = res.data.data; let data = res.data.data;
console.log("data",data) data.map(item => {
this.urrencyTypeObj[0]="不限";
this.urrencyTypeObj[item.ID]=item.Name;
});
}else{ }else{
} }
},err=>{}) },err=>{})
}, },
// 退款操作
RefundPay(item) {
let orderObj = {
OrderID: item.Id, //订单号
OrderSource: 12, //12
Obj: {},
SourceID: item.AirTicketId, //机票id
TCIDList: []
};
this.$router.push({
name: "ChoiceAddFinancialDocuments",
query: {
Type: 2,
companyID: item.RB_Branch_Id, //公司id
path: "",
blank: "y",
orderObj: JSON.stringify(orderObj)
}
});
},
goUrl: function(name, path, id) { goUrl: function(name, path, id) {
this.$router.push({ this.$router.push({
name: path, name: path,
...@@ -147,21 +128,21 @@ export default { ...@@ -147,21 +128,21 @@ export default {
this.loading=false; this.loading=false;
if(res.data.resultCode == 1) { if(res.data.resultCode == 1) {
this.dataList = res.data.data.BusList; this.dataList = [];
console.log("this.dataList",this.dataList); let data=res.data.data.BusList;
data.forEach(item => {
if(item.UseTime==this.msg.date){
this.dataList.push(item);
}
});
// console.log("this.dataList",this.dataList);
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
}, err => {}) }, err => {})
}, },
// 结束日期不能大于开始日期
dataDui() {
if (this.msg.startDate > this.msg.endDate && this.msg.endDate !== "") {
this.$message.error("结束日期不能大于开始日期");
this.msg.endDate = "";
}
}
}, },
mounted() { mounted() {
this.getList(); this.getList();
......
src/components/LeaderManagement/DinningDetails.vue 0 → 100644
View file @ 721a4c40
<template>
<div class="flexOne" style="min-width: 1200px;">
<!-- 表格 -->
<div style="width: 100%; height: auto;min-height:500px;overflow-x: auto;margin-top:20px" class="ownScrollbarStyle">
<table class="groupTourOrderSearchTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
<tr class="title_tr">
<th>日期</th>
<th>餐厅名称</th>
<th>计划金额</th>
<th>用餐信息</th>
<th>金额</th>
<th>币种</th>
<th>支付方式</th>
<th>备注</th>
</tr>
<tr>
<td v-show="dataList.length==0" colspan="16" align="center">暂无数据</td>
</tr>
<tbody v-for="(item,index) in dataList" :key="index">
<tr>
<td>{{item.UseTimeStr}}</td>
<td>
<p v-for="(i,index) in item.DiningSummaryList" :key="index">{{i.DiningName}}({{i.UseDinnerTypeStr}})</p>
</td>
<td>
<p v-for="(i,index) in item.DiningSummaryList" :key="index">{{i.TotalPrice}}</p>
</td>
<td>
<div v-for="(i,index) in item.DiningSummaryList" :key="index">
<p><span class="widthSpan">成人</span>人数：<span class="numSpan">{{i.DiningPriceList[0].PeopleNum}}</span>单价：{{i.DiningPriceList[0].PeoplePrice}}</p>
<p><span class="widthSpan">儿童</span>人数：<span class="numSpan">{{i.DiningPriceList[1].PeopleNum}}</span>单价：{{i.DiningPriceList[1].PeoplePrice}}</p>
<p><span class="widthSpan">婴儿</span>人数：<span class="numSpan">{{i.DiningPriceList[2].PeopleNum}}</span>单价：{{i.DiningPriceList[2].PeoplePrice}}</p>
</div>
</td>
<td>
<p v-for="(i,index) in item.DiningSummaryList" :key="index">
{{diningTotalPrice(i,i.DiningPriceList)}}
</p>
</td>
<td>
{{urrencyTypeObj[item.DiningSummaryList[0].ReimburseList.CurrencyId]}}
</td>
<td>
<span v-if="item.DiningSummaryList[0].PayStyle === 1">现付</span>
<span v-else-if="item.DiningSummaryList[0].PayStyle === 2">公司结算</span>
<span v-else-if="item.DiningSummaryList[0].PayStyle === 3">预付</span>
<span v-else-if="item.DiningSummaryList[0].PayStyle === 6">公司合团支付</span>
</td>
<td>{{item.Remarks}}</td>
</tr>
</tbody>
</table>
</div>
<!-- <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total"></el-pagination> -->
</div>
</template>
<script>
import payURL from "../commonPage/payURL.vue";
import moment from "moment";
export default {
data() {
return {
msg: {
TCIDs:''
},
dataList: [],
loading: false,
total: 0,
currentPage: 1,
showID: -1,
companyList:[],
employeeList:[],
urrencyTypeObj:{},
};
},
components: {},
created() {
let userInfo = this.getLocalStorage();
this.msg.TCIDs=this.$route.query.TCIDs?this.$route.query.TCIDs:"";
this.msg.date=this.$route.query.date?this.$route.query.date:"";
this.financeinfo_post_GetList();
},
methods: {
diningTotalPrice(sObj, obj) {
let totalPrice = 0
obj.forEach(x => {
totalPrice += x.PeoplePrice * (x.PeopleNum - x.Discount) * (1 - x.DiscountPrice / 100)
})
if (sObj.PayStyle !== 1) {
totalPrice = 0
}
return this.moneyFormat(totalPrice)
},
financeinfo_post_GetList(){ // 币种类型
this.apipost('financeinfo_post_GetList',{Name:''},res=>{
if(res.data.resultCode==1){
let data = res.data.data;
data.map(item => {
this.urrencyTypeObj[0]="不限";
this.urrencyTypeObj[item.ID]=item.Name;
});
}else{
}
},err=>{})
},
goUrl: function(name, path, id) {
this.$router.push({
name: path,
query: { id: id, blank: "y", tab: name }
});
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
resetPageIndex() {
this.msg.pageIndex = 1;
this.currentPage = 1;
},
getList() {
this.loading = true;
this.apipost('dmcstatistics_post_GetNewLeaderPayMoneyStatics', this.msg, res => {
this.loading=false;
if(res.data.resultCode == 1) {
this.dataList = [];
let data=res.data.data.DiningList;
data.forEach(item => {
if(item.UseTimeStr==this.msg.date){
this.dataList.push(item);
}
});
// console.log("this.dataList",this.dataList);
} else {
this.Error(res.data.message);
}
}, err => {})
},
},
mounted() {
this.getList();
}
};
</script>
<style scoped>
.numSpan{
display: inline-block;
width:60px;
}
.widthSpan{
display: inline-block;
width: 45px;
}
.groupTourOrderSearchTable {
width: 100%;
min-width: 1500px;
font-size: 14px;
color: #333;
border-bottom: 1px solid #cccccc;
border-right: 1px solid #cccccc;
/* border-collapse: collapse; */
}
.groupTourOrderSearchTable tr th {
background: #e6e6e6;
height: 30px;
font-size: 12px;
text-align: left;
text-indent: 15px;
border-top: 1px solid #cccccc;
border-left: 1px solid #cccccc;
}
.groupTourOrderSearchTable tr {
background: #fff;
text-align: left;
}
.groupTourOrderSearchTable tr td {
padding: 8px;
border-top: 1px solid #cccccc;
border-left: 1px solid #cccccc;
}
.groupTourOrderSearchTable tr td p {
line-height: 20px;
}
.groupTourOrderSearchTable .dowloadSpan:hover {
text-decoration: underline;
cursor: pointer;
}
.groupTourOrderSearchTable span.personNo {
text-decoration: underline;
cursor: pointer;
}
.groupTourOrderSearchTable span.personNo:hover {
font-weight: bold;
color: #e95252;
}
</style>
src/components/leaderPay2.vue
View file @ 721a4c40
...@@ -942,13 +942,20 @@ export default { ...@@ -942,13 +942,20 @@ export default {
}, },
// 明细 // 明细
godetail: function (name, obj) { godetail: function (name, obj) {
let path = "", TCIDs = this.msg.TCIDs, date = ''; let path = "", TCIDs = this.msg.TCIDs, date = '';
if (name == 'ticket') { if (name == 'ticket') {
path = 'leaderPayTicketDetail' path = 'leaderPayTicketDetail'
date = obj.UseTimeStr date = obj.UseTimeStr
} else if (name === 'bus') { } else if (name === 'bus') {
path="CarDetails"
TCIDs=obj.TCIDs;
date=obj.UseTime;
} else if (name === 'dining') { } else if (name === 'dining') {
path="DinningDetails"
TCIDs=obj.TCIDs;
date=obj.UseTimeStr;
} else if (name === 'hotel') { } else if (name === 'hotel') {
path = 'leaderPayHotelDetail' path = 'leaderPayHotelDetail'
......
src/router/config.js
View file @ 721a4c40
...@@ -398,6 +398,14 @@ export default { ...@@ -398,6 +398,14 @@ export default {
title: '车辆报账详情' title: '车辆报账详情'
}, },
}, },
{
path: '/DinningDetails', //餐食报账详情
name: 'DinningDetails',
component: resolve => require(['@/components/LeaderManagement/DinningDetails'], resolve),
meta: {
title: '餐食报账详情'
},
},
{ {
path: '/positionManagement', //岗位管理 path: '/positionManagement', //岗位管理
name: 'positionManagement', name: 'positionManagement',
...@@ -1392,20 +1400,6 @@ export default { ...@@ -1392,20 +1400,6 @@ export default {
meta: { meta: {
title: '领队绩效' title: '领队绩效'
}, },
}, {
path: '/leaderPayHotelDetail', //j酒店报账详情
name: 'leaderPayHotelDetail',
component: resolve => require(['@/components/LeaderManagement/leaderPayHotelDetail'], resolve),
meta: {
title: '领队绩效'
},
}, {
path: '/leaderPayTicketDetail', //j门票报账详情
name: 'leaderPayTicketDetail',
component: resolve => require(['@/components/LeaderManagement/leaderPayTicketDetail'], resolve),
meta: {
title: '领队绩效'
},
}, { }, {
path: '/leaderChedule', //领队档期 path: '/leaderChedule', //领队档期
name: 'leaderChedule', name: 'leaderChedule',
......
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