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

src/components/Hotel/HotelsTeam.vue

@@ -29,7 +29,7 @@
           <th width="80">操作</th>
         </tr>
         <tr v-for="(item,index) in dataList">
-            <td><div class="w80">{{index}}</div></td>
+            <td><div class="w80">{{index+1}}</div></td>
             <td><div class="w120">{{item.CommonReport.HotelList[0].TCNUM}}</div></td>
             <td><div class="w120">{{item.StartCityNames}}</div></td>
             <td><div class="w120">{{item.LeaderName}}</div></td>
@@ -60,8 +60,13 @@
 				</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 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'></el-input>
                     </p>
                 </div>
@@ -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>
@@ -168,6 +173,24 @@
             this.loading = false;
           if (res.data.resultCode == 1) {
               this.dataList = res.data.data;
+              let totalPrice=0
+              this.dataList.forEach(x=>{
+                  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();
+                  })
+                 x.CommonReport.HotelList[0].OrderDetailsList.forEach(y=>{
+                    totalPrice+=y.UnitPrice*(y.HouseGuestNum-y.HotelDiscount)*(1-y.RebateRatio/100)
+                 })
+                 x.TotalPrice=totalPrice.toFixed(2)
+              });
           }else{
               this.Error(res.data.message);
           }
@@ -186,6 +209,10 @@
         //单条保存
         SaveSingle(item){
             item.CommonReport.HotelList[0].HotelOrderState=1;
+            item.CommonReport.HotelList[0].OrderDetailsList.forEach(y=>{
+                    y.HouseTypeCount = parseInt(y.HouseTypeCount);
+                    y.HotelDiscount = parseInt(y.HotelDiscount);
+            })
             this.apipost('dmcstatistics_post_SetNewHotelOrder',item.CommonReport.HotelList[0],res=>{
                 if(res.data.resultCode==1){
                     this.Success(res.data.message)

src/components/SalesModule/productQuery.vue

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