Commit da7fb096 authored by 王悦's avatar 王悦
parents 69453363 5e3dc7e0
...@@ -60,9 +60,14 @@ ...@@ -60,9 +60,14 @@
</div> </div>
</td> </td>
<td> <td>
<!-- <div class="w80">
<p class="pHouseStyle" v-if="item.CommonReport.HotelList[0].OrderDetailsList.length>0" v-for="(o,index) in item.CommonReport.HotelList[0].OrderDetailsList">
<el-input class='w50 tcenter' @keyup.native="checkInteger(o,'HouseTypeCount')" v-model='o.HouseTypeCount<=0?item.CommonReport.HouseStatistics.HouseTypeList[index].HouseTypeCount:o.HouseTypeCount.toString()'></el-input>
</p>
</div> -->
<div class="w80"> <div class="w80">
<p class="pHouseStyle" v-if="item.CommonReport.HotelList[0].OrderDetailsList.length>0" v-for="(o,index) in item.CommonReport.HotelList[0].OrderDetailsList"> <p class="pHouseStyle" v-if="item.CommonReport.HotelList[0].OrderDetailsList.length>0" v-for="(o,index) in item.CommonReport.HotelList[0].OrderDetailsList">
<el-input class='w50 tcenter' @keyup.native="checkInteger(o,'HouseTypeCount')" v-model='o.HouseTypeCount<=0?item.CommonReport.HouseStatistics.HouseTypeList[index].HouseTypeCount:o.HouseTypeCount'></el-input> <el-input class='w50 tcenter' @keyup.native="checkInteger(o,'HouseTypeCount')" v-model='o.HouseTypeCount'></el-input>
</p> </p>
</div> </div>
</td> </td>
...@@ -170,7 +175,14 @@ ...@@ -170,7 +175,14 @@
this.dataList = res.data.data; this.dataList = res.data.data;
let totalPrice=0 let totalPrice=0
this.dataList.forEach(x=>{ this.dataList.forEach(x=>{
x.CommonReport.HotelList[0].OrderDetailsList.forEach(y=>{ x.CommonReport.HotelList[0].OrderDetailsList.forEach((y,index1)=>{
x.CommonReport.HouseStatistics.HouseTypeList.forEach(z=>{
if(y.HouseTypeCount<=0){
x.CommonReport.HotelList[0].OrderDetailsList[index1].HouseTypeCount = x.CommonReport.HouseStatistics.HouseTypeList[index1].HouseTypeCount.toString();
}else{
y.HouseTypeCount = y.HouseTypeCount.toString();
}
})
y.HouseTypeCount = y.HouseTypeCount.toString(); y.HouseTypeCount = y.HouseTypeCount.toString();
y.HotelDiscount = y.HotelDiscount.toString(); y.HotelDiscount = y.HotelDiscount.toString();
}) })
......
...@@ -1832,7 +1832,7 @@ ...@@ -1832,7 +1832,7 @@
} }
}, err => {}) }, err => {})
}, },
getScenicRefundgetScenicRefund(TCID) { getScenicRefund(TCID) {
this.apipost('sellorder_get_GetScenicRefundList', { this.apipost('sellorder_get_GetScenicRefundList', {
TCID TCID
}, res => { }, res => {
......
...@@ -82,10 +82,12 @@ ...@@ -82,10 +82,12 @@
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
<th>优惠券名</th> <th>优惠券名</th>
<th>数量</th> <th>优惠券数量</th>
<th>发放数量</th>
<th>剩余数量</th>
<th>线路名称</th> <th>线路名称</th>
<th>类型</th> <th>类型</th>
<th>满减/折扣</th> <th>使用条件</th>
<th>面额</th> <th>面额</th>
<!-- <th>使用状态</th> --> <!-- <th>使用状态</th> -->
<th>叠加使用</th> <th>叠加使用</th>
...@@ -97,6 +99,8 @@ ...@@ -97,6 +99,8 @@
<tr v-for="(item,index) in DataList" v-loading="loading"> <tr v-for="(item,index) in DataList" v-loading="loading">
<td>{{item.couponsName}}</td> <td>{{item.couponsName}}</td>
<td>{{item.couponCount}}</td> <td>{{item.couponCount}}</td>
<td>{{item.couponReceiveCount}}</td>
<td>{{(item.couponCount - item.couponReceiveCount) > 0 ? (item.couponCount - item.couponReceiveCount) : 0 }}</td>
<td>{{item.lineName}}</td> <td>{{item.lineName}}</td>
<td>{{item.couponsType ===1 ? "抵用券" : "折扣券"}}</td> <td>{{item.couponsType ===1 ? "抵用券" : "折扣券"}}</td>
<td>{{item.useCondition}}</td> <td>{{item.useCondition}}</td>
......
...@@ -62,6 +62,9 @@ ...@@ -62,6 +62,9 @@
.LuckyDraw .ql-container{ .LuckyDraw .ql-container{
min-height: 100px; min-height: 100px;
} }
.LuckyDraw .avatar-uploader-icon{
height: auto
}
</style> </style>
<template> <template>
<div class="flexOne LuckyDraw"> <div class="flexOne LuckyDraw">
......
...@@ -129,7 +129,7 @@ export default { ...@@ -129,7 +129,7 @@ export default {
rank:'', rank:'',
}, },
rules:{ rules:{
awardName: [{ required: true, message: "请输入公司", trigger: "blur" }], awardName: [{ required: true, message: "请输入奖项名称", trigger: "blur" }],
awardType: [{ required: true, message: "请选择奖项类型", trigger: "change" }], awardType: [{ required: true, message: "请选择奖项类型", trigger: "change" }],
awardRelationId: [{required: true, message: "请选择奖项关联", trigger: "change"}], awardRelationId: [{required: true, message: "请选择奖项关联", trigger: "change"}],
awardCount: [{ required: true, message: "请输入奖项数量", trigger: "blur" }], awardCount: [{ required: true, message: "请输入奖项数量", trigger: "blur" }],
......
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