|
@@ -1,11 +1,5 @@
|
|
|
<template>
|
|
|
<div v-loading.fullscreen.lock="fullscreenLoading">
|
|
|
-
|
|
|
- <transition>
|
|
|
- <div class="gotop-index" v-show="btnFlag">
|
|
|
- <a href="javascript:;" class="gotop-a" @click="backTop"></a>
|
|
|
- </div>
|
|
|
- </transition>
|
|
|
<div class="reportsbale-all">
|
|
|
<!-- <WorldMap style="width: 100%;height:600px;" id="WorldMap" ref="WorldMap" :chartData="worldChartData"></WorldMap> -->
|
|
|
<!-- <world-chart :id="WorldMap" ref="WorldMap" :chartData="worldChartData"/> -->
|
|
@@ -1095,15 +1089,84 @@
|
|
|
</el-table>
|
|
|
<div v-html="groupRoyaltyFeeStr.split(/\\r\\n/g).join('<br/>')" class="reportsbale-table-text"></div>
|
|
|
</div>
|
|
|
+ <div class="reportsbale-table-li">
|
|
|
+ <el-table
|
|
|
+ :data="groupReimburseFeeViews"
|
|
|
+ border
|
|
|
+ style="width: 100%;"
|
|
|
+ :row-style="TableRowStyle">
|
|
|
+ <el-table-column
|
|
|
+ label="团组日付报销">
|
|
|
+ <el-table-column
|
|
|
+ prop="appReason"
|
|
|
+ label="费用名称">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="currency"
|
|
|
+ label="币种"
|
|
|
+ width="100">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ label="费用金额"
|
|
|
+ width="120">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{ scope.row.totalAmt.toFixed(2)}}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="applyComp"
|
|
|
+ label="所属公司"
|
|
|
+ width="200">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="applyTime"
|
|
|
+ label="申请时间"
|
|
|
+ width="140">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="auditStatusFlg"
|
|
|
+ label="审核状态"
|
|
|
+ width="140">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span v-html="scope.row.auditStatusFlg"></span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ label="费用标识"
|
|
|
+ prop="transferLabel"
|
|
|
+ width="80">
|
|
|
+ <!-- <template slot-scope="scope">
|
|
|
+ {{ scope.row.orbitalPrivateTransfer==-1?'未选择':scope.row.orbitalPrivateTransfer==0?'公转':'私转' }}
|
|
|
+ </template> -->
|
|
|
+ </el-table-column>
|
|
|
+ <!-- <el-table-column
|
|
|
+ prop="payWay"
|
|
|
+ label="支付方式"
|
|
|
+ width="80">
|
|
|
+ </el-table-column> -->
|
|
|
+ <el-table-column
|
|
|
+ prop="payStatusFlag"
|
|
|
+ label="状态"
|
|
|
+ width="80">
|
|
|
+ <!-- <template slot-scope="scope">
|
|
|
+ {{ scope.row.isPay==-1?'未选择':scope.row.isPay==1?'已付款':'未付款' }}
|
|
|
+ </template> -->
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="applyName"
|
|
|
+ label="申请人"
|
|
|
+ width="80">
|
|
|
+ </el-table-column>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+ <div v-html="groupReimburseFeeStr.split(/\\r\\n/g).join('<br/>')" class="reportsbale-table-text"></div>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</template>
|
|
|
<script>
|
|
|
-import WorldMap from "../ConferenceModule/WorldMap.vue"; //引入地图组件
|
|
|
-import "../../assets/js/world"
|
|
|
export default {
|
|
|
- components: { WorldMap },
|
|
|
data () {
|
|
|
return {
|
|
|
groupInfo:{},
|
|
@@ -1133,16 +1196,15 @@ export default {
|
|
|
groupInsuranceFeeStr:'',//保险费用 Str
|
|
|
groupDecreaseFeeViews:[],//其他款项费用 Items
|
|
|
groupDecreaseFeeStr:'',//其他款项费用 Str
|
|
|
- groupcommission:'',//团组提成
|
|
|
+ groupcommission:[],//团组提成
|
|
|
groupRoyaltyFeeStr:'',//团组提成合计
|
|
|
+ groupReimburseFeeViews:[],//团组日付
|
|
|
+ groupReimburseFeeStr:'',//团组日付
|
|
|
feeTotalStr:'',
|
|
|
btnFlag: false,
|
|
|
scrollTop:0,
|
|
|
fullscreenLoading:false,
|
|
|
- worldChartData:{
|
|
|
- namemap:{}, // 自定义地区的名称映射,从官方world.json中获取
|
|
|
- dataArr: [], // 地图系列中的数据内容数组,从后台返回数据
|
|
|
- },
|
|
|
+
|
|
|
isShow:false,
|
|
|
}
|
|
|
},
|
|
@@ -1191,8 +1253,8 @@ export default {
|
|
|
isAudit:true
|
|
|
}
|
|
|
}).then(function (res) {
|
|
|
- var resinif=res.data.data
|
|
|
if(res.data.code==200){
|
|
|
+ var resinif=res.data.data
|
|
|
that.feeTotalStr=resinif.feeTotalStr;
|
|
|
that.groupHotelFeeViews=resinif.groupExpenditure.groupHotelFeeViews;
|
|
|
that.groupHotelFeeStr=resinif.groupExpenditure.groupHotelFeeStr;
|
|
@@ -1218,6 +1280,8 @@ export default {
|
|
|
that.groupDecreaseFeeStr=resinif.groupExpenditure.groupDecreaseFeeStr;
|
|
|
that.groupcommission=resinif.groupExpenditure.groupRoyaltyFeeViews;
|
|
|
that.groupRoyaltyFeeStr=resinif.groupExpenditure.groupRoyaltyFeeStr;
|
|
|
+ that.groupReimburseFeeViews=resinif.groupExpenditure.groupReimburseFeeViews;
|
|
|
+ that.groupReimburseFeeStr=resinif.groupExpenditure.groupReimburseFeeStr;
|
|
|
that.fullscreenLoading=false;
|
|
|
}else{
|
|
|
that.$message.error(res.data.msg);
|
|
@@ -1228,17 +1292,7 @@ export default {
|
|
|
that.fullscreenLoading=false;
|
|
|
});
|
|
|
},
|
|
|
- backTop() {
|
|
|
- const that = this;
|
|
|
- let timer = setInterval(() => {
|
|
|
- let ispeed = Math.floor(-that.scrollTop / 5);
|
|
|
- document.documentElement.scrollTop = document.body.scrollTop =
|
|
|
- that.scrollTop + ispeed;
|
|
|
- if (that.scrollTop === 0) {
|
|
|
- clearInterval(timer);
|
|
|
- }
|
|
|
- }, 16);
|
|
|
- },
|
|
|
+
|
|
|
TableRowStyle({ row, rowIndex }) {
|
|
|
// 注意,这里返回的是一个对象
|
|
|
let rowBackground = {};
|
|
@@ -1250,20 +1304,7 @@ export default {
|
|
|
return rowBackground;
|
|
|
}
|
|
|
},
|
|
|
- // 为了计算距离顶部的高度,当高度大于60显示回顶部图标,小于60则隐藏
|
|
|
- scrollToTop() {
|
|
|
- const that = this;
|
|
|
- let scrollTop =
|
|
|
- window.pageYOffset ||
|
|
|
- document.documentElement.scrollTop ||
|
|
|
- document.body.scrollTop;
|
|
|
- that.scrollTop = scrollTop;
|
|
|
- if (that.scrollTop > 30) {
|
|
|
- that.btnFlag = true;
|
|
|
- } else {
|
|
|
- that.btnFlag = false;
|
|
|
- }
|
|
|
- },
|
|
|
+
|
|
|
|
|
|
},
|
|
|
filters:{
|
|
@@ -1297,9 +1338,6 @@ export default {
|
|
|
next()
|
|
|
},
|
|
|
mounted(){
|
|
|
- this.worldChartData.namemap=this.$store.state.worldjson.namemap;
|
|
|
- this.worldChartData.dataArr=this.$store.state.worldjson.dataArr;
|
|
|
- console.log(this.worldChartData);
|
|
|
this.isShow=true;
|
|
|
this.diid = Number(this.$route.query.id);
|
|
|
this.token=JSON.parse(localStorage.getItem('userinif')).token;
|
|
@@ -1307,10 +1345,9 @@ export default {
|
|
|
this.userid=JSON.parse(localStorage.getItem('userinif')).userInfo.userId;
|
|
|
this.PostShareGroupInfo();
|
|
|
|
|
|
- window.addEventListener("scroll", this.scrollToTop, true);
|
|
|
},
|
|
|
destroyed() {
|
|
|
- window.removeEventListener("scroll", this.scrollToTop, true);
|
|
|
+
|
|
|
},
|
|
|
}
|
|
|
</script>
|