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

src/components/Hotel/HotelProductManage2.vue

@@ -665,6 +665,8 @@
             return 'hasStock_5';
           } else if (type === 6) {
             return 'hasStock_6';
+          } else {
+            return 'hasStock_7';
           }
         } else {
           return;
@@ -1167,6 +1169,10 @@
     background-color: #808000;
   }
 
+ .hotelProductManage2_calendarItem>.calendarItem_day>div>.hasStock_7 {
+    background-color: #DDA0DD;
+  }
+
   /* 页面编辑 */
   .hotelProductManage2_edit2 {
     margin: 20px 0 0 0;

src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue

@@ -807,7 +807,7 @@
                       </template>
                     </font>
                     =<font style="color:red">
-                      {{Number(getLocalJpyTotalMoney(subItem.PeopleNumber))+Number(getLocalJpyChangeTotalMoney(subItem.PeopleNumber))}}
+                      {{(Number(getLocalJpyTotalMoney(subItem.PeopleNumber))+Number(getLocalJpyChangeTotalMoney(subItem.PeopleNumber))).toFixed(2)}}
                     </font>
                   </template>
                 </td>
@@ -840,6 +840,7 @@
                         </template>
                       </font>
                       =<font style="color:red">
+                        
                         {{Number(getLocalTotalMoney(subItem.PeopleNumber))+Number(getLocalChangeTotalMoney(subItem.PeopleNumber))}}
                       </font>
                     </template>