Commit ee7adfc3 authored by zhengke's avatar zhengke

修改

parent 15f2a666
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
<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}"> <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>
...@@ -143,6 +143,34 @@ ...@@ -143,6 +143,34 @@
</template> </template>
</template> </template>
</tbody> </tbody>
<tbody v-else v-for="(outItem,outindex) in shopDataList">
<tr>
<td>
{{outItem.NewCombinationNum}}
</td>
<td>
</td>
<td>
</td>
<td>
</td>
<td>
</td>
<td width="180"></td>
<td width="60"></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></td>
<td></td>
</tr>
</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"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="msg.total"></el-pagination> layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="msg.total"></el-pagination>
...@@ -165,7 +193,7 @@ ...@@ -165,7 +193,7 @@
StartDate: '', StartDate: '',
EndDate: '', EndDate: '',
currentPage: 1, currentPage: 1,
total: 0, total: 0,
}, },
LineList: [], LineList: [],
LineTeamList: [], LineTeamList: [],
...@@ -274,7 +302,6 @@ ...@@ -274,7 +302,6 @@
''; '';
}); });
}); });
console.log("shopDataList", shopDataList);
this.shopDataList = shopDataList; this.shopDataList = shopDataList;
} else { } else {
this.$message.error(res.data.message) this.$message.error(res.data.message)
...@@ -323,8 +350,8 @@ ...@@ -323,8 +350,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();
}, },
......
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
<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}"> <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>
...@@ -134,6 +134,31 @@ ...@@ -134,6 +134,31 @@
</template> </template>
</template> </template>
</tbody> </tbody>
<tbody v-else v-for="(outItem,outindex) in shopDataList">
<tr>
<td>
{{outItem.NewCombinationNum}}
</td>
<td>
</td>
<td>
</td>
<td>
</td>
<td>
</td>
<td width="180"></td>
<td width="60"></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></td>
</tr>
</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"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="msg.total"></el-pagination> layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="msg.total"></el-pagination>
...@@ -265,7 +290,6 @@ ...@@ -265,7 +290,6 @@
''; '';
}); });
}); });
console.log("shopDataList", shopDataList);
this.shopDataList = shopDataList; this.shopDataList = shopDataList;
} else { } else {
this.$message.error(res.data.message) this.$message.error(res.data.message)
...@@ -314,8 +338,8 @@ ...@@ -314,8 +338,8 @@
"-" + "-" +
myDate.getDate(); myDate.getDate();
this.msg.StartDate = nowDate; this.msg.StartDate = nowDate;
this.msg.StartDate = '2019-01-01'; // this.msg.StartDate = '';
this.msg.EndDate = '2019-02-01' // this.msg.EndDate = ''
this.getLineList(); this.getLineList();
this.getList(); this.getList();
}, },
......
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