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

src/components/Hotel/roomReservationsDetails.vue

@@ -119,7 +119,7 @@
                 {{subItem.HouseStatistics.HouseTypeList[childIndex].HouseTypeName}}
                 <template v-if="childIndex==4">
                   <template v-if="subItem.DriverGuideIsRebate==1">
-                    <br />返佣
+                    <br /><span style="color:green">返佣</span>
                   </template>
                   <template v-else-if="subItem.DriverGuideIsRebate==0">
                     <br /><span style="color:red;">不返佣</span>
@@ -186,11 +186,11 @@
               <!-- 房间数 -->
               <td>
                 <el-input class='w40 tcenter' maxlength="2" @keyup.native="checkPrice(childItem,'HouseTypeCount')"
-                  v-model='childItem.HouseTypeCount' :disabled="childIndex<4?true:false"></el-input>
+                  v-model='childItem.HouseTypeCount' :disabled="true"></el-input>
               </td>
               <td>
                 <el-input class='w40 tcenter' maxlength="2" @keyup.native="checkInteger(childItem,'BookNum')"
-                  @input="calculationPrice(subItem)" v-model='childItem.BookNum' :disabled="childIndex<4?true:false">
+                  @input="calculationPrice(subItem)" v-model='childItem.BookNum' :disabled="true">
                 </el-input>
               </td>
               <!-- 尚差房间数 -->
@@ -220,7 +220,7 @@
               <!-- 返佣类型 -->
               <td style="white-space:nowrap;" v-if="childIndex==0" :rowspan="6">
                 <template v-if="subItem.RebateType==1">
-                  含税
+                   <span style="color:green">含税</span>
                 </template>
                 <template v-else>
                   <span style="color:red"> 不含税</span>
@@ -690,8 +690,7 @@
           if (obj.TaxType == 2) {
             if (index == 4) {
               if (obj.DriverGuideIsRebate == 1) {
-                totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 + 0.08 - item.RebateRatio /
-                  100);
+                totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 + 0.08 - item.RebateRatio /   100);
               } else {
                 totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 - item.RebateRatio / 100);
               }