Commit 35862986 authored by 黄奎's avatar 黄奎

购物报账页面修改

parent 8dab1947
...@@ -71,13 +71,29 @@ ...@@ -71,13 +71,29 @@
<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>
<template v-if="outItem.TCList.length==1">
<td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
{{subItem.StartCityNames}}
</td>
<td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
{{subItem.TCNUMS}}
</td>
<td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
{{subItem.LeaderName}}
</td>
<td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
{{subItem.GuideName}}
</td>
</template>
<template v-else>
<td> <td>
{{subItem.StartCityNames}} {{subItem.StartCityNames}}
</td> </td>
...@@ -90,6 +106,7 @@ ...@@ -90,6 +106,7 @@
<td> <td>
{{subItem.GuideName}} {{subItem.GuideName}}
</td> </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}}
...@@ -127,8 +144,7 @@ ...@@ -127,8 +144,7 @@
</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>
...@@ -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)
} }
...@@ -350,8 +359,8 @@ ...@@ -350,8 +359,8 @@
"-" + "-" +
myDate.getDate(); myDate.getDate();
this.msg.StartDate = nowDate; this.msg.StartDate = nowDate;
// this.msg.StartDate = '2019-01-01'; this.msg.StartDate = '2019-01-01';
// this.msg.EndDate = '2019-02-01' this.msg.EndDate = '2019-02-01'
this.getLineList(); this.getLineList();
this.getList(); this.getList();
}, },
......
...@@ -60,9 +60,6 @@ ...@@ -60,9 +60,6 @@
<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,13 +67,29 @@ ...@@ -70,13 +67,29 @@
<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>
<template v-if="outItem.TCList.length==1">
<td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
{{subItem.StartCityNames}}
</td>
<td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
{{subItem.TCNUMS}}
</td>
<td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
{{subItem.LeaderName}}
</td>
<td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
{{subItem.GuideName}}
</td>
</template>
<template v-else>
<td> <td>
{{subItem.StartCityNames}} {{subItem.StartCityNames}}
</td> </td>
...@@ -89,6 +102,7 @@ ...@@ -89,6 +102,7 @@
<td> <td>
{{subItem.GuideName}} {{subItem.GuideName}}
</td> </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}}
...@@ -108,15 +122,6 @@ ...@@ -108,15 +122,6 @@
<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>
...@@ -126,8 +131,7 @@ ...@@ -126,8 +131,7 @@
</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>
...@@ -379,7 +383,7 @@ ...@@ -379,7 +383,7 @@
.ShoppingTable th { .ShoppingTable th {
background-color: #E6E6E6; background-color: #E6E6E6;
height:35px; height: 35px;
} }
.SponeTable td:first-child { .SponeTable td:first-child {
......
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