Skip to content

S
SuperMan
Commit 70786fc2 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

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

parents 3d85a44e 6a28db9f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4473 additions and 122 deletions
src/components/ShoppingStore/ShoppingReimbursement.vue
View file @ 70786fc2
...@@ -71,25 +71,42 @@ ...@@ -71,25 +71,42 @@
<tr v-if="shopDataList.length==0"> <tr v-if="shopDataList.length==0">
<td colspan="22">暂无数据</td> <td colspan="22">暂无数据</td>
</tr> </tr>
<tbody v-for="(outItem,outindex) in shopDataList" :class="{roomReservationsSplitTrCss:outindex%2!=0}" v-if="outItem.PriceShopList.length>0"> <tbody v-for="(outItem,outindex) in shopDataList" :class="{roomReservationsSplitTrCss:outindex%2!=0}"
v-if="outItem.PriceShopList.length>0">
<template v-for="(item,index) in outItem.PriceShopList"> <template v-for="(item,index) in outItem.PriceShopList">
<template v-for="(subItem,subIndex) in item.ShopDetailsList"> <template v-for="(subItem,subIndex) in item.ShopDetailsList">
<tr> <tr>
<td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0"> <td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
{{outItem.NewCombinationNum}} {{outItem.NewCombinationNum}}
</td> </td>
<td> <template v-if="outItem.TCList.length==1">
{{subItem.StartCityNames}} <td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
</td> {{subItem.StartCityNames}}
<td> </td>
{{subItem.TCNUMS}} <td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
</td> {{subItem.TCNUMS}}
<td> </td>
{{subItem.LeaderName}} <td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
</td> {{subItem.LeaderName}}
<td> </td>
{{subItem.GuideName}} <td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
</td> {{subItem.GuideName}}
</td>
</template>
<template v-else>
<td>
{{subItem.StartCityNames}}
</td>
<td>
{{subItem.TCNUMS}}
</td>
<td>
{{subItem.LeaderName}}
</td>
<td>
{{subItem.GuideName}}
</td>
</template>
<td :rowspan="item.ShopDetailsList.length" v-if='subIndex==0' width="180" <td :rowspan="item.ShopDetailsList.length" v-if='subIndex==0' width="180"
style="word-wrap:break-word ;"> style="word-wrap:break-word ;">
{{item.ShopName}} {{item.ShopName}}
...@@ -126,50 +143,49 @@ ...@@ -126,50 +143,49 @@
v-if="img !== ''" style="cursor: pointer;color:blue;">{{ '凭证' + (imgIndex + 1)}}</p> v-if="img !== ''" style="cursor: pointer;color:blue;">{{ '凭证' + (imgIndex + 1)}}</p>
</td> </td>
<td :rowspan="item.ShopDetailsList.length" v-if='subIndex==0'> <td :rowspan="item.ShopDetailsList.length" v-if='subIndex==0'>
<div> <div>
<p style="cursor: pointer;color:blue;" <p style="cursor: pointer;color:blue;" @click="CreateBill(item.ShopDetailsList)">生成单据</p>
@click="CreateBill(item.ShopDetailsList)">生成单据</p>
</div> </div>
</td> </td>
<td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0"> <td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
<p style="cursor: pointer;color:blue;margin-top:5px;" <p style="cursor: pointer;color:blue;margin-top:5px;"
@click="goHuiZhi(outItem.TCIDs, item.LeaderName, item.GuideName, item.StartCityNames, item.TCNUMS)"> @click="goHuiZhi(outItem.TCIDs, item.LeaderName, item.GuideName, item.StartCityNames, item.TCNUMS)">
选择购物店</p> 选择购物店</p>
<p style="cursor: pointer;color:blue;margin-top:10px" <p style="cursor: pointer;color:blue;margin-top:10px"
@click="goUrlT('ShoppingReimbursementDetails',outItem.TCIDs,'购物报账详情')">操作</p> @click="goUrlT('ShoppingReimbursementDetails',outItem.TCIDs,'购物报账详情')">操作</p>
</td> </td>
</tr> </tr>
</template> </template>
</template> </template>
</tbody> </tbody>
<tbody v-else v-for="(outItem,outindex) in shopDataList"> <tbody v-else v-for="(outItem,outindex) in shopDataList">
<tr> <tr>
<td> <td>
{{outItem.NewCombinationNum}} {{outItem.NewCombinationNum}}
</td> </td>
<td> <td>
</td> </td>
<td> <td>
</td> </td>
<td> <td>
</td> </td>
<td> <td>
</td> </td>
<td width="180"></td> <td width="180"></td>
<td width="60"></td> <td width="60"></td>
<td width="70"></td> <td width="70"></td>
<td width="70"></td> <td width="70"></td>
<td width="80"></td> <td width="80"></td>
<td width="80"></td> <td width="80"></td>
<td width="80"></td> <td width="80"></td>
<td width="80"></td> <td width="80"></td>
<td width="80"> </td> <td width="80"> </td>
<td width="80"> </td> <td width="80"> </td>
<td width="80"></td> <td width="80"></td>
<td></td> <td></td>
<td></td> <td></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage"
...@@ -193,7 +209,7 @@ ...@@ -193,7 +209,7 @@
StartDate: '', StartDate: '',
EndDate: '', EndDate: '',
currentPage: 1, currentPage: 1,
total: 0, total: 0,
}, },
LineList: [], LineList: [],
LineTeamList: [], LineTeamList: [],
...@@ -295,14 +311,7 @@ ...@@ -295,14 +311,7 @@
this.loading = false this.loading = false
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.msg.total = res.data.data.count; this.msg.total = res.data.data.count;
let shopDataList = res.data.data.pageData; this.shopDataList = res.data.data.pageData;
shopDataList.forEach(x => {
x.PriceShopList.forEach(z => {
z.imgList = (z.Credentials && z.Credentials.length > 0) ? z.Credentials.split(",") :
'';
});
});
this.shopDataList = shopDataList;
} else { } else {
this.$message.error(res.data.message) this.$message.error(res.data.message)
} }
......
src/components/ShoppingStore/ShoppingReimbursement2.vue
View file @ 70786fc2
...@@ -58,11 +58,8 @@ ...@@ -58,11 +58,8 @@
<th width="60">进店人数</th> <th width="60">进店人数</th>
<th width="70">公司</th> <th width="70">公司</th>
<th width="70">总金额</th> <th width="70">总金额</th>
<th width="80">领队佣金<br />(应付)</th> <th width="80">领队佣金<br />(应付)</th>
<th width="80">导游佣金<br />(应付)</th> <th width="80">导游佣金<br />(应付)</th>
<!--<th width="80">公司佣金<br />(应收)</th>
<th width="80">返佣余额</th>
<th width="80">返佣总计</th>-->
<th width="80">汇率</th> <th width="80">汇率</th>
<th width="80">凭证</th> <th width="80">凭证</th>
<th width="80">财务单据</th> <th width="80">财务单据</th>
...@@ -70,25 +67,42 @@ ...@@ -70,25 +67,42 @@
<tr v-if="shopDataList.length==0"> <tr v-if="shopDataList.length==0">
<td colspan="22">暂无数据</td> <td colspan="22">暂无数据</td>
</tr> </tr>
<tbody v-for="(outItem,outindex) in shopDataList" :class="{roomReservationsSplitTrCss:outindex%2!=0}" v-if="outItem.PriceShopList.length>0"> <tbody v-for="(outItem,outindex) in shopDataList" :class="{roomReservationsSplitTrCss:outindex%2!=0}"
v-if="outItem.PriceShopList.length>0">
<template v-for="(item,index) in outItem.PriceShopList"> <template v-for="(item,index) in outItem.PriceShopList">
<template v-for="(subItem,subIndex) in item.ShopDetailsList"> <template v-for="(subItem,subIndex) in item.ShopDetailsList">
<tr> <tr>
<td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0"> <td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
{{outItem.NewCombinationNum}} {{outItem.NewCombinationNum}}
</td> </td>
<td> <template v-if="outItem.TCList.length==1">
{{subItem.StartCityNames}} <td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
</td> {{subItem.StartCityNames}}
<td> </td>
{{subItem.TCNUMS}} <td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
</td> {{subItem.TCNUMS}}
<td> </td>
{{subItem.LeaderName}} <td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
</td> {{subItem.LeaderName}}
<td> </td>
{{subItem.GuideName}} <td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
</td> {{subItem.GuideName}}
</td>
</template>
<template v-else>
<td>
{{subItem.StartCityNames}}
</td>
<td>
{{subItem.TCNUMS}}
</td>
<td>
{{subItem.LeaderName}}
</td>
<td>
{{subItem.GuideName}}
</td>
</template>
<td :rowspan="item.ShopDetailsList.length" v-if='subIndex==0' width="180" <td :rowspan="item.ShopDetailsList.length" v-if='subIndex==0' width="180"
style="word-wrap:break-word ;"> style="word-wrap:break-word ;">
{{item.ShopName}} {{item.ShopName}}
...@@ -101,22 +115,13 @@ ...@@ -101,22 +115,13 @@
</td> </td>
<td width="70"> <td width="70">
{{subItem.TotalMoney}} {{subItem.TotalMoney}}
</td> </td>
<td width="80"> <td width="80">
{{subItem.LeaderCommission}} {{subItem.LeaderCommission}}
</td> </td>
<td width="80"> <td width="80">
{{subItem.GuideCommission}} {{subItem.GuideCommission}}
</td> </td>
<!-- <td width="80">
{{subItem.CompanyCommission}}
</td>
<td width="80" :rowspan="item.ShopDetailsList.length" v-if='subIndex==0'>
{{subItem.OtherDeduct}}
</td>
<td width="80" :rowspan="item.ShopDetailsList.length" v-if='subIndex==0'>
{{subItem.BackTotalMoney}}
</td> -->
<td width="80" :rowspan="item.ShopDetailsList.length" v-if='subIndex==0'> <td width="80" :rowspan="item.ShopDetailsList.length" v-if='subIndex==0'>
{{subItem.DMCRate}} {{subItem.DMCRate}}
</td> </td>
...@@ -125,9 +130,8 @@ ...@@ -125,9 +130,8 @@
v-if="img !== ''" style="cursor: pointer;color:blue;">{{ '凭证' + (imgIndex + 1)}}</p> v-if="img !== ''" style="cursor: pointer;color:blue;">{{ '凭证' + (imgIndex + 1)}}</p>
</td> </td>
<td :rowspan="item.ShopDetailsList.length" v-if='subIndex==0'> <td :rowspan="item.ShopDetailsList.length" v-if='subIndex==0'>
<div> <div>
<p style="cursor: pointer;color:blue;" <p style="cursor: pointer;color:blue;" @click="CreateBill(item.ShopDetailsList)">生成单据</p>
@click="CreateBill(item.ShopDetailsList)">生成单据</p>
</div> </div>
</td> </td>
</tr> </tr>
...@@ -135,28 +139,28 @@ ...@@ -135,28 +139,28 @@
</template> </template>
</tbody> </tbody>
<tbody v-else v-for="(outItem,outindex) in shopDataList"> <tbody v-else v-for="(outItem,outindex) in shopDataList">
<tr> <tr>
<td> <td>
{{outItem.NewCombinationNum}} {{outItem.NewCombinationNum}}
</td> </td>
<td> <td>
</td> </td>
<td> <td>
</td> </td>
<td> <td>
</td> </td>
<td> <td>
</td> </td>
<td width="180"></td> <td width="180"></td>
<td width="60"></td> <td width="60"></td>
<td width="70"></td> <td width="70"></td>
<td width="70"></td> <td width="70"></td>
<td width="80"></td> <td width="80"></td>
<td width="80"></td> <td width="80"></td>
<td width="80"> </td> <td width="80"> </td>
<td width="80"></td> <td width="80"></td>
<td></td> <td></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
...@@ -338,8 +342,6 @@ ...@@ -338,8 +342,6 @@
"-" + "-" +
myDate.getDate(); myDate.getDate();
this.msg.StartDate = nowDate; this.msg.StartDate = nowDate;
// this.msg.StartDate = '';
// this.msg.EndDate = ''
this.getLineList(); this.getLineList();
this.getList(); this.getList();
}, },
...@@ -379,7 +381,7 @@ ...@@ -379,7 +381,7 @@
.ShoppingTable th { .ShoppingTable th {
background-color: #E6E6E6; background-color: #E6E6E6;
height:35px; height: 35px;
} }
.SponeTable td:first-child { .SponeTable td:first-child {
......
src/components/scenicSpot/admissionStatisticsDetails.vue
View file @ 70786fc2
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<th width="80">返佣</th> <th width="80">返佣</th>
<th width="80">总金额</th> <th width="80">总金额</th>
<th width="80">付款方式</th> <th width="80">付款方式</th>
<th width="150">订团号</th> <th width="150">订团号</th>
<th width="150">联络电话</th> <th width="150">联络电话</th>
<th width="300">地址</th> <th width="300">地址</th>
<th width="200">备注</th> <th width="200">备注</th>
...@@ -119,9 +119,9 @@ ...@@ -119,9 +119,9 @@
</el-select> </el-select>
</div> </div>
</td> </td>
<td> <td>
<div class="w160 ScenicComDiv" v-for="subItem in item.ScenicStatisticsList"> <div class="w160 ScenicComDiv" v-for="subItem in item.ScenicStatisticsList">
<el-input class='w120' v-model='subItem.CombinationNum' type="text"></el-input> <el-input class='w120' v-model='subItem.CombinationNum' type="text"></el-input>
</div> </div>
</td> </td>
<td> <td>
...@@ -187,14 +187,14 @@ ...@@ -187,14 +187,14 @@
TCIDs: this.$route.query.id TCIDs: this.$route.query.id
}, res => { }, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.list = res.data.data; this.list = res.data.data;
this.list.forEach(item => { this.list.forEach(item => {
item.ScenicStatisticsList.forEach(x => { item.ScenicStatisticsList.forEach(x => {
x.PayStyle = x.PayStyle.toString(); x.PayStyle = x.PayStyle.toString();
this.calculationPrice(x); this.calculationPrice(x);
if(x.CombinationNum==''||x.CombinationNum==null){ if (x.CombinationNum == '' || x.CombinationNum == null) {
x.CombinationNum = this.$route.query.NewCombinationNum; x.CombinationNum = this.$route.query.NewCombinationNum;
} }
}) })
}) })
} else { } else {
...@@ -207,6 +207,11 @@ ...@@ -207,6 +207,11 @@
this.list.forEach(item => { this.list.forEach(item => {
item.ScenicStatisticsList.forEach(insideItem => { item.ScenicStatisticsList.forEach(insideItem => {
insideItem.OrderState = 0; insideItem.OrderState = 0;
insideItem.TicketPriceList.forEach(subItem => {
if (!subItem.Discount) {
subItem.Discount = 0;
}
});
}) })
}) })
} }
...@@ -214,9 +219,16 @@ ...@@ -214,9 +219,16 @@
this.list.forEach(item => { this.list.forEach(item => {
item.ScenicStatisticsList.forEach(insideItem => { item.ScenicStatisticsList.forEach(insideItem => {
insideItem.OrderState = 1; insideItem.OrderState = 1;
insideItem.TicketPriceList.forEach(subItem => {
if (!subItem.Discount) {
subItem.Discount = 0;
}
});
}) })
}) })
} }
console.log("this.list", this.list);
this.apipost('dmcstatistics_get_SetTicketOrder', this.list, res => { this.apipost('dmcstatistics_get_SetTicketOrder', this.list, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.$message.success(res.data.message); this.$message.success(res.data.message);
...@@ -234,6 +246,7 @@ ...@@ -234,6 +246,7 @@
this.getList() this.getList()
}, },
} }
</script> </script>
<style> <style>
.admissionStatisticsDetailsTalbe { .admissionStatisticsDetailsTalbe {
......
src/router/config.js
View file @ 70786fc2
...@@ -2614,7 +2614,21 @@ export default { ...@@ -2614,7 +2614,21 @@ export default {
meta: { meta: {
title: '营收报表' title: '营收报表'
}, },
}, { //财务 报表 团队营收变更报表 }, { //财务 报表 变更报表
path: '/ChangeRevenueReport',
name: 'ChangeRevenueReport',
component: resolve => require(['@/components/FinancialModule/ReportForm/ChangeRevenueReport'], resolve),
meta: {
title: '变更报表'
},
},{ //财务 变更详情
path: '/ChangeRevenueDetail',
name: 'ChangeRevenueDetail',
component: resolve => require(['@/components/FinancialModule/ReportForm/ChangeRevenueDetail'], resolve),
meta: {
title: '变更详情'
},
},{ //财务 报表 团队营收变更报表
path: '/TeamRevenueReportChange', path: '/TeamRevenueReportChange',
name: 'TeamRevenueReportChange', name: 'TeamRevenueReportChange',
component: resolve => require(['@/components/FinancialModule/ReportForm/TeamRevenueReportChange'], resolve), component: resolve => require(['@/components/FinancialModule/ReportForm/TeamRevenueReportChange'], resolve),
......
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