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

src/components/Hotel/HotelsTeam.vue

@@ -60,9 +60,14 @@
 				</div>
             </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">
                     <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>
                 </div>
             </td>
@@ -83,7 +88,7 @@
             <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" @input="calculationPrice(item)">
-                        <el-input class='w50'   @keyup.native="checkInteger(o,'HotelDiscount')" v-model='o.HotelDiscount'></el-input>
+                        <el-input class='w50' @keyup.native="checkInteger(o,'HotelDiscount')" v-model='o.HotelDiscount'></el-input>
                     </p>
                 </div>
             </td>
@@ -170,7 +175,14 @@
               this.dataList = res.data.data;
               let totalPrice=0
               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.HotelDiscount = y.HotelDiscount.toString();
                   })

src/components/SalesModule/productQuery.vue

@@ -1832,7 +1832,7 @@
           }
         }, err => {})
       },
-      getScenicRefundgetScenicRefund(TCID) {
+      getScenicRefund(TCID) {
         this.apipost('sellorder_get_GetScenicRefundList', {
           TCID
         }, res => {

src/components/activity/CouponList.vue

@@ -82,10 +82,12 @@
     <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
       <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>
@@ -97,6 +99,8 @@
       <tr v-for="(item,index) in DataList" v-loading="loading">
         <td>{{item.couponsName}}</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.couponsType ===1 ? "抵用券" : "折扣券"}}</td>
         <td>{{item.useCondition}}</td>

src/components/activity/LuckyDraw.vue

@@ -62,6 +62,9 @@
     .LuckyDraw .ql-container{
       min-height: 100px;
     }
+    .LuckyDraw .avatar-uploader-icon{
+      height: auto
+    }
   </style>
 <template>
   <div class="flexOne LuckyDraw">

src/components/activity/awardList.vue

@@ -129,7 +129,7 @@ export default {
           rank:'',  
       },
      rules:{ 
-        awardName: [{ required: true, message: "请输入公司", trigger: "blur" }],
+        awardName: [{ required: true, message: "请输入奖项名称", trigger: "blur" }],
         awardType: [{ required: true, message: "请选择奖项类型", trigger: "change" }],
         awardRelationId: [{required: true, message: "请选择奖项关联", trigger: "change"}],
         awardCount: [{ required: true, message: "请输入奖项数量", trigger: "blur" }],